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"
dnl Used by JSBSim to conditionally compile in fgfs interface code
AC_DEFINE([FGFS], 1, [Define so that JSBSim compiles in 'library' mode])
-dnl Used to control whether clouds3d should be compiled in or not
-AC_DEFINE([FG_USE_CLOUDS_3D], 1, [Define to use 3D cloud support])
-AM_CONDITIONAL(FG_USE_CLOUDS_3D, test "x" = "x")
-
# Check for MS Windows environment
AC_CHECK_HEADER(windows.h)
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
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
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"
fi
LIBS="$LIBS -lglu32 -lopengl32 -luser32 -lgdi32"
+ joystick_LIBS="$joystick_LIBS -lwinmm"
dnl add -lwsock32 for mingwin
case "${host}" in
*-*-mingw32*)
echo "********** BUILDING FOR MINGW32 *************"
- base_LIBS="$base_LIBS -lws2_32"
+ network_LIBS="$network_LIBS -lws2_32"
;;
esac
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"
;;
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
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