[Fedora-directory-commits] ldapserver/m4 mozldap.m4,1.8,1.9

Richard Allen Megginson (rmeggins) fedora-directory-commits at redhat.com
Mon Jun 11 14:13:57 UTC 2007


Author: rmeggins

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

Modified Files:
	mozldap.m4 
Log Message:
Resolves: bug 243639
Description: --with-ldapsdk-bin required for configure argument
Fix Description: 
In m4/mozldap.m4, there is a code to check whether ldapsdk_bindir is specified,
but you can't specify it except for --with-ldapsdk argument or using pkg-config.
So using --with-ldapsdk-lib and --with-ldapsdk-inc requires the additional
argument '--with-ldapsdk-bin'.



Index: mozldap.m4
===================================================================
RCS file: /cvs/dirsec/ldapserver/m4/mozldap.m4,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- mozldap.m4	6 Feb 2007 15:51:22 -0000	1.8
+++ mozldap.m4	11 Jun 2007 14:13:54 -0000	1.9
@@ -70,6 +70,21 @@
 ],
 AC_MSG_RESULT(no))
 
+# check for --with-ldapsdk-bin
+AC_MSG_CHECKING(for --with-ldapsdk-bin)
+AC_ARG_WITH(ldapsdk-bin, [  --with-ldapsdk-bin=PATH     Mozilla LDAP SDK binary directory],
+[
+  if test -d "$withval"
+  then
+    AC_MSG_RESULT([using $withval])
+    ldapsdk_bindir="$withval"
+  else
+    echo
+    AC_MSG_ERROR([$withval not found])
+  fi
+],
+AC_MSG_RESULT(no))
+
 # if LDAPSDK is not found yet, try pkg-config
 
 # last resort
@@ -82,7 +97,7 @@
     elif $PKG_CONFIG --exists mozldap; then
 	mozldappkg=mozldap
     else
-      AC_MSG_ERROR([LDAPSDK not found, specify with --with-ldapsdk[-inc|-lib].])
+      AC_MSG_ERROR([LDAPSDK not found, specify with --with-ldapsdk[-inc|-lib|-bin].])
     fi
     ldapsdk_inc=`$PKG_CONFIG --cflags-only-I $mozldappkg`
     ldapsdk_lib=`$PKG_CONFIG --libs-only-L $mozldappkg`
@@ -92,7 +107,7 @@
   fi
 fi
 if test -z "$ldapsdk_inc" -o -z "$ldapsdk_lib"; then
-  AC_MSG_ERROR([LDAPSDK not found, specify with --with-ldapsdk[-inc|-lib].])
+  AC_MSG_ERROR([LDAPSDK not found, specify with --with-ldapsdk[-inc|-lib|-bin].])
 fi
 dnl default path for the ldap c sdk tools (see [210947] for more details)
 if test -z "$ldapsdk_bindir" ; then




More information about the Fedora-directory-commits mailing list