Moved includes higher to make sure that std::sort is known.

[simgear.git] / configure.in

diff --git a/configure.in b/configure.in
index e857a2fb287c1db019311fdc7d1578955b3a81b5..286f2133ef49556fcee127f5066e7fb028c9240c 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.18pre1)
 
 dnl Specify KAI C++ compiler and flags.
 dnl Borrowed with slight modification from blitz distribution.
@@ -103,8 +106,8 @@ AC_EGREP_CPP(yes,
  #endif
 ],is_mingw=yes, is_mingw=no)
 
-echo "IS_MINGW = "$is_mingw
-AM_CONDITIONAL(IS_MINGW, test $is_mingw="yes")
+echo "IS_MINGW = $is_mingw"
+AM_CONDITIONAL(IS_MINGW, test "x$is_mingw" = "xyes")
 
 AC_EGREP_CPP(yes,
 [#ifdef __CYGWIN__
@@ -112,8 +115,8 @@ AC_EGREP_CPP(yes,
  #endif
 ],is_cygwin=yes, is_cygwin=no)
 
-echo "IS_CYGWIN = "$is_cygwin
-AM_CONDITIONAL(IS_CYGWIN, test $is_cygwin="yes")
+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
     dnl extra library and include directories
@@ -195,8 +198,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