Restore trRenderFrame (which used to be in main.cxx before the

[flightgear.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 2aa2d3eeaa27997fbe72f89074f5ab6c27151ae2..0900a1ba8fa4be8b27af5d6a12f4f8472c1f6664 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -10,7 +10,9 @@ dnl Require at least automake 2.52
 AC_PREREQ(2.52)
 
 dnl Initialize the automake stuff
-AM_INIT_AUTOMAKE(FlightGear, 0.9.4)
+dnl set the $host variable based on local machine/os
+AC_CANONICAL_TARGET
+AM_INIT_AUTOMAKE(FlightGear, 0.9.6-pre1)
 
 dnl Checks for programs.
 AC_PROG_MAKE_SET
@@ -29,9 +31,6 @@ if test "x$with_simgear" != "x" ; then
     EXTRA_DIRS="${EXTRA_DIRS} $with_simgear"
 fi
 
-dnl set the $host variable based on local machine/os
-AC_CANONICAL_HOST
-
 case "${host}" in
 *-*-irix*)
     if test "$CXX" = "CC"; then
@@ -71,8 +70,12 @@ AM_CONDITIONAL(ENABLE_MPLAYER_AS, test "x$with_multiplayer" != "xno")
 
 
 dnl Thread related checks
-AC_ARG_WITH(threads, [  --with-threads          Include tile loading threads [default=no]])
-if test "x$with_threads" = "xyes"; then
+# 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_DEFINE([ENABLE_THREADS], 1, [Define to enable threaded tile paging])
     CXXFLAGS="$CXXFLAGS -D_REENTRANT"
     CFLAGS="$CFLAGS -D_REENTRANT"
@@ -91,7 +94,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")
 
@@ -106,7 +109,7 @@ case "${host}" in
 
 *-*-cygwin*)
     if test -d /usr/local ; then
-        EXTRA_DIRS="/usr/local"
+        EXTRA_DIRS="${EXTRA_DIRS} /usr/local"
     fi
     ;;
 
@@ -117,7 +120,7 @@ case "${host}" in
     if test -d /opt/X11R6 ; then
         EXTRA_DIR2="/opt/X11R6"
     fi
-    EXTRA_DIRS="${EXTRA_DIRS} $EXTRA_DIR1 $EXTRA_DIR2"
+    EXTRA_DIRS="${EXTRA_DIRS} $EXTRA_DIR1 $EXTRA_DIR2 /usr/local/"
     ;;
 
 esac
@@ -215,6 +218,15 @@ AC_SEARCH_LIBS(dlclose, dl)
 
 base_LIBS="$LIBS"
 
+dnl Check for SDL if enabled.
+AC_ARG_ENABLE(sdl, [  --enable-sdl    Configure to use SDL instead of GLUT], enable_sdl="yes", enable_sdl="")
+AM_CONDITIONAL(USE_SDL, test "x$enable_sdl" = "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])
+fi
+
 dnl check for glut location
 AC_CHECK_HEADER(GL/glut.h)
 if test "x$ac_cv_header_GL_glut_h" = "xyes"; then
@@ -224,8 +236,10 @@ else
     if test "x$ac_cv_header_GLUT_glut_h" = "xyes"; then
         AC_DEFINE([FG_GLUT_H], <GLUT/glut.h>, [Define as glut.h include location])
     else
-        echo "Neither GL/glut.h nor GLUT/glut.h found.  Cannot continue"
-        exit
+        if test "x$enable_sdl" != "xyes"; then
+            echo "Neither GL/glut.h nor GLUT/glut.h found.  Cannot continue"
+            exit
+        fi
     fi
 fi
 
@@ -238,8 +252,13 @@ case "${host}" in
     AC_DEFINE([WIN32], 1, [Define for Win32 platforms])
     AC_DEFINE([NOMINMAX], 1, [Define for Win32 platforms])
 
-    LIBS="$LIBS -lglut32 -lglu32 -lopengl32"
-    LIBS="$LIBS -luser32 -lgdi32"
+    if test "x$enable_sdl" = "xyes"; then
+        AC_SEARCH_LIBS(SDL_Init, SDL)
+    else
+        LIBS="$LIBS -lglut32"
+    fi
+
+    LIBS="$LIBS -lglu32 -lopengl32 -luser32 -lgdi32"
 
     dnl add -lwsock32 for mingwin
     case "${host}" in
@@ -256,7 +275,7 @@ case "${host}" in
 *-apple-darwin*)
     dnl Mac OS X
 
-    LIBS="$LIBS -framework GLUT -framework OpenGL -framework Carbon -lobjc"
+    LIBS="$LIBS -framework GLUT -framework OpenGL -framework AGL -framework Carbon -lobjc"
     ;;
 
 *)
@@ -290,6 +309,9 @@ case "${host}" in
 
     AC_SEARCH_LIBS(gluLookAt, [ GLU MesaGLU ])
     AC_SEARCH_LIBS(glutGetModifiers, [ glut freeglut ])
+    if test "x$enable_sdl" = "xyes"; then
+        AC_SEARCH_LIBS(SDL_Init, SDL)
+    fi
     ;;
 
 esac
@@ -297,7 +319,35 @@ esac
 opengl_LIBS="$LIBS"
 LIBS="$base_LIBS"
 
+dnl check for OpenAL libraries
+case "${host}" in
+*-*-cygwin* | *-*-mingw32*)
+    dnl CygWin under Windoze.
+
+    AC_SEARCH_LIBS(alGenBuffers, openal32)
+    AC_SEARCH_LIBS(alutInit, [ openal32 ALut ] )
+    LIBS="$LIBS -lwinmm -ldsound -ldxguid -lole32"
+    ;;
+
+*-apple-darwin*)
+    dnl Mac OS X
+
+    LIBS="$LIBS -framework IOKit -framework OpenAL"
+    ;;
+
+*)
+    dnl default unix style machines
+
+    AC_SEARCH_LIBS(alGenBuffers, openal)
+    ;;
+
+esac
+
+openal_LIBS="$LIBS"
+LIBS="$base_LIBS"
+
 AC_SUBST(base_LIBS)
+AC_SUBST(openal_LIBS)
 AC_SUBST(opengl_LIBS)
 AC_SUBST(thread_LIBS)
 AC_SUBST(network_LIBS)
@@ -320,11 +370,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.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;
@@ -339,7 +389,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)
 )
 
@@ -361,7 +411,7 @@ if test "x$ac_cv_header_simgear_version_h" != "xyes"; then
     exit
 fi
 
-AC_MSG_CHECKING([for simgear 0.3.5 or newer])
+AC_MSG_CHECKING([for simgear 0.3.7 or newer])
 AC_TRY_RUN([
 #include <stdio.h>
 
@@ -372,20 +422,19 @@ AC_TRY_RUN([
 
 #define MIN_MAJOR 0
 #define MIN_MINOR 3
-#define MIN_MICRO 5
+#define MIN_MICRO 7
 
 int main() {
     int major, minor, micro;
 
-    printf("%d.%d.%d or greater... ", MIN_MAJOR, MIN_MINOR, MIN_MICRO);
+    /* printf("%d.%d.%d or greater, ", MIN_MAJOR, MIN_MINOR, MIN_MICRO); */
+    printf("[found %s] ... ", STRINGIFY(SIMGEAR_VERSION));
 
     sscanf( STRINGIFY(SIMGEAR_VERSION), "%d.%d.%d", &major, &minor, &micro );
 
-    if ( major < MIN_MAJOR ) {
-        return -1;
-    } else if ( major == MIN_MAJOR && minor < MIN_MINOR ) {
-        return -1;
-    } else if ( major == MIN_MAJOR && minor == MIN_MINOR && micro < MIN_MICRO ){
+    if ( (major < MIN_MAJOR) ||
+         (major == MIN_MAJOR && minor < MIN_MINOR) ||
+         (major == MIN_MAJOR && minor == MIN_MINOR && micro < MIN_MICRO) ) {
         return -1;
     }
 
@@ -401,7 +450,7 @@ int main() {
 
 LIBS="$saved_LIBS"
 
-dnl Check if SimGear was built with Norman JPEG factory support
+dnl Check if SimGear was built with Norman's JPEG factory support
 AC_CHECK_HEADER(simgear/screen/jpgfactory.hxx)
 if test "x$ac_cv_header_simgear_screen_jpgfactory_hxx" = "xyes"; then
     AC_CHECK_LIB(jpeg, jpeg_start_compress)
@@ -516,6 +565,7 @@ AC_CONFIG_FILES([ \
        src/Sound/Makefile \
        src/Systems/Makefile \
        src/Time/Makefile \
+       src/Traffic/Makefile \
        tests/Makefile \
        utils/Makefile \
        utils/TerraSync/Makefile \