X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=configure.in;h=286f2133ef49556fcee127f5066e7fb028c9240c;hb=bed7593cdd1f4dcbdf376b3f7831af3a0f9ff4a9;hp=5c8f4a208e0a4d003fe20ffc6d31a9f9ca1f87b3;hpb=c3b21e143ce297d59d09f43d3096a70bf8d36f53;p=simgear.git

diff --git a/configure.in b/configure.in
index 5c8f4a20..286f2133 100644
--- 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.
@@ -34,11 +37,6 @@ AC_PROG_RANLIB
 AC_PROG_INSTALL
 AC_PROG_LN_S
 
-# Check to see if this `configure' is being run in the `Cygwin32' environment
-AC_CYGWIN
-AC_MINGW32
-AC_EXEEXT
-
 AR="ar"
 OS=`uname -s`
 if test "$OS" = "IRIX" -o "$OS" = "IRIX64"; then
@@ -102,19 +100,31 @@ AM_CONDITIONAL(ENABLE_JPEG_SERVER, test "x$with_jpeg_factory" = "xyes")
 dnl Check for MS Windows environment
 AC_CHECK_HEADER(windows.h)
 
-if test "x$HOSTTYPE" != "xmacintosh" ; then
+AC_EGREP_CPP(yes,
+[#ifdef __MINGW32__
+ yes
+ #endif
+],is_mingw=yes, is_mingw=no)
+
+echo "IS_MINGW = $is_mingw"
+AM_CONDITIONAL(IS_MINGW, test "x$is_mingw" = "xyes")
+
+AC_EGREP_CPP(yes,
+[#ifdef __CYGWIN__
+ yes
+ #endif
+],is_cygwin=yes, is_cygwin=no)
+
+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
     EXTRA_DIRS="/usr/local /usr/local/plib /usr/X11R6"
 
     if test -d /opt/X11R6 ; then
         EXTRA_DIRS="$EXTRA_DIRS /opt/X11R6"
     fi
-
-    if test "x$ac_cv_header_windows_h" = "xyes" ; then
-        if test -d /usr/mingw/usr ; then
-            EXTRA_DIRS="$EXTRA_DIRS /usr/mingw/usr"
-        fi
-    fi
 fi
 
 wi_EXTRA_DIRS(no, ${EXTRA_DIRS})
@@ -141,10 +151,6 @@ null_LIBS="$LIBS"
 
 AC_CHECK_LIB(m, cos)
 
-if test  "x$ac_cv_mingw32" = "xyes" ; then
-    LIBS="$LIBS -lwsock32"
-fi
-
 base_LIBS="$LIBS"
 
 dnl Thread related checks
@@ -192,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
@@ -240,8 +246,8 @@ else
 
     LIBS="$LIBS -l${WIN32_GLUT} -l${WIN32_GLU} -l${WIN32_OPENGL}"
     LIBS="$LIBS -luser32 -lgdi32"
-    if test  "x$ac_cv_mingw32" = "xyes" ; then
-	LIBS="$LIBS -wsock32"
+    if test "x$is_mingw" = "xyes" ; then
+        EXTRA_DIRS="${EXTRA_DIRS}"
     fi
     echo "Will link apps with $LIBS"
 fi
@@ -383,9 +389,3 @@ if test "x$ac_cv_lib_pthread_pthread_exit" = "xyes" -a "x$ac_cv_header_pthread_h
 else
    echo "Threads: no threads (pthread lib not found.)"
 fi
-
-if test "$OS" = "IRIX" -o "$OS" = "IRIX64"; then
-    if test "$CXX" = "CC"; then
-        echo "\nRemember to run: sh ../FlightGear/irix-hack.sh!\07\n"
-    fi
-fi