Author: nkinder
Update of /cvs/dirsec/ldapserver/m4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20714/m4
Modified Files: db.m4 mozldap.m4 netsnmp.m4 nspr.m4 nss.m4 sasl.m4 Log Message: Resolves: 212038
Make configure create program wrapper scripts.
Index: db.m4 =================================================================== RCS file: /cvs/dirsec/ldapserver/m4/db.m4,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- db.m4 17 Oct 2006 17:07:14 -0000 1.1 +++ db.m4 24 Oct 2006 21:11:01 -0000 1.2 @@ -38,6 +38,7 @@ 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])
Index: mozldap.m4 =================================================================== RCS file: /cvs/dirsec/ldapserver/m4/mozldap.m4,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- mozldap.m4 19 Oct 2006 16:53:05 -0000 1.2 +++ mozldap.m4 24 Oct 2006 21:11:02 -0000 1.3 @@ -30,6 +30,7 @@ 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 @@ 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 @@ # 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].])
Index: netsnmp.m4 =================================================================== RCS file: /cvs/dirsec/ldapserver/m4/netsnmp.m4,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- netsnmp.m4 17 Oct 2006 17:07:14 -0000 1.1 +++ netsnmp.m4 24 Oct 2006 21:11:02 -0000 1.2 @@ -35,6 +35,7 @@ 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 @@ then AC_MSG_RESULT([using $withval]) netsnmp_lib="-L$withval" + netsnmp_libdir="$withval" else echo AC_MSG_ERROR([$withval not found])
Index: nspr.m4 =================================================================== RCS file: /cvs/dirsec/ldapserver/m4/nspr.m4,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- nspr.m4 19 Oct 2006 16:53:05 -0000 1.2 +++ nspr.m4 24 Oct 2006 21:11:02 -0000 1.3 @@ -30,6 +30,7 @@ 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 @@ 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 @@ # 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.])
Index: nss.m4 =================================================================== RCS file: /cvs/dirsec/ldapserver/m4/nss.m4,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- nss.m4 19 Oct 2006 16:53:05 -0000 1.2 +++ nss.m4 24 Oct 2006 21:11:02 -0000 1.3 @@ -30,6 +30,7 @@ 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 @@ 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 @@ # 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.])
Index: sasl.m4 =================================================================== RCS file: /cvs/dirsec/ldapserver/m4/sasl.m4,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sasl.m4 17 Oct 2006 17:07:14 -0000 1.1 +++ sasl.m4 24 Oct 2006 21:11:02 -0000 1.2 @@ -42,6 +42,7 @@ 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 @@ 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])
389-commits@lists.fedoraproject.org