X-Git-Url: http://git.kpe.io/?p=ctsim.git;a=blobdiff_plain;f=configure.in;h=61ddc8cbba18c562cef57300c7da513714b4b403;hp=45a3342426ee8786e65856659ff10604e7bcf4c1;hb=249f195fc5ec53e539dd91397a1adafb2f8b5cfb;hpb=d46f5229565d6fdd6c3d164ee0790433ff9118a2 diff --git a/configure.in b/configure.in index 45a3342..61ddc8c 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/ctrec.c) -AM_INIT_AUTOMAKE(ctsim,0.5.2-b3) +AM_INIT_AUTOMAKE(ctsim,0.5.3) AM_CONFIG_HEADER(config.h) dnl Checks for programs. @@ -13,6 +13,7 @@ AC_PROG_INSTALL AC_PROG_MAKE_SET AC_PROG_RANLIB AC_PROG_CC +AC_PROG_CXX dnl Checks for libraries. AC_CHECK_LIB(z, main, @@ -29,7 +30,7 @@ AC_CHECK_LIB(ncurses, main, [ncurses=true], [ncurses=false]) 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) +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) dnl Checks for typedefs, structures, and compiler characteristics. AC_C_CONST @@ -39,7 +40,7 @@ AC_STRUCT_TM dnl Checks for library functions. AC_FUNC_VPRINTF -AC_CHECK_FUNCS(strtod strtol) +AC_CHECK_FUNCS(strtod strtol snprintf) AC_CHECK_FUNC(basename) AC_CHECK_FUNC(setjmp) AC_CHECK_FUNC(getopt_long, @@ -82,9 +83,14 @@ dnl Check for debug mode AC_ARG_ENABLE(debug, [ --enable-debug Turn on debugging], [case "${enableval}" in - yes) debug=true ;; - no) debug=false ;; - *) AC_MSG_ERROR(bad value ${enableval} for --enable-debug) ;; + yes) debug=true + CFLAGS="$CFLAGS -g" + ;; + no) debug=false + CFLAGS="$CFLAGS -O2" + ;; + *) AC_MSG_ERROR(bad value ${enableval} for --enable-debug) + ;; esac],[debug=false]) AM_CONDITIONAL(DEBUG, test "$debug" = "true") @@ -191,7 +197,7 @@ if test -n "$cgibindir" -o -n "$cgibinurl" ; then fi if test -n "$htmldir" ; then - htmldata=ctsim.html + htmldata=simulate.html AC_SUBST(htmldata) fi AM_CONDITIONAL(USE_HTML, test -n "$htmldir") @@ -294,4 +300,4 @@ if test -n "$lamdir" ; then AC_SUBST(ctlamlibs) fi -AC_OUTPUT(Makefile libezplot/Makefile src/Makefile libgraph/Makefile libkmath/Makefile Makefile libk/Makefile libir/Makefile libcio/Makefile man/Makefile cgi-bin/ctsim.cgi cgi-bin/Makefile html/ctsim.html html/Makefile include/Makefile getopt/Makefile src/sample-ctrec.sh cgi-bin/ctsim.conf) +AC_OUTPUT(Makefile libezplot/Makefile src/Makefile libgraph/Makefile libkmath/Makefile Makefile libk/Makefile libir/Makefile libcio/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)