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
AM_CONDITIONAL(ENABLE_MPLAYER_AS, test "x$with_multiplayer" != "xno")
-# Specify if we want to use WeatherCM instead of FGEnvironment.
-# default to with_weathercm=no
-AC_ARG_WITH(weathercm, [ --with-weathercm Use WeatherCM instead of FGEnvironment])
-if test "x$with_weathercm" = "xyes" ; then
- echo "Building with WeatherCM"
- AC_DEFINE([FG_WEATHERCM], 1,
- [Define to build with Christian Mayer's weather code])
-else
- echo "Building with FGEnvironment"
-fi
-AM_CONDITIONAL(ENABLE_WEATHERCM, test "x$with_weathercm" = "xyes")
-
dnl Thread related checks
AC_ARG_WITH(threads, [ --with-threads Include tile loading threads [default=no]])
if test "x$with_threads" = "xyes"; then
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")
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"
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 <plib/ul.h>
-#define MIN_PLIB_VERSION 160
+#define MIN_PLIB_VERSION 170
int main() {
int major, minor, micro;
],
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)
)
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 <stdio.h>
#define MIN_MAJOR 0
#define MIN_MINOR 3
-#define MIN_MICRO 4
+#define MIN_MICRO 5
int main() {
int major, minor, micro;
src/Sound/Makefile \
src/Systems/Makefile \
src/Time/Makefile \
- src/WeatherCM/Makefile \
tests/Makefile \
utils/Makefile \
utils/TerraSync/Makefile \
echo -n "Automake version: "
automake --version | head -1
-if test "x$with_weathercm" != "x"; then
- echo "WeatherCM instead of FGEnvironment: $with_weathercm"
-else
- echo "Using FGEnvironment"
-fi
-
if test "x$with_multiplayer" != "xno"; then
echo "Building with multiplayer support"
fi