X-Git-Url: http://git.kpe.io/?p=ctsim.git;a=blobdiff_plain;f=configure.ac;h=f0c72fefd4cbeac126fcfdc4c9faa8b5ae481142;hp=4de3646c4e139b615a10e76a1510212dfc52e2d5;hb=232b3dbd5572d95ab9023ec02f46dd145c5afc13;hpb=e99ef5538ce4756a0b3e77d347076ef5c041c629

diff --git a/configure.ac b/configure.ac
index 4de3646..f0c72fe 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6,7 +6,7 @@ dnl CDPATH=
 AC_INIT
 AC_CONFIG_SRCDIR([src/ctsim.cpp])
 AM_MAINTAINER_MODE
-AM_INIT_AUTOMAKE(ctsim,4.5.0x)
+AM_INIT_AUTOMAKE(ctsim,4.5.2)
 AM_CONFIG_HEADER(config.h)
 
 dnl Checks for programs.
@@ -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