[gentoo-commits] gentoo-x86 commit in sys-fs/ecryptfs-utils/files: ecryptfs-utils-90-nss-pkgconfig.patch

[Diego Petteno (flameeyes)]

flameeyes    11/08/31 00:01:09

  Added:                ecryptfs-utils-90-nss-pkgconfig.patch
  Log:
  Use pkg-config to look up NSS. This allows a clean cross-compilation of the package.
  
  (Portage version: 2.2.0_alpha51/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  sys-fs/ecryptfs-utils/files/ecryptfs-utils-90-nss-pkgconfig.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/ecryptfs-utils/files/ecryptfs-utils-90-nss-pkgconfig.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/ecryptfs-utils/files/ecryptfs-utils-90-nss-pkgconfig.patch?rev=1.1&content-type=text/plain

Index: ecryptfs-utils-90-nss-pkgconfig.patch
===================================================================
Index: ecryptfs-utils-90/configure.ac
===================================================================
--- ecryptfs-utils-90.orig/configure.ac
+++ ecryptfs-utils-90/configure.ac
@@ -228,16 +228,12 @@ else
 fi
 
 #Verify nss
-NSS_LIBS=`nss-config --libs`
-if test "x${NSS_LIBS}" != "x" ; then
-        NSS_CFLAGS=`nss-config --cflags`
-        NSPR_CFLAGS=`nspr-config --cflags`
-        NSS_CFLAGS="${NSS_CFLAGS} -DENABLE_NSS ${NSPR_CFLAGS}"
-        have_nss="yes"
-else
-        NSS_CFLAGS=""
-        have_nss="no"
-fi
+PKG_CHECK_MODULES(
+	[NSS],
+	[nss],
+        [have_nss="yes"
+	 NSS_CFLAGS="${NSS_CFLAGS} -DENABLE_NSS"],
+        [have_nss="no"])
 
 if test "${enable_nss}" = "detect" ; then
         if test "$have_nss" == "yes" ; then