| OLD | NEW |
|---|
| 1 dnl configure.ac: Autoconfiscation for Subversion | 1 dnl configure.ac: Autoconfiscation for Subversion |
| 2 dnl Process this file with autoconf to produce a configure script. | 2 dnl Process this file with autoconf to produce a configure script. |
| 3 | 3 |
| 4 AC_PREREQ(2.58) | 4 AC_PREREQ(2.58) |
| 5 | 5 |
| 6 dnl Get the version of Subversion, using m4's esyscmd() command to do this | 6 dnl Get the version of Subversion, using m4's esyscmd() command to do this |
| 7 dnl at m4-time, since AC_INIT() requires it then. | 7 dnl at m4-time, since AC_INIT() requires it then. |
| 8 AC_INIT([subversion], | 8 AC_INIT([subversion], |
| 9 [esyscmd(python build/getversion.py subversion/include/svn_version.h)], | 9 [esyscmd(python build/getversion.py subversion/include/svn_version.h)], |
| 10 [http://subversion.tigris.org/]) | 10 [http://subversion.tigris.org/]) |
| 11 | 11 |
| 12 AC_CONFIG_SRCDIR(subversion/include/svn_types.h) | 12 AC_CONFIG_SRCDIR(subversion/include/svn_types.h) |
| 13 AC_CONFIG_AUX_DIR([build]) | 13 AC_CONFIG_AUX_DIR([build]) |
| 14 | 14 |
| 15 AC_MSG_NOTICE([Configuring Subversion ]AC_PACKAGE_VERSION) | 15 AC_MSG_NOTICE([Configuring Subversion ]AC_PACKAGE_VERSION) |
| 16 | 16 |
| 17 AC_SUBST([abs_srcdir], ["`cd $srcdir && pwd`"]) | 17 AC_SUBST([abs_srcdir], ["`cd $srcdir && pwd`"]) |
| 18 AC_SUBST([abs_builddir], ["`pwd`"]) | 18 AC_SUBST([abs_builddir], ["`pwd`"]) |
| 19 | 19 |
| 20 # Generate config.nice early (before the arguments are munged) | 20 # Generate config.nice early (before the arguments are munged) |
| 21 SVN_CONFIG_NICE(config.nice) | 21 SVN_CONFIG_NICE(config.nice) |
| 22 | 22 |
| 23 # ==== Check for programs ==================================================== | 23 # ==== Check for programs ==================================================== |
| 24 | 24 |
| 25 # Look for a C compiler (before anything can set CFLAGS) | 25 # Look for a C compiler (before anything can set CFLAGS) |
| 26 AC_PROG_CC | 26 AC_PROG_CC |
| 27 |
| 28 # Look for a C++ compiler |
| 29 AC_PROG_CXX |
| 27 | 30 |
| 28 # Look for a C pre-processor | 31 # Look for a C pre-processor |
| 29 AC_PROG_CPP | 32 AC_PROG_CPP |
| 30 | 33 |
| 31 # Grab target_cpu, so we can use it in the Solaris pkginfo file | 34 # Grab target_cpu, so we can use it in the Solaris pkginfo file |
| 32 AC_CANONICAL_TARGET | 35 AC_CANONICAL_TARGET |
| 33 | 36 |
| 34 # Look for an extended grep | 37 # Look for an extended grep |
| 35 AC_PROG_EGREP | 38 AC_PROG_EGREP |
| 36 | 39 |
| 37 AC_PROG_LN_S | 40 AC_PROG_LN_S |
| 38 | 41 |
| 39 AC_PROG_INSTALL | 42 AC_PROG_INSTALL |
| 40 # If $INSTALL is relative path to our fallback install-sh, then convert | 43 # If $INSTALL is relative path to our fallback install-sh, then convert |
| 41 # to an absolute path, as in some cases (e.g. Solaris VPATH build), libtool | 44 # to an absolute path, as in some cases (e.g. Solaris VPATH build), libtool |
| 42 # may try to use it from a changed working directory. | 45 # may try to use it from a changed working directory. |
| 43 if test "$INSTALL" = "build/install-sh -c"; then | 46 if test "$INSTALL" = "build/install-sh -c"; then |
| 44 INSTALL="$abs_srcdir/$INSTALL" | 47 INSTALL="$abs_srcdir/$INSTALL" |
| 45 fi | 48 fi |
| 46 | 49 |
| 47 AC_SUBST([MKDIR], ["$INSTALL -d"]) | 50 AC_SUBST([MKDIR], ["$INSTALL -d"]) |
| 48 | 51 |
| 49 | 52 |
| 50 dnl find Apache with a recent-enough magic module number. | 53 dnl find Apache with a recent-enough magic module number. |
| 51 SVN_FIND_APACHE(20020903) | 54 SVN_FIND_APACHE(20020903) |
| 52 | 55 |
| 53 # ==== Libraries, for which we may have source to build ====================== | 56 # ==== Libraries, for which we may have source to build ====================== |
| 54 | 57 |
| 55 dnl verify apr version and set apr flags | 58 dnl verify apr version and set apr flags |
| 56 dnl These regular expressions should not contain "\(" and "\)". | 59 dnl These regular expressions should not contain "\(" and "\)". |
| 57 dnl The specific reason we require APR 0.9.7 is: | 60 dnl The specific reason we require APR 0.9.7 is: |
| 58 dnl It contains fixes to its file writing routines | 61 dnl It contains fixes to its file writing routines |
| 59 dnl now generating errors instead of silently ignoring | 62 dnl now generating errors instead of silently ignoring |
| 60 dnl them. Only .7 and later can guarantee repository | 63 dnl them. Only .7 and later can guarantee repository |
| 61 dnl integrity with FSFS. | 64 dnl integrity with FSFS. |
| 62 | 65 |
| 63 APR_VER_REGEXES=["0\.9\.[7-9] 0\.9\.1[0-9] 1\."] | 66 APR_VER_REGEXES=["0\.9\.[7-9] 0\.9\.1[0-9] 1\."] |
| 64 APU_VER_REGEXES=["0\.9\.[7-9] 0\.9\.1[0-9] 1\."] | 67 APU_VER_REGEXES=["0\.9\.[7-9] 0\.9\.1[0-9] 1\."] |
| 65 | 68 |
| 66 SVN_LIB_APR($APR_VER_REGEXES) | 69 SVN_LIB_APR($APR_VER_REGEXES) |
| 67 SVN_LIB_APRUTIL($APU_VER_REGEXES) | 70 SVN_LIB_APRUTIL($APU_VER_REGEXES) |
| 68 | 71 |
| 69 # Either a space-separated list of allowable Neon versions, or "any" to | 72 # Either a space-separated list of allowable Neon versions, or "any" to |
| 70 # mean allow anything. | 73 # mean allow anything. |
| 71 NEON_ALLOWED_LIST="0.25.0 0.25.1 0.25.2 0.25.3 0.25.4 0.25.5 0.26.0 0.26.1 0.26.
2 0.26.3 0.26.4 0.27.2 0.28.0 0.28.1 0.28.2 0.29.0-dev" | 74 NEON_ALLOWED_LIST="0.25.0 0.25.1 0.25.2 0.25.3 0.25.4 0.25.5 0.26.0 0.26.1 0.26.
2 0.26.3 0.26.4 0.27.2 0.28.0 0.28.1 0.28.2 0.29.0-dev" |
| 72 NEON_RECOMMENDED_VER=0.28.1 | 75 NEON_RECOMMENDED_VER=0.28.1 |
| 73 NEON_URL="http://www.webdav.org/neon/neon-${NEON_RECOMMENDED_VER}.tar.gz" | 76 NEON_URL="http://www.webdav.org/neon/neon-${NEON_RECOMMENDED_VER}.tar.gz" |
| 74 dnl You can skip the neon version check only if you know what you are doing | 77 dnl You can skip the neon version check only if you know what you are doing |
| 75 AC_ARG_ENABLE(neon-version-check, | 78 AC_ARG_ENABLE(neon-version-check, |
| 76 AS_HELP_STRING([--disable-neon-version-check], | 79 AS_HELP_STRING([--disable-neon-version-check], |
| (...skipping 152 matching lines...) Show 10 above Show 10 below |
| 229 AC_DEFINE_UNQUOTED(SVN_FS_WANT_DB_MAJOR, $SVN_FS_WANT_DB_MAJOR, | 232 AC_DEFINE_UNQUOTED(SVN_FS_WANT_DB_MAJOR, $SVN_FS_WANT_DB_MAJOR, |
| 230 [The desired major version for the Berkeley DB]) | 233 [The desired major version for the Berkeley DB]) |
| 231 AC_DEFINE_UNQUOTED(SVN_FS_WANT_DB_MINOR, $SVN_FS_WANT_DB_MINOR, | 234 AC_DEFINE_UNQUOTED(SVN_FS_WANT_DB_MINOR, $SVN_FS_WANT_DB_MINOR, |
| 232 [The desired minor version for the Berkeley DB]) | 235 [The desired minor version for the Berkeley DB]) |
| 233 AC_DEFINE_UNQUOTED(SVN_FS_WANT_DB_PATCH, $SVN_FS_WANT_DB_PATCH, | 236 AC_DEFINE_UNQUOTED(SVN_FS_WANT_DB_PATCH, $SVN_FS_WANT_DB_PATCH, |
| 234 [The desired patch version for the Berkeley DB]) | 237 [The desired patch version for the Berkeley DB]) |
| 235 | 238 |
| 236 SVN_LIB_SASL | 239 SVN_LIB_SASL |
| 237 | 240 |
| 238 if test "$svn_lib_sasl" = "yes"; then | 241 if test "$svn_lib_sasl" = "yes"; then |
| 239 AC_DEFINE(SVN_HAVE_SASL, 1, | 242 AC_DEFINE(SVN_HAVE_SASL, 1, |
| 240 [Defined if Cyrus SASL v2 is present on the system]) | 243 [Defined if Cyrus SASL v2 is present on the system]) |
| 241 fi | 244 fi |
| 242 | 245 |
| 243 dnl Mac OS KeyChain ------------------- | 246 dnl Mac OS KeyChain ------------------- |
| 244 | 247 |
| 245 AC_ARG_ENABLE(keychain, | 248 AC_ARG_ENABLE(keychain, |
| 246 AS_HELP_STRING([--disable-keychain], | 249 AS_HELP_STRING([--disable-keychain], |
| 247 [Disable use of Mac OS KeyChain for auth credentials]), | 250 [Disable use of Mac OS KeyChain for auth credentials]), |
| 248 [enable_keychain=$enableval],[enable_keychain=yes]) | 251 [enable_keychain=$enableval],[enable_keychain=yes]) |
| 249 | 252 |
| 250 AC_MSG_CHECKING([for Mac OS KeyChain Services]) | 253 AC_MSG_CHECKING([for Mac OS KeyChain Services]) |
| 251 | 254 |
| 252 if test "$enable_keychain" = "yes"; then | 255 if test "$enable_keychain" = "yes"; then |
| 253 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <AvailabilityMacros.h> | 256 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <AvailabilityMacros.h> |
| 254 #if !DARWIN || (MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_2) | 257 #if !DARWIN || (MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_2) |
| 255 #error KeyChain API unavailable. | 258 #error KeyChain API unavailable. |
| 256 #endif]], [[]])],[],[enable_keychain=no]) | 259 #endif]], [[]])],[],[enable_keychain=no]) |
| 257 fi | 260 fi |
| 258 | 261 |
| 259 if test "$enable_keychain" = "yes"; then | 262 if test "$enable_keychain" = "yes"; then |
| 260 dnl ### Hack. We should only need to pass the -framework options when | 263 dnl ### Hack. We should only need to pass the -framework options when |
| 261 dnl linking libsvn_subr, since it is the only library that uses Keychain. | 264 dnl linking libsvn_subr, since it is the only library that uses Keychain. |
| 262 dnl | 265 dnl |
| 263 dnl Unfortunately, libtool 1.5.x doesn't track transitive dependencies for | 266 dnl Unfortunately, libtool 1.5.x doesn't track transitive dependencies for |
| 264 dnl OS X frameworks like it does for normal libraries, so we need to | 267 dnl OS X frameworks like it does for normal libraries, so we need to |
| 265 dnl explicitly pass the option to all the users of libsvn_subr to allow | 268 dnl explicitly pass the option to all the users of libsvn_subr to allow |
| 266 dnl static builds to link successfully. | 269 dnl static builds to link successfully. |
| 267 dnl | 270 dnl |
| 268 dnl This does mean that all executables we link will be linked directly | 271 dnl This does mean that all executables we link will be linked directly |
| 269 dnl to these frameworks - even when building shared libraries - but that | 272 dnl to these frameworks - even when building shared libraries - but that |
| 270 dnl shouldn't cause any problems. | 273 dnl shouldn't cause any problems. |
| 271 LIBS="$LIBS -framework Security" | 274 LIBS="$LIBS -framework Security" |
| 272 LIBS="$LIBS -framework CoreFoundation" | 275 LIBS="$LIBS -framework CoreFoundation" |
| 273 LIBS="$LIBS -framework CoreServices" | 276 LIBS="$LIBS -framework CoreServices" |
| 274 AC_DEFINE([SVN_HAVE_KEYCHAIN_SERVICES], [1], [Is Mac OS KeyChain support enabl
ed?]) | 277 AC_DEFINE([SVN_HAVE_KEYCHAIN_SERVICES], [1], [Is Mac OS KeyChain support enabl
ed?]) |
| 275 AC_MSG_RESULT([yes]) | 278 AC_MSG_RESULT([yes]) |
| 276 else | 279 else |
| 277 AC_MSG_RESULT([no]) | 280 AC_MSG_RESULT([no]) |
| 278 fi | 281 fi |
| 282 |
| 283 |
| 284 dnl pkg-config (required for support for KWallet and GNOME Keyring) ------------
------- |
| 285 |
| 286 AC_CHECK_PROG(HAVE_PKG_CONFIG, pkg-config, yes) |
| 287 |
| 288 |
| 289 dnl KWallet ------------------- |
| 290 |
| 291 AC_ARG_WITH(kwallet, |
| 292 [AS_HELP_STRING([[--with-kwallet[=PATH]]], |
| 293 [Enable use of KWallet (KDE 4) for auth credentials])], |
| 294 [with_kwallet="$withval"], |
| 295 [with_kwallet=no]) |
| 296 |
| 297 AC_MSG_CHECKING([whether to look for KWallet]) |
| 298 if test "$with_kwallet" != "no"; then |
| 299 AC_MSG_RESULT([yes]) |
| 300 if test "$enable_shared" = "yes"; then |
| 301 if test "$HAVE_PKG_CONFIG" = "yes"; then |
| 302 AC_MSG_CHECKING([for QtCore, QtDBus, QtGui]) |
| 303 if pkg-config --exists QtCore QtDBus QtGui; then |
| 304 AC_MSG_RESULT([yes]) |
| 305 if test "$with_kwallet" != "yes"; then |
| 306 AC_MSG_CHECKING([for kde4-config]) |
| 307 kde4_config="$with_kwallet/bin/kde4-config" |
| 308 if test -f "$kde4_config" && test -x "$kde4_config"; then |
| 309 HAVE_KDE4_CONFIG="yes" |
| 310 AC_MSG_RESULT([yes]) |
| 311 else |
| 312 AC_MSG_RESULT([no]) |
| 313 fi |
| 314 else |
| 315 AC_CHECK_PROG(HAVE_KDE4_CONFIG, kde4-config, yes) |
| 316 kde4_config="kde4-config" |
| 317 fi |
| 318 if test "$HAVE_KDE4_CONFIG" = "yes"; then |
| 319 AC_MSG_CHECKING([for KWallet]) |
| 320 old_CXXFLAGS="$CXXFLAGS" |
| 321 old_LDFLAGS="$LDFLAGS" |
| 322 old_LIBS="$LIBS" |
| 323 for d in [`pkg-config --cflags QtCore QtDBus QtGui | $GREP -o -- -D[^[
:space:]]*`]; do |
| 324 CPPFLAGS="$CPPFLAGS $d" |
| 325 done |
| 326 qt_include_dirs="" |
| 327 for i in [`pkg-config --cflags QtCore QtDBus QtGui | $GREP -o -- -I[^[
:space:]]*`]; do |
| 328 qt_include_dirs="$qt_include_dirs $i" |
| 329 done |
| 330 qt_include_dirs="${qt_include_dirs## }" |
| 331 kde_dir="`$kde4_config --prefix`" |
| 332 SVN_KWALLET_INCLUDES="$qt_include_dirs -I$kde_dir/include" |
| 333 SVN_KWALLET_LIBS="-lQtCore -lQtDBus -lQtGui -lkdecore -lkdeui" |
| 334 CXXFLAGS="$CXXFLAGS $SVN_KWALLET_INCLUDES" |
| 335 LIBS="$LIBS $SVN_KWALLET_LIBS" |
| 336 qt_lib_dirs="" |
| 337 for l in [`pkg-config --libs QtCore QtDBus QtGui | $GREP -o -- -L[^[:s
pace:]]*`]; do |
| 338 qt_lib_dirs="$qt_lib_dirs $l" |
| 339 done |
| 340 qt_lib_dirs="${qt_lib_dirs## }" |
| 341 LDFLAGS="$old_LDFLAGS $qt_lib_dirs -L$kde_dir/lib`$kde4_config --libsu
ffix`" |
| 342 AC_LANG(C++) |
| 343 AC_LINK_IFELSE([ |
| 344 #include <kwallet.h> |
| 345 int main() |
| 346 {KWallet::Wallet::walletList();}], with_kwallet=yes, with_kwallet=no) |
| 347 AC_LANG(C) |
| 348 if test "$with_kwallet" = "yes"; then |
| 349 AC_DEFINE([SVN_HAVE_KWALLET], [1], |
| 350 [Is KWallet support enabled?]) |
| 351 AC_MSG_RESULT([yes]) |
| 352 CXXFLAGS="$old_CXXFLAGS" |
| 353 LIBS="$old_LIBS" |
| 354 else |
| 355 AC_MSG_RESULT([no]) |
| 356 AC_MSG_ERROR([cannot find KWallet]) |
| 357 fi |
| 358 else |
| 359 AC_MSG_ERROR([cannot find kde4-config]) |
| 360 fi |
| 361 else |
| 362 AC_MSG_RESULT([no]) |
| 363 AC_MSG_ERROR([cannot find QtCore, QtDBus, QtGui]) |
| 364 fi |
| 365 else |
| 366 AC_MSG_ERROR([cannot find pkg-config]) |
| 367 fi |
| 368 else |
| 369 AC_MSG_ERROR([--with-kwallet conflicts with --disable-shared]) |
| 370 fi |
| 371 else |
| 372 AC_MSG_RESULT([no]) |
| 373 fi |
| 374 AC_SUBST(SVN_KWALLET_INCLUDES) |
| 375 AC_SUBST(SVN_KWALLET_LIBS) |
| 279 | 376 |
| 280 | 377 |
| 281 dnl I18n ------------------- | 378 dnl I18n ------------------- |
| 282 | 379 |
| 283 AC_ARG_ENABLE(nls, | 380 AC_ARG_ENABLE(nls, |
| 284 AS_HELP_STRING([--disable-nls],[Disable gettext functionality]), | 381 AS_HELP_STRING([--disable-nls],[Disable gettext functionality]), |
| 285 [enable_nls=$enableval],[enable_nls=yes]) | 382 [enable_nls=$enableval],[enable_nls=yes]) |
| 286 | 383 |
| 287 USE_NLS="no" | 384 USE_NLS="no" |
| 288 if test "$enable_nls" = "yes"; then | 385 if test "$enable_nls" = "yes"; then |
| 289 dnl First, check to see if there is a working msgfmt. | 386 dnl First, check to see if there is a working msgfmt. |
| 290 AC_PATH_PROG(MSGFMT, msgfmt, none) | 387 AC_PATH_PROG(MSGFMT, msgfmt, none) |
| 291 AC_PATH_PROG(MSGMERGE, msgmerge, none) | 388 AC_PATH_PROG(MSGMERGE, msgmerge, none) |
| 292 AC_PATH_PROG(XGETTEXT, xgettext, none) | 389 AC_PATH_PROG(XGETTEXT, xgettext, none) |
| 293 if test "$MSGFMT" != "none"; then | 390 if test "$MSGFMT" != "none"; then |
| 294 AC_SEARCH_LIBS(bindtextdomain, [intl], [], | 391 AC_SEARCH_LIBS(bindtextdomain, [intl], [], |
| 295 [ | 392 [ |
| 296 AC_MSG_WARN([bindtextdomain() not found. Disabling NLS.]) | 393 AC_MSG_WARN([bindtextdomain() not found. Disabling NLS.]) |
| 297 enable_nls="no" | 394 enable_nls="no" |
| 298 ]) | 395 ]) |
| 299 if test "$enable_nls" = "yes"; then | 396 if test "$enable_nls" = "yes"; then |
| 300 AC_DEFINE(ENABLE_NLS, 1, | 397 AC_DEFINE(ENABLE_NLS, 1, |
| 301 [Define to 1 if translation of program messages to the user's | 398 [Define to 1 if translation of program messages to the user's |
| 302 native language is requested.]) | 399 native language is requested.]) |
| 303 USE_NLS="yes" | 400 USE_NLS="yes" |
| 304 fi | 401 fi |
| 305 fi | 402 fi |
| 306 fi | 403 fi |
| 307 | 404 |
| 308 AH_BOTTOM( | 405 AH_BOTTOM( |
| 309 #define N_(x) x | 406 #define N_(x) x |
| 310 #ifdef ENABLE_NLS | 407 #ifdef ENABLE_NLS |
| 311 #include <locale.h> | 408 #include <locale.h> |
| 312 #include <libintl.h> | 409 #include <libintl.h> |
| 313 #define _(x) dgettext(PACKAGE_NAME, x) | 410 #define _(x) dgettext(PACKAGE_NAME, x) |
| 314 #else | 411 #else |
| 315 #define _(x) (x) | 412 #define _(x) (x) |
| 316 #define gettext(x) (x) | 413 #define gettext(x) (x) |
| 317 #define dgettext(domain,x) (x) | 414 #define dgettext(domain,x) (x) |
| 318 #endif | 415 #endif |
| 319 ) | 416 ) |
| 320 | 417 |
| 321 dnl Used to simulate makefile conditionals. | 418 dnl Used to simulate makefile conditionals. |
| 322 GETTEXT_CODESET=\# | 419 GETTEXT_CODESET=\# |
| 323 NO_GETTEXT_CODESET=\# | 420 NO_GETTEXT_CODESET=\# |
| 324 if test $USE_NLS = "yes"; then | 421 if test $USE_NLS = "yes"; then |
| 325 AC_CHECK_FUNCS(bind_textdomain_codeset, | 422 AC_CHECK_FUNCS(bind_textdomain_codeset, |
| 326 [ GETTEXT_CODESET="" ], | 423 [ GETTEXT_CODESET="" ], |
| 327 [ NO_GETTEXT_CODESET="" ]) | 424 [ NO_GETTEXT_CODESET="" ]) |
| 328 fi | 425 fi |
| 329 AC_SUBST(GETTEXT_CODESET) | 426 AC_SUBST(GETTEXT_CODESET) |
| 330 AC_SUBST(NO_GETTEXT_CODESET) | 427 AC_SUBST(NO_GETTEXT_CODESET) |
| 331 | 428 |
| 332 # Check if we are using GNU gettext. | 429 # Check if we are using GNU gettext. |
| 333 GNU_GETTEXT=no | 430 GNU_GETTEXT=no |
| 334 MSGFMTFLAGS='' | 431 MSGFMTFLAGS='' |
| 335 if test $USE_NLS = "yes"; then | 432 if test $USE_NLS = "yes"; then |
| 336 AC_MSG_CHECKING(if we are using GNU gettext) | 433 AC_MSG_CHECKING(if we are using GNU gettext) |
| 337 if $MSGFMT --version 2>&1 | $EGREP GNU > /dev/null; then | 434 if $MSGFMT --version 2>&1 | $EGREP GNU > /dev/null; then |
| 338 GNU_GETTEXT=yes | 435 GNU_GETTEXT=yes |
| 339 MSGFMTFLAGS='-c' | 436 MSGFMTFLAGS='-c' |
| 340 fi | 437 fi |
| 341 AC_MSG_RESULT($GNU_GETTEXT) | 438 AC_MSG_RESULT($GNU_GETTEXT) |
| 342 fi | 439 fi |
| 343 AC_SUBST(MSGFMTFLAGS) | 440 AC_SUBST(MSGFMTFLAGS) |
| 344 | 441 |
| 345 INSTALL_STATIC_RULES="install-bin install-docs" | 442 INSTALL_STATIC_RULES="install-bin install-docs" |
| 346 INSTALL_RULES="install-fsmod-lib install-ramod-lib install-lib install-include i
nstall-static" | 443 INSTALL_RULES="install-fsmod-lib install-ramod-lib install-lib install-include i
nstall-static" |
| 347 INSTALL_RULES="$INSTALL_RULES $INSTALL_APACHE_RULE" | 444 INSTALL_RULES="$INSTALL_RULES $INSTALL_APACHE_RULE" |
| 348 BUILD_RULES="fsmod-lib ramod-lib lib bin test $BUILD_APACHE_RULE" | 445 BUILD_RULES="fsmod-lib ramod-lib lib bin test $BUILD_APACHE_RULE" |
| 349 | 446 |
| 350 if test "$svn_lib_berkeley_db" = "yes"; then | 447 if test "$svn_lib_berkeley_db" = "yes"; then |
| 351 BUILD_RULES="$BUILD_RULES bdb-lib bdb-test" | 448 BUILD_RULES="$BUILD_RULES bdb-lib bdb-test" |
| 352 INSTALL_RULES="`echo $INSTALL_RULES | sed 's/install-fsmod-lib/install-fsmod-l
ib install-bdb-lib/'`" | 449 INSTALL_RULES="`echo $INSTALL_RULES | sed 's/install-fsmod-lib/install-fsmod-l
ib install-bdb-lib/'`" |
| 353 INSTALL_STATIC_RULES="$INSTALL_STATIC_RULES install-bdb-lib" | 450 INSTALL_STATIC_RULES="$INSTALL_STATIC_RULES install-bdb-lib" |
| 354 BDB_TEST_DEPS="\$(BDB_TEST_DEPS)" | 451 BDB_TEST_DEPS="\$(BDB_TEST_DEPS)" |
| 355 BDB_TEST_PROGRAMS="\$(BDB_TEST_PROGRAMS)" | 452 BDB_TEST_PROGRAMS="\$(BDB_TEST_PROGRAMS)" |
| 356 fi | 453 fi |
| 357 | 454 |
| 358 if test "$svn_lib_neon" = "yes"; then | 455 if test "$svn_lib_neon" = "yes"; then |
| 359 BUILD_RULES="$BUILD_RULES neon-lib" | 456 BUILD_RULES="$BUILD_RULES neon-lib" |
| 360 INSTALL_RULES="`echo $INSTALL_RULES | sed 's/install-ramod-lib/install-ramod-l
ib install-neon-lib/'`" | 457 INSTALL_RULES="`echo $INSTALL_RULES | sed 's/install-ramod-lib/install-ramod-l
ib install-neon-lib/'`" |
| 361 INSTALL_STATIC_RULES="$INSTALL_STATIC_RULES install-neon-lib" | 458 INSTALL_STATIC_RULES="$INSTALL_STATIC_RULES install-neon-lib" |
| 362 fi | 459 fi |
| 363 | 460 |
| 364 if test "$svn_lib_serf" = "yes"; then | 461 if test "$svn_lib_serf" = "yes"; then |
| 365 BUILD_RULES="$BUILD_RULES serf-lib" | 462 BUILD_RULES="$BUILD_RULES serf-lib" |
| 366 INSTALL_RULES="`echo $INSTALL_RULES | sed 's/install-ramod-lib/install-ramod-l
ib install-serf-lib/'`" | 463 INSTALL_RULES="`echo $INSTALL_RULES | sed 's/install-ramod-lib/install-ramod-l
ib install-serf-lib/'`" |
| 367 INSTALL_STATIC_RULES="$INSTALL_STATIC_RULES install-serf-lib" | 464 INSTALL_STATIC_RULES="$INSTALL_STATIC_RULES install-serf-lib" |
| 465 fi |
| 466 |
| 467 if test "$with_kwallet" = "yes"; then |
| 468 BUILD_RULES="$BUILD_RULES kwallet-lib" |
| 469 INSTALL_RULES="`echo $INSTALL_RULES | sed 's/install-lib/install-lib install-k
wallet-lib/'`" |
| 470 INSTALL_STATIC_RULES="$INSTALL_STATIC_RULES install-kwallet-lib" |
| 368 fi | 471 fi |
| 369 | 472 |
| 370 if test "$USE_NLS" = "yes"; then | 473 if test "$USE_NLS" = "yes"; then |
| 371 BUILD_RULES="$BUILD_RULES locale" | 474 BUILD_RULES="$BUILD_RULES locale" |
| 372 INSTALL_RULES="$INSTALL_RULES install-locale" | 475 INSTALL_RULES="$INSTALL_RULES install-locale" |
| 373 fi | 476 fi |
| 374 | 477 |
| 375 AC_SUBST(BUILD_RULES) | 478 AC_SUBST(BUILD_RULES) |
| 376 AC_SUBST(INSTALL_STATIC_RULES) | 479 AC_SUBST(INSTALL_STATIC_RULES) |
| 377 AC_SUBST(INSTALL_RULES) | 480 AC_SUBST(INSTALL_RULES) |
| 378 AC_SUBST(BDB_TEST_DEPS) | 481 AC_SUBST(BDB_TEST_DEPS) |
| 379 AC_SUBST(BDB_TEST_PROGRAMS) | 482 AC_SUBST(BDB_TEST_PROGRAMS) |
| 380 | 483 |
| 381 dnl Check for header files ---------------- | 484 dnl Check for header files ---------------- |
| 382 | 485 |
| 383 dnl Standard C headers | 486 dnl Standard C headers |
| 384 AC_HEADER_STDC | 487 AC_HEADER_STDC |
| 385 | 488 |
| 386 dnl Check for typedefs, structures, and compiler characteristics ---------- | 489 dnl Check for typedefs, structures, and compiler characteristics ---------- |
| 387 | 490 |
| 388 dnl if compiler doesn't understand `const', then define it empty | 491 dnl if compiler doesn't understand `const', then define it empty |
| 389 AC_C_CONST | 492 AC_C_CONST |
| 390 | 493 |
| 391 dnl if non-existent, define size_t to be `unsigned' | 494 dnl if non-existent, define size_t to be `unsigned' |
| 392 AC_TYPE_SIZE_T | 495 AC_TYPE_SIZE_T |
| 393 | 496 |
| 394 | 497 |
| 395 dnl Check for library functions ---------- | 498 dnl Check for library functions ---------- |
| 396 | 499 |
| 397 dnl libsvn_string uses memcmp() | 500 dnl libsvn_string uses memcmp() |
| 398 AC_FUNC_MEMCMP | 501 AC_FUNC_MEMCMP |
| 399 | 502 |
| 400 dnl svn_error's default warning handler uses vfprintf() | 503 dnl svn_error's default warning handler uses vfprintf() |
| 401 AC_FUNC_VPRINTF | 504 AC_FUNC_VPRINTF |
| 402 | 505 |
| 403 dnl check for functions needed in special file handling | 506 dnl check for functions needed in special file handling |
| 404 AC_CHECK_FUNCS(symlink readlink) | 507 AC_CHECK_FUNCS(symlink readlink) |
| 405 | 508 |
| 406 | 509 |
| 407 dnl Process some configuration options ---------- | 510 dnl Process some configuration options ---------- |
| 408 | 511 |
| 409 AC_ARG_WITH(ssl, | 512 AC_ARG_WITH(ssl, |
| 410 AS_HELP_STRING([--with-ssl], | 513 AS_HELP_STRING([--with-ssl], |
| 411 [This option does NOT affect the Subversion build process in any | 514 [This option does NOT affect the Subversion build process in any |
| 412 way. It enables OpenSSL support in the Neon library. If and | 515 way. It enables OpenSSL support in the Neon library. If and |
| 413 only if you are building Neon as an integrated part of the | 516 only if you are building Neon as an integrated part of the |
| 414 Subversion build process, rather than linking to an already | 517 Subversion build process, rather than linking to an already |
| 415 installed version of Neon, you probably want to pass this | 518 installed version of Neon, you probably want to pass this |
| 416 option so that Neon (and so indirectly, Subversion) will be | 519 option so that Neon (and so indirectly, Subversion) will be |
| 417 capable of https:// access.]), | 520 capable of https:// access.]), |
| (...skipping 210 matching lines...) Show 10 above Show 10 below |
| 628 | 731 |
| 629 AC_DEFINE(SVN_LIBSVN_FS_LINKS_FS_FS, 1, | 732 AC_DEFINE(SVN_LIBSVN_FS_LINKS_FS_FS, 1, |
| 630 [Defined if libsvn_fs should link against libsvn_fs_fs]) | 733 [Defined if libsvn_fs should link against libsvn_fs_fs]) |
| 631 svn_fs_lib_deps="\$(FS_FS_DEPS)" | 734 svn_fs_lib_deps="\$(FS_FS_DEPS)" |
| 632 svn_fs_lib_install_deps="install-fsmod-lib" | 735 svn_fs_lib_install_deps="install-fsmod-lib" |
| 633 svn_fs_lib_link="\$(FS_FS_LINK)" | 736 svn_fs_lib_link="\$(FS_FS_LINK)" |
| 634 | 737 |
| 635 if test "$svn_lib_berkeley_db" = "yes"; then | 738 if test "$svn_lib_berkeley_db" = "yes"; then |
| 636 AC_DEFINE(SVN_LIBSVN_FS_LINKS_FS_BASE, 1, | 739 AC_DEFINE(SVN_LIBSVN_FS_LINKS_FS_BASE, 1, |
| 637 [Defined if libsvn_fs should link against libsvn_fs_base]) | 740 [Defined if libsvn_fs should link against libsvn_fs_base]) |
| 638 svn_fs_lib_deps="$svn_fs_lib_deps \$(FS_BASE_DEPS)" | 741 svn_fs_lib_deps="$svn_fs_lib_deps \$(FS_BASE_DEPS)" |
| 639 svn_fs_lib_install_deps="$svn_fs_lib_install_deps install-bdb-lib" | 742 svn_fs_lib_install_deps="$svn_fs_lib_install_deps install-bdb-lib" |
| 640 svn_fs_lib_link="$svn_fs_lib_link \$(FS_BASE_LINK)" | 743 svn_fs_lib_link="$svn_fs_lib_link \$(FS_BASE_LINK)" |
| 641 fi | 744 fi |
| 642 | 745 |
| 643 SVN_FS_LIB_DEPS=$svn_fs_lib_deps | 746 SVN_FS_LIB_DEPS=$svn_fs_lib_deps |
| 644 SVN_FS_LIB_INSTALL_DEPS=$svn_fs_lib_install_deps | 747 SVN_FS_LIB_INSTALL_DEPS=$svn_fs_lib_install_deps |
| 645 SVN_FS_LIB_LINK=$svn_fs_lib_link | 748 SVN_FS_LIB_LINK=$svn_fs_lib_link |
| 646 fi | 749 fi |
| 647 | 750 |
| 648 AC_SUBST(SVN_RA_LIB_DEPS) | 751 AC_SUBST(SVN_RA_LIB_DEPS) |
| 649 AC_SUBST(SVN_RA_LIB_INSTALL_DEPS) | 752 AC_SUBST(SVN_RA_LIB_INSTALL_DEPS) |
| 650 AC_SUBST(SVN_RA_LIB_LINK) | 753 AC_SUBST(SVN_RA_LIB_LINK) |
| 651 AC_SUBST(SVN_FS_LIB_DEPS) | 754 AC_SUBST(SVN_FS_LIB_DEPS) |
| 652 AC_SUBST(SVN_FS_LIB_INSTALL_DEPS) | 755 AC_SUBST(SVN_FS_LIB_INSTALL_DEPS) |
| 653 AC_SUBST(SVN_FS_LIB_LINK) | 756 AC_SUBST(SVN_FS_LIB_LINK) |
| 654 | 757 |
| 655 # ==== JavaHL ================================================================ | 758 # ==== JavaHL ================================================================ |
| 656 | 759 |
| 657 dnl Possibly compile JavaHL | 760 dnl Possibly compile JavaHL |
| 658 do_javahl_build=no | 761 do_javahl_build=no |
| 659 AC_ARG_ENABLE(javahl, | 762 AC_ARG_ENABLE(javahl, |
| 660 AS_HELP_STRING([--enable-javahl], | 763 AS_HELP_STRING([--enable-javahl], |
| 661 [Enable compilation of Java high-level bindings (requires C++)]), | 764 [Enable compilation of Java high-level bindings (requires C++)]), |
| 662 [ if test "$enableval" = "yes" ; then | 765 [ if test "$enableval" = "yes" ; then |
| 663 do_javahl_build="yes" | 766 do_javahl_build="yes" |
| 664 fi | 767 fi |
| 665 ]) | 768 ]) |
| 666 | 769 |
| 667 JAVAHL_OBJDIR="" | 770 JAVAHL_OBJDIR="" |
| 668 INSTALL_EXTRA_JAVAHL_LIB="" | 771 INSTALL_EXTRA_JAVAHL_LIB="" |
| 669 FIX_JAVAHL_LIB="" | 772 FIX_JAVAHL_LIB="" |
| 670 JAVAHL_TESTS_TARGET="" | 773 JAVAHL_TESTS_TARGET="" |
| 671 LT_CXX_LIBADD="" | 774 LT_CXX_LIBADD="" |
| 672 if test "$do_javahl_build" = "yes"; then | 775 if test "$do_javahl_build" = "yes"; then |
| 673 dnl Check for suitable JDK | 776 dnl Check for suitable JDK |
| 674 if test "$JDK_SUITABLE" = "no"; then | 777 if test "$JDK_SUITABLE" = "no"; then |
| 675 AC_MSG_ERROR([Cannot compile JavaHL without a suitable JDK. | 778 AC_MSG_ERROR([Cannot compile JavaHL without a suitable JDK. |
| 676 Please specify a suitable JDK using the --with-jdk option.]) | 779 Please specify a suitable JDK using the --with-jdk option.]) |
| 677 fi | 780 fi |
| 678 | |
| 679 AC_PROG_CXX | |
| 680 | 781 |
| 681 dnl The temporary directory where libtool compiles libsvnjavahl. | 782 dnl The temporary directory where libtool compiles libsvnjavahl. |
| 682 dnl N.B. objdir is "the name of the directory that contains temporary | 783 dnl N.B. objdir is "the name of the directory that contains temporary |
| 683 dnl libtool files" and it is set by libtool.m4 | 784 dnl libtool files" and it is set by libtool.m4 |
| 684 JAVAHL_OBJDIR='$(libsvnjavahl_PATH)'/$objdir | 785 JAVAHL_OBJDIR='$(libsvnjavahl_PATH)'/$objdir |
| 685 | 786 |
| 686 os_arch=`uname` | 787 os_arch=`uname` |
| 687 if test "$os_arch" = "Darwin"; then | 788 if test "$os_arch" = "Darwin"; then |
| 688 dnl On Darwin, JNI libs must be installed as .jnilib | 789 dnl On Darwin, JNI libs must be installed as .jnilib |
| 689 INSTALL_EXTRA_JAVAHL_LIB='ln -sf $(libdir)/libsvnjavahl-1.dylib $(libdir)/li
bsvnjavahl-1.jnilib' | 790 INSTALL_EXTRA_JAVAHL_LIB='ln -sf $(libdir)/libsvnjavahl-1.dylib $(libdir)/li
bsvnjavahl-1.jnilib' |
| 690 FIX_JAVAHL_LIB="ln -sf libsvnjavahl-1.dylib $JAVAHL_OBJDIR/libsvnjavahl-1.jn
ilib" | 791 FIX_JAVAHL_LIB="ln -sf libsvnjavahl-1.dylib $JAVAHL_OBJDIR/libsvnjavahl-1.jn
ilib" |
| 691 fi | 792 fi |
| 692 # This segment (and the rest of r10800) is very likely unnecessary | 793 # This segment (and the rest of r10800) is very likely unnecessary |
| 693 # with libtool 1.5, which automatically adds libstdc++ as a | 794 # with libtool 1.5, which automatically adds libstdc++ as a |
| 694 # dependency to the C++ libraries it builds. So at some future time | 795 # dependency to the C++ libraries it builds. So at some future time |
| 695 # when autogen.sh requires libtool 1.5 or higher, we can get rid of | 796 # when autogen.sh requires libtool 1.5 or higher, we can get rid of |
| 696 # it. | 797 # it. |
| 697 AC_MSG_CHECKING([for additional flags to link C++ libraries]) | 798 AC_MSG_CHECKING([for additional flags to link C++ libraries]) |
| 698 if test "x$ac_compiler_gnu" = "xyes"; then | 799 if test "x$ac_compiler_gnu" = "xyes"; then |
| 699 LT_CXX_LIBADD="-lstdc++" | 800 LT_CXX_LIBADD="-lstdc++" |
| 700 AC_MSG_RESULT([$LT_CXX_LIBADD]) | 801 AC_MSG_RESULT([$LT_CXX_LIBADD]) |
| 701 else | 802 else |
| 702 AC_MSG_RESULT([none needed]) | 803 AC_MSG_RESULT([none needed]) |
| 703 fi | 804 fi |
| 704 fi | 805 fi |
| 705 AC_SUBST(INSTALL_EXTRA_JAVAHL_LIB) | 806 AC_SUBST(INSTALL_EXTRA_JAVAHL_LIB) |
| 706 AC_SUBST(JAVAHL_OBJDIR) | 807 AC_SUBST(JAVAHL_OBJDIR) |
| 707 AC_SUBST(FIX_JAVAHL_LIB) | 808 AC_SUBST(FIX_JAVAHL_LIB) |
| 708 AC_SUBST(LT_CXX_LIBADD) | 809 AC_SUBST(LT_CXX_LIBADD) |
| 709 | 810 |
| 710 AC_ARG_WITH(junit, | 811 AC_ARG_WITH(junit, |
| 711 AS_HELP_STRING([--with-junit=PATH], | 812 AS_HELP_STRING([--with-junit=PATH], |
| 712 [Specify a path to the junit JAR file.]), | 813 [Specify a path to the junit JAR file.]), |
| 713 [ | 814 [ |
| 714 if test "$withval" != "no"; then | 815 if test "$withval" != "no"; then |
| 715 if test -n "$JAVA_CLASSPATH"; then | 816 if test -n "$JAVA_CLASSPATH"; then |
| 716 JAVA_CLASSPATH="$withval:$JAVA_CLASSPATH" | 817 JAVA_CLASSPATH="$withval:$JAVA_CLASSPATH" |
| 717 else | 818 else |
| 718 JAVA_CLASSPATH="$withval" | 819 JAVA_CLASSPATH="$withval" |
| 719 fi | 820 fi |
| 720 JAVAHL_TESTS_TARGET="javahl-tests" | 821 JAVAHL_TESTS_TARGET="javahl-tests" |
| 721 fi | 822 fi |
| 722 ]) | 823 ]) |
| 723 AC_SUBST(JAVA_CLASSPATH) | 824 AC_SUBST(JAVA_CLASSPATH) |
| 724 AC_SUBST(JAVAHL_TESTS_TARGET) | 825 AC_SUBST(JAVAHL_TESTS_TARGET) |
| 725 | 826 |
| 726 # ==== Miscellaneous bits ==================================================== | 827 # ==== Miscellaneous bits ==================================================== |
| 727 | 828 |
| 728 dnl Since this is used only on Unix-y systems, define the path separator as '/' | 829 dnl Since this is used only on Unix-y syste |