AC_INIT
AC_CONFIG_SRCDIR([src/ctsim.cpp])
AM_MAINTAINER_MODE
-AM_INIT_AUTOMAKE(ctsim,4.5.1)
+AM_INIT_AUTOMAKE(ctsim,4.5.2)
AM_CONFIG_HEADER(config.h)
dnl Checks for programs.
AC_C_BIGENDIAN
AC_PATH_PROG(wxconfig,wxgtk-2.4-config)
-if [ ! "$wxconfig" ]; then
+if test -z "$wxconfig" ; then
AC_PATH_PROG(wxconfig,wx-config)
fi
[ 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])
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
ctlib_graphics="$ctlib_graphics -lGL -lGLU"
if test "$wxwin" = "true" ; then
if [ "$wx_gtk" ]; then
- ctlib_graphics="$ctlib_graphics `wx-config --libs` -lwx_gtk_gl-2.4 `gtk-config --libs` `glib-config --libs glib gmodule gthread`"
+ ctlib_graphics="$ctlib_graphics `$wxconfig --libs` -lwx_gtk_gl-2.4 `gtk-config --libs` `glib-config --libs glib gmodule gthread`"
elif [ "$wx_mac" ]; then
ctlib_graphics="$ctlib_graphics -lwx_mac_gl-2.4"
fi