dnl script.
AC_INIT
-AC_CONFIG_SRCDIR([src/Aircraft/aircraft.cxx])
+AC_CONFIG_SRCDIR([src/Airports/simple.cxx])
dnl Require at least automake 2.52
AC_PREREQ(2.52)
dnl Thank you Christian Bauer from SheepSaver
dnl Modified by Tatsuhiro Nishioka for accepting a given framework path
- dnl AC_CHECK_FRAMEWORK($1=NAME, $2=INCLUDES, $3=FRAMEWORK_PATH) ; $3 is optional
+ dnl AC_CHECK_FRAMEWORK($1=NAME, $2=INCLUDES, $3=FRAMEWORK_PATH, $4=ACTION_IF_FOUND) ;
AC_DEFUN([AC_CHECK_FRAMEWORK], [
AS_VAR_PUSHDEF([ac_Framework], [ac_cv_framework_$1])dnl
AC_CACHE_CHECK([whether compiler supports framework $1],
FRAMEWORKS="$FRAMEWORKS -F$3"
CXXFLAGS="$CXXFLAGS -F$3"
CCFLAGS="$CCFLAGS -F$3"
+ CPPFLAGS="$CPPFLAGS -F$3"
dnl This is needed for AC_TRY_LINK when a framework path is specified
export DYLD_FRAMEWORK_PATH="${DYLD_FRAMEWORK_PATH}:$3"
fi
AS_IF([test AS_VAR_GET(ac_Framework) = yes],
[AC_DEFINE(AS_TR_CPP(HAVE_FRAMEWORK_$1), 1, [Define if framework $1 is available.])]
)
+ AS_IF([test AS_VAR_GET(ac_Framework) = yes], $4)
AS_VAR_POPDEF([ac_Framework])dnl
])
export DYLD_FRAMEWORK_PATH="$DYLD_FRAMEWORK_PATH:$with_plib_framework"
fi
- AC_ARG_WITH(openal_framework, [ --with-openal-framework=PREFIX Speicfy the prefix path to OpenAL.framework ])
- if test "x$with_openal_framework" != "x"; then
- echo "OpenAL framework prefix is $with_openal_framework"
+ AC_ARG_WITH(alut_framework, [ --with-alut-framework=PREFIX Specify the prefix path to ALUT.framework ])
+ if test "x$with_alut_framework" != "x"; then
+ echo "ALUT framework prefix is $with_alut_framework"
fi
;;
# Specify whether we want to compile ATCDCL.
# default to with_atcdcl=yes
-AC_ARG_ENABLE(atcdcl, [ --enable-atcdcl Compile and link the depricated atc/ai module], [enable_atcdcl="$enableval"] )
-if test "x$enable_atcdcl" != "xno"; then
+AC_ARG_ENABLE(atcdcl, [ --enable-atcdcl Compile and link the depricated atc/ai module], [], [enable_atcdcl="$enableval"] )
+if test "x$enable_atcdcl" = "xyes"; then
AC_DEFINE([ENABLE_ATCDCL], 1, [Define to include old ATC/AI module])
else
AC_DEFINE([ENABLE_ATCDCL], 0, [Define to include old ATC/AI module])
fi
-AM_CONDITIONAL(ENABLE_ATCDCL, test "x$enable_atcdcl" != "xno")
+AM_CONDITIONAL(ENABLE_ATCDCL, test "x$enable_atcdcl" = "xyes")
*-apple-darwin*)
dnl Mac OS X
- # Mac OS X has OpenAL.framework with ALUT by default
- # so we can use it without checking it.
- # Note: SimGear needs to check the existance of alut.h since it includes the header.
- LIBS="$LIBS -framework IOKit -framework OpenAL"
- openal_LIBS="$LIBS"
- OPENAL_OK="yes"
- ALUT_OK="yes"
+ # Mac OS X has OpenAL.framework, but no ALUT, by default, so we
+ # require use of a non-Apple ALUT.framework which we provide
+ openal_LIBS="-framework IOKit -framework OpenAL"
- dnl Check for OpenAL.framework when --with-openal-framework is specified
- if test "x$with_openal_framework" != "x"; then
- AC_CHECK_FRAMEWORK(OpenAL, [#include <OpenAL/alut.h>], $with_openal_framework)
- fi
-
+ AC_CHECK_FRAMEWORK(OpenAL, [#include <OpenAL/al.h>], "", [OPENAL_OK="yes"])
+ AC_CHECK_FRAMEWORK(ALUT, [#include <ALUT/alut.h>], $with_alut_framework, [
+ ALUT_OK="yes"
+ openal_LIBS="$openal_LIBS -framework ALUT"
+ ])
;;
*)
dnl Check for Subversion library support
save_LIBS=$LIBS
save_CPPFLAGS=$CPPFLAGS
-LIBS=""
+LIBS="`apr-1-config --link-ld`"
CPPFLAGS="-I/usr/include/subversion-1 `apr-1-config --includes`"
-AC_CHECK_LIB(svn_client-1, svn_client_checkout3)
-AC_CHECK_HEADERS([svn_client.h glut.h])
+AC_CHECK_HEADERS([svn_client.h])
if test "x$ac_cv_header_svn_client_h" != "xyes"; then
echo "TerraSync will shell out for command line subversion"
svn_LIBS=""
else
echo "TerraSync will use integrated subversion library"
AC_SEARCH_LIBS(svn_client_checkout, svn_client-1)
+ AC_SEARCH_LIBS(svn_cmdline_init, svn_subr-1)
svn_LIBS=$LIBS
svn_CPPFLAGS=$CPPFLAGS
AC_SUBST(svn_LIBS)
src/Makefile \
src/Include/Makefile \
src/Include/version.h \
- src/Include/config.h-msvc6 \
- src/Include/config.h-msvc71 \
- src/Include/config.h-msvc8 \
- src/Include/config.h-msvc90 \
src/Aircraft/Makefile \
src/Airports/Makefile \
src/ATC/Makefile \
echo "Include special purpose flight models: no"
fi
-if test "x$enable_atcdcl" != "xno"; then
+if test "x$enable_atcdcl" = "xyes"; then
echo "Build depricated ATC/AI module: yes"
else
echo "Build depricated ATC/AI module: no"