[Fedora-directory-commits] ldapserver/m4 mozldap.m4, 1.1, 1.2 nspr.m4, 1.1, 1.2 nss.m4, 1.1, 1.2 svrcore.m4, 1.1, 1.2
Richard Allen Megginson (rmeggins)
fedora-directory-commits at redhat.com
Thu Oct 19 16:53:12 UTC 2006
- Previous message (by thread): [Fedora-directory-commits] ldapserver configure,1.2,1.3
- Next message (by thread): [Fedora-directory-commits] mod_nss mod_nss.c, 1.14, 1.15 mod_nss.h, 1.16, 1.17 nss_engine_config.c, 1.13, 1.14 nss_engine_init.c, 1.24, 1.25 nss.conf.in, 1.9, 1.10
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: rmeggins
Update of /cvs/dirsec/ldapserver/m4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10279/m4
Modified Files:
mozldap.m4 nspr.m4 nss.m4 svrcore.m4
Log Message:
Bug(s) fixed: 211426
Bug Description: autotools: support dirsec packages, mozldap6, svrcore
Reviewed by: nkinder (Thanks!)
Fix Description: Look for the dirsec-nspr and dirsec-nss if nspr and nss
are not found in pkg-config. Look for mozldap6 then mozldap in
pkg-config. Look for svrcore-devel in pkg-config, then look for it in
the system directories.
Nathan pointed out that we do not support mozldap v5.x anymore, so we should just look for mozldap6 with pkg-config. I also added an explicit check of the vendor version in the header file to make sure we are using 600 or greater.
Platforms tested: RHEL4
Flag Day: no
Doc impact: no
Index: mozldap.m4
===================================================================
RCS file: /cvs/dirsec/ldapserver/m4/mozldap.m4,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mozldap.m4 17 Oct 2006 17:07:14 -0000 1.1
+++ mozldap.m4 19 Oct 2006 16:53:05 -0000 1.2
@@ -74,9 +74,10 @@
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 mozldap; then
- nspr_inc=`$PKG_CONFIG --cflags-only-I mozldap`
- nspr_lib=`$PKG_CONFIG --libs-only-L mozldap`
+ if $PKG_CONFIG --exists mozldap6; then
+ ldapsdk_inc=`$PKG_CONFIG --cflags-only-I mozldap6`
+ ldapsdk_lib=`$PKG_CONFIG --libs-only-L mozldap6`
+ AC_MSG_RESULT([using system mozldap6])
else
AC_MSG_ERROR([LDAPSDK not found, specify with --with-ldapsdk[-inc|-lib].])
fi
@@ -85,3 +86,19 @@
if test -z "$ldapsdk_inc" -o -z "$ldapsdk_lib"; then
AC_MSG_ERROR([LDAPSDK not found, specify with --with-ldapsdk[-inc|-lib].])
fi
+dnl make sure the ldap sdk version is 6 or greater - we do not support
+dnl the old 5.x or prior versions - the ldap server code expects the new
+dnl ber types and other code used with version 6
+save_cppflags="$CPPFLAGS"
+CPPFLAGS="$ldapsdk_inc $nss_inc $nspr_inc"
+AC_CHECK_HEADER([ldap.h], [isversion6=1], [isversion6=],
+[#include <ldap-standard.h>
+#if LDAP_VENDOR_VERSION < 600
+#error The LDAP C SDK version is not supported
+#endif
+])
+CPPFLAGS="$save_cppflags"
+
+if test -z "$isversion6" ; then
+ AC_MSG_ERROR([The LDAPSDK version in $ldapsdk_inc/ldap-standard.h is not supported])
+fi
Index: nspr.m4
===================================================================
RCS file: /cvs/dirsec/ldapserver/m4/nspr.m4,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nspr.m4 17 Oct 2006 17:07:14 -0000 1.1
+++ nspr.m4 19 Oct 2006 16:53:05 -0000 1.2
@@ -78,6 +78,10 @@
nspr_inc=`$PKG_CONFIG --cflags-only-I nspr`
nspr_lib=`$PKG_CONFIG --libs-only-L nspr`
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`
+ AC_MSG_RESULT([using system dirsec NSPR])
else
AC_MSG_ERROR([NSPR not found, specify with --with-nspr.])
fi
Index: nss.m4
===================================================================
RCS file: /cvs/dirsec/ldapserver/m4/nss.m4,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nss.m4 17 Oct 2006 17:07:14 -0000 1.1
+++ nss.m4 19 Oct 2006 16:53:05 -0000 1.2
@@ -78,6 +78,10 @@
nss_inc=`$PKG_CONFIG --cflags-only-I nss`
nss_lib=`$PKG_CONFIG --libs-only-L nss`
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`
+ AC_MSG_RESULT([using system dirsec NSS])
else
AC_MSG_ERROR([NSS not found, specify with --with-nss.])
fi
Index: svrcore.m4
===================================================================
RCS file: /cvs/dirsec/ldapserver/m4/svrcore.m4,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- svrcore.m4 17 Oct 2006 17:07:14 -0000 1.1
+++ svrcore.m4 19 Oct 2006 16:53:05 -0000 1.2
@@ -63,6 +63,32 @@
],
AC_MSG_RESULT(no))
+dnl svrcore not given - look for pkg-config
if test -z "$svrcore_inc" -o -z "$svrcore_lib"; then
- AC_MSG_ERROR([svrcore not found, specify with --with-svrcore.])
+ AC_MSG_CHECKING(for svrcore with pkg-config)
+ AC_PATH_PROG(PKG_CONFIG, pkg-config)
+ if test -n "$PKG_CONFIG"; then
+ if $PKG_CONFIG --exists svrcore-devel; then
+ svrcore_inc=`$PKG_CONFIG --cflags-only-I svrcore-devel`
+ svrcore_lib=`$PKG_CONFIG --libs-only-L svrcore-devel`
+ AC_MSG_RESULT([using system svrcore])
+ fi
+ fi
+fi
+
+if test -z "$svrcore_inc" -o -z "$svrcore_lib"; then
+dnl just see if svrcore is already a system library
+ AC_CHECK_LIB([svrcore], [SVRCORE_GetRegisteredPinObj], [havesvrcore=1],
+ [], [$nss_inc $nspr_inc $nss_lib -lnss3 -lsoftokn3 $nspr_lib -lplds4 -lplc4 -lnspr4])
+ if test -n "$havesvrcore" ; then
+dnl just see if svrcore is already a system header file
+ save_cppflags="$CPPFLAGS"
+ CPPFLAGS="$nss_inc $nspr_inc"
+ AC_CHECK_HEADER([svrcore.h], [havesvrcore=1], [havesvrcore=])
+ CPPFLAGS="$save_cppflags"
+ fi
+dnl for svrcore to be present, both the library and the header must exist
+ if test -z "$havesvrcore" ; then
+ AC_MSG_ERROR([svrcore not found, specify with --with-svrcore.])
+ fi
fi
- Previous message (by thread): [Fedora-directory-commits] ldapserver configure,1.2,1.3
- Next message (by thread): [Fedora-directory-commits] mod_nss mod_nss.c, 1.14, 1.15 mod_nss.h, 1.16, 1.17 nss_engine_config.c, 1.13, 1.14 nss_engine_init.c, 1.24, 1.25 nss.conf.in, 1.9, 1.10
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Fedora-directory-commits
mailing list