X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=configure.in;h=79f48747ab3558478ae469199dab5a27b10fbe61;hb=36c820a392f2e9e023d373aaf46e8bfb6018bdd4;hp=93673659e12d7559a2dd6d25da3366d3009b91e3;hpb=d359e1b7608af3ee78e13ff315445396276644e9;p=ctsim.git

diff --git a/configure.in b/configure.in
index 9367365..79f4874 100644
--- a/configure.in
+++ b/configure.in
@@ -4,7 +4,7 @@ dnl Must reset CDPATH so that bash's cd does not print to stdout
 dnl CDPATH=
 
 AC_INIT(src/ctsim.cpp)
-AM_INIT_AUTOMAKE(ctsim,3.0.0alpha3)
+AM_INIT_AUTOMAKE(ctsim,3.0.0alpha4)
 AM_CONFIG_HEADER(config.h)
 
 dnl Checks for programs.
@@ -39,6 +39,7 @@ AC_CHECK_LIB(m, sin)
 AC_CHECK_LIB(curses, main, [curses=true], [curses=false])
 AC_CHECK_LIB(ncurses, main, [ncurses=true], [ncurses=false])
 AC_CHECK_LIB(g2, main, [g2=true], [g2=false])
+AC_CHECK_LIB(readline, main, [readline=true; AC_DEFINE(HAVE_READLINE)], [readline=false])
 wxwin=false
 AC_CHECK_LIB(wx_gtk, main, [wxwin=true; wx_gtk=true; AC_DEFINE(HAVE_WXWINDOWS)])
 AC_CHECK_LIB(wx, main, [wxwin=true; wx_msw=true; AC_DEFINE(HAVE_WXWINDOWS)])
@@ -51,7 +52,7 @@ fi
 
 dnl Checks for header files.
 AC_HEADER_STDC
-AC_CHECK_HEADERS(fcntl.h unistd.h getopt.h sys/fcntl.h setjmp.h stdarg.h stddef.h sys/types.h sys/stat.h string.h ctype.h math.h stdio.h netinet/in.h inttypes.h sys/param.h stdint.h stdlib.h g2.h assert.h sys/time.h sys/resource.h sys/time.h)
+AC_CHECK_HEADERS(fcntl.h unistd.h getopt.h sys/fcntl.h setjmp.h stdarg.h stddef.h sys/types.h sys/stat.h string.h ctype.h math.h stdio.h netinet/in.h inttypes.h sys/param.h stdint.h stdlib.h g2.h assert.h sys/time.h sys/resource.h sys/time.h readline.h readline/readline.h)
 
 dnl Checks for typedefs, structures, and compiler characteristics.
 AC_C_CONST
@@ -82,6 +83,10 @@ if test "${getopt_long}" = "false" ; then
   AM_CONDITIONAL(INCLUDED_GETOPT_LONG, test 1==1)
 fi
 
+if test "${readline}" = "true" ; then
+  ctlibs_base="$ctlibs_base -lreadline"
+fi
+
 dnl Check for debug mode
 AC_MSG_CHECKING([debug])
 AC_ARG_ENABLE(debug,
@@ -104,8 +109,8 @@ dnl  AC_ADD_GCC_CFLAGS([-g -DDEBUG])
   CFLAGS="-g -DDEBUG"
   AC_DEFINE(DEBUG)
 else
-dnl  AC_ADD_GCC_CFLAGS([-g -O2 -DNDEBUG])
-  CFLAGS="-g -O3 -DNDEBUG"
+dnl  AC_ADD_GCC_CFLAGS([-O2 -DNDEBUG])
+  CFLAGS="-O3 -DNDEBUG"
   AC_DEFINE(NDEBUG)
 fi
 
@@ -364,7 +369,7 @@ ctlibs="$ctlibs_base -lctsim $ctlibs_graphics -lctsupport $ctlibs_tools"
 AC_SUBST(ctlibs)
 
 if test -n "$lamdir" ; then
-  lamprograms="pjrec-lam phm2if-lam phm2pj-lam"
+  lamprograms="ctsimtext-lam"
   AC_SUBST(lamprograms)
   lamdefs="$CFLAGS"
   AC_SUBST(lamdefs)