projects
/
ctsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
update with latest versions from system utils
[ctsim.git]
/
configure.ac
diff --git
a/configure.ac
b/configure.ac
index 687c0105d558cd6d9e626791daeb409b8c986f9e..78bcb8a1bf64ff381034bf1eb3863b3f40bad0d3 100644
(file)
--- a/
configure.ac
+++ b/
configure.ac
@@
-6,7
+6,7
@@
dnl CDPATH=
AC_INIT
AC_CONFIG_SRCDIR([src/ctsim.cpp])
AM_MAINTAINER_MODE
AC_INIT
AC_CONFIG_SRCDIR([src/ctsim.cpp])
AM_MAINTAINER_MODE
-AM_INIT_AUTOMAKE(ctsim,4.
3.4
)
+AM_INIT_AUTOMAKE(ctsim,4.
5.2
)
AM_CONFIG_HEADER(config.h)
dnl Checks for programs.
AM_CONFIG_HEADER(config.h)
dnl Checks for programs.
@@
-19,7
+19,10
@@
AC_PROG_CC
AC_PROG_CXX
AC_C_BIGENDIAN
AC_PROG_CXX
AC_C_BIGENDIAN
-AC_PATH_PROG(wxconfig,wx-config)
+AC_PATH_PROG(wxconfig,wxgtk-2.4-config)
+if test -z "$wxconfig" ; then
+ AC_PATH_PROG(wxconfig,wx-config)
+fi
dnl Check for C operation
AC_CANONICAL_HOST
dnl Check for C operation
AC_CANONICAL_HOST
@@
-270,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])
@@
-295,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
@@
-335,7
+338,7
@@
if test "$with_x" != "no" && test "$wxwin" = "true"; then
ctlib_graphics="$ctlib_graphics -lGL -lGLU"
if test "$wxwin" = "true" ; then
if [ "$wx_gtk" ]; then
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 `
$wx
config --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
elif [ "$wx_mac" ]; then
ctlib_graphics="$ctlib_graphics -lwx_mac_gl-2.4"
fi