dnl Process this file with autogen.sh to produce a working configure
dnl script.
-AC_INIT(FlightGear, m4_esyscmd([cat ./version]), [http://www.flightgear.org/])
+AC_INIT(FlightGear, m4_esyscmd([cat ./version | tr -d '\n']), [http://www.flightgear.org])
dnl Ensure touching the version causes autoconf to re-run
AC_SUBST([CONFIGURE_DEPENDENCIES], ['$(top_srcdir)/version'])
AC_SUBST([HUDSON_BUILD_NUMBER], $BUILD_NUMBER)
else
AC_SUBST([HUDSON_BUILD_ID], [none])
- AC_SUBST([HUDSON_BUILD_NUMBER], [none])
+ AC_SUBST([HUDSON_BUILD_NUMBER], 0)
fi
AC_CHECK_PROG([HAVE_GIT], git, 1)
fi
dnl Check for Subversion library support
+# libsvn support defaults to yes
save_LIBS=$LIBS
save_CPPFLAGS=$CPPFLAGS
-LIBS="`apr-1-config --link-ld`"
-CPPFLAGS="-I/usr/include/subversion-1 `apr-1-config --includes`"
-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"
+AC_ARG_WITH(libsvn, [ --without-libsvn Do not use libsvn for terrasync [default=no]], [], [with_libsvn=yes])
+if test "x$with_libsvn" = "xyes"; then
+ LIBS="`apr-1-config --link-ld`"
+ CPPFLAGS="-I/usr/include/subversion-1 `apr-1-config --includes --cppflags`"
+ AC_CHECK_HEADERS([svn_client.h])
+ if test "x$ac_cv_header_svn_client_h" = "xyes"; then
+ echo "TerraSync will use libsvn"
+ 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)
+ AC_SUBST(svn_CPPFLAGS)
+ else
+ echo "Libsvn not found. TerraSync will use command line subversion"
+ svn_LIBS=""
+ svn_CPPFLAGS=""
+ fi
+else
+echo "Libsvn explicitly disabled. TerraSync will use command line subversion"
svn_LIBS=""
svn_CPPFLAGS=""
-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)
- AC_SUBST(svn_CPPFLAGS)
fi
LIBS=$save_LIBS
CPPFLAGS=$save_CPPFLAGS
echo "Prefix: $prefix"
if test "x$with_logging" != "x"; then
- echo "Debug messages: $with_logging"
+ echo "Log messages: $with_logging"
else
- echo "Debug messages: yes"
+ echo "Log messages: yes"
fi
echo -n "Automake version: "
fi
if test "x$with_threads" = "xyes"; then
- echo "threads: yes"
+ echo "Threads: yes"
else
- echo "threads: no"
+ echo "Threads: no"
fi
if test "x$with_eventinput" = "xyes"; then
- echo "event input: yes"
+ echo "Event input: yes"
else
- echo "event input: no"
+ echo "Event input: no"
fi
if test "x$enable_sp_fdms" != "xno"; then
fi
if test "x$enable_atcdcl" = "xyes"; then
- echo "Build depricated ATC/AI module: yes"
+ echo "Build deprecated ATC/AI module: yes"
else
- echo "Build depricated ATC/AI module: no"
+ echo "Build deprecated ATC/AI module: no"
fi