[Fedora-directory-commits] ldapserver/m4 nspr.m4, 1.3, 1.4 nss.m4, 1.3, 1.4 mozldap.m4, 1.6, 1.7 sasl.m4, 1.2, 1.3

[Doctor Conrad]

Author: rmeggins

Update of /cvs/dirsec/ldapserver/m4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15601/m4

Modified Files:
	nspr.m4 nss.m4 mozldap.m4 sasl.m4 
Log Message:
fix build problems on Solaris; minor m4 cleanup


Index: nspr.m4
===================================================================
RCS file: /cvs/dirsec/ldapserver/m4/nspr.m4,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- nspr.m4	24 Oct 2006 21:11:02 -0000	1.3
+++ nspr.m4	2 Feb 2007 20:27:30 -0000	1.4
@@ -1,5 +1,5 @@
 # BEGIN COPYRIGHT BLOCK
-# Copyright (C) 2006 Red Hat, Inc.
+# Copyright (C) 2007 Red Hat, Inc.
 # All rights reserved.
 #
 # This program is free software; you can redistribute it and/or
@@ -73,8 +73,8 @@
 
 # last resort
 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)
+  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`


Index: nss.m4
===================================================================
RCS file: /cvs/dirsec/ldapserver/m4/nss.m4,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- nss.m4	24 Oct 2006 21:11:02 -0000	1.3
+++ nss.m4	2 Feb 2007 20:27:30 -0000	1.4
@@ -1,5 +1,5 @@
 # BEGIN COPYRIGHT BLOCK
-# Copyright (C) 2006 Red Hat, Inc.
+# Copyright (C) 2007 Red Hat, Inc.
 # All rights reserved.
 #
 # This program is free software; you can redistribute it and/or
@@ -73,8 +73,8 @@
 
 # last resort
 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)
+  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`


Index: mozldap.m4
===================================================================
RCS file: /cvs/dirsec/ldapserver/m4/mozldap.m4,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- mozldap.m4	12 Jan 2007 16:18:15 -0000	1.6
+++ mozldap.m4	2 Feb 2007 20:27:30 -0000	1.7
@@ -1,5 +1,5 @@
 # BEGIN COPYRIGHT BLOCK
-# Copyright (C) 2006 Red Hat, Inc.
+# Copyright (C) 2007 Red Hat, Inc.
 # All rights reserved.
 #
 # This program is free software; you can redistribute it and/or
@@ -31,6 +31,7 @@
     ldapsdk_inc="-I$LDAPSDKDIR/include"
     ldapsdk_lib="-L$LDAPSDKDIR/lib"
     ldapsdk_libdir="$LDAPSDKDIR/lib"
+    ldapsdk_bindir="$LDAPSDKDIR/bin"
   else
     echo
     AC_MSG_ERROR([$withval not found])
@@ -73,8 +74,8 @@
 
 # last resort
 if test -z "$ldapsdk_inc" -o -z "$ldapsdk_lib" -o -z
"$ldapsdk_libdir" -o -z "$ldapsdk_bindir"; then
-  AC_MSG_CHECKING(for mozldap with pkg-config)
   AC_PATH_PROG(PKG_CONFIG, pkg-config)
+  AC_MSG_CHECKING(for mozldap with pkg-config)
   if test -n "$PKG_CONFIG"; then
     if $PKG_CONFIG --exists mozldap6; then
 	mozldappkg=mozldap6