Remove efence support in favor of valgrind.

[simgear.git] / configure.in

diff --git a/configure.in b/configure.in
index aab124510de5d34febb2c54cecba06cd68991aeb..c2e2a3261904d9b131fa3801de33ad7226950d96 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -5,8 +5,11 @@ dnl $Id$
 
 AC_INIT(simgear/bucket/newbucket.cxx)
 
+# Require at least automake 2.13
+AC_PREREQ(2.13)
+
 dnl Initialize the automake stuff
-AM_INIT_AUTOMAKE(SimGear, 0.0.17)
+AM_INIT_AUTOMAKE(SimGear, 0.0.19pre1)
 
 dnl Specify KAI C++ compiler and flags.
 dnl Borrowed with slight modification from blitz distribution.
@@ -63,14 +66,6 @@ if test "x$with_logging" = "xno" ; then
     AC_DEFINE(FG_NDEBUG)
 fi
 
-dnl specify if we are building with "electric fence"
-AC_ARG_WITH(efence, [  --with-efence           Specify if we are building with "electric-fence"])
-
-if test "x$with_efence" = "xyes" ; then
-    echo "Building with efence"
-    LIBS="$LIBS -lefence"
-fi
-
 # Specify if we want to build with Norman's jpeg image server support.
 # This requires libjpeg to be installed and available.
 # Default to with_jpeg_server=no
@@ -103,7 +98,7 @@ AC_EGREP_CPP(yes,
  #endif
 ],is_mingw=yes, is_mingw=no)
 
-echo "IS_MINGW =" $is_mingw
+echo "IS_MINGW = $is_mingw"
 AM_CONDITIONAL(IS_MINGW, test "x$is_mingw" = "xyes")
 
 AC_EGREP_CPP(yes,
@@ -112,7 +107,7 @@ AC_EGREP_CPP(yes,
  #endif
 ],is_cygwin=yes, is_cygwin=no)
 
-echo "IS_CYGWIN =" $is_cygwin
+echo "IS_CYGWIN = $is_cygwin"
 AM_CONDITIONAL(IS_CYGWIN, test "x$is_cygwin" = "xyes")
 
 if test "x$HOSTTYPE" != "xmacintosh" -a "x$is_mingw" != "xyes"; then
@@ -195,8 +190,8 @@ elif test "x$ac_cv_header_windows_h" != "xyes" ; then
 
     dnl if using mesa, check for xmesa.h
     if test "x$ac_cv_lib_MesaGL_glNewList" = "xyes" ; then
-       AC_CHECK_HEADER(GL/xmesa.h)
-       if test "x$ac_cv_header_GL_xmesa_h" = "xyes"; then
+       AC_CHECK_HEADER(GL/fxmesa.h)
+       if test "x$ac_cv_header_GL_fxmesa_h" = "xyes"; then
            AC_DEFINE( XMESA )
             AC_DEFINE( FX )
         fi
@@ -289,6 +284,7 @@ fi
 dnl Check for system installed metakit
 AC_CHECK_HEADER(mk4.h)
 if test "x$ac_cv_header_mk4_h" != "xyes"; then
+    echo 
     echo "Metakit not found, you will need to install this first."
     echo "Please read the README.metakit for more information."
     exit
@@ -300,6 +296,7 @@ dnl Specify if we want logging (testing build) or not (release build)
 dnl Check for system installed zlib
 AC_CHECK_HEADER(zlib.h)
 if test "x$ac_cv_header_zlib_h" != "xyes"; then
+    echo 
     echo "zlib not found, you will need to install this first."
     echo "Please read the README.zlib for more information."
     exit
@@ -332,11 +329,13 @@ AM_CONFIG_HEADER(simgear/simgear_config.h)
 AC_OUTPUT( \
        Makefile \
        SimGear.spec \
+       src-libs/Makefile \
        simgear/Makefile \
        simgear/version.h \
        simgear/bucket/Makefile \
        simgear/debug/Makefile \
        simgear/ephemeris/Makefile \
+       simgear/interpreter/Makefile \
        simgear/io/Makefile \
        simgear/magvar/Makefile \
        simgear/math/Makefile \
@@ -366,12 +365,6 @@ else
     echo "Debug messages: yes"
 fi
 
-if test "x$with_efence" != "x"; then
-    echo "Electric fence: $with_efence"
-else
-    echo "Electric fence: no"
-fi
-
 echo -n "Automake version: ($AUTO_MAKE_VERSION) "
 automake --version | head -1