libnspr/libnspr-4.9-config-pc.patch

50 lines
1.6 KiB
Diff

diff -Nru nspr-4.8.7/mozilla/nsprpub/config/nspr-config-pc.in nspr-4.8.7-gil/mozilla/nsprpub/config/nspr-config-pc.in
--- nspr-4.8.7/mozilla/nsprpub/config/nspr-config-pc.in 2011-01-25 12:44:30.000000000 +0100
+++ nspr-4.8.7-gil/mozilla/nsprpub/config/nspr-config-pc.in 2011-01-25 12:41:35.000000000 +0100
@@ -98,7 +98,7 @@
includedir=@includedir@
fi
if test -z "$libdir"; then
- libdir=@libdir@
+ libdir=`pkg-config --variable=libdir nspr`
fi
if test "$echo_prefix" = "yes"; then
@@ -132,12 +132,12 @@
if test -n "$lib_nspr"; then
libdirs="$libdirs -lnspr${major_version}"
fi
- os_ldflags="@LDFLAGS@"
+ os_ldflags=`pkg-config --variable=ldflags nspr`
for i in $os_ldflags ; do
if echo $i | grep \^-L >/dev/null; then
libdirs="$libdirs $i"
fi
done
- echo $libdirs @OS_LIBS@
+ echo $libdirs `pkg-config --variable=os_libs nspr`
fi
--- nspr-4.9/mozilla/nsprpub/configure.in.orig 2012-03-24 01:49:14.667083058 +0100
+++ nspr-4.9/mozilla/nsprpub/configure.in 2012-03-24 01:49:27.556944216 +0100
@@ -3357,6 +3357,8 @@
config/nsprincl.mk
config/nsprincl.sh
config/nspr-config
+ config/nspr-config-pc
+ config/nspr-config-vars
lib/Makefile
lib/ds/Makefile
lib/libc/Makefile
--- nspr-4.9/mozilla/nsprpub/configure.orig 2012-03-24 01:48:32.729534715 +0100
+++ nspr-4.9/mozilla/nsprpub/configure 2012-03-24 01:49:05.446182357 +0100
@@ -6694,6 +6694,8 @@
config/nsprincl.mk
config/nsprincl.sh
config/nspr-config
+ config/nspr-config-pc
+ config/nspr-config-vars
lib/Makefile
lib/ds/Makefile
lib/libc/Makefile