AC_PREREQ(2.52)
dnl Initialize the automake stuff
-AM_INIT_AUTOMAKE(FlightGear, 0.9.1)
+AM_INIT_AUTOMAKE(FlightGear, 0.9.2)
dnl Checks for programs.
AC_PROG_MAKE_SET
AC_DEFINE([FG_NDEBUG], 1, [Define for no logging output])
fi
-# Specify if we want to build with Oliver's networking support
+# Specify if we want to build with Multiplayer support
# default to with_network=yes
-AC_ARG_WITH(network_olk, [ --with-network-olk Include Oliver's multi-pilot networking support])
-if test "x$with_network_olk" = "xno" ; then
- echo "Building without Oliver's multi-pilot network support"
+AC_ARG_WITH(multiplayer, [ --with-multiplayer Include default multiplayer support])
+AC_ARG_WITH(network_olk, [ --with-network-olk Include Oliver's multi-pilot networking support [default=no]])
+
+if test "x$with_multiplayer" = "xno" -a "x$with_network_olk" = "xno"; then
+ echo "Building without any kind of multiplayer support"
+
+elif test "x$with_multiplayer" = "xno"; then
+# echo "Building without default multiplayer support"
+ echo "Building with Oliver's multi-pilot network support"
+ AC_DEFINE([FG_NETWORK_OLK], 1, [Define to build with Oliver's networking])
+
else
- echo "Building with Oliver's multi-pilot network support"
- AC_DEFINE([FG_NETWORK_OLK], 1, [Define to build with Oliver's networking])
+ echo "Building with default multiplayer support"
+# echo "Building without Oliver's multi-pilot network support"
+ AC_DEFINE([FG_MPLAYER_AS], 1, [Define to build with default multiplayer support])
fi
-AM_CONDITIONAL(ENABLE_NETWORK_OLK, test "x$with_network_olk" != "xno")
+
+AM_CONDITIONAL(ENABLE_NETWORK_OLK, test "x$with_network_olk" != "xno" -a "x$with_multiplayer" = "xno")
+AM_CONDITIONAL(ENABLE_MPLAYER_AS, test "x$with_multiplayer" != "xno")
# Specify if we want to use WeatherCM instead of FGEnvironment.
# default to with_weathercm=no
-AC_ARG_WITH(new-environment, [ --with-weathercm Use WeatherCM instead of FGEnvironment])
+AC_ARG_WITH(weathercm, [ --with-weathercm Use WeatherCM instead of FGEnvironment])
if test "x$with_weathercm" = "xyes" ; then
echo "Building with WeatherCM"
AC_DEFINE([FG_WEATHERCM], 1,
AC_DEFINE([ENABLE_THREADS], 1, [Define to enable threaded tile paging])
CXXFLAGS="$CXXFLAGS -D_REENTRANT"
CFLAGS="$CFLAGS -D_REENTRANT"
- AC_CHECK_HEADER(pthread.h)
fi
+AC_CHECK_HEADER(pthread.h)
AM_CONDITIONAL(WITH_THREADS, test "x$with_threads" = "xyes")
# specify the plib location
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 controll 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_DIR1 $EXTRA_DIR2"
+ EXTRA_DIRS="${EXTRA_DIRS} $EXTRA_DIR1 $EXTRA_DIR2"
;;
esac
*-*-cygwin* | *-*-mingw32*)
audio_LIBS="$audio_LIBS -lwinmm"
;;
-
+*-apple-darwin*)
+ audio_LIBS="$audio_LIBS -framework IOKit -framework CoreFoundation"
+ ;;
*-*-irix* )
audio_LIBS="$audio_LIBS -laudio"
;;
dnl Checks for libraries.
-null_LIBS="$LIBS"
+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"
+ 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
+
+thread_LIBS="$LIBS"
+LIBS=""
-AC_CHECK_LIB(m, cos)
+dnl search for network related libraries
+AC_SEARCH_LIBS(inet_addr, xnet)
+AC_SEARCH_LIBS(socket, socket)
+AC_SEARCH_LIBS(main, nsl)
-base_LIBS="$LIBS"
+network_LIBS="$LIBS"
+LIBS=""
-dnl Thread related checks
-AC_CHECK_LIB(pthread, pthread_exit)
-AC_CHECK_LIB(socket, socket)
+dnl check for some default libraries
+AC_SEARCH_LIBS(cos, m)
+AC_SEARCH_LIBS(dlclose, dl)
+
+base_LIBS="$LIBS"
dnl check for glut location
AC_CHECK_HEADER(GL/glut.h)
if test "x$ac_cv_header_GL_glut_h" = "xyes"; then
- AC_DEFINE([GLUT_H], "GL/glut.h", [Define as glut.h include location])
+ AC_DEFINE([GLUT_H], <GL/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([GLUT_H], "GLUT/glut.h", [Define as glut.h include location])
+ AC_DEFINE([GLUT_H], <GLUT/glut.h>, [Define as glut.h include location])
else
echo "Neither GL/glut.h nor GLUT/glut.h found. Cannot continue"
exit
dnl Skip X11 library tests if requested.
if test "x$no_x" != "xyes"; then
- AC_CHECK_LIB(X11, XCreateWindow)
- AC_CHECK_LIB(Xext, XShmCreateImage)
- AC_CHECK_LIB(Xi, XGetExtensionVersion)
- AC_CHECK_LIB(ICE, IceOpenConnection)
- AC_CHECK_LIB(SM, SmcOpenConnection)
- AC_CHECK_LIB(Xt, XtMalloc)
- AC_CHECK_LIB(Xmu, XmuLookupStandardColormap)
+ AC_SEARCH_LIBS(XCreateWindow, X11)
+ AC_SEARCH_LIBS(XShmCreateImage, Xext)
+ AC_SEARCH_LIBS(XGetExtensionVersion, Xi)
+ AC_SEARCH_LIBS(IceOpenConnection, ICE)
+ AC_SEARCH_LIBS(SmcOpenConnection, SM)
+ AC_SEARCH_LIBS(XtMalloc, Xt)
+ AC_SEARCH_LIBS(XmuLookupStandardColormap, Xmu)
fi
- AC_CHECK_LIB(GLcore, glNewList)
- if test "x$ac_cv_lib_GLcore_glNewList" = "xno" ; then
- dnl if no GLcore, check for GL
- AC_CHECK_LIB(GL, glNewList)
- if test "x$ac_cv_lib_GL_glNewList" = "xno" ; then
- dnl if no GL, check for MesaGL
- AC_CHECK_LIB(MesaGL, glNewList)
- fi
- else
- dnl if GLcore found, then also check for GL
- AC_CHECK_LIB(GL, glXCreateContext)
+ AC_SEARCH_LIBS(glNewList, [ GL GLcore MesaGL ])
+ if test "x$ac_cv_search_glNewList" = "x-lGLcore"; then
+ dnl if GLcore found, then also check for GL
+ AC_SEARCH_LIBS(glXCreateContext, GL)
fi
dnl if using mesa, check for xmesa.h
- if test "x$ac_cv_lib_MesaGL_glNewList" = "xyes" ; then
- AC_CHECK_HEADER(GL/fxmesa.h)
- if test "x$ac_cv_header_GL_fxmesa_h" = "xyes"; then
- AC_DEFINE([XMESA], 1, [Define for fxmesa])
+ if test "x$ac_cv_search_glNewList" = "x-lMesaGL"; then
+ AC_CHECK_HEADER(GL/fxmesa.h)
+ if test "x$ac_cv_header_GL_fxmesa_h" = "xyes"; then
+ AC_DEFINE([XMESA], 1, [Define for fxmesa])
AC_DEFINE([FX], 1, [Define for fxmesa])
fi
fi
- AC_CHECK_LIB(GLU, gluLookAt)
- if test "x$ac_cv_lib_GLU_gluLookAt" = "xno" ; then
- dnl if no GLU, check for MesaGLU
- AC_CHECK_LIB(MesaGLU, gluLookAt)
- fi
-
- AC_CHECK_LIB(glut, glutGetModifiers)
- if test "x$ac_cv_lib_glut_glutGetModifiers" = "xno" ; then
- dnl if no "real" glut, check for freeglut
- AC_CHECK_LIB(freeglut, glutGetModifiers)
- fi
+ AC_SEARCH_LIBS(gluLookAt, [ GLU MesaGLU ])
+ AC_SEARCH_LIBS(glutGetModifiers, [ glut freeglut ])
;;
esac
AC_SUBST(base_LIBS)
AC_SUBST(opengl_LIBS)
+AC_SUBST(thread_LIBS)
+AC_SUBST(network_LIBS)
# The following are C++ items that need to be tested for with the c++
# compiler
AC_DEFINE([ENABLE_PLIB_JOYSTICK], 1, [Define to enable plib joystick support])
-dnl Compiling an in-memory PSL script is available only in the CVS
+dnl Checking for PSL in plib
dnl version of plib, so check for it.
-AC_MSG_CHECKING([for plib PSL in-memory script compilation support])
+AC_MSG_CHECKING([for plib PSL scripting support])
AC_COMPILE_IFELSE([
#include <plib/psl.h>
}
],
[AC_MSG_RESULT(yes);
- fg_psl_string_compile=yes],
+ have_plib_psl=yes],
AC_MSG_RESULT(no)
)
-if test "x$fg_psl_string_compile" = "xyes"; then
- AC_DEFINE([FG_PSL_STRING_COMPILE], 1,
- [Support for compiling PSL scripts from an in-memory string.])
+AM_CONDITIONAL(HAVE_PLIB_PSL, test "x$have_plib_psl" = "xyes")
+if test "x$have_plib_psl" = "xyes"; then
+ AC_DEFINE([HAVE_PLIB_PSL], 1,
+ [Define if plib version is new enough to provide "PSL"])
fi
dnl Check for MetaKit
exit
fi
-AC_MSG_CHECKING([for simgear 0.3.0 or newer])
+AC_MSG_CHECKING([for simgear 0.3.3 or newer])
AC_TRY_RUN([
#include <stdio.h>
#define MIN_MAJOR 0
#define MIN_MINOR 3
-#define MIN_MICRO 0
+#define MIN_MICRO 3
int main() {
int major, minor, micro;
AC_HEADER_STDC
AC_CHECK_HEADERS( \
fcntl.h getopt.h malloc.h memory.h stdlib.h sys/param.h sys/stat.h \
- sys/time.h sys/timeb.h unistd.h windows.h winbase.h values.h )
+ sys/time.h sys/timeb.h unistd.h windows.h values.h )
dnl Checks for typedefs, structures, and compiler characteristics.
AC_C_CONST
AC_TYPE_SIGNAL
AC_FUNC_VPRINTF
AC_CHECK_FUNCS( \
- ftime gettimeofday timegm memcpy bcopy mktime strstr rand \
+ ftime gettimeofday timegm memcpy bcopy mktime strstr rand mkfifo \
random drand48 setitimer getitimer signal GetLocalTime rint getrusage )
AM_CONFIG_HEADER(src/Include/config.h)
src/Environment/Makefile \
src/FDM/Balloon/Makefile \
src/FDM/ExternalNet/Makefile \
+ src/FDM/ExternalPipe/Makefile \
src/FDM/JSBSim/Makefile \
src/FDM/JSBSim/filtersjb/Makefile \
src/FDM/LaRCsim/Makefile \
src/Main/runfgfs \
src/Main/runfgfs.bat \
src/Model/Makefile \
+ src/MultiPlayer/Makefile \
src/Navaids/Makefile \
src/Network/Makefile \
src/NetworkOLK/Makefile \
src/Objects/Makefile \
+ src/Replay/Makefile \
src/Scenery/Makefile \
src/Scripting/Makefile \
src/Sound/Makefile \
echo "Prefix: $prefix"
-if test "x$fg_psl_string_compile" = "xyes"; then
- echo "Scripts for input bindings: yes"
+if test "x$have_plib_psl" = "xyes"; then
+ echo "Plib PSL scripting: yes"
else
- echo "Scripts for input bindings: $fg_psl_string_compile"
- echo " PSL scripts attached to input bindings will not"
- echo " work. Download the latest CVS version of plib"
- echo " if you would like to enable them."
+ echo "Plib PSL scripting: $fg_psl_string_compile"
+ echo " You will not be able to run scripts written in PSL"
+ echo " and some advanced GUI and input features may not"
+ echo " work. Download and install the latest CVS version"
+ echo " of plib if you would like to enable PSL support."
fi
if test "x$with_logging" != "x"; then
echo "Using FGEnvironment"
fi
+if test "x$with_multiplayer" != "xno"; then
+ echo "Using default multiplayer support"
+elif test "x$with_network_olk" != "xno"; then
+ echo "Using Oliver's multi-pilot network support"
+fi
+
if test "x$with_threads" = "xyes"; then
echo "threads: yes"
else