Add serviceable property.

[flightgear.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 56c7987bec01feb190a9c7cab7b4f7e9dc6a0189..aa4c4c7a7ee2284f3347b330f90148afe083a39f 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -71,7 +71,7 @@ AM_CONDITIONAL(ENABLE_NETWORK_OLK, test "x$with_network_olk" != "xno")
 
 # Specify if we want to use WeatherCM instead of FGEnvironment.
 # default to with_weathercm=no
-AC_ARG_WITH(new-environment, [  --with-weathercm        Use WeatherCM instead of FGEnvironment])
+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,
@@ -81,14 +81,25 @@ else
 fi
 AM_CONDITIONAL(ENABLE_WEATHERCM, test "x$with_weathercm" = "xyes")
 
+dnl Specify if we want the old menubar; default to the new one
+AC_ARG_WITH(old-menubar, [  --with-old-menubar        Use the old menu bar])
+if test "x$with_old_menubar" = "xyes" ; then
+    echo "Building with old menubar"
+    AC_DEFINE([FG_OLD_MENUBAR], 1,
+              [Define to build with old menubar])
+else
+    echo "Building with new menubar"
+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
     AC_DEFINE([ENABLE_THREADS], 1, [Define to enable threaded tile paging])
     CXXFLAGS="$CXXFLAGS -D_REENTRANT"
     CFLAGS="$CFLAGS -D_REENTRANT"
-    AC_CHECK_HEADER(pthread.h)
 fi
+AC_CHECK_HEADER(pthread.h)
 AM_CONDITIONAL(WITH_THREADS, test "x$with_threads" = "xyes")
 
 # specify the plib location
@@ -193,6 +204,23 @@ base_LIBS="$LIBS"
 
 dnl Thread related checks
 AC_CHECK_LIB(pthread, pthread_exit)
+if test "x$ac_cv_lib_pthread_pthread_exit" != "xyes" \
+   -a "x$ac_cv_header_pthread_h" = "xyes"; then
+    dnl FreeBSD: System has pthread.h, but -lpthread library check
+    dnl fails.  See if we need -pthread instead of -lpthread and look
+    dnl for the functions in libc_r.
+    save_CXXFLAGS="$CXXFLAGS"
+    save_CFLAGS="$FLAGS"
+    CXXFLAGS="-pthread $CXXFLAGS"
+    CFLAGS="-pthread $FLAGS"
+    save_LIBS=$LIBS
+    AC_CHECK_LIB(c_r, pthread_exit)
+    if test "x$ac_cv_lib_c_r_pthread_exit" != "xyes"; then
+        CXXFLAGS=$save_CXXFLAGS
+        CFLAGS=$save_CFLAGS
+    fi
+    LIBS=$save_LIBS
+fi
 AC_CHECK_LIB(socket, socket)
 
 dnl check for glut location
@@ -342,9 +370,9 @@ dnl joystick lib
 AC_DEFINE([ENABLE_PLIB_JOYSTICK], 1, [Define to enable plib joystick support])
 
 
-dnl Compiling an in-memory PSL script is available only in the CVS
+dnl Checking for PSL in plib
 dnl version of plib, so check for it.
-AC_MSG_CHECKING([for plib PSL in-memory script compilation support])
+AC_MSG_CHECKING([for plib PSL scripting support])
 AC_COMPILE_IFELSE([
 #include <plib/psl.h>
 
@@ -356,13 +384,10 @@ int main() {
 }
 ],
   [AC_MSG_RESULT(yes);
-   fg_psl_string_compile=yes],
+   have_plib_psl=yes],
   AC_MSG_RESULT(no)
 )
-if test "x$fg_psl_string_compile" = "xyes"; then
-  AC_DEFINE([FG_PSL_STRING_COMPILE], 1,
-            [Support for compiling PSL scripts from an in-memory string.])
-fi
+AM_CONDITIONAL(HAVE_PLIB_PSL, test "x$have_plib_psl" = "xyes")
 
 dnl Check for MetaKit
 AC_CHECK_HEADER(mk4.h)
@@ -586,13 +611,14 @@ echo "================="
 
 echo "Prefix: $prefix"
 
-if test "x$fg_psl_string_compile" = "xyes"; then
-    echo "Scripts for input bindings: yes"
+if test "x$have_plib_psl" = "xyes"; then
+    echo "Plib PSL scripting: yes"
 else
-    echo "Scripts for input bindings: $fg_psl_string_compile"
-    echo "  PSL scripts attached to input bindings will not"
-    echo "  work.  Download the latest CVS version of plib"
-    echo "  if you would like to enable them."
+    echo "Plib PSL scripting: $fg_psl_string_compile"
+    echo "  You will not be able to run scripts written in PSL"
+    echo "  and some advanced GUI and input features may not"
+    echo "  work.  Download and install the latest CVS version"
+    echo "  of plib if you would like to enable PSL support."
 fi
 
 if test "x$with_logging" != "x"; then
@@ -610,6 +636,12 @@ else
     echo "Using FGEnvironment"
 fi
 
+if test "x$with_old_menubar" != "x"; then
+    echo "Using old menubar"
+else
+    echo "Defaulting to new XML-configurable menubar"
+fi
+
 if test "x$with_threads" = "xyes"; then
     echo "threads: yes"
 else