r10675: remove commands commented-out

[ctsim.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 2ce392d076a09af503a529cc2e2accbd03bc9c69..687c0105d558cd6d9e626791daeb409b8c986f9e 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -6,7 +6,7 @@ dnl CDPATH=
 AC_INIT
 AC_CONFIG_SRCDIR([src/ctsim.cpp])
 AM_MAINTAINER_MODE
-AM_INIT_AUTOMAKE(ctsim,4.3.0)
+AM_INIT_AUTOMAKE(ctsim,4.3.4)
 AM_CONFIG_HEADER(config.h)
 
 dnl Checks for programs.
@@ -41,10 +41,10 @@ AC_CHECK_LIB(readline, main, [readline=true;
                  AC_DEFINE([HAVE_READLINE],1,[Readline library])],
                 [readline=false], [-lcurses])  
 wxwin=false
-AC_CHECK_LIB(wx_gtk-2.4, main, [wxwin=true; wx_gtk=true; AC_DEFINE(HAVE_WXWINDOWS,1,[wxwindows library])])
+AC_CHECK_LIB(wx_gtk-2.4, main, [wxwin=true; wx_gtk=true; AC_DEFINE(HAVE_WXWINDOWS,1,[wxwindows library])], [], [-L/usr/lib64 -L/usr/lib `gtk-config --libs` `glib-config --libs glib gmodule gthread` ])
 AC_CHECK_LIB(wx_mac-2.4, main, [wxwin=true; wx_mac=true; AC_DEFINE(HAVE_WXWINDOWS,1,[wxwindows library])])
-AC_CHECK_LIB(fftw3, fftw_malloc, [fftw=true; AC_DEFINE(HAVE_FFTW,1,[FFTW library])], [fftw=false])
-AC_CHECK_LIB(GL, main, [libgl=true], [libgl=false], [-L/usr/X11R6/lib -L/usr/X11R6/lib64 -lXt -lXext])
+AC_CHECK_LIB(fftw3, fftw_malloc, [fftw=true; AC_DEFINE(HAVE_FFTW,1,[FFTW library])], [fftw=false], [-L/usr/lib64 -L/usr/lib])
+AC_CHECK_LIB(GL, main, [libgl=true], [libgl=false], [-L/usr/X11R6/lib -L/usr/X11R6/lib64])
 AC_CHECK_LIB(pthread, main, [pthread=true], [pthread=false])
 
 if test "$zlib" = "true" ; then
@@ -63,7 +63,7 @@ AC_STRUCT_TM
 
 dnl Checks for library functions.
 AC_FUNC_VPRINTF
-AC_CHECK_FUNCS(strtod strtol snprintf htonl usleep vsprintf vsnprintf)
+AC_CHECK_FUNCS(strtod strtol snprintf htonl usleep vsprintf vsnprintf basename setjmp setpriority time gettimeofday getenv)
 AC_CHECK_FUNC(basename)
 AC_CHECK_FUNC(setjmp)
 AC_CHECK_FUNC(setpriority)
@@ -304,17 +304,6 @@ fi
 
 AM_CONDITIONAL(USE_LAM, test -n "$lamdir")
 
-dnl Prepare to support X.  If the user gave the command-line option
-dnl --without-x, AC_PATH_XTRA will set no_x to "yes".  Otherwise, it will
-dnl add appropriate preprocessor flags to X_CFLAGS, and appropriate linker
-dnl flags to X_LIBS.  It also checks for system-specific X libraries, and
-dnl adds them to X_PRE_LIBS or X_EXTRA_LIBS, as appropriate.  (The former
-dnl is where "-lSM -lICE" goes, in X11R6.)  We define the X_TOOLKIT_LIBS
-dnl and X_BASIC_LIBS argument vectors ourselves, and if X is to be
-dnl supported, we'll concatenate the whole lot of these into a command line
-dnl for libtool.  See, e.g., the libplot_la_LIBADD line in
-dnl libplot/Makefile.am.
-
 AC_PATH_XTRA
 AC_SUBST(X_CFLAGS)
 dnl Following five are concatenated together into a linker specification.
@@ -324,19 +313,9 @@ AC_SUBST(X_PRE_LIBS)
 AC_SUBST(X_BASIC_LIBS)
 AC_SUBST(X_EXTRA_LIBS)
 
-X_TOOLKIT_LIBS="-lXt"
-X_BASIC_LIBS="-lXext -lX11 -lXmu"
-
-dnl Check whether libXt has thread support.  Some platforms may have
-dnl pthread support in libc, but no thread support in libXt/libX11.
-our_saved_LDFLAGS="$LDFLAGS"
-LDFLAGS="$X_LIBS $LDFLAGS"
-AC_CHECK_LIB(Xt, XtToolkitThreadInitialize, AC_DEFINE(X_THREAD_SUPPORT,1,[x thread supported]), , $X_PRE_LIBS $X_BASIC_LIBS $X_EXTRA_LIBS)
-LDFLAGS="$our_saved_LDFLAGS"
-
 dnl Our Makefile.am files test the automake variable NO_X to determine
 dnl whether X should be supported.
-AM_CONDITIONAL(NO_X, test "x$no_x" = "xyes")
+AM_CONDITIONAL(NO_X, test "x$with_x" = "xno")
 
 my_includes="$my_includes -I../include -I.. -I/usr/local/include"
 AC_SUBST(my_includes)
@@ -344,7 +323,7 @@ AC_SUBST(my_includes)
 LDFLAGS="$LDFLAGS -L/usr/local/lib"
 
 AC_MSG_CHECKING([for X])
-if test "$no_x" != "yes" ; then
+if test "$with_x" != "no" && test "$wxwin" = "true"; then
   AC_DEFINE(HAVE_X11,1,[X11 system])
   LDFLAGS="$LDFLAGS -L../libctgraphics -L/usr/X11R6/lib -L/usr/X11R6/lib64"
   my_includes="$my_includes -I/usr/X11R6/include"
@@ -356,7 +335,7 @@ if test "$no_x" != "yes" ; then
     ctlib_graphics="$ctlib_graphics -lGL -lGLU"
     if test "$wxwin" = "true" ; then
       if [ "$wx_gtk" ]; then 
-        ctlib_graphics="$ctlib_graphics -lwx_gtk_gl-2.4"
+        ctlib_graphics="$ctlib_graphics `wx-config --libs` -lwx_gtk_gl-2.4 `gtk-config --libs` `glib-config --libs glib gmodule gthread`"
       elif [ "$wx_mac" ]; then
         ctlib_graphics="$ctlib_graphics -lwx_mac_gl-2.4"
       fi