X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=configure.ac;h=41ceae44401dec01fd412da46ef04c1962b6d48d;hb=81797885ce38edf58d786b3e54555aca3070a08e;hp=a2c48a0fb79c8c31067cf6fd318a61ec9a7db8a5;hpb=8b53b86aa0f9c5a25ff5490689417ccce42e406e;p=flightgear.git diff --git a/configure.ac b/configure.ac index a2c48a0fb..41ceae444 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,5 @@ dnl Process this file with autoget.sh to produce a working configure dnl script. -dnl -dnl $Id$ AC_INIT AC_CONFIG_SRCDIR([src/Aircraft/aircraft.cxx]) @@ -12,7 +10,7 @@ AC_PREREQ(2.52) dnl Initialize the automake stuff dnl set the $host variable based on local machine/os AC_CANONICAL_TARGET -AM_INIT_AUTOMAKE(FlightGear, 0.9.6) +AM_INIT_AUTOMAKE(FlightGear, 0.9.9) dnl Checks for programs. AC_PROG_MAKE_SET @@ -36,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" @@ -75,11 +74,8 @@ AM_CONDITIONAL(ENABLE_SP_FDM, test "x$enable_sp_fdms" != "xno") dnl Thread related checks # defaults to yes -with_threads=yes -AC_ARG_WITH(threads, [ --with-threads Include tile loading threads [default=yes]]) -if test "x$with_threads" != "xyes"; then - AC_DEFINE([ENABLE_THREADS], 0, [Define to enable threaded tile paging]) -else +AC_ARG_WITH(threads, [ --with-threads Include tile loading threads [default=yes]], [], [with_threads=yes]) +if test "x$with_threads" = "xyes"; then AC_DEFINE([ENABLE_THREADS], 1, [Define to enable threaded tile paging]) CXXFLAGS="$CXXFLAGS -D_REENTRANT" CFLAGS="$CFLAGS -D_REENTRANT" @@ -98,10 +94,6 @@ fi 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) @@ -124,7 +116,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 @@ -149,21 +141,13 @@ if test "$have_timezone" = yes; then AC_DEFINE([HAVE_TIMEZONE], 1, [Define if system has timezone variable]) fi -dnl add correct audio libs and configure for audio support -audio_LIBS="-lplibsl -lplibsm" -case "${host}" in -*-*-cygwin* | *-*-mingw32*) - audio_LIBS="$audio_LIBS -lwinmm" - ;; -*-apple-darwin*) - audio_LIBS="$audio_LIBS -framework IOKit -framework CoreFoundation" - ;; -*-*-irix* ) - audio_LIBS="$audio_LIBS -laudio" - ;; -esac -AC_SUBST(audio_LIBS) +dnl add joystick support libraries +dnl search for FreeBSD library +AC_SEARCH_LIBS(hid_init, usbhid) +joystick_LIBS="$LIBS" +LIBS="" + dnl ENABLE_AUDIO_SUPPORT could be depricated at any time in favor of dnl just assuming we have audio support on all platform. We can @@ -186,23 +170,12 @@ esac dnl Checks for libraries. dnl Thread related checks -AC_CHECK_LIB(pthread, pthread_exit) -if test "x$ac_cv_lib_pthread_pthread_exit" != "xyes" \ - -a "x$ac_cv_header_pthread_h" = "xyes"; then - dnl FreeBSD: System has pthread.h, but -lpthread library check - dnl fails. See if we need -pthread instead of -lpthread and look - dnl for the functions in libc_r. - save_CXXFLAGS="$CXXFLAGS" - save_CFLAGS="$CFLAGS" +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 $CFLAGS" - save_LIBS=$LIBS - AC_CHECK_LIB(c_r, pthread_exit) - if test "x$ac_cv_lib_c_r_pthread_exit" != "xyes"; then - CXXFLAGS=$save_CXXFLAGS - CFLAGS=$save_CFLAGS - fi - LIBS=$save_LIBS + fi fi thread_LIBS="$LIBS" @@ -217,7 +190,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" @@ -231,22 +205,6 @@ else AC_DEFINE([PU_USE_GLUT], 1, [Define to use glut]) fi -dnl check for glut location -AC_CHECK_HEADER(GL/glut.h) -if test "x$ac_cv_header_GL_glut_h" = "xyes"; then - AC_DEFINE([FG_GLUT_H], , [Define as glut.h include location]) -else - AC_CHECK_HEADER(GLUT/glut.h) - if test "x$ac_cv_header_GLUT_glut_h" = "xyes"; then - AC_DEFINE([FG_GLUT_H], , [Define as glut.h include location]) - else - if test "x$enable_sdl" != "xyes"; then - echo "Neither GL/glut.h nor GLUT/glut.h found. Cannot continue" - exit - fi - fi -fi - dnl check for OpenGL related libraries case "${host}" in *-*-cygwin* | *-*-mingw32*) @@ -263,12 +221,13 @@ case "${host}" in 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 @@ -280,6 +239,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" ;; *) @@ -321,7 +281,7 @@ case "${host}" in esac opengl_LIBS="$LIBS" -LIBS="$base_LIBS" +LIBS="$base_LIBS $joystick_LIBS" dnl check for OpenAL libraries case "${host}" in @@ -330,24 +290,31 @@ 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" ;; *-apple-darwin*) dnl Mac OS X LIBS="$LIBS -framework IOKit -framework OpenAL" + openal_LIBS="$LIBS" ;; *) dnl default unix style machines + 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 ;; esac -openal_LIBS="$LIBS" LIBS="$base_LIBS" AC_SUBST(base_LIBS) @@ -355,6 +322,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 @@ -374,11 +342,11 @@ if test "x$ac_cv_header_plib_ul_h" != "xyes"; then exit fi -AC_MSG_CHECKING([for plib 1.8.0 or newer]) +AC_MSG_CHECKING([for plib 1.8.4 or newer]) AC_TRY_RUN([ #include -#define MIN_PLIB_VERSION 170 +#define MIN_PLIB_VERSION 184 int main() { int major, minor, micro; @@ -393,7 +361,7 @@ int main() { ], AC_MSG_RESULT(yes), [AC_MSG_RESULT(wrong version); - AC_MSG_ERROR([Install plib 1.8.0 or later first...])], + AC_MSG_ERROR([Install plib 1.8.4 or later first...])], AC_MSG_RESULT(yes) ) @@ -415,7 +383,7 @@ if test "x$ac_cv_header_simgear_version_h" != "xyes"; then exit fi -AC_MSG_CHECKING([for simgear 0.3.7 or newer]) +AC_MSG_CHECKING([for simgear 0.3.9 or newer]) AC_TRY_RUN([ #include @@ -426,7 +394,7 @@ AC_TRY_RUN([ #define MIN_MAJOR 0 #define MIN_MINOR 3 -#define MIN_MICRO 7 +#define MIN_MICRO 9 int main() { int major, minor, micro; @@ -541,7 +509,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 \ @@ -564,8 +531,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 \ @@ -574,9 +539,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