X-Git-Url: http://git.kpe.io/?p=ctsim.git;a=blobdiff_plain;f=configure.in;h=262f928be32742d772236a4346f433a427907ed8;hp=6af88a0a8760bcdb78de093ae4f35f7d175a8d8b;hb=bfcc769cf8019eabc8c65c07257c8dbee4b4c977;hpb=980bef9b95bef1ab728634181a5672088fd47066

diff --git a/configure.in b/configure.in
index 6af88a0..262f928 100644
--- 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.0b8)
+AM_INIT_AUTOMAKE(ctsim,2.0.0b11)
 AM_CONFIG_HEADER(config.h)
 
 dnl Checks for programs.
@@ -99,7 +99,7 @@ AC_STRUCT_TM
 
 dnl Checks for library functions.
 AC_FUNC_VPRINTF
-AC_CHECK_FUNCS(strtod strtol snprintf htonl)
+AC_CHECK_FUNCS(strtod strtol snprintf htonl usleep)
 AC_CHECK_FUNC(basename)
 AC_CHECK_FUNC(setjmp)
 if test "${OSTYPE}" = "cygwin" ; then
@@ -165,6 +165,21 @@ AC_ARG_ENABLE(verbose-warnings,
   esac ], AC_MSG_RESULT(no)
 )
 
+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)
+)
+
 dnl Set LAM path
 AC_ARG_WITH(lam,
 [  --with-lam[=PATH]       Set path of LAM MPI ],
@@ -300,8 +315,12 @@ if test "$no_x" != "yes" ; then
   AC_DEFINE(HAVE_SGP)
   AM_CONDITIONAL(HAVE_SGP, test 1==1)
   LDFLAGS="$LDFLAGS -L../libctgraphics -L/usr/X11R6/lib"
-  ctlibs_graphics="$ctlibs_base -lctgraphics $X_BASIC_LIBS $X_TOOLKIT_LIBS"
+  ctlibs_graphics="$ctlibs_base -lctgraphics"
   AC_MSG_RESULT(yes)
+  if test "$g2" = "true" ; then
+  ctlibs_graphics="$ctlibs_graphics -lg2"
+  fi	
+  ctlibs_graphics="$ctlibs_graphics $X_BASIC_LIBS $X_TOOLKIT_LIBS"
 else
   AC_MSG_RESULT(no)
 fi
@@ -312,10 +331,6 @@ fi
 if test "$zlib" = "true" ; then
   ctlibs_tools="$ctlibs_tools -lz"
 fi
-if test "$g2" = "true" ; then
-  ctlibs_tools="$ctlibs_tools -lg2"
-fi
-
 if test "$fftw" = "true" ; then
   ctlibs_tools="$ctlibs_tools -lrfftw -lfftw"
 fi
@@ -361,6 +376,8 @@ AC_SUBST(ctlibs)
 if test -n "$lamdir" ; then
   lamprograms="pjrec-lam phm2if-lam phm2pj-lam"
   AC_SUBST(lamprograms)
+  lamdefs="$CFLAGS"
+  AC_SUBST(lamdefs)
 fi
 
 CXXFLAGS="$CFLAGS"