X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=configure.in;h=e04c771a9d2be2354104770de8877c3b9e4ed6ff;hb=d3fa225aa232e132cc198672c4fc148f96a1ab8c;hp=e13510f3a728ed58963ea976451caf81b775fac5;hpb=22d00c00e9e45cdcb489c8cbbfc1b996f8ee981d;p=ctsim.git diff --git a/configure.in b/configure.in index e13510f..e04c771 100644 --- a/configure.in +++ b/configure.in @@ -48,7 +48,7 @@ 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]) +AC_CHECK_LIB(wx_gtk_gl, main, [wxgtkgl=true], [wxgtkgl=false], -lwx_gtk -lGL) if test "$zlib" = "true" ; then AC_CHECK_LIB(png, main, [png=true ; AC_DEFINE(HAVE_PNG)], [png=false]) @@ -316,7 +316,7 @@ if test "$no_x" != "yes" ; then AC_DEFINE(HAVE_G2) fi ctlib_graphics="$ctlib_graphics $X_BASIC_LIBS $X_TOOLKIT_LIBS" - if test "$libgl" = "true" -a test "$wxgtkgl" = "true" ; then + if test "$libgl" = "true" -a "$wxgtkgl" = "true" ; then ctlib_graphics="$ctlib_graphics -lglut -lGL -lGLU -lwx_gtk_gl" fi else @@ -389,4 +389,4 @@ fi CXXFLAGS="$CFLAGS" -AC_OUTPUT(Makefile libctgraphics/Makefile libctsupport/Makefile libctsim/Makefile Makefile man/Makefile doc/Makefile cgi-bin/ctsim.cgi cgi-bin/Makefile html/simulate.html html/Makefile include/Makefile getopt/Makefile tools/sample-ctsim.sh cgi-bin/ctsim.conf tools/Makefile src/Makefile doc/tex2rtf/Makefile) +AC_OUTPUT(Makefile libctgraphics/Makefile libctsupport/Makefile libctsim/Makefile Makefile man/Makefile doc/Makefile cgi-bin/ctsim.cgi cgi-bin/Makefile html/simulate.html html/Makefile include/Makefile getopt/Makefile tools/sample-ctsim.sh cgi-bin/ctsim.conf tools/Makefile src/Makefile)