X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=configure.ac;h=9a2b50ea71d30a0aaedf356ba209b11fd44fe88f;hb=ca69697ca67d0029db4ade2c73c10fd9bcbb29a3;hp=70dd32516776b935614ff181f7f52a671392affd;hpb=d5e57b8c1f9b506ab409198993f02ba949d5ee8e;p=flightgear.git

diff --git a/configure.ac b/configure.ac
index 70dd32516..9a2b50ea7 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.10-pre1)
+AM_INIT_AUTOMAKE(FlightGear, 0.9.10)
 
 dnl Checks for programs.
 AC_PROG_MAKE_SET
@@ -38,6 +38,14 @@ if test "x$with_plib" != "x" ; then
     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*)
@@ -91,7 +99,11 @@ if test "x$with_logging" = "xno" ; then
 fi
 
 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])
+if test "x$enable_sp_fdms" != "xno"; then
+    AC_DEFINE([ENABLE_SP_FDM], 1, [Define to include special purpose FDMs])
+else
+    AC_DEFINE([ENABLE_SP_FDM], 0, [Define to include special purpose FDMs])
+fi
 AM_CONDITIONAL(ENABLE_SP_FDM, test "x$enable_sp_fdms" != "xno")
 
 
@@ -187,11 +199,18 @@ base_LIBS="$LIBS"
 
 dnl Check for SDL if enabled.
 AC_ARG_ENABLE(sdl, [  --enable-sdl                  Configure to use SDL instead of GLUT], [enable_sdl="$enableval"])
+AC_ARG_ENABLE(osgviewer, [  --enable-osgviewer                  Configure to use osgViewer], [enable_osgviewer="$enableval"])
 AM_CONDITIONAL(USE_SDL, test "x$enable_sdl" = "xyes")
+AM_CONDITIONAL(USE_OSGVIEWER, test "x$enable_osgviewer" = "xyes")
 if test "x$enable_sdl" = "xyes"; then
     AC_DEFINE([PU_USE_SDL], 1, [Define to use SDL])
 else
-    AC_DEFINE([PU_USE_GLUT], 1, [Define to use glut])
+    if test "x$enable_osgviewer" = "xyes"; then
+       AC_DEFINE([ENABLE_OSGVIEWER], 1, [Define to use osgViewer in renderer])
+       AC_DEFINE([PU_USE_NATIVE], 1, [Define to use native system])
+    else
+        AC_DEFINE([PU_USE_GLUT], 1, [Define to use glut])
+    fi
 fi
 
 dnl check for OpenGL related libraries
@@ -461,7 +480,7 @@ dnl Checks for header files.
 AC_HEADER_STDC
 AC_CHECK_HEADERS( \
 	fcntl.h getopt.h malloc.h memory.h stdlib.h sys/param.h sys/stat.h \
-        sys/time.h sys/timeb.h unistd.h windows.h values.h )
+	sys/time.h sys/timeb.h unistd.h windows.h values.h )
 
 dnl Checks for typedefs, structures, and compiler characteristics.
 AC_C_CONST
@@ -475,7 +494,7 @@ LIBS="$base_LIBS $network_LIBS $opengl_LIBS"
 AC_TYPE_SIGNAL
 AC_FUNC_VPRINTF
 AC_CHECK_FUNCS( [ \
-        ftime gettimeofday timegm memcpy bcopy mktime strstr rand mkfifo \
+	ftime gettimeofday timegm memcpy bcopy mktime strstr rand mkfifo \
 	random drand48 setitimer getitimer signal GetLocalTime rint getrusage \
 	truncf ] )
 LIBS=$old_LIBS
@@ -491,15 +510,17 @@ AC_CONFIG_FILES([ \
 	man/gl-info.1 \
 	man/js_demo.1 \
 	man/pstest.1 \
-        scripts/Makefile \
-        scripts/debug/Makefile \
-        scripts/perl/Makefile \
-        scripts/perl/examples/Makefile \
-        scripts/python/Makefile \
+	scripts/Makefile \
+	scripts/debug/Makefile \
+	scripts/perl/Makefile \
+	scripts/perl/examples/Makefile \
+	scripts/python/Makefile \
 	src/Makefile \
 	src/Include/Makefile \
 	src/Include/version.h \
 	src/Include/config.h-msvc6 \
+	src/Include/config.h-msvc71 \
+	src/Include/config.h-msvc8 \
 	src/Aircraft/Makefile \
 	src/Airports/Makefile \
 	src/ATC/Makefile \
@@ -514,7 +535,7 @@ AC_CONFIG_FILES([ \
 	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/Makefile \
 	src/FDM/JSBSim/models/flight_control/Makefile \
 	src/FDM/JSBSim/models/atmosphere/Makefile \
 	src/FDM/JSBSim/models/propulsion/Makefile \
@@ -527,6 +548,7 @@ AC_CONFIG_FILES([ \
 	src/Input/Makefile \
 	src/Instrumentation/Makefile \
 	src/Instrumentation/KLN89/Makefile \
+	src/Instrumentation/HUD/Makefile \
 	src/Main/Makefile \
 	src/Main/runfgfs \
 	src/Main/runfgfs.bat \