X-Git-Url: http://git.kpe.io/?p=ctsim.git;a=blobdiff_plain;f=configure.in;h=7c0189c103aac5663994024f75d9a04767952709;hp=fe236e653057574d574b5f916dc3c5fc7c08258b;hb=82ea0c94394a5a175b260160760155a6686203a1;hpb=e2dbd11ba1c5f0535d2f73c83e95c9c2ebef5318

diff --git a/configure.in b/configure.in
index fe236e6..7c0189c 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.2-b2)
+AC_INIT(src/ctsim.cpp)
+AM_INIT_AUTOMAKE(ctsim,3.0.0beta1)
 AM_CONFIG_HEADER(config.h)
 
 dnl Checks for programs.
@@ -12,24 +12,50 @@ AC_PROG_AWK
 AC_PROG_INSTALL
 AC_PROG_MAKE_SET
 AC_PROG_RANLIB
+
+CFLAGS="$CFLAGS -I/usr/local/include"
+LDFLAGS="$LDFLAGS -L/usr/local/lib"
 AC_PROG_CC
+AC_PROG_CXX
+AC_C_BIGENDIAN
+
+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.))
+
+dnl Check for C operation
+AC_CANONICAL_HOST 
+AC_C_INLINE
+AC_CHECK_SIZEOF(short, 2)
+AC_CHECK_SIZEOF(int, 4)
+AC_CHECK_SIZEOF(long, 4)
+AC_CHECK_SIZEOF(float, 4)
+AC_CHECK_SIZEOF(double, 8)
 
 dnl Checks for libraries.
-AC_CHECK_LIB(z, main, 
-[
-  zlib="true"
-],
-[ 
-  zlib="false"
-  AC_MSG_WARN([zlib missing. Will need zlib for PNG support])
-])
-AC_CHECK_LIB(m, main)
+AC_CHECK_LIB(z, deflate, [ zlib="true" ], [ zlib="false" ;  AC_MSG_WARN([zlib missing. Will need zlib for PNG support])])
+AC_CHECK_LIB(m, sin)
 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(readline, main, [readline=true; AC_DEFINE(HAVE_READLINE)], [readline=false])
+AC_CHECK_LIB(ncurses, main, [ncurses=true; AC_DEFINE(HAVE_NCURSES)], [ncurses=false])
+AC_CHECK_LIB(curses, main, [curses=true; AC_DEFINE(HAVE_CURSES)], [curses=false])
+wxwin=false
+AC_CHECK_LIB(wx_gtk, main, [wxwin=true; wx_gtk=true; AC_DEFINE(HAVE_WXWINDOWS)])
+AC_CHECK_LIB(wx, main, [wxwin=true; wx_msw=true; AC_DEFINE(HAVE_WXWINDOWS)])
+AC_CHECK_LIB(hdf5, main, [hdf5=true], [hdf5=false], -lz)
+AC_CHECK_LIB(fftw, fftw_one, [fftw=true; AC_DEFINE(HAVE_FFTW)], [fftw=false])
+AC_CHECK_LIB(GL, main, [libgl=true], [libgl=false])
+
+if test "$zlib" = "true" ; then
+  AC_CHECK_LIB(png, main, [png=true ; AC_DEFINE(HAVE_PNG)], [png=false])
+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)
+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 sys/time.h sys/resource.h sys/time.h readline.h readline/readline.h)
 
 dnl Checks for typedefs, structures, and compiler characteristics.
 AC_C_CONST
@@ -39,21 +65,70 @@ AC_STRUCT_TM
 
 dnl Checks for library functions.
 AC_FUNC_VPRINTF
-AC_CHECK_FUNCS(strtod strtol)
+AC_CHECK_FUNCS(strtod strtol snprintf htonl usleep vsprintf vsnprintf)
 AC_CHECK_FUNC(basename)
 AC_CHECK_FUNC(setjmp)
-AC_CHECK_FUNC(getopt_long,
-[
-  getopt_long=true
-],
-[
+AC_CHECK_FUNC(setpriority)
+AC_CHECK_FUNC(time)
+AC_CHECK_FUNC(gettimeofday)
+
+if test "${OSTYPE}" = "cygwin" ; then
   getopt_long=false
-  my_includes="$myincludes -I../getopt"
+else
+  AC_CHECK_FUNC(getopt_long, [ getopt_long=true ], [ getopt_long=false ])
+fi
+
+if test "${getopt_long}" = "false" ; then
+  my_includes="$my_includes -I../getopt"
   AC_DEFINE(HAVE_GETOPT_LONG)
   ctlibs_base="$ctlibs_base -lgetopt"
   LDFLAGS="$LDFLAGS -L../getopt"
   AM_CONDITIONAL(INCLUDED_GETOPT_LONG, test 1==1)
-])
+fi
+
+if test "${readline}" = "true" ; then
+  ctlibs_base="$ctlibs_base -lreadline"
+  if test "${ncurses}" = "true"; then
+    ctlibs_base="$ctlibs_base -lncurses"
+  elif test "${curses}" = "true"; then
+    ctlibs_base="$ctlibs_base -lcurses"
+  fi
+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([-O2 -DNDEBUG])
+  CFLAGS="-O3 -DNDEBUG -fomit-frame-pointer"
+  AC_DEFINE(NDEBUG)
+fi
+
+AC_MSG_CHECKING(sstream)
+ if [ test -f /usr/include/sstream || test -f /usr/include/g++/sstream ||
+     test -f /usr/include/g++-2/sstream || test -f /usr/include/g++-3/sstream ]; then
+  AC_DEFINE(HAVE_SSTREAM)
+  AC_MSG_RESULT(yes)
+fi
+AC_MSG_RESULT(no)
 
 
 AC_ADD_GCC_CFLAGS([-Wall])
@@ -78,68 +153,21 @@ 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 ;;
-  no)  debug=false ;;
-  *) AC_MSG_ERROR(bad value ${enableval} for --enable-debug) ;;
-esac],[debug=false])
-AM_CONDITIONAL(DEBUG, test "$debug" = "true")
-
-dnl Set PNG directory     
-AC_MSG_CHECKING([for PNG library installation])
-AC_ARG_WITH(png,
-[  --with-png[=PATH]       Set path of lib PNG installation ],
-[
-     if test "$withval" != "no" ; then
-         trypngdir=$withval
-         if test "$prefix" != "NONE" ; then
-         trypngdir="$trypngdir $prefix"
-       fi
-     fi
-]
+AC_MSG_CHECKING(static executables)
+AC_ARG_ENABLE(static,
+[  --enable-static
+                          Enable static executables.],
+[ case "$enableval" in
+  yes)
+    AC_MSG_RESULT(yes)
+    AC_ADD_GCC_CFLAGS([--static])
+    ;;
+  *)
+    AC_MSG_RESULT(no)
+    ;;
+  esac ], AC_MSG_RESULT(no)
 )
 
-if test "$withval" != "no" -a "$zlib" = "true" ; then
-  for testpngdir in "." $trypngdir /usr/local /usr /opt ; do
-    if test -f "$testpngdir/lib/libpng.a" ; then
-      if test ! -f "$testpngdir/include/png.h" ; then
-        AC_MSG_ERROR([PNG library found, but png.h not found. Check PNG installation])
-      else
-          grep PNG_LIBPNG_VER_STRING "$testpngdir/include/png.h" | grep 9 > /dev/null 
-          if test "$?" = "0" ; then
-            AC_MSG_ERROR([Your version of libpng in $testpngdir is too old -- please upgrade])
-          fi
-      fi
-      LDFLAGS="$LDFLAGS -L$testpngdir/lib"
-      CFLAGS="$CFLAGS -I$testpngdir/include"
-      pngdir="$testpngdir"
-      AC_DEFINE(HAVE_PNG)
-      break
-    elif test -f "$testpngdir/libpng.a" ; then
-      if test ! -f "$testpngdir/png.h" ; then
-        AC_MSG_ERROR([PNG library found, but png.h not found. Check PNG installation])
-      else
-          grep PNG_LIBPNG_VER_STRING "$testpngdir/png.h" | grep 9 > /dev/null 
-          if test "$?" = "0" ; then
-            AC_MSG_ERROR([Your version of libpng in $testpngdir is too old -- please upgrade])
-          fi
-      fi
-      LDFLAGS="$LDFLAGS -L$testpngdir"
-      CFLAGS="$CFLAGS -I$testpngdir"
-      pngdir="$testpngdir"
-      AC_DEFINE(HAVE_PNG)
-      break
-    fi
-  done
-  AC_MSG_RESULT($pngdir)
-  AM_CONDITIONAL(HAVE_PNG, test -n "$pngdir")
-else
-  AC_MSG_RESULT([no])
-fi
-
 dnl Set LAM path
 AC_ARG_WITH(lam,
 [  --with-lam[=PATH]       Set path of LAM MPI ],
@@ -155,9 +183,12 @@ if test "$withval" != "no" ; then
 
   AC_MSG_CHECKING([for LAM MPI installation])
   for testlamdir in "." $trylamdir /usr/local /usr/local/lam /usr /usr/lam /opt /opt/lam ; do
-    if test -x "$testlamdir/bin/hcc" ; then
-      LDFLAGS="$LDFLAGS -L$testlamdir/lib"
-      CFLAGS="$CFLAGS -I$testlamdir/include"
+    if test -x "$testlamdir/bin/hcp" ; then
+      if test "$testlamdir" != "/usr"; then 	
+        LDFLAGS="$LDFLAGS -L$testlamdir/lib"
+        CFLAGS="$CFLAGS -I$testlamdir/include"
+      fi
+      CFLAGS="$CFLAGS -I$testlamdir/include/mpi2c++"
       lamdir="$testlamdir"
       AC_SUBST(lamdir)
       mpienable="true"
@@ -166,6 +197,8 @@ if test "$withval" != "no" ; then
     fi
   done
   AC_MSG_RESULT($lamdir)
+else
+  AC_MSG_RESULT([no])
 fi
 
 AC_MSG_CHECKING([for web access])
@@ -191,7 +224,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")
@@ -215,26 +248,6 @@ else
   AC_MSG_RESULT([no])
 fi
 
-dnl Setting projet libraries and includes
-LDFLAGS="$LDFLAGS -L../libezplot -L../libgraph -L../libkmath -L../libk -L../libcio -L../libir" 
-ctlibs_base="$ctlibs_base -lezplot -lgraph -lkmath -lk -lcio"
-if test -n "$pngdir" ; then
-  ctlibs_base="$ctlibs_base -lpng"
-fi
-if test "$zlib" = "true" ; then
-  ctlibs_base="$ctlibs_base -lz"
-fi
-ctlibs="-lir $ctlibs_base"
-
-AC_SUBST(ctlibs)
-
-if test -n "$lamdir" ; then
-  ctlamlibs="-lir_lam $ctlibs_base"
-  lamprograms="ctrec-lam phm2sdf-lam phm2rs-lam"
-  AC_SUBST(lamprograms)
-  AC_SUBST(ctlamlibs)
-fi
-
 AM_CONDITIONAL(USE_LAM, test -n "$lamdir")
 
 dnl Prepare to support X.  If the user gave the command-line option
@@ -284,12 +297,95 @@ dnl Our Makefile.am files test the automake variable NO_X to determine
 dnl whether X should be supported.
 AM_CONDITIONAL(NO_X, test "x$no_x" = "xyes")
 
-my_includes="$my_includes -I../include -I.."
+my_includes="$my_includes -I../include -I.. -I/usr/local/include"
 AC_SUBST(my_includes)
 
-if test "x$no_x" != "xyes" ; then
-  AC_DEFINE(HAVE_INTERACTIVE_GRAPHICS)
-  AM_CONDITIONAL(HAVE_INTERACTIVE_GRAPHICS, test 1==1)
+LDFLAGS="$LDFLAGS -L/usr/local/lib"
+
+AC_MSG_CHECKING([for X])
+if test "$no_x" != "yes" ; then
+  AC_DEFINE(HAVE_SGP)
+  AM_CONDITIONAL(HAVE_SGP, test 1==1)
+  AC_DEFINE(HAVE_X11)
+  LDFLAGS="$LDFLAGS -L../libctgraphics -L/usr/X11R6/lib"
+  ctlib_graphics="$ctlibs_base -lctgraphics"
+  AC_MSG_RESULT(yes)
+  if test "$g2" = "true" ; then
+    ctlib_graphics="$ctlib_graphics -lg2"
+    AC_DEFINE(HAVE_G2)
+  fi	
+  ctlib_graphics="$ctlib_graphics $X_BASIC_LIBS $X_TOOLKIT_LIBS"
+  if test "$libgl" = "true" ; then
+    ctlib_graphics="$ctlib_graphics -lwx_gtk_gl -lglut -lGL -lGLU"
+  fi
+else
+  if test "$wxwin" = "true" ; then
+    AC_DEFINE(HAVE_SGP)
+    AM_CONDITIONAL(HAVE_SGP, test 1==1)
+  fi
+  AC_MSG_RESULT(no)
+fi
+
+if test "$png" = "true" ; then
+  ctlibs_tools="$ctlibs_tools -lpng"
+fi
+if test "$zlib" = "true" ; then
+  ctlibs_tools="$ctlibs_tools -lz"
 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
+  if test "$wx_gtk" = "true" ; then	
+    wxcflags=`$wxconfig --cflags`
+    wxlibs=`$wxconfig --libs`
+  else
+	wxcflags="-D__WXMSW__ -D__WIN32__ -D__GNUWIN32__"
+   wxlibs="-lwx -lglui -ljpeg -lxpm -lzlib -ltiff"
+  fi
+  CFLAGS="$CFLAGS -I../include $wxcflags"
+  ctlib_graphics="$ctlib_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 $ctlib_graphics -lctsupport $ctlibs_tools"
+AC_SUBST(ctlibs)
+
+if test -n "$lamdir" ; then
+  lamprograms="ctsimtext-lam"
+  AC_SUBST(lamprograms)
+  lamdefs="$CFLAGS"
+  AC_SUBST(lamdefs)
+fi
+
+CXXFLAGS="$CFLAGS"
 
-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 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)