diff options
Diffstat (limited to 'package/bitlbee/patches/patch-configure')
| -rw-r--r-- | package/bitlbee/patches/patch-configure | 38 |
1 files changed, 12 insertions, 26 deletions
diff --git a/package/bitlbee/patches/patch-configure b/package/bitlbee/patches/patch-configure index 1f4538ac4..72b91af09 100644 --- a/package/bitlbee/patches/patch-configure +++ b/package/bitlbee/patches/patch-configure @@ -1,20 +1,12 @@ ---- bitlbee-1.2.3.orig/configure 2008-09-06 14:33:13.000000000 +0200 -+++ bitlbee-1.2.3/configure 2008-10-08 16:07:32.000000000 +0200 -@@ -19,7 +19,6 @@ libevent='/usr/' - pidfile='/var/run/bitlbee.pid' - ipcsocket='/var/run/bitlbee.sock' - pcdir='$prefix/lib/pkgconfig' --systemlibdirs="/lib /usr/lib /usr/local/lib" - - msn=1 - jabber=1 -@@ -137,12 +136,8 @@ EOF +--- bitlbee-3.0.1.orig/configure 2010-11-24 23:44:00.000000000 +0100 ++++ bitlbee-3.0.1/configure 2011-03-03 22:36:43.000000000 +0100 +@@ -171,12 +171,9 @@ EOF if [ -n "$target" ]; then - PKG_CONFIG_LIBDIR=/usr/$target/lib/pkgconfig - export PKG_CONFIG_LIBDIR -- PATH=/usr/$target/bin:$PATH + PATH=/usr/$target/bin:$PATH - CC=$target-cc + CC=$target-gcc LD=$target-ld @@ -22,18 +14,12 @@ fi -@@ -348,14 +343,6 @@ fi; - - echo 'SSL_CLIENT=ssl_'$ssl'.o' >> Makefile.settings - --for i in $systemlibdirs; do -- if [ -f $i/libresolv.a ]; then -- echo '#define HAVE_RESOLV_A' >> config.h -- echo 'EFLAGS+='$i'/libresolv.a' >> Makefile.settings -- break -- fi --done -- - STORAGES="text xml" +@@ -225,7 +222,7 @@ if [ -z "$PKG_CONFIG" ]; then + PKG_CONFIG=pkg-config + fi - if [ "$ldap" = "auto" ]; then +-if $PKG_CONFIG --version > /dev/null 2>/dev/null && $PKG_CONFIG glib-2.0; then ++if $PKG_CONFIG --version && $PKG_CONFIG glib-2.0; then + if $PKG_CONFIG glib-2.0 --atleast-version=$GLIB_MIN_VERSION; then + cat<<EOF>>Makefile.settings + EFLAGS+=`$PKG_CONFIG --libs glib-2.0 gmodule-2.0` |