Resolves: 212038

Make configure create program wrapper scripts.

6 files changed, 19 insertions, 3 deletions

diff --git a/m4/db.m4 b/m4/db.m4
index 376aed75..8d520c54 100644
--- a/m4/db.m4
+++ b/m4/db.m4
@@ -38,6 +38,7 @@ AC_ARG_WITH(db, [  --with-db=PATH   Berkeley DB directory],
     dnl - check the user provided location
     DBDIR=$withval
     db_lib="-L$DBDIR/lib"
+    db_libdir="$DBDIR/lib"
     db_incdir="$DBDIR/include"
     if ! test -e "$db_incdir/db.h" ; then
       AC_MSG_ERROR([$withval include dir not found])
diff --git a/m4/mozldap.m4 b/m4/mozldap.m4
index c9361987..8007ad27 100644
--- a/m4/mozldap.m4
+++ b/m4/mozldap.m4
@@ -30,6 +30,7 @@ AC_ARG_WITH(ldapsdk, [  --with-ldapsdk=PATH     Mozilla LDAP SDK directory],
     LDAPSDKDIR=$withval
     ldapsdk_inc="-I$LDAPSDKDIR/include"
     ldapsdk_lib="-L$LDAPSDKDIR/lib"
+    ldapsdk_libdir="$LDAPSDKDIR/lib"
   else
     echo
     AC_MSG_ERROR([$withval not found])
@@ -60,6 +61,7 @@ AC_ARG_WITH(ldapsdk-lib, [  --with-ldapsdk-lib=PATH     Mozilla LDAP SDK library
   then
     AC_MSG_RESULT([using $withval])
     ldapsdk_lib="-L$withval"
+    ldapsdk_libdir="$withval"
   else
     echo
     AC_MSG_ERROR([$withval not found])
@@ -70,13 +72,14 @@ AC_MSG_RESULT(no))
 # if LDAPSDK is not found yet, try pkg-config
 
 # last resort
-if test -z "$ldapsdk_inc" -o -z "$ldapsdk_lib"; then
+if test -z "$ldapsdk_inc" -o -z "$ldapsdk_lib" -o -z "$ldapsdk_libdir"; then
   AC_MSG_CHECKING(for mozldap with pkg-config)
   AC_PATH_PROG(PKG_CONFIG, pkg-config)
   if test -n "$PKG_CONFIG"; then
     if $PKG_CONFIG --exists mozldap6; then
       ldapsdk_inc=`$PKG_CONFIG --cflags-only-I mozldap6`
       ldapsdk_lib=`$PKG_CONFIG --libs-only-L mozldap6`
+      ldapsdk_libdir=`$PKG_CONFIG --libs-only-L mozldap6 | sed -e s/-L// | sed -e s/\ *$//`
       AC_MSG_RESULT([using system mozldap6])
     else
       AC_MSG_ERROR([LDAPSDK not found, specify with --with-ldapsdk[-inc|-lib].])
diff --git a/m4/netsnmp.m4 b/m4/netsnmp.m4
index 787801d5..d8f32f44 100644
--- a/m4/netsnmp.m4
+++ b/m4/netsnmp.m4
@@ -35,6 +35,7 @@ AC_ARG_WITH(netsnmp, [  --with-netsnmp=PATH   Net-SNMP directory],
     fi
 
     netsnmp_lib="-L$withval/lib"
+    netsnmp_libdir="$withval/lib"
   else
     AC_MSG_RESULT(yes)
     AC_MSG_ERROR([$withval not found])
@@ -64,6 +65,7 @@ AC_ARG_WITH(netsnmp-lib, [  --with-netsnmp-lib=PATH     Net-SNMP library directo
   then
     AC_MSG_RESULT([using $withval])
     netsnmp_lib="-L$withval"
+    netsnmp_libdir="$withval"
   else
     echo
     AC_MSG_ERROR([$withval not found])
diff --git a/m4/nspr.m4 b/m4/nspr.m4
index 81230f66..72eee27f 100644
--- a/m4/nspr.m4
+++ b/m4/nspr.m4
@@ -30,6 +30,7 @@ AC_ARG_WITH(nspr, [  --with-nspr=PATH        Netscape Portable Runtime (NSPR) di
     NSPRDIR=$withval
     nspr_inc="-I$NSPRDIR/include"
     nspr_lib="-L$NSPRDIR/lib"
+    nspr_libdir="$NSPRDIR/lib"
   else
     echo
     AC_MSG_ERROR([$withval not found])
@@ -60,6 +61,7 @@ AC_ARG_WITH(nspr-lib, [  --with-nspr-lib=PATH        Netscape Portable Runtime (
   then
     AC_MSG_RESULT([using $withval])
     nspr_lib="-L$withval"
+    nspr_libdir="$withval"
   else
     echo
     AC_MSG_ERROR([$withval not found])
@@ -70,17 +72,19 @@ AC_MSG_RESULT(no))
 # if NSPR is not found yet, try pkg-config
 
 # last resort
-if test -z "$nspr_inc" -o -z "$nspr_lib"; then
+if test -z "$nspr_inc" -o -z "$nspr_lib" -o -z "$nspr_libdir"; then
   AC_MSG_CHECKING(for nspr with pkg-config)
   AC_PATH_PROG(PKG_CONFIG, pkg-config)
   if test -n "$PKG_CONFIG"; then
     if $PKG_CONFIG --exists nspr; then
       nspr_inc=`$PKG_CONFIG --cflags-only-I nspr`
       nspr_lib=`$PKG_CONFIG --libs-only-L nspr`
+      nspr_libdir=`$PKG_CONFIG --libs-only-L nspr | sed -e s/-L// | sed -e s/\ *$//`
       AC_MSG_RESULT([using system NSPR])
     elif $PKG_CONFIG --exists dirsec-nspr; then
       nspr_inc=`$PKG_CONFIG --cflags-only-I dirsec-nspr`
       nspr_lib=`$PKG_CONFIG --libs-only-L dirsec-nspr`
+      nspr_libdir=`$PKG_CONFIG --libs-only-L dirsec-nspr | sed -e s/-L// | sed -e s/\ *$//`
       AC_MSG_RESULT([using system dirsec NSPR])
     else
       AC_MSG_ERROR([NSPR not found, specify with --with-nspr.])
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.])
diff --git a/m4/sasl.m4 b/m4/sasl.m4
index 73e86dcb..beb96a3a 100644
--- a/m4/sasl.m4
+++ b/m4/sasl.m4
@@ -42,6 +42,7 @@ AC_ARG_WITH(sasl,
         fi
 
         sasl_lib="-L$withval/lib"
+        sasl_libdir="$withval/lib"
       else
           AC_MSG_RESULT(yes)
           AC_MSG_ERROR([sasl not found in $withval])
@@ -70,6 +71,7 @@ AC_ARG_WITH(sasl-lib,
       if test -d "$withval"; then
         AC_MSG_RESULT([using $withval])
         sasl_lib="-L$withval"
+        sasl_libdir="$withval"
       else
         echo
         AC_MSG_ERROR([$withval not found])