X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=configure.ac;h=b843d6c82dc57875ccc29253c4d01271c60d732a;hb=3b5512f573ab0a1fc3ff107db77d5e2f7c2b9a28;hp=4b6a6ce0066a667a1524c40a95f26d7f455d6741;hpb=91cb15d9b07742d38b2e28f35b643e48f6b858ce;p=flightgear.git

diff --git a/configure.ac b/configure.ac
index 4b6a6ce00..b843d6c82 100644
--- a/configure.ac
+++ b/configure.ac
@@ -34,7 +34,8 @@ case "${host}" in
     if test "$CXX" = "CC"; then
         AR="CC -ar"
         ARFLAGS="-o"
-        CXXFLAGS="$CXXFLAGS -I$with_simgear/include/simgear/compatibility"
+        CXXFLAGS="$CXXFLAGS -c99 -I$with_simgear/include/simgear/compatibility"
+        CFLAGS="$CFLAGS -c99"
     else
         AR="ar"
         ARFLAGS="cru"
@@ -153,7 +154,6 @@ dnl search for FreeBSD library
 AC_SEARCH_LIBS(hid_init, usbhid)
 joystick_LIBS="$LIBS"
 LIBS=""
-AC_SUBST(joystick_LIBS)
 
 
 dnl ENABLE_AUDIO_SUPPORT could be depricated at any time in favor of
@@ -227,6 +227,7 @@ case "${host}" in
     fi
 
     LIBS="$LIBS -lglu32 -lopengl32 -luser32 -lgdi32"
+    joystick_LIBS="$joystick_LIBS -lwinmm"
 
     dnl add -lwsock32 for mingwin
     case "${host}" in
@@ -244,6 +245,7 @@ case "${host}" in
     dnl Mac OS X
 
     LIBS="$LIBS -framework GLUT -framework OpenGL -framework AGL -framework Carbon -lobjc"
+    joystick_LIBS="$joystick_LIBS -framework IOKit -framework CoreFoundation"
     ;;
 
 *)
@@ -294,7 +296,7 @@ case "${host}" in
 
     AC_SEARCH_LIBS(alGenBuffers, openal32)
     AC_SEARCH_LIBS(alutInit, [ openal32 ALut ] )
-    LIBS="$LIBS -lwinmm -ldsound -ldxguid -lole32"
+    LIBS="$LIBS -ldsound -ldxguid -lole32"
     openal_LIBS="$LIBS"
     ;;
 
@@ -325,6 +327,7 @@ AC_SUBST(openal_LIBS)
 AC_SUBST(opengl_LIBS)
 AC_SUBST(thread_LIBS)
 AC_SUBST(network_LIBS)
+AC_SUBST(joystick_LIBS)
 
 # The following are C++ items that need to be tested for with the c++
 # compiler