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_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")
fi
AM_CONDITIONAL(ENABLE_WEATHERCM, test "x$with_weathercm" = "xyes")
-dnl Specify if we want the old menubar; default to the new one
-AC_ARG_WITH(old-menubar, [ --with-old-menubar Use the old menu bar])
-if test "x$with_old_menubar" = "xyes" ; then
- echo "Building with old menubar"
- AC_DEFINE([FG_OLD_MENUBAR], 1,
- [Define to build with old menubar])
-else
- echo "Building with new menubar"
-fi
-
dnl Thread related checks
AC_ARG_WITH(threads, [ --with-threads Include tile loading threads [default=no]])
if test "x$with_threads" = "xyes"; then
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)
dnl Checks for libraries.
-null_LIBS="$LIBS"
-
-AC_CHECK_LIB(m, cos)
-
-base_LIBS="$LIBS"
-
dnl Thread related checks
AC_CHECK_LIB(pthread, pthread_exit)
if test "x$ac_cv_lib_pthread_pthread_exit" != "xyes" \
save_CXXFLAGS="$CXXFLAGS"
save_CFLAGS="$CFLAGS"
CXXFLAGS="-pthread $CXXFLAGS"
- CFLAGS="-pthread $FLAGS"
+ 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
fi
LIBS=$save_LIBS
fi
-AC_CHECK_LIB(socket, socket)
+
+thread_LIBS="$LIBS"
+LIBS=""
+
+dnl search for network related libraries
+AC_SEARCH_LIBS(inet_addr, xnet)
+AC_SEARCH_LIBS(socket, socket)
+AC_SEARCH_LIBS(main, nsl)
+
+network_LIBS="$LIBS"
+LIBS=""
+
+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([FG_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([FG_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_MSG_RESULT(no)
)
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
AC_CHECK_HEADER(mk4.h)
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/Network/Makefile \
src/NetworkOLK/Makefile \
src/Objects/Makefile \
+ src/Replay/Makefile \
src/Scenery/Makefile \
src/Scripting/Makefile \
src/Sound/Makefile \
echo "Using Oliver's multi-pilot network support"
fi
-if test "x$with_old_menubar" != "x"; then
- echo "Using old menubar"
-else
- echo "Defaulting to new XML-configurable menubar"
-fi
-
if test "x$with_threads" = "xyes"; then
echo "threads: yes"
else
projects / flightgear.git / blobdiff