X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=configure.ac;h=1e58d02c6fbcdaf346c672fd3ea3ef3162f5511a;hb=92010f9f9483082bbf83638a49e08053f53c5daa;hp=5be1a33fd09372ad38a5427145b022495194b03a;hpb=25290c44678369dc47ce9030d56ee2127226412b;p=flightgear.git diff --git a/configure.ac b/configure.ac index 5be1a33fd..1e58d02c6 100644 --- a/configure.ac +++ b/configure.ac @@ -10,7 +10,7 @@ dnl Require at least automake 2.52 AC_PREREQ(2.52) dnl Initialize the automake stuff -AM_INIT_AUTOMAKE(FlightGear, 0.9.3) +AM_INIT_AUTOMAKE(FlightGear, 0.9.4) dnl Checks for programs. AC_PROG_MAKE_SET @@ -91,7 +91,7 @@ fi dnl Used by JSBSim to conditionally compile in fgfs interface code AC_DEFINE([FGFS], 1, [Define so that JSBSim compiles in 'library' mode]) -dnl Used to controll whether clouds3d should be compiled in or not +dnl Used to control whether clouds3d should be compiled in or not AC_DEFINE([FG_USE_CLOUDS_3D], 1, [Define to use 3D cloud support]) AM_CONDITIONAL(FG_USE_CLOUDS_3D, test "x" = "x") @@ -104,6 +104,12 @@ case "${host}" in echo no EXTRA_DIRS for $host ;; +*-*-cygwin*) + if test -d /usr/local ; then + EXTRA_DIRS="${EXTRA_DIRS} /usr/local" + fi + ;; + *) if test -d /usr/X11R6 ; then EXTRA_DIR1="/usr/X11R6" @@ -314,11 +320,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.7.0 or newer]) AC_TRY_RUN([ #include -#define MIN_PLIB_VERSION 160 +#define MIN_PLIB_VERSION 170 int main() { int major, minor, micro; @@ -333,7 +339,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.0 or later first...])], AC_MSG_RESULT(yes) ) @@ -355,7 +361,7 @@ if test "x$ac_cv_header_simgear_version_h" != "xyes"; then exit fi -AC_MSG_CHECKING([for simgear 0.3.4 or newer]) +AC_MSG_CHECKING([for simgear 0.3.5 or newer]) AC_TRY_RUN([ #include @@ -366,7 +372,7 @@ AC_TRY_RUN([ #define MIN_MAJOR 0 #define MIN_MINOR 3 -#define MIN_MICRO 4 +#define MIN_MICRO 5 int main() { int major, minor, micro;