Author: nhosoi
Update of /cvs/dirsec/setuputil/m4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29778/m4
Modified Files: mozldap.m4 nspr.m4 nss.m4 Log Message: Resolves: #235476 Summary: Port setuputil onto Solaris
Index: mozldap.m4 =================================================================== RCS file: /cvs/dirsec/setuputil/m4/mozldap.m4,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- mozldap.m4 5 Apr 2007 01:53:37 -0000 1.1 +++ mozldap.m4 9 Apr 2007 22:13:37 -0000 1.2 @@ -79,7 +79,7 @@ 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/\ *$//` + ldapsdk_libdir=`$PKG_CONFIG --libs-only-L mozldap6 | sed -e "s/-L//g" | sed -e "s/\ *$//" | sed -e "s/\ /:/g"` AC_MSG_RESULT([using system mozldap6]) else AC_MSG_ERROR([LDAPSDK not found, specify with --with-ldapsdk[-inc|-lib].])
Index: nspr.m4 =================================================================== RCS file: /cvs/dirsec/setuputil/m4/nspr.m4,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- nspr.m4 5 Apr 2007 01:53:37 -0000 1.1 +++ nspr.m4 9 Apr 2007 22:13:37 -0000 1.2 @@ -84,7 +84,7 @@ 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/\ *$//` + nspr_libdir=`$PKG_CONFIG --libs-only-L dirsec-nspr | sed -e "s/-L//g" | sed -e "s/\ *$//" | sed -e "s/\ /:/g"` 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/setuputil/m4/nss.m4,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- nss.m4 5 Apr 2007 01:53:37 -0000 1.1 +++ nss.m4 9 Apr 2007 22:13:37 -0000 1.2 @@ -84,7 +84,7 @@ 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/\ *$//` + nss_libdir=`$PKG_CONFIG --libs-only-L dirsec-nss | sed -e "s/-L//g" | sed -e "s/\ *$//" | sed -e "s/\ /:/g"` AC_MSG_RESULT([using system dirsec NSS]) else AC_MSG_ERROR([NSS not found, specify with --with-nss.])
389-commits@lists.fedoraproject.org