Deleted Added
sdiff udiff text old ( 286506 ) new ( 289180 )
full compact
configure.ac (286506) configure.ac (289180)
1dnl Licensed to the Apache Software Foundation (ASF) under one
2dnl or more contributor license agreements. See the NOTICE file
3dnl distributed with this work for additional information
4dnl regarding copyright ownership. The ASF licenses this file
5dnl to you under the Apache License, Version 2.0 (the
6dnl "License"); you may not use this file except in compliance
7dnl with the License. You may obtain a copy of the License at
8dnl

--- 35 unchanged lines hidden (view full) ---

44AC_SUBST([SWIG_LDFLAGS])
45
46# Generate config.nice early (before the arguments are munged)
47SVN_CONFIG_NICE(config.nice)
48
49# ==== Check for programs ====================================================
50
51# Look for a C compiler (before anything can set CFLAGS)
1dnl Licensed to the Apache Software Foundation (ASF) under one
2dnl or more contributor license agreements. See the NOTICE file
3dnl distributed with this work for additional information
4dnl regarding copyright ownership. The ASF licenses this file
5dnl to you under the Apache License, Version 2.0 (the
6dnl "License"); you may not use this file except in compliance
7dnl with the License. You may obtain a copy of the License at
8dnl

--- 35 unchanged lines hidden (view full) ---

44AC_SUBST([SWIG_LDFLAGS])
45
46# Generate config.nice early (before the arguments are munged)
47SVN_CONFIG_NICE(config.nice)
48
49# ==== Check for programs ====================================================
50
51# Look for a C compiler (before anything can set CFLAGS)
52CMAINTAINERFLAGS="$CUSERFLAGS"
53CUSERFLAGS="$CFLAGS"
54AC_PROG_CC
55SVN_CC_MODE_SETUP
56
57# Look for a C++ compiler (before anything can set CXXFLAGS)
52CUSERFLAGS="$CFLAGS"
53AC_PROG_CC
54SVN_CC_MODE_SETUP
55
56# Look for a C++ compiler (before anything can set CXXFLAGS)
58CXXMAINTAINERFLAGS="$CXXUSERFLAGS"
59CXXUSERFLAGS="$CXXFLAGS"
60AC_PROG_CXX
61SVN_CXX_MODE_SETUP
62
63# Look for a C pre-processor
64AC_PROG_CPP
65
66# Look for a good sed

--- 20 unchanged lines hidden (view full) ---

87 MKDIR="$INSTALL -d"
88fi
89AC_SUBST([MKDIR])
90
91# ==== Libraries, for which we may have source to build ======================
92
93dnl verify apr version and set apr flags
94dnl These regular expressions should not contain "\(" and "\)".
57CXXUSERFLAGS="$CXXFLAGS"
58AC_PROG_CXX
59SVN_CXX_MODE_SETUP
60
61# Look for a C pre-processor
62AC_PROG_CPP
63
64# Look for a good sed

--- 20 unchanged lines hidden (view full) ---

85 MKDIR="$INSTALL -d"
86fi
87AC_SUBST([MKDIR])
88
89# ==== Libraries, for which we may have source to build ======================
90
91dnl verify apr version and set apr flags
92dnl These regular expressions should not contain "\(" and "\)".
95dnl The specific reason we require APR 0.9.7 is:
96dnl It contains fixes to its file writing routines
97dnl now generating errors instead of silently ignoring
98dnl them. Only .7 and later can guarantee repository
99dnl integrity with FSFS.
100
93
101APR_VER_REGEXES=["0\.9\.[7-9] 0\.9\.[12][0-9] 1\. 2\."]
94APR_VER_REGEXES=["1\.[3-9]\. 2\."]
102
103SVN_LIB_APR($APR_VER_REGEXES)
104
105if test `expr $apr_version : 2` -ne 0; then
106 dnl Bump the library so-version to 2 if using APR-2
107 dnl (Debian uses so-version 1 for APR-1-with-largefile)
108 svn_lib_ver=2
109 dnl APR-2 provides APRUTIL
110 apu_config=$apr_config
111 AC_SUBST(SVN_APRUTIL_INCLUDES)
112 AC_SUBST(SVN_APRUTIL_CONFIG, ["$apu_config"])
113 AC_SUBST(SVN_APRUTIL_LIBS)
95
96SVN_LIB_APR($APR_VER_REGEXES)
97
98if test `expr $apr_version : 2` -ne 0; then
99 dnl Bump the library so-version to 2 if using APR-2
100 dnl (Debian uses so-version 1 for APR-1-with-largefile)
101 svn_lib_ver=2
102 dnl APR-2 provides APRUTIL
103 apu_config=$apr_config
104 AC_SUBST(SVN_APRUTIL_INCLUDES)
105 AC_SUBST(SVN_APRUTIL_CONFIG, ["$apu_config"])
106 AC_SUBST(SVN_APRUTIL_LIBS)
107 SVN_APR_MAJOR_VERSION=2
114else
115 svn_lib_ver=0
108else
109 svn_lib_ver=0
116 APU_VER_REGEXES=["0\.9\.[7-9] 0\.9\.1[0-9] 1\."]
110 APU_VER_REGEXES=["1\.[3-9]\."]
117 SVN_LIB_APRUTIL($APU_VER_REGEXES)
111 SVN_LIB_APRUTIL($APU_VER_REGEXES)
112 SVN_APR_MAJOR_VERSION=1
118fi
113fi
114AC_SUBST(SVN_APR_MAJOR_VERSION)
119SVN_LT_SOVERSION="-version-info $svn_lib_ver"
120AC_SUBST(SVN_LT_SOVERSION)
121AC_DEFINE_UNQUOTED(SVN_SOVERSION, $svn_lib_ver,
122 [Subversion library major verson])
123
124dnl Search for pkg-config
125AC_PATH_PROG(PKG_CONFIG, pkg-config)
126
127dnl Search for serf
115SVN_LT_SOVERSION="-version-info $svn_lib_ver"
116AC_SUBST(SVN_LT_SOVERSION)
117AC_DEFINE_UNQUOTED(SVN_SOVERSION, $svn_lib_ver,
118 [Subversion library major verson])
119
120dnl Search for pkg-config
121AC_PATH_PROG(PKG_CONFIG, pkg-config)
122
123dnl Search for serf
128SVN_LIB_SERF(1,2,1)
124SVN_LIB_SERF(1,3,4)
129
130if test "$svn_lib_serf" = "yes"; then
131 AC_DEFINE([SVN_HAVE_SERF], 1,
132 [Defined if support for Serf is enabled])
133fi
134
135dnl Search for apr_memcache (only affects fs_fs)
136SVN_LIB_APR_MEMCACHE
137
138if test "$svn_lib_apr_memcache" = "yes"; then
139 AC_DEFINE(SVN_HAVE_MEMCACHE, 1,
140 [Defined if apr_memcache (standalone or in apr-util) is present])
141fi
142
143
144dnl Find Apache with a recent-enough magic module number
125
126if test "$svn_lib_serf" = "yes"; then
127 AC_DEFINE([SVN_HAVE_SERF], 1,
128 [Defined if support for Serf is enabled])
129fi
130
131dnl Search for apr_memcache (only affects fs_fs)
132SVN_LIB_APR_MEMCACHE
133
134if test "$svn_lib_apr_memcache" = "yes"; then
135 AC_DEFINE(SVN_HAVE_MEMCACHE, 1,
136 [Defined if apr_memcache (standalone or in apr-util) is present])
137fi
138
139
140dnl Find Apache with a recent-enough magic module number
145SVN_FIND_APACHE(20020903)
141SVN_FIND_APACHE(20051115)
146
147dnl Search for SQLite. If you change SQLITE_URL from a .zip to
148dnl something else also update build/ac-macros/sqlite.m4 to reflect
149dnl the correct command to unpack the downloaded file.
150SQLITE_MINIMUM_VER="3.7.12"
151SQLITE_RECOMMENDED_VER="3.7.15.1"
152SQLITE_URL="http://www.sqlite.org/sqlite-amalgamation-$(printf %d%02d%02d%02d $(echo ${SQLITE_RECOMMENDED_VER} | sed -e 's/\./ /g')).zip"
153

--- 8 unchanged lines hidden (view full) ---

162if test -n "$sqlite_compat_ver" && test "$sqlite_compat_ver" != no; then
163 SVN_SQLITE_VERNUM_PARSE([$sqlite_compat_ver],
164 [sqlite_compat_ver_num])
165 CFLAGS="-DSVN_SQLITE_MIN_VERSION='\"$sqlite_compat_ver\"' $CFLAGS"
166 CFLAGS="-DSVN_SQLITE_MIN_VERSION_NUMBER=$sqlite_compat_ver_num $CFLAGS"
167fi
168
169SVN_CHECK_FOR_ATOMIC_BUILTINS
142
143dnl Search for SQLite. If you change SQLITE_URL from a .zip to
144dnl something else also update build/ac-macros/sqlite.m4 to reflect
145dnl the correct command to unpack the downloaded file.
146SQLITE_MINIMUM_VER="3.7.12"
147SQLITE_RECOMMENDED_VER="3.7.15.1"
148SQLITE_URL="http://www.sqlite.org/sqlite-amalgamation-$(printf %d%02d%02d%02d $(echo ${SQLITE_RECOMMENDED_VER} | sed -e 's/\./ /g')).zip"
149

--- 8 unchanged lines hidden (view full) ---

158if test -n "$sqlite_compat_ver" && test "$sqlite_compat_ver" != no; then
159 SVN_SQLITE_VERNUM_PARSE([$sqlite_compat_ver],
160 [sqlite_compat_ver_num])
161 CFLAGS="-DSVN_SQLITE_MIN_VERSION='\"$sqlite_compat_ver\"' $CFLAGS"
162 CFLAGS="-DSVN_SQLITE_MIN_VERSION_NUMBER=$sqlite_compat_ver_num $CFLAGS"
163fi
164
165SVN_CHECK_FOR_ATOMIC_BUILTINS
170
171if test "$svn_cv_atomic_builtins" = "yes"; then
172 AC_DEFINE(SVN_HAS_ATOMIC_BUILTINS, 1, [Define if compiler provides atomic builtins])
173fi
174
175dnl Set up a number of directories ---------------------
176
177dnl Create SVN_BINDIR for proper substitution
178if test "${bindir}" = '${exec_prefix}/bin'; then

--- 43 unchanged lines hidden (view full) ---

222
223if test "$experimental_libtool" = "yes"; then
224 echo "using APR's libtool"
225 sh_libtool="`$apr_config --apr-libtool`"
226 LIBTOOL="$sh_libtool"
227 SVN_LIBTOOL="$sh_libtool"
228else
229 sh_libtool="$abs_builddir/libtool"
166if test "$svn_cv_atomic_builtins" = "yes"; then
167 AC_DEFINE(SVN_HAS_ATOMIC_BUILTINS, 1, [Define if compiler provides atomic builtins])
168fi
169
170dnl Set up a number of directories ---------------------
171
172dnl Create SVN_BINDIR for proper substitution
173if test "${bindir}" = '${exec_prefix}/bin'; then

--- 43 unchanged lines hidden (view full) ---

217
218if test "$experimental_libtool" = "yes"; then
219 echo "using APR's libtool"
220 sh_libtool="`$apr_config --apr-libtool`"
221 LIBTOOL="$sh_libtool"
222 SVN_LIBTOOL="$sh_libtool"
223else
224 sh_libtool="$abs_builddir/libtool"
230 SVN_LIBTOOL="\$(SHELL) $sh_libtool"
225 SVN_LIBTOOL="\$(SHELL) \"$sh_libtool\""
231fi
232AC_SUBST(SVN_LIBTOOL)
233
234dnl Determine the libtool version
235changequote(, )dnl
236lt_pversion=`$LIBTOOL --version 2>/dev/null|$SED -e 's/([^)]*)//g;s/^[^0-9]*//;s/[- ].*//g;q'`
237lt_version=`echo $lt_pversion|$SED -e 's/\([a-z]*\)$/.\1/'`
238lt_major_version=`echo $lt_version | cut -d'.' -f 1`

--- 80 unchanged lines hidden (view full) ---

319 ;;
320 *)
321 AC_MSG_RESULT([no])
322 LT_NO_UNDEFINED=""
323 ;;
324esac
325AC_SUBST(LT_NO_UNDEFINED)
326
226fi
227AC_SUBST(SVN_LIBTOOL)
228
229dnl Determine the libtool version
230changequote(, )dnl
231lt_pversion=`$LIBTOOL --version 2>/dev/null|$SED -e 's/([^)]*)//g;s/^[^0-9]*//;s/[- ].*//g;q'`
232lt_version=`echo $lt_pversion|$SED -e 's/\([a-z]*\)$/.\1/'`
233lt_major_version=`echo $lt_version | cut -d'.' -f 1`

--- 80 unchanged lines hidden (view full) ---

314 ;;
315 *)
316 AC_MSG_RESULT([no])
317 LT_NO_UNDEFINED=""
318 ;;
319esac
320AC_SUBST(LT_NO_UNDEFINED)
321
327AC_MSG_CHECKING([whether to avoid circular linkage at all costs])
328case $host in
329 *-*-cygwin*)
330 AC_MSG_RESULT([yes])
331 AC_DEFINE([SVN_AVOID_CIRCULAR_LINKAGE_AT_ALL_COSTS_HACK], 1,
332 [Define if circular linkage is not possible on this platform.])
333 ;;
334 *)
335 AC_MSG_RESULT([no])
336 ;;
337esac
338
339dnl Check for trang.
340trang=yes
341AC_ARG_WITH(trang,
342AS_HELP_STRING([--with-trang=PATH],
343 [Specify the command to run the trang schema converter]),
344[
345 trang="$withval"
346])

--- 218 unchanged lines hidden (view full) ---

565 [Enable use of GNOME Keyring for auth credentials (enabled by default if found)]),
566 [with_gnome_keyring="$withval"],
567 [with_gnome_keyring=auto])
568
569found_gnome_keyring=no
570AC_MSG_CHECKING([whether to look for GNOME Keyring])
571if test "$with_gnome_keyring" != "no"; then
572 AC_MSG_RESULT([yes])
322dnl Check for trang.
323trang=yes
324AC_ARG_WITH(trang,
325AS_HELP_STRING([--with-trang=PATH],
326 [Specify the command to run the trang schema converter]),
327[
328 trang="$withval"
329])

--- 218 unchanged lines hidden (view full) ---

548 [Enable use of GNOME Keyring for auth credentials (enabled by default if found)]),
549 [with_gnome_keyring="$withval"],
550 [with_gnome_keyring=auto])
551
552found_gnome_keyring=no
553AC_MSG_CHECKING([whether to look for GNOME Keyring])
554if test "$with_gnome_keyring" != "no"; then
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
578 AC_MSG_RESULT([yes])
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
556 case "$host" in
557 *-*-darwin*)
558 if test "$with_gnome_keyring" = "yes"; then
559 AC_MSG_ERROR([--with-gnome-keyring is not supported on Mac OS X.])
560 else
561 with_gnome_keyring=no
562 fi
563 ;;
564 *)
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 AC_MSG_RESULT([yes])
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
577 AC_MSG_RESULT([yes])
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`"
582 else
583 AC_MSG_RESULT([no])
584 if test "$with_gnome_keyring" = "yes"; then
585 AC_MSG_ERROR([cannot find GNOME Keyring])
586 fi
587 fi
590 else
591 AC_MSG_RESULT([no])
592 if test "$with_gnome_keyring" = "yes"; then
588 else
589 AC_MSG_RESULT([no])
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.])
592 else
593 with_gnome_keyring=no
594 fi
595 fi
596 else
594 fi
595 fi
596 else
597 AC_MSG_RESULT([no])
598 if test "$with_gnome_keyring" = "yes"; then
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.])
600 else
601 with_gnome_keyring=no
602 fi
603 fi
604 else
605 if test "$with_gnome_keyring" = "yes"; then
599 else
600 with_gnome_keyring=no
601 fi
602 fi
603 else
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.])
607 else
608 with_gnome_keyring=no
609 fi
610 fi
611 else
612 if test "$with_gnome_keyring" = "yes"; then
606 else
607 with_gnome_keyring=no
608 fi
609 fi
610 else
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])
614 else
615 with_gnome_keyring=no
616 fi
617 fi
613 else
614 with_gnome_keyring=no
615 fi
616 fi
618 else
619 if test "$with_gnome_keyring" = "yes"; then
620 AC_MSG_ERROR([--with-gnome-keyring conflicts with --disable-shared])
621 else
622 with_gnome_keyring=no
623 fi
624 fi
617 ;;
618 esac
625else
626 AC_MSG_RESULT([no])
627fi
628AC_SUBST(SVN_GNOME_KEYRING_INCLUDES)
629AC_SUBST(SVN_GNOME_KEYRING_LIBS)
630
619else
620 AC_MSG_RESULT([no])
621fi
622AC_SUBST(SVN_GNOME_KEYRING_INCLUDES)
623AC_SUBST(SVN_GNOME_KEYRING_LIBS)
624
625dnl Googlemock -----------------
626AC_ARG_ENABLE([gmock],
627 AS_HELP_STRING([--disable-gmock],
628 [Do not use the Googlemock testing framework]),
629 [],
630 [enable_gmock=yes])
631
631
632AC_SUBST([GMOCK_SRCDIR], [$abs_srcdir/gmock-fused])
633AC_MSG_CHECKING([whether use Googlemock])
634if test "$enable_gmock" != "no"; then
635 if test -d "$GMOCK_SRCDIR"; then
636 AC_MSG_RESULT([yes])
637 SVN_USE_GMOCK=true
638 else
639 AC_MSG_RESULT([no])
640 SVN_USE_GMOCK=false
641 fi
642else
643 AC_MSG_RESULT([no])
644 SVN_USE_GMOCK_SOURCES=false
645fi
646AC_SUBST([SVN_USE_GMOCK])
647
632dnl Ev2 experimental features ----------------------
633dnl Note: The Ev2 implementations will be built unconditionally, but by
634dnl providing this flag, users can choose to use the currently-shimmed Ev2
635dnl editor implementations for various operations. This will probably
636dnl negatively impact performance, but is useful for testing.
637AC_ARG_ENABLE(ev2-impl,
638 AS_HELP_STRING([--enable-ev2-impl],
639 [Use Ev2 implementations, where available [EXPERIMENTAL]]),

--- 6 unchanged lines hidden (view full) ---

646
647dnl I18n -------------------
648
649AC_ARG_ENABLE(nls,
650 AS_HELP_STRING([--disable-nls],[Disable gettext functionality]),
651 [enable_nls=$enableval],[enable_nls=yes])
652
653USE_NLS="no"
648dnl Ev2 experimental features ----------------------
649dnl Note: The Ev2 implementations will be built unconditionally, but by
650dnl providing this flag, users can choose to use the currently-shimmed Ev2
651dnl editor implementations for various operations. This will probably
652dnl negatively impact performance, but is useful for testing.
653AC_ARG_ENABLE(ev2-impl,
654 AS_HELP_STRING([--enable-ev2-impl],
655 [Use Ev2 implementations, where available [EXPERIMENTAL]]),

--- 6 unchanged lines hidden (view full) ---

662
663dnl I18n -------------------
664
665AC_ARG_ENABLE(nls,
666 AS_HELP_STRING([--disable-nls],[Disable gettext functionality]),
667 [enable_nls=$enableval],[enable_nls=yes])
668
669USE_NLS="no"
670SVN_INTL_LIBS=""
654if test "$enable_nls" = "yes"; then
655 dnl First, check to see if there is a working msgfmt.
656 AC_PATH_PROG(MSGFMT, msgfmt, none)
657 AC_PATH_PROG(MSGMERGE, msgmerge, none)
658 AC_PATH_PROG(XGETTEXT, xgettext, none)
659 if test "$MSGFMT" != "none"; then
671if test "$enable_nls" = "yes"; then
672 dnl First, check to see if there is a working msgfmt.
673 AC_PATH_PROG(MSGFMT, msgfmt, none)
674 AC_PATH_PROG(MSGMERGE, msgmerge, none)
675 AC_PATH_PROG(XGETTEXT, xgettext, none)
676 if test "$MSGFMT" != "none"; then
660 AC_SEARCH_LIBS(bindtextdomain, [intl], [],
677 AC_SEARCH_LIBS(bindtextdomain, [intl],
661 [
678 [
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
682 then
683 SVN_INTL_LIBS="$ac_cv_search_bindtextdomain"
684 fi
685 ],
686 [
662 enable_nls="no"
663 ])
664 if test "$enable_nls" = "no"; then
665 # Destroy the cached result so we can test again
666 unset ac_cv_search_bindtextdomain
667 # On some systems, libintl needs libiconv to link properly,
668 # so try again with -liconv.
669 AC_SEARCH_LIBS(bindtextdomain, [intl],
670 [
671 enable_nls="yes"
687 enable_nls="no"
688 ])
689 if test "$enable_nls" = "no"; then
690 # Destroy the cached result so we can test again
691 unset ac_cv_search_bindtextdomain
692 # On some systems, libintl needs libiconv to link properly,
693 # so try again with -liconv.
694 AC_SEARCH_LIBS(bindtextdomain, [intl],
695 [
696 enable_nls="yes"
697 if echo "$ac_cv_search_bindtextdomain" | grep '^-l' >/dev/null
698 then
699 SVN_INTL_LIBS="$ac_cv_search_bindtextdomain"
700 fi
672 # This is here so that -liconv ends up in LIBS
673 # if it worked with -liconv.
674 AC_CHECK_LIB(iconv, libiconv_open)
675 ],
676 [
677 AC_MSG_WARN([bindtextdomain() not found. Disabling NLS.])
678 enable_nls="no"
679 ], -liconv)
680 fi
681 if test "$enable_nls" = "yes"; then
682 AC_DEFINE(ENABLE_NLS, 1,
683 [Define to 1 if translation of program messages to the user's
684 native language is requested.])
685 USE_NLS="yes"
686 fi
687 fi
688fi
689
701 # This is here so that -liconv ends up in LIBS
702 # if it worked with -liconv.
703 AC_CHECK_LIB(iconv, libiconv_open)
704 ],
705 [
706 AC_MSG_WARN([bindtextdomain() not found. Disabling NLS.])
707 enable_nls="no"
708 ], -liconv)
709 fi
710 if test "$enable_nls" = "yes"; then
711 AC_DEFINE(ENABLE_NLS, 1,
712 [Define to 1 if translation of program messages to the user's
713 native language is requested.])
714 USE_NLS="yes"
715 fi
716 fi
717fi
718
719AC_SUBST(SVN_INTL_LIBS)
720
690AH_BOTTOM([
691/* Indicate to translators that string X should be translated. Do not look
692 up the translation at run time; just expand to X. This macro is suitable
693 for use where a constant string is required at compile time. */
694#define N_(x) x
695/* Indicate to translators that we have decided the string X should not be
696 translated. Expand to X. */
697#define U_(x) x

--- 8 unchanged lines hidden (view full) ---

706 an appropriate translation depending on the number N. */
707#define Q_(x1, x2, n) dngettext(PACKAGE_NAME, x1, x2, n)
708#else
709#define _(x) (x)
710#define Q_(x1, x2, n) (((n) == 1) ? x1 : x2)
711#define gettext(x) (x)
712#define dgettext(domain, x) (x)
713#endif
721AH_BOTTOM([
722/* Indicate to translators that string X should be translated. Do not look
723 up the translation at run time; just expand to X. This macro is suitable
724 for use where a constant string is required at compile time. */
725#define N_(x) x
726/* Indicate to translators that we have decided the string X should not be
727 translated. Expand to X. */
728#define U_(x) x

--- 8 unchanged lines hidden (view full) ---

737 an appropriate translation depending on the number N. */
738#define Q_(x1, x2, n) dngettext(PACKAGE_NAME, x1, x2, n)
739#else
740#define _(x) (x)
741#define Q_(x1, x2, n) (((n) == 1) ? x1 : x2)
742#define gettext(x) (x)
743#define dgettext(domain, x) (x)
744#endif
745
746/* compiler hints */
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))
750#else
751# define SVN__PREDICT_FALSE(x) (x)
752# define SVN__PREDICT_TRUE(x) (x)
753#endif
754
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))
761#else
762# define SVN__FORCE_INLINE APR_INLINE
763# define SVN__PREVENT_INLINE
764#endif
765
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) )
714])
715
716dnl Used to simulate makefile conditionals.
717GETTEXT_CODESET=\#
718NO_GETTEXT_CODESET=\#
719if test $USE_NLS = "yes"; then
720 AC_CHECK_FUNCS(bind_textdomain_codeset,
721 [ GETTEXT_CODESET="" ],

--- 160 unchanged lines hidden (view full) ---

882AC_CHECK_HEADER(termios.h,[
883 AC_CHECK_FUNCS(tcgetattr tcsetattr,[
884 AC_DEFINE(HAVE_TERMIOS_H,1,[Defined if we have a usable termios library.])
885 ])
886])
887
888dnl Process some configuration options ----------
889
769])
770
771dnl Used to simulate makefile conditionals.
772GETTEXT_CODESET=\#
773NO_GETTEXT_CODESET=\#
774if test $USE_NLS = "yes"; then
775 AC_CHECK_FUNCS(bind_textdomain_codeset,
776 [ GETTEXT_CODESET="" ],

--- 160 unchanged lines hidden (view full) ---

937AC_CHECK_HEADER(termios.h,[
938 AC_CHECK_FUNCS(tcgetattr tcsetattr,[
939 AC_DEFINE(HAVE_TERMIOS_H,1,[Defined if we have a usable termios library.])
940 ])
941])
942
943dnl Process some configuration options ----------
944
890AC_ARG_WITH(openssl,
891AS_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.]),
898[])
899
900AC_ARG_ENABLE(debug,
901AS_HELP_STRING([--enable-debug],
902 [Turn on debugging]),
903[
904 if test "$enableval" = "yes" ; then
905 enable_debugging="yes"
906 else
907 enable_debugging="no"

--- 76 unchanged lines hidden (view full) ---

984 dnl so the user can specify flags that override these.
985 if test "$GCC" = "yes"; then
986 AC_MSG_NOTICE([maintainer-mode: adding GCC warning flags])
987
988 dnl some additional flags that can be handy for an occasional review,
989 dnl but throw too many warnings in svn code, of too little importance,
990 dnl to keep these enabled. Remove the "dnl" to do a run with these
991 dnl switches enabled.
945AC_ARG_ENABLE(debug,
946AS_HELP_STRING([--enable-debug],
947 [Turn on debugging]),
948[
949 if test "$enableval" = "yes" ; then
950 enable_debugging="yes"
951 else
952 enable_debugging="no"

--- 76 unchanged lines hidden (view full) ---

1029 dnl so the user can specify flags that override these.
1030 if test "$GCC" = "yes"; then
1031 AC_MSG_NOTICE([maintainer-mode: adding GCC warning flags])
1032
1033 dnl some additional flags that can be handy for an occasional review,
1034 dnl but throw too many warnings in svn code, of too little importance,
1035 dnl to keep these enabled. Remove the "dnl" to do a run with these
1036 dnl switches enabled.
992 dnl ./configure CUSERFLAGS="-Wswitch-enum -Wswitch-default"
1037 dnl ./configure CFLAGS="-Wswitch-enum -Wswitch-default"
993
994 dnl Add each of the following flags only if the C compiler accepts it.
995 CFLAGS_KEEP="$CFLAGS"
996 CFLAGS=""
997
998 SVN_CFLAGS_ADD_IFELSE([-Werror=implicit-function-declaration])
999 SVN_CFLAGS_ADD_IFELSE([-Werror=declaration-after-statement])
1000 SVN_CFLAGS_ADD_IFELSE([-Wextra-tokens])
1001 SVN_CFLAGS_ADD_IFELSE([-Wnewline-eof])
1002 SVN_CFLAGS_ADD_IFELSE([-Wshorten-64-to-32])
1003 SVN_CFLAGS_ADD_IFELSE([-Wold-style-definition])
1004 SVN_CFLAGS_ADD_IFELSE([-Wno-system-headers])
1005 SVN_CFLAGS_ADD_IFELSE([-Wno-format-nonliteral])
1038
1039 dnl Add each of the following flags only if the C compiler accepts it.
1040 CFLAGS_KEEP="$CFLAGS"
1041 CFLAGS=""
1042
1043 SVN_CFLAGS_ADD_IFELSE([-Werror=implicit-function-declaration])
1044 SVN_CFLAGS_ADD_IFELSE([-Werror=declaration-after-statement])
1045 SVN_CFLAGS_ADD_IFELSE([-Wextra-tokens])
1046 SVN_CFLAGS_ADD_IFELSE([-Wnewline-eof])
1047 SVN_CFLAGS_ADD_IFELSE([-Wshorten-64-to-32])
1048 SVN_CFLAGS_ADD_IFELSE([-Wold-style-definition])
1049 SVN_CFLAGS_ADD_IFELSE([-Wno-system-headers])
1050 SVN_CFLAGS_ADD_IFELSE([-Wno-format-nonliteral])
1051 SVN_CFLAGS_ADD_IFELSE([-Wmissing-variable-declarations])
1006
1052
1007 CMAINTAINERFLAGS="$CFLAGS $CMAINTAINERFLAGS"
1053 CMAINTAINERFLAGS="$CFLAGS"
1008 CFLAGS="$CFLAGS_KEEP"
1009
1010 dnl Add flags that all versions of GCC (should) support
1054 CFLAGS="$CFLAGS_KEEP"
1055
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"
1012 fi
1013 if test "$GXX" = "yes"; then
1014 AC_MSG_NOTICE([maintainer-mode: adding G++ warning flags])
1015
1016 dnl Add each of the following flags only if the C++ compiler accepts it.
1017 CXXFLAGS_KEEP="$CXXFLAGS"
1018 CXXFLAGS=""
1019
1020 SVN_CXXFLAGS_ADD_IFELSE([-Wextra-tokens])
1021 SVN_CXXFLAGS_ADD_IFELSE([-Wnewline-eof])
1022 SVN_CXXFLAGS_ADD_IFELSE([-Wshorten-64-to-32])
1023 SVN_CXXFLAGS_ADD_IFELSE([-Wno-system-headers])
1024
1058 fi
1059 if test "$GXX" = "yes"; then
1060 AC_MSG_NOTICE([maintainer-mode: adding G++ warning flags])
1061
1062 dnl Add each of the following flags only if the C++ compiler accepts it.
1063 CXXFLAGS_KEEP="$CXXFLAGS"
1064 CXXFLAGS=""
1065
1066 SVN_CXXFLAGS_ADD_IFELSE([-Wextra-tokens])
1067 SVN_CXXFLAGS_ADD_IFELSE([-Wnewline-eof])
1068 SVN_CXXFLAGS_ADD_IFELSE([-Wshorten-64-to-32])
1069 SVN_CXXFLAGS_ADD_IFELSE([-Wno-system-headers])
1070
1025 CXXMAINTAINERFLAGS="$CXXFLAGS $CXXMAINTAINERFLAGS"
1071 CXXMAINTAINERFLAGS="$CXXFLAGS"
1026 CXXFLAGS="$CXXFLAGS_KEEP"
1027
1028 dnl Add flags that all versions of G++ (should) support
1029 CXXMAINTAINERFLAGS="-Wall -Wpointer-arith -Wwrite-strings -Wshadow -Wunused -Wunreachable-code $CXXMAINTAINERFLAGS"
1030 fi
1031 fi
1032])
1033

--- 188 unchanged lines hidden (view full) ---

1222
1223# Scripting and Bindings languages
1224
1225# Python: Used for testsuite, and bindings
1226
1227
1228PYTHON="`$abs_srcdir/build/find_python.sh`"
1229if test -z "$PYTHON"; then
1072 CXXFLAGS="$CXXFLAGS_KEEP"
1073
1074 dnl Add flags that all versions of G++ (should) support
1075 CXXMAINTAINERFLAGS="-Wall -Wpointer-arith -Wwrite-strings -Wshadow -Wunused -Wunreachable-code $CXXMAINTAINERFLAGS"
1076 fi
1077 fi
1078])
1079

--- 188 unchanged lines hidden (view full) ---

1268
1269# Scripting and Bindings languages
1270
1271# Python: Used for testsuite, and bindings
1272
1273
1274PYTHON="`$abs_srcdir/build/find_python.sh`"
1275if test -z "$PYTHON"; then
1230 AC_MSG_WARN([Python 2.5 or later is required to run the testsuite])
1276 AC_MSG_WARN([Python 2.7 or later is required to run the testsuite])
1231 AC_MSG_WARN([or to use the Subversion Python bindings])
1232 AC_MSG_WARN([])
1233 AC_MSG_WARN([If you have a suitable Python installed, but not on the])
1234 AC_MSG_WARN([PATH, set the environment variable PYTHON to the full path])
1235 AC_MSG_WARN([to the Python executable, and re-run configure])
1236fi
1237AC_PATH_PROGS(PYTHON, "$PYTHON", none)
1238
1239# The minimum version for the JVM runtime for our Java bytecode.
1277 AC_MSG_WARN([or to use the Subversion Python bindings])
1278 AC_MSG_WARN([])
1279 AC_MSG_WARN([If you have a suitable Python installed, but not on the])
1280 AC_MSG_WARN([PATH, set the environment variable PYTHON to the full path])
1281 AC_MSG_WARN([to the Python executable, and re-run configure])
1282fi
1283AC_PATH_PROGS(PYTHON, "$PYTHON", none)
1284
1285# The minimum version for the JVM runtime for our Java bytecode.
1240JAVA_OLDEST_WORKING_VER='1.5'
1286JAVA_OLDEST_WORKING_VER='1.6'
1241# SVN_CHECK_JDK sets $JAVA_CLASSPATH
1242SVN_CHECK_JDK($JAVA_OLDEST_WORKING_VER)
1243
1244AC_PATH_PROG(PERL, perl, none)
1245
1246if test -n "$RUBY"; then
1247 AC_PATH_PROG(RUBY, "$RUBY", none)
1248else

--- 87 unchanged lines hidden (view full) ---

1336 SVN_RA_LIB_LINK=$svn_ra_lib_link
1337
1338 AC_DEFINE(SVN_LIBSVN_FS_LINKS_FS_FS, 1,
1339 [Defined if libsvn_fs should link against libsvn_fs_fs])
1340 svn_fs_lib_deps="\$(FS_FS_DEPS)"
1341 svn_fs_lib_install_deps="install-fsmod-lib"
1342 svn_fs_lib_link="\$(FS_FS_LINK)"
1343
1287# SVN_CHECK_JDK sets $JAVA_CLASSPATH
1288SVN_CHECK_JDK($JAVA_OLDEST_WORKING_VER)
1289
1290AC_PATH_PROG(PERL, perl, none)
1291
1292if test -n "$RUBY"; then
1293 AC_PATH_PROG(RUBY, "$RUBY", none)
1294else

--- 87 unchanged lines hidden (view full) ---

1382 SVN_RA_LIB_LINK=$svn_ra_lib_link
1383
1384 AC_DEFINE(SVN_LIBSVN_FS_LINKS_FS_FS, 1,
1385 [Defined if libsvn_fs should link against libsvn_fs_fs])
1386 svn_fs_lib_deps="\$(FS_FS_DEPS)"
1387 svn_fs_lib_install_deps="install-fsmod-lib"
1388 svn_fs_lib_link="\$(FS_FS_LINK)"
1389
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)"
1394dnl FSFS already installs fsmod
1395dnl svn_fs_lib_install_deps="$svn_fs_lib_install_deps install-fsmod-lib"
1396
1344 if test "$svn_lib_berkeley_db" = "yes"; then
1345 AC_DEFINE(SVN_LIBSVN_FS_LINKS_FS_BASE, 1,
1346 [Defined if libsvn_fs should link against libsvn_fs_base])
1347 svn_fs_lib_deps="$svn_fs_lib_deps \$(FS_BASE_DEPS)"
1348 svn_fs_lib_install_deps="$svn_fs_lib_install_deps install-bdb-lib"
1349 svn_fs_lib_link="$svn_fs_lib_link \$(FS_BASE_LINK)"
1350 fi
1351

--- 45 unchanged lines hidden (view full) ---

1397 fi
1398 # This segment (and the rest of r10800) is very likely unnecessary
1399 # with libtool 1.5, which automatically adds libstdc++ as a
1400 # dependency to the C++ libraries it builds. So at some future time
1401 # when autogen.sh requires libtool 1.5 or higher, we can get rid of
1402 # it.
1403 AC_MSG_CHECKING([for additional flags to link C++ libraries])
1404 if test "x$ac_compiler_gnu" = "xyes"; then
1397 if test "$svn_lib_berkeley_db" = "yes"; then
1398 AC_DEFINE(SVN_LIBSVN_FS_LINKS_FS_BASE, 1,
1399 [Defined if libsvn_fs should link against libsvn_fs_base])
1400 svn_fs_lib_deps="$svn_fs_lib_deps \$(FS_BASE_DEPS)"
1401 svn_fs_lib_install_deps="$svn_fs_lib_install_deps install-bdb-lib"
1402 svn_fs_lib_link="$svn_fs_lib_link \$(FS_BASE_LINK)"
1403 fi
1404

--- 45 unchanged lines hidden (view full) ---

1450 fi
1451 # This segment (and the rest of r10800) is very likely unnecessary
1452 # with libtool 1.5, which automatically adds libstdc++ as a
1453 # dependency to the C++ libraries it builds. So at some future time
1454 # when autogen.sh requires libtool 1.5 or higher, we can get rid of
1455 # it.
1456 AC_MSG_CHECKING([for additional flags to link C++ libraries])
1457 if test "x$ac_compiler_gnu" = "xyes"; then
1405 LT_CXX_LIBADD="-lstdc++"
1406 AC_MSG_RESULT([$LT_CXX_LIBADD])
1458 case "$host" in
1459 *freebsd10*)
1460 AC_MSG_RESULT([none needed])
1461 ;;
1462 *)
1463 LT_CXX_LIBADD="-lstdc++"
1464 AC_MSG_RESULT([$LT_CXX_LIBADD])
1465 ;;
1466 esac
1407 else
1408 AC_MSG_RESULT([none needed])
1409 fi
1410fi
1411AC_SUBST(INSTALL_EXTRA_JAVAHL_LIB)
1412AC_SUBST(JAVAHL_OBJDIR)
1413AC_SUBST(FIX_JAVAHL_LIB)
1414AC_SUBST(LT_CXX_LIBADD)

--- 13 unchanged lines hidden (view full) ---

1428 fi
1429])
1430AC_SUBST(JAVA_CLASSPATH)
1431AC_SUBST(JAVAHL_TESTS_TARGET)
1432AC_SUBST(JAVAHL_COMPAT_TESTS_TARGET)
1433
1434# ==== Miscellaneous bits ====================================================
1435
1467 else
1468 AC_MSG_RESULT([none needed])
1469 fi
1470fi
1471AC_SUBST(INSTALL_EXTRA_JAVAHL_LIB)
1472AC_SUBST(JAVAHL_OBJDIR)
1473AC_SUBST(FIX_JAVAHL_LIB)
1474AC_SUBST(LT_CXX_LIBADD)

--- 13 unchanged lines hidden (view full) ---

1488 fi
1489])
1490AC_SUBST(JAVA_CLASSPATH)
1491AC_SUBST(JAVAHL_TESTS_TARGET)
1492AC_SUBST(JAVAHL_COMPAT_TESTS_TARGET)
1493
1494# ==== Miscellaneous bits ====================================================
1495
1496AC_CHECK_HEADERS([stdbool.h inttypes.h])
1497
1436# Strip '-no-cpp-precomp' from CPPFLAGS for the clang compiler
1437### I think we get this flag from APR, so the fix probably belongs there
1438if test "$CC" = "clang"; then
1439 SVN_STRIP_FLAG(CPPFLAGS, [-no-cpp-precomp ])
1440fi
1441
1442# Need to strip '-no-cpp-precomp' from CPPFLAGS for SWIG as well.
1443SWIG_CPPFLAGS="$CPPFLAGS"

--- 35 unchanged lines hidden (view full) ---

1479 [svn_cf=subversion/svn_private_config.h;
1480 $SED -e "s/@SVN_DB_HEADER@/$SVN_DB_HEADER/" $svn_cf.tmp > $svn_cf.tmp.new
1481 cmp -s $svn_cf.tmp.new $svn_cf || mv -f $svn_cf.tmp.new $svn_cf
1482 rm -f $svn_cf.tmp.new $svn_cf.tmp],
1483 [SED="$SED"
1484 SVN_DB_HEADER="$SVN_DB_HEADER"])
1485AC_CONFIG_FILES([Makefile])
1486
1498# Strip '-no-cpp-precomp' from CPPFLAGS for the clang compiler
1499### I think we get this flag from APR, so the fix probably belongs there
1500if test "$CC" = "clang"; then
1501 SVN_STRIP_FLAG(CPPFLAGS, [-no-cpp-precomp ])
1502fi
1503
1504# Need to strip '-no-cpp-precomp' from CPPFLAGS for SWIG as well.
1505SWIG_CPPFLAGS="$CPPFLAGS"

--- 35 unchanged lines hidden (view full) ---

1541 [svn_cf=subversion/svn_private_config.h;
1542 $SED -e "s/@SVN_DB_HEADER@/$SVN_DB_HEADER/" $svn_cf.tmp > $svn_cf.tmp.new
1543 cmp -s $svn_cf.tmp.new $svn_cf || mv -f $svn_cf.tmp.new $svn_cf
1544 rm -f $svn_cf.tmp.new $svn_cf.tmp],
1545 [SED="$SED"
1546 SVN_DB_HEADER="$SVN_DB_HEADER"])
1547AC_CONFIG_FILES([Makefile])
1548
1549# Create pkg-config .pc files from .pc.in files
1550for pc_in_file in "${abs_srcdir}"/subversion/libsvn_*/*.pc.in; do
1551 pc_file=${pc_in_file#${abs_srcdir}/}
1552 pc_file=${pc_file%.in}
1553 AC_CONFIG_FILES([${pc_file}])
1554done
1555
1487SVN_CONFIG_SCRIPT(tools/backup/hot-backup.py)
1488SVN_CONFIG_SCRIPT(tools/hook-scripts/commit-access-control.pl)
1489SVN_CONFIG_SCRIPT(subversion/bindings/swig/perl/native/Makefile.PL)
1490if test -e packages/solaris/pkginfo.in; then
1491 SVN_CONFIG_SCRIPT(packages/solaris/pkginfo)
1492fi
1493AC_SUBST(SVN_CONFIG_SCRIPT_FILES)
1494

--- 44 unchanged lines hidden --- 		1556SVN_CONFIG_SCRIPT(tools/backup/hot-backup.py)
1557SVN_CONFIG_SCRIPT(tools/hook-scripts/commit-access-control.pl)
1558SVN_CONFIG_SCRIPT(subversion/bindings/swig/perl/native/Makefile.PL)
1559if test -e packages/solaris/pkginfo.in; then
1560 SVN_CONFIG_SCRIPT(packages/solaris/pkginfo)
1561fi
1562AC_SUBST(SVN_CONFIG_SCRIPT_FILES)
1563

--- 44 unchanged lines hidden ---