[Pkg-apache-commits] r899 - in /trunk/apr-util: changelog patches/00list patches/011_avoid_ldap_by_defaut.dpatch

[ryan52-guest at alioth.debian.org]

Author: ryan52-guest
Date: Fri Mar 27 18:37:22 2009
New Revision: 899

URL: http://svn.debian.org/wsvn/pkg-apache/?sc=1&rev=899
Log:
don't output ldap libs by default from apu-config

Added:
    trunk/apr-util/patches/011_avoid_ldap_by_defaut.dpatch   (with props)
Modified:
    trunk/apr-util/changelog
    trunk/apr-util/patches/00list

Modified: trunk/apr-util/changelog
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apr-util/changelog?rev=899&op=diff
==============================================================================
--- trunk/apr-util/changelog (original)
+++ trunk/apr-util/changelog Fri Mar 27 18:37:22 2009
@@ -13,6 +13,7 @@
   * remove build/apr_common.m4 in the clean target, it gets modified
     during build and is automatically generated
   * switch the libaprutil1-dbg package to the debug section
+  * don't output ldap libs by default from apu-config
   * upload to unstable this time
 
   [ Stefan Fritsch ]

Modified: trunk/apr-util/patches/00list
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apr-util/patches/00list?rev=899&op=diff
==============================================================================
--- trunk/apr-util/patches/00list (original)
+++ trunk/apr-util/patches/00list Fri Mar 27 18:37:22 2009
@@ -3,6 +3,7 @@
 003_buildconf_config.guess_sub_location
 004_debian_layout_fix
 010_dont_use_all_pg_build_deps
+011_avoid_ldap_by_defaut.dpatch
 013_ship_find_apu.m4
 014_apu_config_dont_list_indep_libs
 099_alternate_md4_md5_impl

Added: trunk/apr-util/patches/011_avoid_ldap_by_defaut.dpatch
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apr-util/patches/011_avoid_ldap_by_defaut.dpatch?rev=899&op=file
==============================================================================
--- trunk/apr-util/patches/011_avoid_ldap_by_defaut.dpatch (added)
+++ trunk/apr-util/patches/011_avoid_ldap_by_defaut.dpatch Fri Mar 27 18:37:22 2009
@@ -1,0 +1,39 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## avoid-ldap-by-default.dpatch by Ryan Niebur <ryanryan52 at gmail.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: by default --avoid-ldap since apache2 is the only user, and we
+## don't want to add extra dependencies to other apr-utils rdepends
+
+ at DPATCH@
+diff -urNad apr-util~/apu-config.in apr-util/apu-config.in
+--- apr-util~/apu-config.in	2009-03-27 11:30:29.000000000 -0700
++++ apr-util/apu-config.in	2009-03-27 11:35:15.000000000 -0700
+@@ -30,7 +30,8 @@
+ LIBS="@APRUTIL_EXPORT_LIBS@"
+ INCLUDES="@APRUTIL_INCLUDES@"
+ LDFLAGS="@APRUTIL_LDFLAGS@"
+-LDAP_LIBS="@LDADD_ldap@"
++ORIG_LDAP_LIBS="@LDADD_ldap@"
++LDAP_LIBS=""
+ 
+ APRUTIL_LIBNAME="@APRUTIL_LIBNAME@"
+ 
+@@ -54,7 +55,7 @@
+   --includedir      print location where headers are installed
+   --ldflags         print linker flags
+   --libs            print library information
+-  --avoid-ldap      do not include ldap library information with --libs
++  --avoid-ldap      do not include ldap library information with --libs (default on Debian)
+   --ldap-libs       print additional library information to link with ldap
+   --srcdir          print APR-util source directory
+   --link-ld         print link switch(es) for linking to APR-util
+@@ -119,7 +120,7 @@
+     flags="$flags $LDAP_LIBS $LIBS"
+     ;;
+     --ldap-libs)
+-    flags="$flags $LDAP_LIBS"
++    flags="$flags $ORIG_LDAP_LIBS"
+     ;;
+     --includedir)
+     if test "$location" = "installed"; then

Propchange: trunk/apr-util/patches/011_avoid_ldap_by_defaut.dpatch
------------------------------------------------------------------------------
    svn:executable = *