X-Git-Url: http://git.kpe.io/?p=ctsim.git;a=blobdiff_plain;f=configure.in;h=153bd9471a20bf25a9881abaf3acf6d22f8172f9;hp=20cc06498eb751008de0e1040a56d0a579d5f1fb;hb=08a5cd04c3994d5ea24713b9b000791bd2e406fe;hpb=6850134e4711a842cc7c0a306a9e4243df06b952 diff --git a/configure.in b/configure.in index 20cc064..153bd94 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/pjrec.cpp) -AM_INIT_AUTOMAKE(ctsim,2.0.0-b3) +AC_INIT(src/ctsim.cpp) +AM_INIT_AUTOMAKE(ctsim,2.0.0-b8) AM_CONFIG_HEADER(config.h) dnl Checks for programs. @@ -12,9 +12,9 @@ AC_PROG_AWK 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.)) @@ -77,9 +77,10 @@ AC_CHECK_LIB(m, main) 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]) -AC_CHECK_LIB(dmallocxx, main, [dmalloc=true], [dmalloc=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(hdf5, main, [hdf5=true], [hdf5=false], -lz) AC_CHECK_LIB(fftw, main, [fftw=true; AC_DEFINE(HAVE_FFTW)], [fftw=false]) if test "$zlib" = "true" ; then @@ -114,29 +115,6 @@ if test "${getopt_long}" = "false" ; then 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-verbose-warnings - Enable verbose compiler warnings.], -[ case "$enableval" in - yes) - AC_MSG_RESULT(yes) - AC_ADD_GCC_CFLAGS([-W]) - AC_ADD_GCC_CFLAGS([-Wshadow -Wpointer-arith -Wbad-function-cast]) - AC_ADD_GCC_CFLAGS([-Wcast-align -Wwrite-strings -Waggregate-return]) - AC_ADD_GCC_CFLAGS([-Wmissing-prototypes -Wstrict-prototypes]) - AC_ADD_GCC_CFLAGS([-pedantic]) - AC_ADD_GCC_CFLAGS([-Wredundant-decls]) - - ;; - *) - AC_MSG_RESULT(no) - ;; - esac ], AC_MSG_RESULT(no) -) - dnl Check for debug mode AC_MSG_CHECKING([debug]) AC_ARG_ENABLE(debug, @@ -155,13 +133,38 @@ esac], AM_CONDITIONAL(DEBUG, test "$debug" = "true") if test "$debug" = "true" ; then +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" AC_DEFINE(NDEBUG) fi + +AC_ADD_GCC_CFLAGS([-Wall]) +AC_MSG_CHECKING(whether to enable verbose warnings) +AC_ARG_ENABLE(verbose-warnings, +[ --enable-verbose-warnings + Enable verbose compiler warnings.], +[ case "$enableval" in + yes) + AC_MSG_RESULT(yes) + AC_ADD_GCC_CFLAGS([-W]) + AC_ADD_GCC_CFLAGS([-Wshadow -Wpointer-arith -Wbad-function-cast]) + AC_ADD_GCC_CFLAGS([-Wcast-align -Wwrite-strings -Waggregate-return]) + AC_ADD_GCC_CFLAGS([-Wmissing-prototypes -Wstrict-prototypes]) + AC_ADD_GCC_CFLAGS([-pedantic]) + AC_ADD_GCC_CFLAGS([-Wredundant-decls]) + + ;; + *) + AC_MSG_RESULT(no) + ;; + esac ], AC_MSG_RESULT(no) +) + dnl Set LAM path AC_ARG_WITH(lam, [ --with-lam[=PATH] Set path of LAM MPI ], @@ -312,14 +315,44 @@ fi 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" fi +dnl Check for dmalloc +AC_CHECK_LIB(dmallocxx, main, [dmallocxx=true], [dmallocxx=false]) +AC_MSG_CHECKING([for enable-dmalloc]) +AC_ARG_ENABLE(dmalloc, +[ --enable-dmalloc Use dmalloc memory allocation], +[case "${enableval}" in + yes) usedmalloc=true + AC_MSG_RESULT(yes) + ;; + no) usedmalloc=false + AC_MSG_RESULT(no) + ;; + *) AC_MSG_RESULT([bad value ${enableval} for --enable-dmalloc]) + ;; +esac], +[usedmalloc=false; AC_MSG_RESULT(no)]) + +if test "$dmallocxx" = "true" -a "$usedmalloc" = "true" ; then + ctlibs_tools="$ctlibs_tools -ldmallocxx" + AC_DEFINE(HAVE_DMALLOC) + AC_MSG_RESULT(Using dmalloc) +fi + +if test "$wxwin" = "true" ; then + wxcflags=`$wxconfig --cflags` + CFLAGS="$CFLAGS -I../include $wxcflags" + wxlibs=`$wxconfig --libs` + ctlibs_graphics="$ctlibs_graphics $wxlibs" + AM_CONDITIONAL(HAVE_WXWINDOWS, test 1==1 ) +fi +AC_SUBST(wxcflags) +AC_SUBST(wxlibs) + dnl Setting projet libraries and includes LDFLAGS="$LDFLAGS -L../libctsupport -L../libctsim" ctlibs="$ctlibs_base -lctsim $ctlibs_graphics -lctsupport $ctlibs_tools" @@ -330,4 +363,6 @@ if test -n "$lamdir" ; then 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 libctgraphics/Makefile libctsupport/Makefile libctsim/Makefile Makefile man/Makefile doc/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 src/Makefile)