← Back to team overview

ecryptfs team mailing list archive

[Merge] lp:~flameeyes/ecryptfs/devel into lp:ecryptfs

 

Diego E. "Flameeyes" Pettenò has proposed merging lp:~flameeyes/ecryptfs/devel into lp:ecryptfs.

Requested reviews:
  eCryptfs (ecryptfs)
Related bugs:
  Bug #837762 in eCryptfs: "Reliance on nss-config hinders cross-compilation"
  https://bugs.launchpad.net/ecryptfs/+bug/837762

For more details, see:
https://code.launchpad.net/~flameeyes/ecryptfs/devel/+merge/73516

Branch with the patch I submitted last night.
-- 
https://code.launchpad.net/~flameeyes/ecryptfs/devel/+merge/73516
Your team eCryptfs is requested to review the proposed merge of lp:~flameeyes/ecryptfs/devel into lp:ecryptfs.
=== modified file 'configure.ac'
--- configure.ac	2011-08-10 13:38:09 +0000
+++ configure.ac	2011-08-31 11:57:23 +0000
@@ -228,16 +228,12 @@
 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


Follow ups