X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;ds=sidebyside;f=configure.ac;h=80bd7ea47436dc09617aadb4b2fc347fb3614192;hb=6644d6564f4fad97d6d0d488abdd2b37ccba79cb;hp=8cbebb2d79d7c77b8c9496fb323ba4c64940362f;hpb=92b40e557630881d08f67e2498b3e062ab8ec8ec;p=ctsim.git diff --git a/configure.ac b/configure.ac index 8cbebb2..80bd7ea 100644 --- a/configure.ac +++ b/configure.ac @@ -5,7 +5,7 @@ dnl CDPATH= AC_INIT AC_CONFIG_SRCDIR([src/ctsim.cpp]) -AM_INIT_AUTOMAKE(ctsim,3.5.6) +AM_INIT_AUTOMAKE(ctsim,3.7.0) AM_CONFIG_HEADER(config.h) dnl Checks for programs. @@ -130,7 +130,8 @@ fi AC_MSG_CHECKING(sstream) if [ test -f /usr/include/sstream || test -f /usr/include/g++/sstream || - test -f /usr/include/g++-2/sstream || test -f /usr/include/g++-3/sstream ]; then + test -f /usr/include/g++-2/sstream || test -f /usr/include/g++-3/sstream || + test -f /usr/include/gcc/darwin/3.1/g++-v3/sstream ]; then AC_DEFINE(HAVE_SSTREAM,1,[sstream header]) AC_MSG_RESULT(yes) fi @@ -330,6 +331,7 @@ 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" + my_includes="$my_includes -I/usr/X11R6/include" ctlib_graphics="$ctlibs_base -lctgraphics" AC_MSG_RESULT(yes) ctlib_graphics="$ctlib_graphics $X_BASIC_LIBS $X_TOOLKIT_LIBS"