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

diff --git a/configure.in b/configure.in
index 262f928..9d13113 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.0b11)
+AM_INIT_AUTOMAKE(ctsim,2.0.4)
 AM_CONFIG_HEADER(config.h)
 
 dnl Checks for programs.
@@ -12,6 +12,9 @@ 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_PATH_PROG(wxconfig,wx-config)
@@ -72,16 +75,16 @@ WX_C_BIGENDIAN
 
 
 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])
 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(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, main, [fftw=true; AC_DEFINE(HAVE_FFTW)], [fftw=false])
+AC_CHECK_LIB(fftw, fftw_one, [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])
@@ -89,7 +92,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)
+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)
 
 dnl Checks for typedefs, structures, and compiler characteristics.
 AC_C_CONST
@@ -99,16 +102,21 @@ AC_STRUCT_TM
 
 dnl Checks for library functions.
 AC_FUNC_VPRINTF
-AC_CHECK_FUNCS(strtod strtol snprintf htonl usleep)
+AC_CHECK_FUNCS(strtod strtol snprintf htonl usleep vsprintf vsnprintf)
 AC_CHECK_FUNC(basename)
 AC_CHECK_FUNC(setjmp)
+AC_CHECK_FUNC(setpriority)
+AC_CHECK_FUNC(time)
+AC_CHECK_FUNC(gettimeofday)
+
 if test "${OSTYPE}" = "cygwin" ; then
   getopt_long=false
 else
   AC_CHECK_FUNC(getopt_long, [ getopt_long=true ], [ getopt_long=false ])
 fi
+
 if test "${getopt_long}" = "false" ; then
-  my_includes="$myincludes -I../getopt"
+  my_includes="$my_includes -I../getopt"
   AC_DEFINE(HAVE_GETOPT_LONG)
   ctlibs_base="$ctlibs_base -lgetopt"
   LDFLAGS="$LDFLAGS -L../getopt"
@@ -306,22 +314,29 @@ 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)
 
-AC_MSG_CHECKING([interactive graphics])
+LDFLAGS="$LDFLAGS -L/usr/local/lib"
+
+AC_MSG_CHECKING([for X])
 if test "$no_x" != "yes" ; then
-  AC_DEFINE(HAVE_X11)
   AC_DEFINE(HAVE_SGP)
   AM_CONDITIONAL(HAVE_SGP, test 1==1)
+  AC_DEFINE(HAVE_X11)
   LDFLAGS="$LDFLAGS -L../libctgraphics -L/usr/X11R6/lib"
   ctlibs_graphics="$ctlibs_base -lctgraphics"
   AC_MSG_RESULT(yes)
   if test "$g2" = "true" ; then
   ctlibs_graphics="$ctlibs_graphics -lg2"
+  AC_DEFINE(HAVE_G2)
   fi	
   ctlibs_graphics="$ctlibs_graphics $X_BASIC_LIBS $X_TOOLKIT_LIBS"
 else
+  if test "$wxwin" = "true" ; then
+    AC_DEFINE(HAVE_SGP)
+    AM_CONDITIONAL(HAVE_SGP, test 1==1)
+  fi
   AC_MSG_RESULT(no)
 fi
 
@@ -359,9 +374,14 @@ if test "$dmallocxx" = "true" -a "$usedmalloc" = "true" ; then
 fi
 
 if test "$wxwin" = "true" ; then
-  wxcflags=`$wxconfig --cflags`
+  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"
-  wxlibs=`$wxconfig --libs`
   ctlibs_graphics="$ctlibs_graphics $wxlibs"
   AM_CONDITIONAL(HAVE_WXWINDOWS, test 1==1 )
 fi