X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=configure.in;h=ecd8610f40dab4626df6bf3cf52249b519c3ce2c;hb=c5171b1bac474eb90f7a78247864eb3696022f7c;hp=178cc21d6c063d830bde1c5dcb3b54349c708082;hpb=67fad72dc873923c43d8eaae1f6a4305dc5fd55e;p=ctsim.git diff --git a/configure.in b/configure.in index 178cc21..ecd8610 100644 --- a/configure.in +++ b/configure.in @@ -43,7 +43,7 @@ AC_CHECK_LIB(readline, main, [readline=true; AC_DEFINE(HAVE_READLINE)], [readlin AC_CHECK_LIB(ncurses, main, [ncurses=true; AC_DEFINE(HAVE_NCURSES)], [ncurses=false]) AC_CHECK_LIB(curses, main, [curses=true; AC_DEFINE(HAVE_CURSES)], [curses=false]) wxwin=false -AC_CHECK_LIB(wx_gtk, main, [wxwin=true; wx_gtk=true; AC_DEFINE(HAVE_WXWINDOWS)]) +AC_CHECK_LIB(wx_gtk-2.2, 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]) @@ -350,7 +350,10 @@ if test "$no_x" != "yes" ; then AC_MSG_RESULT(yes) ctlib_graphics="$ctlib_graphics $X_BASIC_LIBS $X_TOOLKIT_LIBS" if test "$libgl" = "true" ; then - ctlib_graphics="$ctlib_graphics -lwx_gtk_gl -lglut -lGL -lGLU" + ctlib_graphics="$ctlib_graphics -lglut -lGL -lGLU" + if test "$wxwin" = "true" ; then + ctlib_graphics="$ctlib_graphics -lwx_gtk_gl-2.2" + fi fi if test "$wxwin" = "true" ; then AC_DEFINE(HAVE_SGP)