From d3895305f93511d6dd63f1f44fadbb96a0f1c251 Mon Sep 17 00:00:00 2001
From: "Kevin M. Rosenberg" <kevin@rosenberg.net>
Date: Thu, 19 Oct 2006 04:35:25 +0000
Subject: [PATCH] r11240: rename from htmldir in configure.ac. Is it some new
 autoconf reserved name?

---
 configure    | 10 +++++-----
 configure.ac | 10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/configure b/configure
index e83f123..d952023 100755
--- a/configure
+++ b/configure
@@ -10890,7 +10890,7 @@ fi
 
 # Check whether --with-html-dir was given.
 if test "${with_html_dir+set}" = set; then
-  withval=$with_html_dir;  htmldir=$withval ;
+  withval=$with_html_dir;  html_%dir=$withval ;
 fi
 
 
@@ -10899,13 +10899,13 @@ if test -n "$cgibindir" -o -n "$cgibinurl" ; then
 
 fi
 
-if test -n "$htmldir" ; then
+if test -n "$html_dir" ; then
   htmldata=simulate.html
 
 fi
 
 
-if test -n "$htmldir"; then
+if test -n "$html_dir"; then
   USE_HTML_TRUE=
   USE_HTML_FALSE='#'
 else
@@ -10914,7 +10914,7 @@ else
 fi
 
 
-if test -n "$cgibindir" -o -n "$cgibinurl" -o -n "$webdatadir" -o -n "$webdataurl" -o -n "$htmldir" ; then
+if test -n "$cgibindir" -o -n "$cgibinurl" -o -n "$webdatadir" -o -n "$webdataurl" -o -n "$html_dir" ; then
   webenabled=true
 
   { echo "$as_me:$LINENO: result: yes" >&5
@@ -10935,7 +10935,7 @@ echo "$as_me: error: --with-webdata-dir not set for web access" >&2;}
     { { echo "$as_me:$LINENO: error: --with-webdata-url not set for web access" >&5
 echo "$as_me: error: --with-webdata-url not set for web access" >&2;}
    { (exit 1); exit 1; }; }
-  elif test -z "$htmldir" ; then
+  elif test -z "$html_dir" ; then
     { { echo "$as_me:$LINENO: error: --with-html-dir not set for web access" >&5
 echo "$as_me: error: --with-html-dir not set for web access" >&2;}
    { (exit 1); exit 1; }; }
diff --git a/configure.ac b/configure.ac
index f206d65..6d884aa 100644
--- a/configure.ac
+++ b/configure.ac
@@ -273,20 +273,20 @@ AC_ARG_WITH(webdata-url, [  --with-webdata-url=PATH Set URL path of webdata],
 [ webdataurl=$withval ; AC_SUBST(webdataurl) ] )
 
 AC_ARG_WITH(html-dir, [  --with-html-dir=PATH    Set directory of html files], 
-[ htmldir=$withval ; AC_SUBST(htmldir) ] )
+[ html_%dir=$withval ; AC_SUBST(htmldir) ] )
 
 if test -n "$cgibindir" -o -n "$cgibinurl" ; then
   cgiprograms="ctsim.cgi ctsim.conf"
   AC_SUBST(cgiprograms)
 fi
 
-if test -n "$htmldir" ; then
+if test -n "$html_dir" ; then
   htmldata=simulate.html
   AC_SUBST(htmldata)
 fi
-AM_CONDITIONAL(USE_HTML, test -n "$htmldir")
+AM_CONDITIONAL(USE_HTML, test -n "$html_dir")
 
-if test -n "$cgibindir" -o -n "$cgibinurl" -o -n "$webdatadir" -o -n "$webdataurl" -o -n "$htmldir" ; then
+if test -n "$cgibindir" -o -n "$cgibinurl" -o -n "$webdatadir" -o -n "$webdataurl" -o -n "$html_dir" ; then
   webenabled=true
   AC_SUBST(webenabled)
   AC_MSG_RESULT([yes])
@@ -298,7 +298,7 @@ if test -n "$cgibindir" -o -n "$cgibinurl" -o -n "$webdatadir" -o -n "$webdataur
     AC_MSG_ERROR([--with-webdata-dir not set for web access])
   elif test -z "$webdataurl" ; then
     AC_MSG_ERROR([--with-webdata-url not set for web access])
-  elif test -z "$htmldir" ; then
+  elif test -z "$html_dir" ; then
     AC_MSG_ERROR([--with-html-dir not set for web access])
   fi
 else
-- 
2.34.1