X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=configure.in;h=3de71234612fc64bff8dce8b95fe3cd588aba3b3;hb=0e305a6bd11df323b21c77f16159ef365b6846ff;hp=d6312cbbf881664366f07afe33a55bad99a69af9;hpb=7c456cf1278a3dfd6149094292dffea81e795cc6;p=ctsim.git

diff --git a/configure.in b/configure.in
index d6312cb..3de7123 100644
--- a/configure.in
+++ b/configure.in
@@ -38,14 +38,13 @@ AC_CHECK_LIB(z, deflate, [ zlib="true" ], [ zlib="false" ;  AC_MSG_WARN([zlib mi
 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])
 AC_CHECK_LIB(readline, main, [readline=true; AC_DEFINE(HAVE_READLINE)], [readline=false], [-lcurses])
 AC_CHECK_LIB(ncurses, main, [ncurses=true; AC_DEFINE(HAVE_NCURSES)], [ncurses=false])
 AC_CHECK_LIB(curses, main, [curses=true; AC_DEFINE(HAVE_CURSES)], [curses=false])
 wxwin=false
-AC_CHECK_LIB(wx_gtk, main, [wxwin=true; wx_gtk=true; AC_DEFINE(HAVE_WXWINDOWS)])
+AC_CHECK_LIB(wx_gtk-2.2, main, [wxwin=true; wx_gtk=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(hdf4, main, [hdf4=true], [hdf4=false], -lz)
 AC_CHECK_LIB(fftw, fftw_one, [fftw=true; AC_DEFINE(HAVE_FFTW)], [fftw=false])
 AC_CHECK_LIB(GL, main, [libgl=true], [libgl=false], [-L/usr/X11R6/lib -lXt -lXext])
 AC_CHECK_LIB(pthread, main, [pthread=true], [pthread=false])
@@ -56,7 +55,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 readline.h readline/readline.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 assert.h sys/time.h sys/resource.h sys/time.h readline.h readline/readline.h)
 
 dnl Checks for typedefs, structures, and compiler characteristics.
 AC_C_CONST
@@ -344,25 +343,22 @@ LDFLAGS="$LDFLAGS -L/usr/local/lib"
 
 AC_MSG_CHECKING([for X])
 if test "$no_x" != "yes" ; then
-  AC_DEFINE(HAVE_SGP)
-  AM_CONDITIONAL(HAVE_SGP, test 1==1)
   AC_DEFINE(HAVE_X11)
   LDFLAGS="$LDFLAGS -L../libctgraphics -L/usr/X11R6/lib"
   ctlib_graphics="$ctlibs_base -lctgraphics"
   AC_MSG_RESULT(yes)
-  if test "$g2" = "true" ; then
-    ctlib_graphics="$ctlib_graphics -lg2"
-    AC_DEFINE(HAVE_G2)
-  fi	
   ctlib_graphics="$ctlib_graphics $X_BASIC_LIBS $X_TOOLKIT_LIBS"
   if test "$libgl" = "true" ; then
-    ctlib_graphics="$ctlib_graphics -lwx_gtk_gl -lglut -lGL -lGLU"
+    ctlib_graphics="$ctlib_graphics -lglut -lGL -lGLU"
+    if test "$wxwin" = "true" ; then
+      ctlib_graphics="$ctlib_graphics -lwx_gtk_gl-2.2"
+    fi
   fi
-else
   if test "$wxwin" = "true" ; then
     AC_DEFINE(HAVE_SGP)
     AM_CONDITIONAL(HAVE_SGP, test 1==1)
   fi
+else
   AC_MSG_RESULT(no)
 fi