r309: plotfile changes

[ctsim.git] / configure.in

diff --git a/configure.in b/configure.in
index 24d141961178c495f82d3aa4d0a57fde38c401b1..403e5ef4831e49eaac7c7c4094d14609d5d06324 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -4,7 +4,7 @@ dnl Must reset CDPATH so that bash's cd does not print to stdout
 dnl CDPATH=
 
 AC_INIT(src/ctsim.cpp)
-AM_INIT_AUTOMAKE(ctsim,2.0.5)
+AM_INIT_AUTOMAKE(ctsim,2.5.0)
 AM_CONFIG_HEADER(config.h)
 
 dnl Checks for programs.
@@ -51,7 +51,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 assert.h sys/time.h sys/resource.h sys/time.h sstream)
+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)
 
 dnl Checks for typedefs, structures, and compiler characteristics.
 AC_C_CONST
@@ -109,6 +109,14 @@ dnl  AC_ADD_GCC_CFLAGS([-g -O2 -DNDEBUG])
   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])
 AC_MSG_CHECKING(whether to enable verbose warnings)
@@ -162,11 +170,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
+    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"