Checkout Tools
  • last updated 5 hours ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Filter standard library directories from $SVN_ZLIB_LIBS obtained by pkg-config.

Before:

$ grep ZLIB config.log

SVN_ZLIB_INCLUDES='-I/usr/include'

SVN_ZLIB_LIBS='-L/usr/lib -lz'

After:

$ grep ZLIB config.log

SVN_ZLIB_INCLUDES='-I/usr/include'

SVN_ZLIB_LIBS='-lz'

See also r1765143 which applied a workaround for this problem to bb-openbsd.

* build/ac-macros/zlib.m4: After detecting zlib via pkg-config, filter out

standard library directories to avoid potentially picking up conflicting

libraries from there, e.g. when using self-compiled dependencies installed

in non-standard locations.

(We do this for all our dependencies, not just zlib, because libtool...)

Following up on r1762338, fix indentation in new SVN_ZLIB_PKG_CONFIG

function.

* build/ac-macros/zlib.m4

(SVN_ZLIB_PKG_CONFIG): Fix indentation.

Fix SVN-4655: configure: add zlib discovery through pkg-config

Rework zlib.m4 in a way that is first searches zlib_prefix, if

given, else search with pkg-config and ultimately in default

locations traversed by the preprocessor and linker.

* build/ac-macros/zlib.m4:

Add a SVN_ZLIB_PKG_CONFIG function inspired by serf.m4 and

traverse search by prefix, pkg-config and default locations

Patch by: Michael Osipov <michael.osipov{_AT_}siemens.com>

* build/ac-macros/zlib.m4

(SVN_LIB_Z): Don't lose the environment's $LDFLAGS for the AC_CHECK_LIB() call.

* build/ac-macros/zlib.m4

(SVN_LIB_Z): DTRT when --with-zlib is passed without an argument.

Found by: philip

Give a better error message when configured with '--without-zlib'.

* build/ac-macros/zlib.m4

(SVN_LIB_Z): Look for $withval="no" as well.

Patch by: Alexander Thomas <alexander@collab.net>

(log message by me)

Remove unused variables in build system.

* build/ac-macros/apr.m4

(SVN_LIB_APR): Don't set SVN_APR_PREFIX.

* build/ac-macros/aprutil.m4

(SVN_LIB_APRUTIL): Don't set SVN_APRUTIL_PREFIX.

* build/ac-macros/apr_memcache.m4

(SVN_LIB_APR_MEMCACHE): Don't set SVN_APR_MEMCACHE_PREFIX.

* build/ac-macros/serf.m4

(SVN_LIB_SERF): Don't set SVN_SERF_PREFIX.

* build/ac-macros/zlib.m4

(SVN_LIB_Z): Don't set SVN_ZLIB_PREFIX.

* configure.ac: Don't mark SVN_APRUTIL_PREFIX for substitution.

* Makefile.in: Don't set SVN_APR_INCLUDES, SVN_APR_PREFIX,

SVN_APRUTIL_INCLUDES, SVN_APRUTIL_PREFIX, SVN_APR_MEMCACHE_PREFIX,

SVN_APR_MEMCACHE_INCLUDES, SVN_SERF_INCLUDES, SVN_SERF_PREFIX,

SVN_ZLIB_PREFIX and SVN_ZLIB_INCLUDES variables.

  1. … 6 more files in changeset.
Apply ASF license headers to a number of files included under that license

but lacking said header.

Patch by: Niall Pemberton <niallp{_AT_}apache.org>

  1. … 175 more files in changeset.
Follow-up to r38377:

Rename SVN_REMOVE_REDUNDANT_LIB_DIRS to SVN_REMOVE_STANDARD_LIB_DIRS.

* build/ac-macros/svn-macros.m4

(SVN_REMOVE_REDUNDANT_LIB_DIRS): Rename to ...

(SVN_REMOVE_STANDARD_LIB_DIRS): ... this. Improve doc string. Filter -L

options with standard library search directories followed by '/'.

* build/ac-macros/apr.m4

(SVN_LIB_APR):

* build/ac-macros/aprutil.m4

(SVN_LIB_APRUTIL):

* build/ac-macros/gssapi.m4

(SVN_LIB_RA_SERF_GSSAPI):

* build/ac-macros/kwallet.m4

(SVN_LIB_KWALLET):

* build/ac-macros/sasl.m4

(SVN_LIB_SASL):

* build/ac-macros/sqlite.m4

(SVN_SQLITE_DIR_CONFIG):

* build/ac-macros/zlib.m4

(SVN_LIB_Z): Update.

Suggested by: julianfoad

stsp

  1. … 7 more files in changeset.
Filter out redundant library directories (e.g. /usr/lib) to avoid linking

against Subversion libraries potentially placed in these directories.

* build/ac-macros/svn-macros.m4

(SVN_REMOVE_REDUNDANT_LIB_DIRS): New.

* build/ac-macros/apr.m4

(SVN_LIB_APR):

* build/ac-macros/aprutil.m4

(SVN_LIB_APRUTIL):

* build/ac-macros/gssapi.m4

(SVN_LIB_RA_SERF_GSSAPI):

* build/ac-macros/kwallet.m4

(SVN_LIB_KWALLET):

* build/ac-macros/sasl.m4

(SVN_LIB_SASL):

* build/ac-macros/sqlite.m4

(SVN_SQLITE_DIR_CONFIG):

* build/ac-macros/zlib.m4

(SVN_LIB_Z): Use SVN_REMOVE_REDUNDANT_LIB_DIRS.

  1. … 7 more files in changeset.
Revert r38218. Buildbots now provide 'config.log' when an error occurs.

  1. … 16 more files in changeset.
Make `configure` sometimes print the content of 'config.log' when an error occurs.

* build/ac-macros/svn-macros.m4

(SVN_MSG_ERROR): New.

* build/ac-macros/apache.m4:

* build/ac-macros/apr.m4:

* build/ac-macros/apr_memcache.m4:

* build/ac-macros/aprutil.m4:

* build/ac-macros/berkeley-db.m4:

* build/ac-macros/ctypesgen.m4:

* build/ac-macros/gssapi.m4:

* build/ac-macros/java.m4:

* build/ac-macros/kwallet.m4:

* build/ac-macros/neon.m4:

* build/ac-macros/sasl.m4:

* build/ac-macros/serf.m4:

* build/ac-macros/sqlite.m4:

* build/ac-macros/swig.m4:

* build/ac-macros/zlib.m4:

* configure.ac: Use SVN_MSG_ERROR() instead of AC_MSG_ERROR().

[Reverted in r38285.]

  1. … 16 more files in changeset.
Set svn:eol-style property on some files.

* build/ac-macros/apr_memcache.m4:

* build/ac-macros/ctypesgen.m4:

* build/ac-macros/gssapi.m4:

* build/ac-macros/sasl.m4:

* build/ac-macros/serf.m4:

* build/ac-macros/sqlite.m4:

* build/ac-macros/zlib.m4: Set svn:eol-style property to 'native'.

  1. … 6 more files in changeset.
* build/ac-macros/zlib.m4

(SVN_LIB_Z): Don't reset LDFLAGS when the '--with-zlib' option was passed to

configure.

Found by: Igor Galic <ahiro@tigris.org>

* configure.in (AC_PREREQ): Require autoconf >= 2.58.

* configure.in:

* build/ac-macros/apache.m4:

* build/ac-macros/java.m4:

* build/ac-macros/neon.m4:

* build/ac-macros/serf.m4:

* build/ac-macros/sqlite.m4:

* build/ac-macros/svn-macros.m4:

* build/ac-macros/swig.m4:

* build/ac-macros/zlib.m4:

Blind s/AC_HELP_STRING/AS_HELP_STRING/.

  1. … 8 more files in changeset.
Re-remove SVN_HAVE_ZLIB, after it was accidentally reintroduced in r20693.

* build/ac-macros/zlib.m4

(SVN_LIB_Z): Don't set SVN_HAVE_ZLIB. We always have zlib, and since

r20664, there is no longer any code that relies on the conditional.

Allow the path to a zlib install to be passed at configure-time via

--with-zlib.

(MinGW does not include zlib by default.)

* build/ac-macros/zlib.m4

(SVN_LIB_Z): New file to contain zlib detection macros plus --with-zlib

support.

* configure.in: Move zlib checks to zlib.m4 and call SVN_LIB_Z macro.

* Makefile.in:

(INCLUDES): add SVN_ZLIB_INCLUDES.

(SVN_ZLIB_PREFIX, SVN_ZLIB_INCLUDES): Define.

* aclocal.m4: Pull in the new zlib.m4.

  1. … 3 more files in changeset.