r1232: *** empty log message ***

[ctsim.git] / configure.in

diff --git a/configure.in b/configure.in
index bb61c8619c958f19728205427b83f9328a6c7384..21ca5b907880e4aef3e16ea0139bede6c3a723a9 100644 (file)
--- 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,3.1.0)
+AM_INIT_AUTOMAKE(ctsim,3.5.0)
 AM_CONFIG_HEADER(config.h)
 
 dnl Checks for programs.
@@ -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"
+    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