X-Git-Url: http://git.kpe.io/?p=ctsim.git;a=blobdiff_plain;f=configure.ac;h=e9f4c40389fa97e3115bb88eedd10303a38062fc;hp=34ca6c2d114ade8630b38067169d4dca7b95771f;hb=5de81048494731a2879f3145517af82722c98f83;hpb=a8b749b787192f1ab9ec88c016bacaab61eab070

diff --git a/configure.ac b/configure.ac
index 34ca6c2..e9f4c40 100644
--- 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.6)
 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,13 +248,11 @@ AC_MSG_CHECKING([for CPU specification])
 AC_ARG_WITH(mcpu,
 [  --with-mcpu[=CPU]         Set name of CPU for gcc -mcpu])
 
-if test "$withval" == "pentium4" -o "$withval" == "athlon"  ; then
-  AC_MSG_RESULT([$withval])
-  CFLAGS="$CFLAGS -mcpu=$withval"
-elif test "$withval" == "no"; then
+if test "$withval" == "no" -o "$withval" == "yes" -o "$withval" == ""; then
   AC_MSG_RESULT([no])
 else
-  AC_MSG_RESULT([Unknown])
+  AC_MSG_RESULT([$withval])
+  CFLAGS="$CFLAGS -mcpu=$withval"
 fi
 
 AC_MSG_CHECKING([for web access])