X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=configure.in;h=e13510f3a728ed58963ea976451caf81b775fac5;hb=22d00c00e9e45cdcb489c8cbbfc1b996f8ee981d;hp=accc2e88d563d28ca18c4722790d031f7b36dc6a;hpb=d0f723d93729549a3aa7513a121daa640a925f1a;p=ctsim.git

diff --git a/configure.in b/configure.in
index accc2e8..e13510f 100644
--- a/configure.in
+++ b/configure.in
@@ -47,6 +47,8 @@ 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(wx_gtk_gl, main, [wxgtkgl=true], [wxgtkgl=false])
 
 if test "$zlib" = "true" ; then
   AC_CHECK_LIB(png, main, [png=true ; AC_DEFINE(HAVE_PNG)], [png=false])
@@ -117,7 +119,7 @@ dnl  AC_ADD_GCC_CFLAGS([-g -DDEBUG])
   AC_DEFINE(DEBUG)
 else
 dnl  AC_ADD_GCC_CFLAGS([-O2 -DNDEBUG])
-  CFLAGS="-O3 -DNDEBUG"
+  CFLAGS="-O3 -DNDEBUG -fomit-frame-pointer"
   AC_DEFINE(NDEBUG)
 fi
 
@@ -307,13 +309,16 @@ if test "$no_x" != "yes" ; then
   AM_CONDITIONAL(HAVE_SGP, test 1==1)
   AC_DEFINE(HAVE_X11)
   LDFLAGS="$LDFLAGS -L../libctgraphics -L/usr/X11R6/lib"
-  ctlibs_graphics="$ctlibs_base -lctgraphics"
+  ctlib_graphics="$ctlibs_base -lctgraphics"
   AC_MSG_RESULT(yes)
   if test "$g2" = "true" ; then
-  ctlibs_graphics="$ctlibs_graphics -lg2"
-  AC_DEFINE(HAVE_G2)
+    ctlib_graphics="$ctlib_graphics -lg2"
+    AC_DEFINE(HAVE_G2)
   fi	
-  ctlibs_graphics="$ctlibs_graphics $X_BASIC_LIBS $X_TOOLKIT_LIBS"
+  ctlib_graphics="$ctlib_graphics $X_BASIC_LIBS $X_TOOLKIT_LIBS"
+  if test "$libgl" = "true" -a test "$wxgtkgl" = "true" ; then
+    ctlib_graphics="$ctlib_graphics -lglut -lGL -lGLU -lwx_gtk_gl"
+  fi
 else
   if test "$wxwin" = "true" ; then
     AC_DEFINE(HAVE_SGP)
@@ -364,7 +369,7 @@ if test "$wxwin" = "true" ; then
    wxlibs="-lwx -lglui -ljpeg -lxpm -lzlib -ltiff"
   fi
   CFLAGS="$CFLAGS -I../include $wxcflags"
-  ctlibs_graphics="$ctlibs_graphics $wxlibs"
+  ctlib_graphics="$ctlib_graphics $wxlibs"
   AM_CONDITIONAL(HAVE_WXWINDOWS, test 1==1 )
 fi
 AC_SUBST(wxcflags)
@@ -372,7 +377,7 @@ AC_SUBST(wxlibs)
 
 dnl Setting projet libraries and includes
 LDFLAGS="$LDFLAGS -L../libctsupport -L../libctsim" 
-ctlibs="$ctlibs_base -lctsim $ctlibs_graphics -lctsupport $ctlibs_tools"
+ctlibs="$ctlibs_base -lctsim $ctlib_graphics -lctsupport $ctlibs_tools"
 AC_SUBST(ctlibs)
 
 if test -n "$lamdir" ; then