summaryrefslogtreecommitdiffstats
path: root/m4/nss.m4
diff options
context:
space:
mode:
authorNathan Kinder <nkinder@redhat.com>2006-10-24 21:11:07 +0000
committerNathan Kinder <nkinder@redhat.com>2006-10-24 21:11:07 +0000
commitce5079cf2029b380efd95f2f6e17b98df22927e5 (patch)
tree79a0c3916b42e467906c4108a4ab17c3798623d2 /m4/nss.m4
parent8f97d86fd6c4a137b4188465c39787dd7b12c149 (diff)
downloadds-ce5079cf2029b380efd95f2f6e17b98df22927e5.tar.gz
ds-ce5079cf2029b380efd95f2f6e17b98df22927e5.tar.xz
ds-ce5079cf2029b380efd95f2f6e17b98df22927e5.zip
Resolves: 212038
Make configure create program wrapper scripts.
Diffstat (limited to 'm4/nss.m4')
-rw-r--r--m4/nss.m46
1 files changed, 5 insertions, 1 deletions
diff --git a/m4/nss.m4 b/m4/nss.m4
index a1bf803d..b4e1e993 100644
--- a/m4/nss.m4
+++ b/m4/nss.m4
@@ -30,6 +30,7 @@ AC_ARG_WITH(nss, [ --with-nss=PATH Network Security Services (NSS) dire
NSSDIR=$withval
nss_inc="-I$NSSDIR/include"
nss_lib="-L$NSSDIR/lib"
+ nss_libdir="$NSSDIR/lib"
else
echo
AC_MSG_ERROR([$withval not found])
@@ -60,6 +61,7 @@ AC_ARG_WITH(nss-lib, [ --with-nss-lib=PATH Network Security Services (N
then
AC_MSG_RESULT([using $withval])
nss_lib="-L$withval"
+ nss_libdir="$withval"
else
echo
AC_MSG_ERROR([$withval not found])
@@ -70,17 +72,19 @@ AC_MSG_RESULT(no))
# if NSS is not found yet, try pkg-config
# last resort
-if test -z "$nss_inc" -o -z "$nss_lib"; then
+if test -z "$nss_inc" -o -z "$nss_lib" -o -z "$nss_libdir"; then
AC_MSG_CHECKING(for nss with pkg-config)
AC_PATH_PROG(PKG_CONFIG, pkg-config)
if test -n "$PKG_CONFIG"; then
if $PKG_CONFIG --exists nss; then
nss_inc=`$PKG_CONFIG --cflags-only-I nss`
nss_lib=`$PKG_CONFIG --libs-only-L nss`
+ nss_libdir=`$PKG_CONFIG --libs-only-L nss | sed -e s/-L// | sed -e s/\ *$//`
AC_MSG_RESULT([using system NSS])
elif $PKG_CONFIG --exists dirsec-nss; then
nss_inc=`$PKG_CONFIG --cflags-only-I dirsec-nss`
nss_lib=`$PKG_CONFIG --libs-only-L dirsec-nss`
+ nss_libdir=`$PKG_CONFIG --libs-only-L dirsec-nss | sed -e s/-L// | sed -e s/\ *$//`
AC_MSG_RESULT([using system dirsec NSS])
else
AC_MSG_ERROR([NSS not found, specify with --with-nss.])