X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=configure.in;h=5f43602fde9d3db4059979e0c35b2b9330b07ad0;hb=3e346e67f7f7a331919a32439b0f54a4d53d3029;hp=b48e0f3aa51a0f17d209fa6acca88e64701bf04b;hpb=44ba9ce559d2d52cbd7bbea6bcd76242840fd3eb;p=ctsim.git

diff --git a/configure.in b/configure.in
index b48e0f3..5f43602 100644
--- a/configure.in
+++ b/configure.in
@@ -3,8 +3,8 @@ dnl Process this file with autoconf to produce a configure script.
 dnl Must reset CDPATH so that bash's cd does not print to stdout
 dnl CDPATH=
 
-AC_INIT(src/ctrec.cpp)
-AM_INIT_AUTOMAKE(ctsim,1.9.4)
+AC_INIT(src/pjrec.cpp)
+AM_INIT_AUTOMAKE(ctsim,1.9.9)
 AM_CONFIG_HEADER(config.h)
 
 dnl Checks for programs.
@@ -12,7 +12,7 @@ AC_PROG_AWK
 AC_PROG_INSTALL
 AC_PROG_MAKE_SET
 AC_PROG_RANLIB
-AC_PROG_CC
+AC_PROG_CC([-g])
 AC_PROG_CXX
 
 
@@ -79,6 +79,7 @@ AC_CHECK_LIB(ncurses, main, [ncurses=true], [ncurses=false])
 AC_CHECK_LIB(g2, main, [g2=true], [g2=false])
 AC_CHECK_LIB(wx_gtk, main, [wxwin=true; wx_gtk=true; AC_DEFINE(HAVE_WXWINDOWS)], [wxwin=false])
 AC_CHECK_LIB(wx_msw, main, [wxwin=true; wx_msw=true; AC_DEFINE(HAVE_WXWINDOWS)], [wxwin=false])
+AC_CHECK_LIB(dmallocxx, main, [dmalloc=true], [dmalloc=false])
 
 if test "$zlib" = "true" ; then
   AC_CHECK_LIB(png, main, [png=true ; AC_DEFINE(HAVE_PNG)], [png=false])
@@ -136,18 +137,22 @@ AC_ARG_ENABLE(verbose-warnings,
 )
 
 dnl Check for debug mode
+AC_MSG_CHECKING([debug])
 AC_ARG_ENABLE(debug,
 [  --enable-debug          Turn on debugging],
 [case "${enableval}" in
   yes) debug=true 
-       CFLAGS="$CFLAGS -g"
+       CFLAGS="-g -DDEBUG"
+       AC_MSG_RESULT(yes)
        ;;
   no)  debug=false 
-       CFLAGS="$CFLAGS -O2"
+       AC_MSG_RESULT(no)
+       CFLAGS="-g -O"
        ;;
-  *) AC_MSG_ERROR(bad value ${enableval} for --enable-debug) 
+  *) AC_MSG_RESULT([bad value ${enableval} for --enable-debug]) 
        ;;
-esac],[debug=false])
+esac],
+[debug=false])
 AM_CONDITIONAL(DEBUG, test "$debug" = "true")
 
 dnl Set LAM path
@@ -310,8 +315,8 @@ ctlibs="$ctlibs_base -lctsim $ctlibs_graphics -lctsupport $ctlibs_tools"
 AC_SUBST(ctlibs)
 
 if test -n "$lamdir" ; then
-  lamprograms="ctrec-lam phm2if-lam phm2pj-lam"
+  lamprograms="pjrec-lam phm2if-lam phm2pj-lam"
   AC_SUBST(lamprograms)
 fi
 
-AC_OUTPUT(Makefile src/Makefile libctgraphics/Makefile libctsupport/Makefile libctsim/Makefile Makefile man/Makefile cgi-bin/ctsim.cgi cgi-bin/Makefile html/simulate.html html/Makefile include/Makefile getopt/Makefile src/sample-ctrec.sh cgi-bin/ctsim.conf)
+AC_OUTPUT(Makefile src/Makefile libctgraphics/Makefile libctsupport/Makefile libctsim/Makefile Makefile man/Makefile cgi-bin/ctsim.cgi cgi-bin/Makefile html/simulate.html html/Makefile include/Makefile getopt/Makefile src/sample-ctsim.sh cgi-bin/ctsim.conf)