curl: fixed internal nss configure to get nspr includes

The nspr includes aren't added when using nss-config while they are
added by pkg-config. This caused internal build to fail when nss devel
packages aren't installed on the system. Patched the configure to get it
working.

Change-Id: I86d7d56c0d6df2dbf69ba7ac2a6f930ecb4ae8fb
This commit is contained in:
Cédric Bosdonnat 2012-07-11 11:46:13 +02:00
parent bd5262540a
commit bbe19f1301
2 changed files with 18 additions and 0 deletions

View file

@ -0,0 +1,17 @@
diff -ur curl-7.26.0/configure misc/build/curl-7.26.0/configure
--- curl-7.26.0/configure 2012-07-11 10:06:15.249214153 +0200
+++ misc/build/curl-7.26.0/configure 2012-07-11 10:09:48.967225739 +0200
@@ -22779,6 +22779,13 @@
addcflags=""
version="unknown"
fi
+
+ # NSPR includes and libs are needed with nss
+ check=`nspr-config --version 2>/dev/null`
+ if test -n "$check"; then
+ addlib="$addlib `nspr-config --libs`"
+ addcflags="$addcflags `nspr-config --cflags`"
+ fi
fi
else
# Without pkg-config, we'll kludge in some defaults

View file

@ -45,6 +45,7 @@ TARFILE_NAME=curl-7.26.0
TARFILE_MD5=3fa4d5236f2a36ca5c3af6715e837691
PATCH_FILES=\
curl-7.26.0.patch \
curl-7.26.0_nspr.patch \
curl-aix.patch
.IF "$(GUI)"=="WNT"