X-Git-Url: http://git.kpe.io/?p=ctsim.git;a=blobdiff_plain;f=configure.ac;h=230c87534c26949a1da72918722e8d6140471678;hp=7f482726bc493e146cf321a5439a6582f8aad832;hb=42d20f563d4d4dcf4a34b450031acc853ffb8183;hpb=37d0a9642338bd25e4185f8c96fbef445d6988ff

diff --git a/configure.ac b/configure.ac
index 7f48272..230c875 100644
--- a/configure.ac
+++ b/configure.ac
@@ -12,6 +12,11 @@ AM_CONFIG_HEADER(config.h)
 CFLAGS=""
 CXXFLAGS=""
 
+AM_PATH_GLIB_2_0(2.0.0,,AC_MSG_ERROR(You should get glib 2.0.0 or better.))
+AM_PATH_GTK_2_0(2.0.0,havegtk=yes,havegtk=no)
+
+CFLAGS="${CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS}"
+
 dnl Checks for programs.
 AC_PROG_AWK
 AC_PROG_INSTALL
@@ -44,7 +49,7 @@ AC_CHECK_LIB(readline, main, [readline=true;
                  AC_DEFINE([HAVE_READLINE],1,[Readline library])],
 		 [readline=false], [-lcurses])	
 wxwin=false
-AC_CHECK_LIB(wx_gtk2u_core-2.8, 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_gtk2u_core-2.8, main, [wxwin=true; wx_gtk=true; AC_DEFINE(HAVE_WXWINDOWS,1,[wxwindows library])], [], [-L/usr/lib64 -L/usr/lib ${GTK_LIBS} ${GLIB_LIBS} ])
 AC_CHECK_LIB(wx_mac-2.8, 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], [-L/usr/lib64 -L/usr/lib])
 AC_CHECK_LIB(GL, main, [libgl=true], [libgl=false], [-L/usr/X11R6/lib -L/usr/X11R6/lib64])
@@ -342,7 +347,7 @@ if test "$with_x" != "no" && test "$wxwin" = "true"; then
          wxdebug="--debug"
        fi  
       if [ "$wx_gtk" ]; then 
-       ctlib_graphics="$ctlib_graphics `$wxconfig $wxdebug --libs --version=2.8` -lwx_gtk2u_gl-2.8 `gtk-config --libs` `glib-config --libs glib gmodule gthread`"
+       ctlib_graphics="$ctlib_graphics `$wxconfig $wxdebug --libs --version=2.8` -lwx_gtk2u_gl-2.8 ${GTK_LIBS} ${GLIB_LIBS}"
       elif [ "$wx_mac" ]; then
         ctlib_graphics="$ctlib_graphics -lwx_mac_gl-2.8"
       fi