r7936: preliminary changes to compile on redhat amd64

[ctsim.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index e0fccd69c8ad1a50ca787b276f973b03da836823..6d2a681392c498500b12e04a3671ca3a5b735c63 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -5,7 +5,8 @@ dnl CDPATH=
 
 AC_INIT
 AC_CONFIG_SRCDIR([src/ctsim.cpp])
-AM_INIT_AUTOMAKE(ctsim,4.0.2)
+AM_MAINTAINER_MODE
+AM_INIT_AUTOMAKE(ctsim,4.2.8)
 AM_CONFIG_HEADER(config.h)
 
 dnl Checks for programs.
@@ -81,8 +82,9 @@ if test "${getopt_long}" = "false" ; then
   AC_DEFINE(HAVE_GETOPT_LONG,1,[getopt_long library])
   ctlibs_base="$ctlibs_base -lgetopt"
   LDFLAGS="$LDFLAGS -L../getopt"
-  AM_CONDITIONAL(INCLUDED_GETOPT_LONG, test 1==1)
+  GETOPTLONG=1
 fi
+AM_CONDITIONAL(INCLUDED_GETOPT_LONG, test "$GETOPTLONG"="1")
 
 if test "${readline}" = "true" ; then
   ctlibs_base="$ctlibs_base -lreadline"
@@ -120,7 +122,7 @@ if test "$debug" = "true" ; then
   CFLAGS="$CFLAGS -g -DDEBUG"
   AC_DEFINE(DEBUG,1,[turn on debugging])
 else
-  CFLAGS="$CFLAGS -O3 -DNDEBUG -fomit-frame-pointer -funroll-loops"
+  CFLAGS="$CFLAGS -O2 -DNDEBUG -fomit-frame-pointer"
   AC_DEFINE(NDEBUG,1,[no debugging])
 fi
 
@@ -246,7 +248,7 @@ AC_MSG_CHECKING([for CPU specification])
 AC_ARG_WITH(mcpu,
 [  --with-mcpu[=CPU]         Set name of CPU for gcc -mcpu])
 
-if [ "$withval" == "" ] || [ "$withval" == "no" ]; then
+if test "$withval" == "no" -o "$withval" == "yes" -o "$withval" == ""; then
   AC_MSG_RESULT([no])
 else
   AC_MSG_RESULT([$withval])
@@ -362,12 +364,13 @@ if test "$no_x" != "yes" ; then
   fi
   if test "$wxwin" = "true" ; then
     AC_DEFINE(HAVE_SGP,1,[use sgp library])
-    AM_CONDITIONAL(HAVE_SGP, test 1==1)
   fi
 else
   AC_MSG_RESULT(no)
 fi
 
+AM_CONDITIONAL(HAVE_SGP, test "$wxwin" = "true")
+
 if test "$png" = "true" ; then
   ctlibs_tools="$ctlibs_tools -lpng"
 fi
@@ -437,10 +440,10 @@ if test "$wxwin" = "true" ; then
   fi
   CFLAGS="$CFLAGS -I../include $wxcflags"
   ctlib_graphics="$ctlib_graphics $wxlibs"
-  AM_CONDITIONAL(HAVE_WXWINDOWS, test 1==1 )
 fi
 AC_SUBST(wxcflags)
 AC_SUBST(wxlibs)
+AM_CONDITIONAL(HAVE_WXWINDOWS, test "$wxwin"="true")
 
 dnl Setting projet libraries and includes
 LDFLAGS="$LDFLAGS -L../libctsupport -L../libctsim"