r619: *** empty log message ***

[ctsim.git] / configure.in

diff --git a/configure.in b/configure.in
index 9e071f6900491e284615613e76190c09f3702e23..c8e272bd85e29c7f102f6fa5e29545fe75203b08 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -47,7 +47,7 @@ AC_CHECK_LIB(wx_gtk, 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])
-AC_CHECK_LIB(GL, main, [libgl=true], [libgl=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])
 
 if test "$zlib" = "true" ; then
@@ -118,7 +118,7 @@ dnl  AC_ADD_GCC_CFLAGS([-g -DDEBUG])
   CFLAGS="-g -DDEBUG"
   AC_DEFINE(DEBUG)
 else
-dnl  AC_ADD_GCC_CFLAGS([-O2 -DNDEBUG])
+dnl  AC_ADD_GCC_CFLAGS([-O2 -fexpensive-optimizations -DNDEBUG])
   CFLAGS="-O3 -DNDEBUG -fomit-frame-pointer"
   AC_DEFINE(NDEBUG)
 fi
@@ -133,7 +133,8 @@ AC_MSG_RESULT(no)
 
 
 if test "${pthread}" = "true" ; then
-  AC_ADD_GCC_CFLAGS([-pthread])
+  AC_ADD_GCC_CFLAGS([-pthread -D_REENTRANT])
+  AC_DEFINE(HAVE_WXTHREADS)
 fi
 
 AC_ADD_GCC_CFLAGS([-Wall])
@@ -310,7 +311,7 @@ AC_SUBST(X_BASIC_LIBS)
 AC_SUBST(X_EXTRA_LIBS)
 
 X_TOOLKIT_LIBS="-lXt"
-X_BASIC_LIBS="-lXext -lX11"
+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.