dnl Must reset CDPATH so that bash's cd does not print to stdout
dnl CDPATH=
-AC_INIT(src/pjrec.cpp)
-AM_INIT_AUTOMAKE(ctsim,2.0.0-b3)
+AC_INIT(src/ctsim.cpp)
+AM_INIT_AUTOMAKE(ctsim,2.0.0-b4)
AM_CONFIG_HEADER(config.h)
dnl Checks for programs.
AC_PROG_INSTALL
AC_PROG_MAKE_SET
AC_PROG_RANLIB
-AC_PROG_CC([-g])
+AC_PROG_CC
AC_PROG_CXX
-
+AC_PATH_PROG(wxconfig,wx-config)
dnl AC_MSG_CHECKING([that the compiler works])
dnl AC_TRY_RUN([ main(int ac, char **av) { return 0; } ], AC_MSG_RESULT(yes), AC_MSG_RESULT(no) AC_MSG_ERROR(Could not compile and run even a trivial ANSI C program - check CC.), AC_MSG_ERROR(Could not compile and run even a trivial ANSI C program - check CC.))
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(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])
+wxwin=false
+AC_CHECK_LIB(wx_gtk, main, [wxwin=true; wx_gtk=true; AC_DEFINE(HAVE_WXWINDOWS)])
+AC_CHECK_LIB(wx_msw, main, [wxwin=true; wx_msw=true; AC_DEFINE(HAVE_WXWINDOWS)])
AC_CHECK_LIB(dmallocxx, main, [dmalloc=true], [dmalloc=false])
AC_CHECK_LIB(fftw, main, [fftw=true; AC_DEFINE(HAVE_FFTW)], [fftw=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 netinet/in.h inttypes.h sys/param.h stdint.h stdlib.h g2.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)
dnl Checks for typedefs, structures, and compiler characteristics.
AC_C_CONST
AM_CONDITIONAL(INCLUDED_GETOPT_LONG, test 1==1)
fi
-
AC_ADD_GCC_CFLAGS([-Wall])
AC_MSG_CHECKING(whether to enable verbose warnings)
AC_ARG_ENABLE(verbose-warnings,
[ --enable-debug Turn on debugging],
[case "${enableval}" in
yes) debug=true
- CFLAGS="-g -DDEBUG"
AC_MSG_RESULT(yes)
;;
no) debug=false
AC_MSG_RESULT(no)
- CFLAGS="-g -O"
;;
*) AC_MSG_RESULT([bad value ${enableval} for --enable-debug])
;;
esac],
-[debug=false])
+[debug=false; AC_MSG_RESULT(no)])
AM_CONDITIONAL(DEBUG, test "$debug" = "true")
+if test "$debug" = "true" ; then
+ AC_ADD_GCC_CFLAGS([-g -DDEBUG])
+ AC_DEFINE(DEBUG)
+else
+ AC_ADD_GCC_CFLAGS([-g -O3 -DNDEBUG --fast-math])
+ AC_DEFINE(NDEBUG)
+fi
+
dnl Set LAM path
AC_ARG_WITH(lam,
[ --with-lam[=PATH] Set path of LAM MPI ],
if test "$g2" = "true" ; then
ctlibs_tools="$ctlibs_tools -lg2"
fi
-if test "$wx_gtk" = "true" ; then
- ctlibs_tools="$ctlibs_tools -lwx_gtk"
-fi
if test "$fftw" = "true" ; then
ctlibs_tools="$ctlibs_tools -lrfftw -lfftw"
ctlibs="$ctlibs_base -lctsim $ctlibs_graphics -lctsupport $ctlibs_tools"
AC_SUBST(ctlibs)
+if test "$wxwin" = "true" ; then
+ wxcflags=`$wxconfig --cflags`
+ CFLAGS="$CFLAGS -I../include $wxcflags"
+ wxlibs=`$wxconfig --libs`
+ wxlibs="$wxlibs $ctlibs"
+ AM_CONDITIONAL(HAVE_WXWINDOWS, test 1==1 )
+fi
+AC_SUBST(wxcflags)
+AC_SUBST(wxlibs)
+
if test -n "$lamdir" ; then
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-ctsim.sh cgi-bin/ctsim.conf)
+CXXFLAGS="$CFLAGS"
+
+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 tools/sample-ctsim.sh cgi-bin/ctsim.conf tools/Makefile)