r11240: rename from htmldir in configure.ac. Is it some new autoconf reserved name?

diff --git a/configure b/configure
index e83f1231678c32ffdcbb6b3b4ac86baf13924446..d9520231da58dfa022f5fb367cb904a2eeb6dec8 100755 (executable)
--- a/configure
+++ b/configure
@@ -10890,7 +10890,7 @@ fi
 
 # Check whether --with-html-dir was given.
 if test "${with_html_dir+set}" = set; then
 
 # 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
 
 
 fi
 
 


@@ -10899,13 +10899,13 @@ if test -n "$cgibindir" -o -n "$cgibinurl" ; then
 
 fi
 
 
 fi
 

-if test -n "$htmldir" ; then
+if test -n "$html_dir" ; then

   htmldata=simulate.html
 
 fi
 
 
   htmldata=simulate.html
 
 fi
 
 

-if test -n "$htmldir"; then
+if test -n "$html_dir"; then

   USE_HTML_TRUE=
   USE_HTML_FALSE='#'
 else
   USE_HTML_TRUE=
   USE_HTML_FALSE='#'
 else


@@ -10914,7 +10914,7 @@ else
 fi
 
 
 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
   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; }; }
     { { 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; }; }
     { { 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 f206d6574eef5def6da78e619a415a7a79b15cbb..6d884aa4b3797c0f99bd7a47d93c12297e65f58a 100644 (file)
--- 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], 
 [ 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 "$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
   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])
   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])
     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
     AC_MSG_ERROR([--with-html-dir not set for web access])
   fi
 else