X-Git-Url: http://git.kpe.io/?p=ctsim.git;a=blobdiff_plain;f=configure.in;h=153bd9471a20bf25a9881abaf3acf6d22f8172f9;hp=8693d57d74997b2d1d132c0bc0a97526408fc6d0;hb=08a5cd04c3994d5ea24713b9b000791bd2e406fe;hpb=031437896d0dc6cac70c16e5604b10f5aa4d0767 diff --git a/configure.in b/configure.in index 8693d57..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/ctrec.cpp) -AM_INIT_AUTOMAKE(ctsim,0.6.0-b3) +AC_INIT(src/ctsim.cpp) +AM_INIT_AUTOMAKE(ctsim,2.0.0-b8) AM_CONFIG_HEADER(config.h) dnl Checks for programs. @@ -14,7 +14,7 @@ AC_PROG_MAKE_SET AC_PROG_RANLIB 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,8 +77,11 @@ 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]) +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 AC_CHECK_LIB(png, main, [png=true ; AC_DEFINE(HAVE_PNG)], [png=false]) @@ -86,7 +89,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) +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 @@ -112,6 +115,33 @@ if test "${getopt_long}" = "false" ; then AM_CONDITIONAL(INCLUDED_GETOPT_LONG, test 1==1) fi +dnl Check for debug mode +AC_MSG_CHECKING([debug]) +AC_ARG_ENABLE(debug, +[ --enable-debug Turn on debugging], +[case "${enableval}" in + yes) debug=true + AC_MSG_RESULT(yes) + ;; + no) debug=false + AC_MSG_RESULT(no) + ;; + *) AC_MSG_RESULT([bad value ${enableval} for --enable-debug]) + ;; +esac], +[debug=false; AC_MSG_RESULT(no)]) +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) @@ -135,21 +165,6 @@ AC_ARG_ENABLE(verbose-warnings, esac ], AC_MSG_RESULT(no) ) -dnl Check for debug mode -AC_ARG_ENABLE(debug, -[ --enable-debug Turn on debugging], -[case "${enableval}" in - 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") - dnl Set LAM path AC_ARG_WITH(lam, [ --with-lam[=PATH] Set path of LAM MPI ], @@ -284,8 +299,8 @@ if test "$no_x" != "yes" ; then AC_DEFINE(HAVE_X11) AC_DEFINE(HAVE_SGP) AM_CONDITIONAL(HAVE_SGP, test 1==1) - LDFLAGS="$LDFLAGS -L../libezplot -L../libgraph -L/usr/X11R6/lib" - ctlibs_graphics="$ctlibs_base -lezplot -lgraph $X_BASIC_LIBS $X_TOOLKIT_LIBS" + LDFLAGS="$LDFLAGS -L../libctgraphics -L/usr/X11R6/lib" + ctlibs_graphics="$ctlibs_base -lctgraphics $X_BASIC_LIBS $X_TOOLKIT_LIBS" AC_MSG_RESULT(yes) else AC_MSG_RESULT(no) @@ -300,18 +315,54 @@ fi if test "$g2" = "true" ; then ctlibs_tools="$ctlibs_tools -lg2" fi -if test "$wx_gtk" = "true" ; then - ctlibs_tools="$ctlibs_tools -lwx_gtk" + +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../libkmath -L../libk -L../libcio -L../libir" -ctlibs="$ctlibs_base -lir $ctlibs_graphics -lkmath -lk -lcio $ctlibs_tools" +LDFLAGS="$LDFLAGS -L../libctsupport -L../libctsim" +ctlibs="$ctlibs_base -lctsim $ctlibs_graphics -lctsupport $ctlibs_tools" AC_SUBST(ctlibs) if test -n "$lamdir" ; then - lamprograms="ctrec-lam phm2if-lam phm2rs-lam" + lamprograms="pjrec-lam phm2if-lam phm2pj-lam" AC_SUBST(lamprograms) 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/simulate.html html/Makefile include/Makefile getopt/Makefile src/sample-ctrec.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)