111
104
AC_SUBST(SVN_APRUTIL_INCLUDES)
112
105
AC_SUBST(SVN_APRUTIL_CONFIG, ["$apu_config"])
113
106
AC_SUBST(SVN_APRUTIL_LIBS)
107
SVN_APR_MAJOR_VERSION=2
116
APU_VER_REGEXES=["0\.9\.[7-9] 0\.9\.1[0-9] 1\."]
110
APU_VER_REGEXES=["1\.[3-9]\."]
117
111
SVN_LIB_APRUTIL($APU_VER_REGEXES)
112
SVN_APR_MAJOR_VERSION=1
114
AC_SUBST(SVN_APR_MAJOR_VERSION)
119
115
SVN_LT_SOVERSION="-version-info $svn_lib_ver"
120
116
AC_SUBST(SVN_LT_SOVERSION)
121
117
AC_DEFINE_UNQUOTED(SVN_SOVERSION, $svn_lib_ver,
570
553
AC_MSG_CHECKING([whether to look for GNOME Keyring])
571
554
if test "$with_gnome_keyring" != "no"; then
572
555
AC_MSG_RESULT([yes])
573
if test "$svn_enable_shared" = "yes"; then
574
if test "$APR_HAS_DSO" = "yes"; then
575
if test -n "$PKG_CONFIG"; then
576
AC_MSG_CHECKING([for GLib and GNOME Keyring .pc files])
577
if $PKG_CONFIG --exists glib-2.0 gnome-keyring-1; then
579
old_CPPFLAGS="$CPPFLAGS"
580
SVN_GNOME_KEYRING_INCLUDES="`$PKG_CONFIG --cflags glib-2.0 gnome-keyring-1`"
581
CPPFLAGS="$CPPFLAGS $SVN_GNOME_KEYRING_INCLUDES"
582
AC_CHECK_HEADER(gnome-keyring.h, found_gnome_keyring=yes, found_gnome_keyring=no)
583
AC_MSG_CHECKING([for GNOME Keyring])
584
if test "$found_gnome_keyring" = "yes"; then
558
if test "$with_gnome_keyring" = "yes"; then
559
AC_MSG_ERROR([--with-gnome-keyring is not supported on Mac OS X.])
561
with_gnome_keyring=no
565
if test "$svn_enable_shared" = "yes"; then
566
if test "$APR_HAS_DSO" = "yes"; then
567
if test -n "$PKG_CONFIG"; then
568
AC_MSG_CHECKING([for GLib and GNOME Keyring .pc files])
569
if $PKG_CONFIG --exists glib-2.0 gnome-keyring-1; then
585
570
AC_MSG_RESULT([yes])
586
AC_DEFINE([SVN_HAVE_GNOME_KEYRING], [1],
587
[Is GNOME Keyring support enabled?])
588
CPPFLAGS="$old_CPPFLAGS"
589
SVN_GNOME_KEYRING_LIBS="`$PKG_CONFIG --libs glib-2.0 gnome-keyring-1`"
571
old_CPPFLAGS="$CPPFLAGS"
572
SVN_GNOME_KEYRING_INCLUDES="`$PKG_CONFIG --cflags glib-2.0 gnome-keyring-1`"
573
CPPFLAGS="$CPPFLAGS $SVN_GNOME_KEYRING_INCLUDES"
574
AC_CHECK_HEADER(gnome-keyring.h, found_gnome_keyring=yes, found_gnome_keyring=no)
575
AC_MSG_CHECKING([for GNOME Keyring])
576
if test "$found_gnome_keyring" = "yes"; then
578
AC_DEFINE([SVN_HAVE_GNOME_KEYRING], [1],
579
[Is GNOME Keyring support enabled?])
580
CPPFLAGS="$old_CPPFLAGS"
581
SVN_GNOME_KEYRING_LIBS="`$PKG_CONFIG --libs glib-2.0 gnome-keyring-1`"
584
if test "$with_gnome_keyring" = "yes"; then
585
AC_MSG_ERROR([cannot find GNOME Keyring])
591
589
AC_MSG_RESULT([no])
592
590
if test "$with_gnome_keyring" = "yes"; then
593
AC_MSG_ERROR([cannot find GNOME Keyring])
591
AC_MSG_ERROR([cannot find GLib and GNOME Keyring .pc files.])
593
with_gnome_keyring=no
598
597
if test "$with_gnome_keyring" = "yes"; then
599
AC_MSG_ERROR([cannot find GLib and GNOME Keyring .pc files.])
598
AC_MSG_ERROR([cannot find pkg-config. GNOME Keyring requires this.])
601
600
with_gnome_keyring=no
605
604
if test "$with_gnome_keyring" = "yes"; then
606
AC_MSG_ERROR([cannot find pkg-config. GNOME Keyring requires this.])
605
AC_MSG_ERROR([APR does not have support for DSOs. GNOME Keyring requires this.])
608
607
with_gnome_keyring=no
612
611
if test "$with_gnome_keyring" = "yes"; then
613
AC_MSG_ERROR([APR does not have support for DSOs. GNOME Keyring requires this.])
612
AC_MSG_ERROR([--with-gnome-keyring conflicts with --disable-shared])
615
614
with_gnome_keyring=no
619
if test "$with_gnome_keyring" = "yes"; then
620
AC_MSG_ERROR([--with-gnome-keyring conflicts with --disable-shared])
622
with_gnome_keyring=no
626
620
AC_MSG_RESULT([no])
628
622
AC_SUBST(SVN_GNOME_KEYRING_INCLUDES)
629
623
AC_SUBST(SVN_GNOME_KEYRING_LIBS)
625
dnl Googlemock -----------------
626
AC_ARG_ENABLE([gmock],
627
AS_HELP_STRING([--disable-gmock],
628
[Do not use the Googlemock testing framework]),
632
AC_SUBST([GMOCK_SRCDIR], [$abs_srcdir/gmock-fused])
633
AC_MSG_CHECKING([whether use Googlemock])
634
if test "$enable_gmock" != "no"; then
635
if test -d "$GMOCK_SRCDIR"; then
644
SVN_USE_GMOCK_SOURCES=false
646
AC_SUBST([SVN_USE_GMOCK])
632
648
dnl Ev2 experimental features ----------------------
633
649
dnl Note: The Ev2 implementations will be built unconditionally, but by
651
667
[enable_nls=$enableval],[enable_nls=yes])
654
671
if test "$enable_nls" = "yes"; then
655
672
dnl First, check to see if there is a working msgfmt.
656
673
AC_PATH_PROG(MSGFMT, msgfmt, none)
657
674
AC_PATH_PROG(MSGMERGE, msgmerge, none)
658
675
AC_PATH_PROG(XGETTEXT, xgettext, none)
659
676
if test "$MSGFMT" != "none"; then
660
AC_SEARCH_LIBS(bindtextdomain, [intl], [],
677
AC_SEARCH_LIBS(bindtextdomain, [intl],
679
# in case libintl needs to be linked explicitly,
680
# $ac_cv_search_bindtextdomain contains -l linker flags
681
if echo "$ac_cv_search_bindtextdomain" | grep '^-l' >/dev/null
683
SVN_INTL_LIBS="$ac_cv_search_bindtextdomain"
711
742
#define gettext(x) (x)
712
743
#define dgettext(domain, x) (x)
747
#if defined(__GNUC__) && (__GNUC__ >= 3)
748
# define SVN__PREDICT_FALSE(x) (__builtin_expect(x, 0))
749
# define SVN__PREDICT_TRUE(x) (__builtin_expect(!!(x), 1))
751
# define SVN__PREDICT_FALSE(x) (x)
752
# define SVN__PREDICT_TRUE(x) (x)
755
#if defined(SVN_DEBUG)
756
# define SVN__FORCE_INLINE
757
# define SVN__PREVENT_INLINE
758
#elif defined(__GNUC__)
759
# define SVN__FORCE_INLINE APR_INLINE __attribute__ ((always_inline))
760
# define SVN__PREVENT_INLINE __attribute__ ((noinline))
762
# define SVN__FORCE_INLINE APR_INLINE
763
# define SVN__PREVENT_INLINE
766
/* Macro used to specify that a variable is intentionally left unused.
767
Supresses compiler warnings about the variable being unused. */
768
#define SVN_UNUSED(v) ( (void)(v) )
716
771
dnl Used to simulate makefile conditionals.
888
943
dnl Process some configuration options ----------
891
AS_HELP_STRING([--with-openssl],
892
[This option does NOT affect the Subversion build process in any
893
way. It tells an integrated Serf HTTP client library build
894
process where to locate the OpenSSL library when (and only when)
895
building Serf as an integrated part of the Subversion build
896
process. When linking to a previously installed version of Serf
897
instead, you do not need to use this option.]),
900
945
AC_ARG_ENABLE(debug,
901
946
AS_HELP_STRING([--enable-debug],
902
947
[Turn on debugging]),
1003
1048
SVN_CFLAGS_ADD_IFELSE([-Wold-style-definition])
1004
1049
SVN_CFLAGS_ADD_IFELSE([-Wno-system-headers])
1005
1050
SVN_CFLAGS_ADD_IFELSE([-Wno-format-nonliteral])
1051
SVN_CFLAGS_ADD_IFELSE([-Wmissing-variable-declarations])
1007
CMAINTAINERFLAGS="$CFLAGS $CMAINTAINERFLAGS"
1053
CMAINTAINERFLAGS="$CFLAGS"
1008
1054
CFLAGS="$CFLAGS_KEEP"
1010
1056
dnl Add flags that all versions of GCC (should) support
1011
CMAINTAINERFLAGS="-Wall -Wpointer-arith -Wwrite-strings -Wshadow -Wformat=2 -Wunused -Waggregate-return -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wno-multichar -Wredundant-decls -Wnested-externs -Winline -Wno-long-long $CMAINTAINERFLAGS"
1057
CMAINTAINERFLAGS="-Wall -Wpointer-arith -Wwrite-strings -Wshadow -Wformat=2 -Wunused -Waggregate-return -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wno-multichar -Wredundant-decls -Wnested-externs -Winline -Wno-long-long -Wbad-function-cast $CMAINTAINERFLAGS"
1013
1059
if test "$GXX" = "yes"; then
1014
1060
AC_MSG_NOTICE([maintainer-mode: adding G++ warning flags])
1341
1387
svn_fs_lib_install_deps="install-fsmod-lib"
1342
1388
svn_fs_lib_link="\$(FS_FS_LINK)"
1390
AC_DEFINE(SVN_LIBSVN_FS_LINKS_FS_X, 1,
1391
[Defined if libsvn_fs should link against libsvn_fs_x])
1392
svn_fs_lib_deps="$svn_fs_lib_deps \$(FS_X_DEPS)"
1393
svn_fs_lib_link="$svn_fs_lib_link \$(FS_X_LINK)"
1394
dnl FSFS already installs fsmod
1395
dnl svn_fs_lib_install_deps="$svn_fs_lib_install_deps install-fsmod-lib"
1344
1397
if test "$svn_lib_berkeley_db" = "yes"; then
1345
1398
AC_DEFINE(SVN_LIBSVN_FS_LINKS_FS_BASE, 1,
1346
1399
[Defined if libsvn_fs should link against libsvn_fs_base])