X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=configure.in;h=8695bdc5cc41ad8f15d6dd1cefdd70c69f08c544;hb=40439a4c37dcc76254a6359a96fe9b60ded4c762;hp=78a67130d2734279b6f8a61dd49c32f6efb69c7f;hpb=98f894fe74f1a532f5e6d69cca0404d9a58893e7;p=ctsim.git

diff --git a/configure.in b/configure.in
index 78a6713..8695bdc 100644
--- a/configure.in
+++ b/configure.in
@@ -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,10 +81,10 @@ 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.
@@ -99,7 +99,7 @@ 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)
@@ -311,7 +311,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 +321,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