X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=configure.ac;h=0afede1a48ed68220a57e6b9d6bc75ae836de932;hb=c54cea8055c02156613e94f628cc5a1b39be85c1;hp=2af7fb8d7230f69bf22a4f9c19e7259857e707d8;hpb=bf7cf64eb22477aeb712aeaeff617530353b5eb7;p=flightgear.git

diff --git a/configure.ac b/configure.ac
index 2af7fb8d7..0afede1a4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10,7 +10,7 @@ AC_PREREQ(2.52)
 dnl Initialize the automake stuff
 dnl set the $host variable based on local machine/os
 AC_CANONICAL_TARGET
-AM_INIT_AUTOMAKE(FlightGear, 0.9.9-pre1)
+AM_INIT_AUTOMAKE(FlightGear, 0.9.10)
 
 dnl Checks for programs.
 AC_PROG_MAKE_SET
@@ -27,8 +27,51 @@ AC_ARG_WITH(simgear, [  --with-simgear=PREFIX   Specify the prefix path to simge
 if test "x$with_simgear" != "x" ; then
     echo "SimGear prefix path is $with_simgear"
     EXTRA_DIRS="${EXTRA_DIRS} $with_simgear"
+    CXXFLAGS="$CXXFLAGS -I$with_simgear"
 fi
 
+# specify the plib location
+AC_ARG_WITH(plib, [  --with-plib=PREFIX      Specify the prefix path to plib])
+
+if test "x$with_plib" != "x" ; then
+    echo "plib prefix is $with_plib"
+    EXTRA_DIRS="${EXTRA_DIRS} $with_plib"
+fi
+
+# specify the osg location
+AC_ARG_WITH(osg, [  --with-osg=PREFIX       Specify the prefix path to osg])
+
+if test "x$with_osg" != "x" ; then
+    echo "osg prefix is $with_osg"
+    EXTRA_DIRS="${EXTRA_DIRS} $with_osg"
+fi
+
+dnl Determine an extra directories to add to include/lib search paths
+case "${host}" in
+*-apple-darwin* | *-*-mingw32*)
+    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"
+    fi
+    if test -d /opt/X11R6 ; then
+        EXTRA_DIR2="/opt/X11R6"
+    fi
+    EXTRA_DIRS="${EXTRA_DIRS} $EXTRA_DIR1 $EXTRA_DIR2 /usr/local"
+    ;;
+
+esac
+wi_EXTRA_DIRS(no, ${EXTRA_DIRS})
+
+
 case "${host}" in
 *-*-irix*)
     if test "$CXX" = "CC"; then
@@ -55,30 +98,19 @@ if test "x$with_logging" = "xno" ; then
     AC_DEFINE([FG_NDEBUG], 1, [Define for no logging output])
 fi
 
-# Specify if we want to build with Multiplayer support
-# default to with_network=yes
-AC_ARG_WITH(multiplayer, [  --with-multiplayer      Include multiplayer support [default=yes]])
-
-if test "x$with_multiplayer" = "xno"; then
-  echo "Building without any kind of multiplayer support"
+AC_ARG_ENABLE(sp_fdms, [  --enable-sp-fdms              Include special purpose Flight Models], [enable_sp_fdms="$enableval"] )
+if test "x$enable_sp_fdms" != "xno"; then
+    AC_DEFINE([ENABLE_SP_FDM], 1, [Define to include special purpose FDMs])
 else
-  echo "Building with multiplayer support"
-  AC_DEFINE([FG_MPLAYER_AS], 1, [Define to build with multiplayer support])
+    AC_DEFINE([ENABLE_SP_FDM], 0, [Define to include special purpose FDMs])
 fi
-AM_CONDITIONAL(ENABLE_MPLAYER_AS, test "x$with_multiplayer" != "xno")
-
-AC_ARG_ENABLE(sp_fdms, [  --enable-sp-fdms              Include special purpose Flight Models], [enable_sp_fdms="$enableval"] )
-AC_DEFINE([ENABLE_SP_FMDS], test "x$enable_sp_fdms" = "xyes", [Define to include special purpose FDMs])
 AM_CONDITIONAL(ENABLE_SP_FDM, test "x$enable_sp_fdms" != "xno")
 
 
 dnl Thread related checks
 # defaults to yes
-with_threads=yes
-AC_ARG_WITH(threads, [  --with-threads          Include tile loading threads [default=yes]])
-if test "x$with_threads" != "xyes"; then
-    AC_DEFINE([ENABLE_THREADS], 0, [Define to enable threaded tile paging])
-else
+AC_ARG_WITH(threads, [  --with-threads          Include tile loading threads [default=yes]], [], [with_threads=yes])
+if test "x$with_threads" = "xyes"; then
     AC_DEFINE([ENABLE_THREADS], 1, [Define to enable threaded tile paging])
     CXXFLAGS="$CXXFLAGS -D_REENTRANT"
     CFLAGS="$CFLAGS -D_REENTRANT"
@@ -86,46 +118,12 @@ fi
 AC_CHECK_HEADER(pthread.h)
 AM_CONDITIONAL(WITH_THREADS, test "x$with_threads" = "xyes")
 
-# specify the plib location
-AC_ARG_WITH(plib, [  --with-plib=PREFIX      Specify the prefix path to plib])
-
-if test "x$with_plib" != "x" ; then
-    echo "plib prefix is $with_plib"
-    EXTRA_DIRS="${EXTRA_DIRS} $with_plib"
-fi
-
 dnl Used by JSBSim to conditionally compile in fgfs interface code
 AC_DEFINE([FGFS], 1, [Define so that JSBSim compiles in 'library' mode])
 
 # Check for MS Windows environment
 AC_CHECK_HEADER(windows.h)
 
-dnl Determine an extra directories to add to include/lib search paths
-case "${host}" in
-*-apple-darwin* | *-*-mingw32*)
-    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"
-    fi
-    if test -d /opt/X11R6 ; then
-        EXTRA_DIR2="/opt/X11R6"
-    fi
-    EXTRA_DIRS="${EXTRA_DIRS} $EXTRA_DIR1 $EXTRA_DIR2 /usr/local"
-    ;;
-
-esac
-wi_EXTRA_DIRS(no, ${EXTRA_DIRS})
-
-
 dnl Using AM_CONDITIONAL is a step out of the protected little 
 dnl automake fold so it is potentially dangerous.  But, we are
 dnl beginning to run into cases where the standard checks are not
@@ -374,7 +372,11 @@ AC_DEFINE([ENABLE_PLIB_JOYSTICK], 1, [Define to enable plib joystick support])
 
 
 dnl Check for the presence of SimGear
+if test "x$with_simgear" != "x"; then
+AC_CHECK_HEADER($with_simgear/include/simgear/version.h, [ac_cv_header_simgear_version_h=yes], [ac_cv_header_simgear_version_h=no])
+else
 AC_CHECK_HEADER(simgear/version.h)
+fi
 if test "x$ac_cv_header_simgear_version_h" != "xyes"; then
     echo
     echo "You *must* have the SimGear support library installed on your system"
@@ -386,7 +388,7 @@ if test "x$ac_cv_header_simgear_version_h" != "xyes"; then
     exit
 fi
 
-AC_MSG_CHECKING([for simgear 0.3.9 or newer])
+AC_MSG_CHECKING([for simgear 0.3.10 or newer])
 AC_TRY_RUN([
 #include <stdio.h>
 
@@ -397,7 +399,7 @@ AC_TRY_RUN([
 
 #define MIN_MAJOR 0
 #define MIN_MINOR 3
-#define MIN_MICRO 9
+#define MIN_MICRO 10
 
 int main() {
     int major, minor, micro;
@@ -426,7 +428,11 @@ int main() {
 LIBS="$saved_LIBS"
 
 dnl Check if SimGear was built with Norman's JPEG factory support
+if test "x$with_simgear" != "x"; then
+AC_CHECK_HEADER($with_simgear/include/simgear/screen/jpgfactory.hxx,[ac_cv_header_simgear_screen_jpgfactory_hxx=yes],[ac_cv_header_simgear_screen_jpgfactory_hxx=no])
+else
 AC_CHECK_HEADER(simgear/screen/jpgfactory.hxx)
+fi
 if test "x$ac_cv_header_simgear_screen_jpgfactory_hxx" = "xyes"; then
     AC_CHECK_LIB(jpeg, jpeg_start_compress)
     if test "x$ac_cv_lib_jpeg_jpeg_start_compress" != "xyes" ; then
@@ -517,7 +523,13 @@ AC_CONFIG_FILES([ \
 	src/FDM/ExternalNet/Makefile \
 	src/FDM/ExternalPipe/Makefile \
 	src/FDM/JSBSim/Makefile \
-	src/FDM/JSBSim/filtersjb/Makefile \
+	src/FDM/JSBSim/initialization/Makefile \
+	src/FDM/JSBSim/input_output/Makefile \
+	src/FDM/JSBSim/math/Makefile \
+        src/FDM/JSBSim/models/Makefile \
+	src/FDM/JSBSim/models/flight_control/Makefile \
+	src/FDM/JSBSim/models/atmosphere/Makefile \
+	src/FDM/JSBSim/models/propulsion/Makefile \
 	src/FDM/LaRCsim/Makefile \
 	src/FDM/SP/Makefile \
 	src/FDM/UIUCModel/Makefile \
@@ -526,6 +538,8 @@ AC_CONFIG_FILES([ \
 	src/GUI/Makefile \
 	src/Input/Makefile \
 	src/Instrumentation/Makefile \
+	src/Instrumentation/KLN89/Makefile \
+	src/Instrumentation/HUD/Makefile \
 	src/Main/Makefile \
 	src/Main/runfgfs \
 	src/Main/runfgfs.bat \
@@ -565,7 +579,7 @@ else
 fi
 
 echo -n "Automake version: "
-automake --version | head -1
+automake --version | head -n 1
 
 if test "x$with_multiplayer" != "xno"; then
     echo "Building with multiplayer support"