X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=configure.ac;h=8ed44bd036f399c119ef9d1594b56563e3a2fa48;hb=1ce68a49c69e6b873852ce306b8190f4f2cae8fe;hp=dc99f2198ae61da1c3068adc6973aa0cf9562e08;hpb=2f0afdccc1cfa6d8fa8d79edff4d356578d332f0;p=simgear.git diff --git a/configure.ac b/configure.ac index dc99f219..8ed44bd0 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,5 @@ dnl Process this file with autoget.sh to produce a working configure dnl script. -dnl -dnl $Id$ AC_INIT AC_CONFIG_SRCDIR([simgear/bucket/newbucket.cxx]) @@ -10,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-pre1) +AM_INIT_AUTOMAKE(SimGear, 0.3.8) dnl Specify KAI C++ compiler and flags. dnl Borrowed with slight modification from blitz distribution. @@ -123,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 ;; @@ -260,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" @@ -331,11 +330,11 @@ if test "x$ac_cv_header_plib_ul_h" != "xyes"; then exit fi -AC_MSG_CHECKING([for plib 1.6.0 or newer]) +AC_MSG_CHECKING([for plib 1.8.4 or newer]) AC_TRY_RUN([ #include -#define MIN_PLIB_VERSION 160 +#define MIN_PLIB_VERSION 184 int main() { int major, minor, micro; @@ -350,7 +349,7 @@ int main() { ], AC_MSG_RESULT(yes), [AC_MSG_RESULT(wrong version); - AC_MSG_ERROR([Install plib 1.6.0 or later first...])], + AC_MSG_ERROR([Install plib 1.8.4 or later first...])], AC_MSG_RESULT(yes) ) @@ -426,7 +425,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 \