X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=configure.in;h=32d3d707435e56a80a8644f8e2146ff621a9c035;hb=4d3663b733242615ba3c5323f7105ef895b3c8bf;hp=f010b6fe6ac01f947ba096229ee1df9a052c6e61;hpb=c149735f56364c224ec6847d0f32ba06af86dc5b;p=ctsim.git

diff --git a/configure.in b/configure.in
index f010b6f..32d3d70 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.0b12)
+AM_INIT_AUTOMAKE(ctsim,2.0.0)
 AM_CONFIG_HEADER(config.h)
 
 dnl Checks for programs.
@@ -72,8 +72,8 @@ 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])
@@ -81,15 +81,15 @@ 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(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, [fttw=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])
+  AC_CHECK_LIB(png, png_check_sig, [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 netinet/in.h inttypes.h sys/param.h stdint.h stdlib.h g2.h assert.h sys/time.h sys/resource.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)
 
 dnl Checks for typedefs, structures, and compiler characteristics.
 AC_C_CONST
@@ -99,10 +99,12 @@ 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
@@ -311,7 +313,7 @@ AM_CONDITIONAL(NO_X, test "x$no_x" = "xyes")
 my_includes="$my_includes -I../include -I.."
 AC_SUBST(my_includes)
 
-AC_MSG_CHECKING([interactive graphics])
+AC_MSG_CHECKING([for X])
 if test "$no_x" != "yes" ; then
   AC_DEFINE(HAVE_X11)
   AC_DEFINE(HAVE_SGP)
@@ -321,6 +323,7 @@ if test "$no_x" != "yes" ; then
   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