fi
AM_CONDITIONAL(ENABLE_WEATHERCM, test "x$with_weathercm" = "xyes")
-dnl Specify if we want the new XML menu; default to the old one
-AC_ARG_WITH(new-menubar, [ --with-new-menubar Use the new XML menu bar])
-if test "x$with_new_menubar" = "xyes" ; then
- echo "Building with new menubar"
-else
+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])
- echo "Building with old menubar"
+else
+ echo "Building with new menubar"
fi
AM_CONDITIONAL(ENABLE_WEATHERCM, test "x$with_weathercm" = "xyes")
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
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 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 $FLAGS"
+ 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
AC_CHECK_LIB(socket, socket)
dnl check for glut 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
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 \
echo "Using FGEnvironment"
fi
-if test "x$with_new_menubar" != "x"; then
- echo "Using new menubar"
+if test "x$with_old_menubar" != "x"; then
+ echo "Using old menubar"
else
- echo "Defaulting to old menubar"
+ echo "Defaulting to new XML-configurable menubar"
fi
if test "x$with_threads" = "xyes"; then