X-Git-Url: http://git.kpe.io/?p=ctsim.git;a=blobdiff_plain;f=configure.in;h=7c27a3e1dc58d18e6516834f9e49de4f62ae72fc;hp=26cbf807c49ed8abcf912134d34826545e6b22b6;hb=3fba6928127cd65870bdcd96c8114ad5894247ae;hpb=61a66c46fb3b7ed0d22b27bf08c2d7adf418ce62 diff --git a/configure.in b/configure.in index 26cbf80..7c27a3e 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.c) -AM_INIT_AUTOMAKE(ctsim,0.5.4) +AC_INIT(src/ctsim.cpp) +AM_INIT_AUTOMAKE(ctsim,2.0.0-b4) 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,15 +77,19 @@ 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]) +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]) + if test "$zlib" = "true" ; then AC_CHECK_LIB(png, main, [png=true ; AC_DEFINE(HAVE_PNG)], [png=false]) fi -AC_CHECK_LIB(wx_gtk, main, [wxwin=true; wx_gtk=true], [wxwin=false]) -AC_CHECK_LIB(wx_msw, main, [wxwin=true; wx_msw=true], [wxwin=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 @@ -111,7 +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, @@ -135,20 +138,30 @@ AC_ARG_ENABLE(verbose-warnings, ) dnl Check for debug mode +AC_MSG_CHECKING([debug]) AC_ARG_ENABLE(debug, [ --enable-debug Turn on debugging], [case "${enableval}" in yes) debug=true - CFLAGS="$CFLAGS -g" + AC_MSG_RESULT(yes) ;; no) debug=false - CFLAGS="$CFLAGS -O2" + AC_MSG_RESULT(no) ;; - *) AC_MSG_ERROR(bad value ${enableval} for --enable-debug) + *) AC_MSG_RESULT([bad value ${enableval} for --enable-debug]) ;; -esac],[debug=false]) +esac], +[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 ], @@ -283,38 +296,47 @@ 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_base="$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) fi -dnl Setting projet libraries and includes -LDFLAGS="$LDFLAGS -L../libkmath -L../libk -L../libcio -L../libir" -ctlibs_base="$ctlibs_base -lkmath -lk -lcio" -if test -n "$pngdir" ; then - ctlibs_base="$ctlibs_base -lpng" +if test "$png" = "true" ; then + ctlibs_tools="$ctlibs_tools -lpng" fi if test "$zlib" = "true" ; then - ctlibs_base="$ctlibs_base -lz" -fi -if test "$png" = "true" ; then - ctlibs_base="$ctlibs_base -lpng" + ctlibs_tools="$ctlibs_tools -lz" fi if test "$g2" = "true" ; then - ctlibs_base="$ctlibs_base -lg2" + ctlibs_tools="$ctlibs_tools -lg2" fi -ctlibs="-lir $ctlibs_base" +if test "$fftw" = "true" ; then + ctlibs_tools="$ctlibs_tools -lrfftw -lfftw" +fi +dnl Setting projet libraries and includes +LDFLAGS="$LDFLAGS -L../libctsupport -L../libctsim" +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 - ctlamlibs="-lir_lam $ctlibs_base" - lamprograms="ctrec-lam phm2sdf-lam phm2rs-lam" + lamprograms="pjrec-lam phm2if-lam phm2pj-lam" AC_SUBST(lamprograms) - 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/simulate.html html/Makefile include/Makefile getopt/Makefile src/sample-ctrec.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)