r1366: *** empty log message ***

[ctsim.git] / configure.in

diff --git a/configure.in b/configure.in
index d6312cbbf881664366f07afe33a55bad99a69af9..ecd8610f40dab4626df6bf3cf52249b519c3ce2c 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -43,7 +43,7 @@ AC_CHECK_LIB(readline, main, [readline=true; AC_DEFINE(HAVE_READLINE)], [readlin
 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(fftw, fftw_one, [fftw=true; AC_DEFINE(HAVE_FFTW)], [fftw=false])
@@ -344,25 +344,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