X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=configure.ac;h=77ebd09dc3c727e3b2f47409f5ed8bf0176cbc91;hb=c64771ab78d25f0cbfbaac2456c8790c786a7a68;hp=c684ec16aae13b32d4dfe035a2a15ed338d6964a;hpb=8427cefe77dc3d3bcca196360997d400d7629e24;p=ctsim.git diff --git a/configure.ac b/configure.ac index c684ec1..77ebd09 100644 --- a/configure.ac +++ b/configure.ac @@ -6,7 +6,7 @@ dnl CDPATH= AC_INIT AC_CONFIG_SRCDIR([src/ctsim.cpp]) AM_MAINTAINER_MODE -AM_INIT_AUTOMAKE(ctsim,4.2.7) +AM_INIT_AUTOMAKE(ctsim,4.2.8) AM_CONFIG_HEADER(config.h) dnl Checks for programs. @@ -44,7 +44,7 @@ wxwin=false AC_CHECK_LIB(wx_gtk-2.4, main, [wxwin=true; wx_gtk=true; AC_DEFINE(HAVE_WXWINDOWS,1,[wxwindows library])]) AC_CHECK_LIB(wx_mac-2.4, main, [wxwin=true; wx_mac=true; AC_DEFINE(HAVE_WXWINDOWS,1,[wxwindows library])]) AC_CHECK_LIB(fftw, fftw_one, [fftw=true; AC_DEFINE(HAVE_FFTW,1,[FFTW library])], [fftw=false]) -AC_CHECK_LIB(GL, main, [libgl=true], [libgl=false], [-L/usr/X11R6/lib -lXt -lXext]) +AC_CHECK_LIB(GL, main, [libgl=true], [libgl=false], [-L/usr/X11R6/lib -L/usr/X11R6/lib64 -lXt -lXext]) AC_CHECK_LIB(pthread, main, [pthread=true], [pthread=false]) if test "$zlib" = "true" ; then @@ -346,7 +346,7 @@ LDFLAGS="$LDFLAGS -L/usr/local/lib" AC_MSG_CHECKING([for X]) if test "$no_x" != "yes" ; then AC_DEFINE(HAVE_X11,1,[X11 system]) - LDFLAGS="$LDFLAGS -L../libctgraphics -L/usr/X11R6/lib" + LDFLAGS="$LDFLAGS -L../libctgraphics -L/usr/X11R6/lib -L/usr/X11R6/lib64" my_includes="$my_includes -I/usr/X11R6/include" ctlib_graphics="$ctlibs_base -lctgraphics" AC_MSG_RESULT(yes)