Attachment 147420 Details for Bug 227452 – m4 fix for libdir

[patch] m4 fix for libdir

cvsdiffs2 (text/plain), 3.66 KB, created by Rich Megginson on 2007-02-06 00:00:29 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Rich Megginson

Created: 2007-02-06 00:00:29 UTC

Size: 3.66 KB

patch

obsolete

>Index: nspr.m4
>===================================================================
>RCS file: /cvs/dirsec/ldapserver/m4/nspr.m4,v
>retrieving revision 1.4
>diff -u -8 -r1.4 nspr.m4
>--- nspr.m4	2 Feb 2007 20:27:30 -0000	1.4
>+++ nspr.m4	5 Feb 2007 23:57:43 -0000
>@@ -74,20 +74,20 @@
> # last resort
> if test -z "$nspr_inc" -o -z "$nspr_lib" -o -z "$nspr_libdir"; then
>   AC_PATH_PROG(PKG_CONFIG, pkg-config)
>   AC_MSG_CHECKING(for nspr with 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/\ *$//`
>+      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/\ *$//`
>+      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.])
>     fi
>   fi
> fi
>Index: nss.m4
>===================================================================
>RCS file: /cvs/dirsec/ldapserver/m4/nss.m4,v
>retrieving revision 1.4
>diff -u -8 -r1.4 nss.m4
>--- nss.m4	2 Feb 2007 20:27:30 -0000	1.4
>+++ nss.m4	5 Feb 2007 23:57:43 -0000
>@@ -74,20 +74,20 @@
> # last resort
> if test -z "$nss_inc" -o -z "$nss_lib" -o -z "$nss_libdir"; then
>   AC_PATH_PROG(PKG_CONFIG, pkg-config)
>   AC_MSG_CHECKING(for nss with 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/\ *$//`
>+      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/\ *$//`
>+      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.])
>     fi
>   fi
> fi
>Index: mozldap.m4
>===================================================================
>RCS file: /cvs/dirsec/ldapserver/m4/mozldap.m4,v
>retrieving revision 1.7
>diff -u -8 -r1.7 mozldap.m4
>--- mozldap.m4	2 Feb 2007 20:27:30 -0000	1.7
>+++ mozldap.m4	5 Feb 2007 23:57:43 -0000
>@@ -81,17 +81,17 @@
> 	mozldappkg=mozldap6
>     elif $PKG_CONFIG --exists mozldap; then
> 	mozldappkg=mozldap
>     else
>       AC_MSG_ERROR([LDAPSDK not found, specify with --with-ldapsdk[-inc|-lib].])
>     fi
>     ldapsdk_inc=`$PKG_CONFIG --cflags-only-I $mozldappkg`
>     ldapsdk_lib=`$PKG_CONFIG --libs-only-L $mozldappkg`
>-    ldapsdk_libdir=`$PKG_CONFIG --libs-only-L $mozldappkg | sed -e s/-L// | sed -e s/\ *$//`
>+    ldapsdk_libdir=`$PKG_CONFIG --libs-only-L $mozldappkg | sed -e s/-L// | sed -e s/\ .*$//`
>     ldapsdk_bindir=`$PKG_CONFIG --variable=bindir $mozldappkg`
>     AC_MSG_RESULT([using system $mozldappkg])
>   fi
> fi
> if test -z "$ldapsdk_inc" -o -z "$ldapsdk_lib"; then
>   AC_MSG_ERROR([LDAPSDK not found, specify with --with-ldapsdk[-inc|-lib].])
> fi
> dnl default path for the ldap c sdk tools (see [210947] for more details)

Actions: View | Diff

Attachments on bug 227452: 147419 | 147420