X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=configure.ac;h=0c1206ddd298f8845bc0d947f4dea9b42bde8907;hb=a8dd5aa0fcc4692b2c5495fde1e9c6920c83ee98;hp=1734e725af48f57748783e768fa46f09bd9248ae;hpb=5bdff41641272687f3bc375530713abbe0b77674;p=simgear.git diff --git a/configure.ac b/configure.ac index 1734e725..0c1206dd 100644 --- a/configure.ac +++ b/configure.ac @@ -8,7 +8,7 @@ dnl Require at least automake 2.52 AC_PREREQ(2.52) dnl Initialize the automake stuff -AM_INIT_AUTOMAKE(SimGear, 0.3.8-pre2) +AM_INIT_AUTOMAKE(SimGear, 0.3.8) dnl Specify KAI C++ compiler and flags. dnl Borrowed with slight modification from blitz distribution. @@ -121,7 +121,7 @@ fi dnl Determine an extra directories to add to include/lib search paths case "${host}" in -*-apple-darwin* | *-*-mingw32*) +*-apple-darwin* | *-*-cygwin* | *-*-mingw32*) echo no EXTRA_DIRS for $host ;; @@ -170,7 +170,7 @@ if test "x$ac_cv_header_pthread_h" = "xyes"; then if test "x$ac_cv_search_pthread_exit" = "x-lc_r"; then CXXFLAGS="-pthread $CXXFLAGS" - CFLAGS="-pthread $FLAGS" + CFLAGS="-pthread $CFLAGS" fi fi @@ -258,7 +258,8 @@ OPENAL_OK="no" case "${host}" in *-*-cygwin* | *-*-mingw32*) dnl CygWin under Windoze. - + INCLUDES="$INCLUDES -I/usr/local/include" + LIBS="$LIBS -L/usr/local/lib" AC_SEARCH_LIBS(alGenBuffers, openal32) AC_SEARCH_LIBS(alutInit, [ openal32 ALut ] ) LIBS="$LIBS -lwinmm -ldsound -ldxguid -lole32" @@ -281,6 +282,7 @@ case "${host}" in save_LIBS=$LIBS LIBS="$LIBS $thread_LIBS" AC_SEARCH_LIBS(alGenBuffers, openal) + AC_SEARCH_LIBS(alutInit, [ alut openal ] ) OPENAL_OK="$ac_cv_search_alGenBuffers" openal_LIBS="$LIBS" LIBS=$save_LIBS @@ -424,7 +426,6 @@ AC_CONFIG_FILES([ \ simgear/scene/material/Makefile \ simgear/scene/model/Makefile \ simgear/scene/sky/Makefile \ - simgear/scene/sky/clouds3d/Makefile \ simgear/scene/tgdb/Makefile \ simgear/screen/Makefile \ simgear/serial/Makefile \