#! /bin/sh /usr/share/dpatch/dpatch-run
##
## no-extra-libs by <peter@p12n.org>
##
## DP: Work around "libtool disease" in '{apr,aprutil,neon}-config --libs',
## DP: where they think our runtime linker is too stupid to handle recursive
## DP: library dependencies.
## DP:
## DP: See Debian bug #338302.

@DPATCH@
--- a/build/ac-macros/apr.m4
+++ b/build/ac-macros/apr.m4
@@ -99,9 +99,9 @@
       AC_MSG_ERROR([apr-config --link-ld --libs failed])
     fi
   else
-    SVN_APR_LIBS="`$apr_config --link-ld`"
+    SVN_APR_LIBS="`pkg-config --libs apr-1`"
     if test $? -ne 0; then
-      AC_MSG_ERROR([apr-config --link-ld failed])
+      AC_MSG_ERROR([pkg-config --libs apr-1 failed])
     fi
   fi
   SVN_APR_LIBS="`SVN_REMOVE_STANDARD_LIB_DIRS($SVN_APR_LIBS)`"
--- a/build/ac-macros/aprutil.m4
+++ b/build/ac-macros/aprutil.m4
@@ -103,9 +103,9 @@
       AC_MSG_ERROR([apu-config --link-ld --libs failed])
     fi
   else
-    SVN_APRUTIL_LIBS="`$apu_config --link-ld`"
+    SVN_APRUTIL_LIBS="`pkg-config --libs apr-util-1`"
     if test $? -ne 0; then
-      AC_MSG_ERROR([apu-config --link-ld failed])
+      AC_MSG_ERROR([pkg-config --libs apr-util-1 failed])
     fi
   fi
   SVN_APRUTIL_LIBS="`SVN_REMOVE_STANDARD_LIB_DIRS($SVN_APRUTIL_LIBS)`"
