Memory allocation bugfix from Frederic Bouvier, plus a few cout's commented out

[flightgear.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index b8cf175bdfa610742a7a417b65679e66ef794cba..fccbbf150d71ab4bc2273357c377f0a5620f6f81 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -21,6 +21,14 @@ AC_PROG_RANLIB
 AC_PROG_INSTALL
 AC_PROG_LN_S
 
+# specify the simgear location
+AC_ARG_WITH(simgear, [  --with-simgear=PREFIX   Specify the prefix path to simgear])
+
+if test "x$with_simgear" != "x" ; then
+    echo "SimGear prefix path is $with_simgear"
+    EXTRA_DIRS="${EXTRA_DIRS} $with_simgear"
+fi
+
 dnl set the $host variable based on local machine/os
 AC_CANONICAL_HOST
 
@@ -29,6 +37,7 @@ case "${host}" in
     if test "$CXX" = "CC"; then
         AR="CC -ar"
         ARFLAGS="-o"
+        CXXFLAGS="$CXXFLAGS -I$with_simgear/include/simgear/compatibility"
     else
         AR="ar"
         ARFLAGS="cru"
@@ -62,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,
@@ -72,6 +81,17 @@ 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
@@ -98,14 +118,6 @@ if test "x$with_metakit" != "x" ; then
     EXTRA_DIRS="${EXTRA_DIRS} $with_metakit"
 fi
 
-# specify the simgear location
-AC_ARG_WITH(simgear, [  --with-simgear=PREFIX   Specify the prefix path to simgear])
-
-if test "x$with_simgear" != "x" ; then
-    echo "SimGear prefix path is $with_simgear"
-    EXTRA_DIRS="${EXTRA_DIRS} $with_simgear"
-fi
-
 dnl Used by JSBSim to conditionally compile in fgfs interface code
 AC_DEFINE([FGFS], 1, [Define so that JSBSim compiles in 'library' mode])
 
@@ -339,8 +351,26 @@ int main() {
 dnl If we get here then plib is available, so force use of plib
 dnl joystick lib
 AC_DEFINE([ENABLE_PLIB_JOYSTICK], 1, [Define to enable plib joystick support])
-AC_DEFINE([FG_PLIB_JOYSTICK_GETNAME], 1,
-          [Define to enable plib joystick name support])
+
+
+dnl Checking for PSL in plib
+dnl version of plib, so check for it.
+AC_MSG_CHECKING([for plib PSL scripting support])
+AC_COMPILE_IFELSE([
+#include <plib/psl.h>
+
+int main() {
+  // not for running...
+  pslProgram program((pslExtension *)0);
+  program.compile("int main () {}", "");
+  return 0;
+}
+],
+  [AC_MSG_RESULT(yes);
+   have_plib_psl=yes],
+  AC_MSG_RESULT(no)
+)
+AM_CONDITIONAL(HAVE_PLIB_PSL, test "x$have_plib_psl" = "xyes")
 
 dnl Check for MetaKit
 AC_CHECK_HEADER(mk4.h)
@@ -545,6 +575,7 @@ AC_CONFIG_FILES([ \
        src/NetworkOLK/Makefile \
        src/Objects/Makefile \
        src/Scenery/Makefile \
+       src/Scripting/Makefile \
        src/Sound/Makefile \
        src/Systems/Makefile \
        src/Time/Makefile \
@@ -563,6 +594,16 @@ echo "================="
 
 echo "Prefix: $prefix"
 
+if test "x$have_plib_psl" = "xyes"; then
+    echo "Plib PSL scripting: yes"
+else
+    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
     echo "Debug messages: $with_logging"
 else
@@ -572,14 +613,18 @@ fi
 echo -n "Automake version: "
 automake --version | head -1
 
-echo "New plib joystick name support: $plib_js_has_getname"
-
 if test "x$with_weathercm" != "x"; then
     echo "WeatherCM instead of FGEnvironment: $with_weathercm"
 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