Tweaks for next prerelease.

[simgear.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 5eefe40dc0305ee4b534384f7bef1ef982bad075..885ce39a52d560f6c776db32e54168c10ad528f1 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -6,11 +6,11 @@ dnl $Id$
 AC_INIT
 AC_CONFIG_SRCDIR([simgear/bucket/newbucket.cxx])
 
-# Require at least automake 2.53
-AC_PREREQ(2.53)
+# Require at least automake 2.52
+AC_PREREQ(2.52)
 
 dnl Initialize the automake stuff
-AM_INIT_AUTOMAKE(SimGear, 0.0.19pre1)
+AM_INIT_AUTOMAKE(SimGear, 0.0.19pre2)
 
 dnl Specify KAI C++ compiler and flags.
 dnl Borrowed with slight modification from blitz distribution.
@@ -215,9 +215,6 @@ else
     echo Win32 specific hacks...
     AC_DEFINE([WIN32], 1, [Define for Win32 platforms])
 
-    dnl force a failed check since we will be building under windoze
-    AM_CONDITIONAL(ENABLE_XMESA_FX, test "no" = "yes")
-
     dnl just define these to true and hope for the best
     ac_cv_lib_glut_glutGetModifiers="yes"
     ac_cv_lib_glut_glutGameModeString="yes"
@@ -268,6 +265,11 @@ AC_SUBST(opengl_LIBS)
 
 AM_CONDITIONAL(HAVE_XWINDOWS, test "x$ac_cv_lib_X11_XCreateWindow" = "xyes" )
 
+# The following are C++ items that need to be tested for with the c++
+# compiler
+
+AC_LANG_PUSH(C++)
+
 dnl Check for "plib" without which we cannot go on
 AC_CHECK_HEADER(plib/pu.h)
 if test "x$ac_cv_header_plib_pu_h" != "xyes"; then
@@ -295,6 +297,7 @@ if test "x$ac_cv_header_mk4_h" != "xyes"; then
     exit
 fi
 
+AC_LANG_POP
 
 dnl Specify if we want logging (testing build) or not (release build)
 
@@ -329,7 +332,7 @@ AC_FUNC_VPRINTF
 AC_CHECK_FUNCS( ftime gettimeofday timegm memcpy bcopy mktime strstr rand \
        random drand48 setitimer getitimer signal GetLocalTime rint getrusage )
 
-AM_CONFIG_HEADER([simgear/simgear_config.h])
+AM_CONFIG_HEADER(simgear/simgear_config.h)
 
 AC_CONFIG_FILES([ \
        Makefile \