implement <key> property for key names: <keynum>27</keynum> == <key>Esc</key>

[flightgear.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index ee44e701dbb437e419923417f1f0f5dfadcf1f00..252e20e177138dcac40cff93e6e2204e76a20aeb 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -119,7 +119,7 @@ case "${host}" in
     if test -d /opt/X11R6 ; then
         EXTRA_DIR2="/opt/X11R6"
     fi
-    EXTRA_DIRS="${EXTRA_DIRS} $EXTRA_DIR1 $EXTRA_DIR2 /usr/local/"
+    EXTRA_DIRS="${EXTRA_DIRS} $EXTRA_DIR1 $EXTRA_DIR2 /usr/local"
     ;;
 
 esac
@@ -177,7 +177,7 @@ AC_SEARCH_LIBS(pthread_cancel, [pthread c_r])
 if test "x$ac_cv_header_pthread_h" = "xyes"; then
   if test "x$ac_cv_search_pthread_exit" = "x-lc_r"; then
     CXXFLAGS="-pthread $CXXFLAGS"
-    CFLAGS="-pthread $FLAGS"
+    CFLAGS="-pthread $CFLAGS"
   fi
 fi
 
@@ -193,7 +193,8 @@ network_LIBS="$LIBS"
 LIBS=""
 
 dnl check for some default libraries
-AC_SEARCH_LIBS(cos, m)
+AC_SEARCH_LIBS(sqrt, [am ffm fm fastm m])
+AC_SEARCH_LIBS(ceil, m)
 AC_SEARCH_LIBS(dlclose, dl)
 
 base_LIBS="$LIBS"
@@ -229,7 +230,7 @@ case "${host}" in
     case "${host}" in
     *-*-mingw32*)
         echo "********** BUILDING FOR MINGW32 *************"
-        base_LIBS="$base_LIBS -lws2_32"
+        network_LIBS="$network_LIBS -lws2_32"
         ;;
     esac
 
@@ -309,6 +310,7 @@ case "${host}" in
     save_LIBS=$LIBS
     LIBS="$LIBS $thread_LIBS"
     AC_SEARCH_LIBS(alGenBuffers, openal)
+    AC_SEARCH_LIBS(alutInit, [ alut openal ] )
     OPENAL_OK="$ac_cv_search_alGenBuffers"
     openal_LIBS="$LIBS"
     LIBS=$save_LIBS
@@ -510,7 +512,6 @@ AC_CONFIG_FILES([ \
        src/Autopilot/Makefile \
        src/Cockpit/Makefile \
        src/Cockpit/built_in/Makefile \
-       src/Controls/Makefile \
        src/Environment/Makefile \
        src/FDM/Balloon/Makefile \
        src/FDM/ExternalNet/Makefile \
@@ -533,8 +534,6 @@ AC_CONFIG_FILES([ \
        src/MultiPlayer/Makefile \
        src/Navaids/Makefile \
        src/Network/Makefile \
-       src/Objects/Makefile \
-       src/Replay/Makefile \
        src/Scenery/Makefile \
        src/Scripting/Makefile \
        src/Sound/Makefile \
@@ -543,9 +542,11 @@ AC_CONFIG_FILES([ \
        src/Traffic/Makefile \
        tests/Makefile \
        utils/Makefile \
-       utils/TerraSync/Makefile \
-       utils/Modeller/Makefile \
+       utils/GPSsmooth/Makefile \
        utils/js_server/Makefile \
+       utils/Modeller/Makefile \
+       utils/TerraSync/Makefile \
+       utils/xmlgrep/Makefile \
 ])
 AC_OUTPUT