Attachment 145418 Details for Bug 222398 – diffs

[patch] diffs

cvsdiffs (text/plain), 6.94 KB, created by Rich Megginson on 2007-01-12 02:16:39 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Rich Megginson

Created: 2007-01-12 02:16:39 UTC

Size: 6.94 KB

patch

obsolete

>Index: ldapserver/Makefile.am
>===================================================================
>RCS file: /cvs/dirsec/ldapserver/Makefile.am,v
>retrieving revision 1.14
>diff -u -8 -r1.14 Makefile.am
>--- ldapserver/Makefile.am	16 Nov 2006 18:56:03 -0000	1.14
>+++ ldapserver/Makefile.am	12 Jan 2007 02:06:23 -0000
>@@ -25,18 +25,18 @@
> AM_CPPFLAGS = $(PLATFORM_DEFINES) $(DEBUG_DEFINES) $(DS_DEFINES) $(DS_INCLUDES) $(PATH_DEFINES)
> PLUGIN_CPPFLAGS = $(AM_CPPFLAGS) @ldapsdk_inc@ @nss_inc@ @nspr_inc@
> 
> #------------------------
> # Linker Flags
> #------------------------
> NSPR_LINK = @nspr_lib@ -lplc4 -lplds4 -lnspr4
> NSS_LINK = @nss_lib@ -lssl3 -lnss3 -lsoftokn3
>-LDAPSDK_LINK = @ldapsdk_lib@ -lssldap60 -lldap60 -lprldap60 -lldif60
>-DB_LINK = @db_lib@ -ldb-4.2
>+LDAPSDK_LINK = @ldapsdk_lib@ -lssldap60 -lprldap60 -lldap60 -lldif60
>+DB_LINK = @db_lib@ -ldb-@db_libver@
> SASL_LINK = @sasl_lib@ -lsasl2
> SVRCORE_LINK = @svrcore_lib@ -lsvrcore
> ICU_LINK = @icu_lib@ -licui18n -licuuc -licudata
> NETSNMP_LINK = @netsnmp_lib@ @netsnmp_link@
> PAM_LINK = -lpam
> 
> #------------------------
> # Generated Sources
>Index: ldapserver/configure.ac
>===================================================================
>RCS file: /cvs/dirsec/ldapserver/configure.ac,v
>retrieving revision 1.11
>diff -u -8 -r1.11 configure.ac
>--- ldapserver/configure.ac	15 Nov 2006 02:07:27 -0000	1.11
>+++ ldapserver/configure.ac	12 Jan 2007 02:06:23 -0000
>@@ -86,35 +86,43 @@
> AC_SUBST(ldapsdk_lib)
> AC_SUBST(ldapsdk_libdir)
> AC_SUBST(ldapsdk_bindir)
> AC_SUBST(db_inc)
> AC_SUBST(db_incdir)
> AC_SUBST(db_lib)
> AC_SUBST(db_libdir)
> AC_SUBST(db_bindir)
>+AC_SUBST(db_libver)
> AC_SUBST(sasl_inc)
> AC_SUBST(sasl_lib)
> AC_SUBST(sasl_libdir)
> AC_SUBST(svrcore_inc)
> AC_SUBST(svrcore_lib)
> AC_SUBST(icu_lib)
> AC_SUBST(icu_inc)
> AC_SUBST(icu_bin)
> AC_SUBST(netsnmp_inc)
> AC_SUBST(netsnmp_lib)
> AC_SUBST(netsnmp_libdir)
> AC_SUBST(netsnmp_link)
> 
>-# installation paths
>+# installation paths - by default, configure will just
>+# use /usr as the prefix for everything, which means
>+# /usr/etc and /usr/var.  FHS sez to use /etc and /var.
> if test "$with_fhs" = "yes"; then
>-  bindir=@prefix@/usr/bin
>-  libdir=@prefix@/usr/lib
>-  datadir=@prefix@/usr/share
>+  ac_default_prefix=/usr
>+  prefix=$ac_default_prefix
>+  exec_prefix=$prefix
>+dnl as opposed to the default /usr/etc
>+  sysconfdir='/etc'
>+dnl as opposed to the default /usr/var
>+  localstatedir='/var'
> fi
>+
> # relative to sysconfdir
> configdir=/fedora-ds/config
> # relative to datadir
> sampledatadir=/fedora-ds/data
> # relative to sysconfdir
> propertydir=/fedora-ds/property
> # relative to sysconfdir
> schemadir=/fedora-ds/schema
>Index: ldapserver/m4/db.m4
>===================================================================
>RCS file: /cvs/dirsec/ldapserver/m4/db.m4,v
>retrieving revision 1.3
>diff -u -8 -r1.3 db.m4
>--- ldapserver/m4/db.m4	25 Oct 2006 20:36:45 -0000	1.3
>+++ ldapserver/m4/db.m4	12 Jan 2007 02:06:23 -0000
>@@ -60,8 +60,18 @@
>     AC_MSG_RESULT([using /usr/include/db.h])
>     db_incdir="/usr/include"
>     db_inc="-I/usr/include"
>   else
>     AC_MSG_RESULT(no)
>     AC_MSG_ERROR([db not found, specify with --with-db.])
>   fi
> fi
>+dnl figure out which version of db we're using from the header file
>+db_ver_maj=`grep DB_VERSION_MAJOR $db_incdir/db.h | awk '{print $3}'`
>+db_ver_min=`grep DB_VERSION_MINOR $db_incdir/db.h | awk '{print $3}'`
>+db_ver_pat=`grep DB_VERSION_PATCH $db_incdir/db.h | awk '{print $3}'`
>+dnl libname is libdb-maj.min e.g. libdb-4.2
>+db_libver=${db_ver_maj}.${db_ver_min}
>+dnl make sure the lib is available
>+AC_CHECK_LIB([db-$db_libver], [db_create], [],
>+  [AC_MSG_ERROR([$db_incdir/db.h is version $db_libver but libdb-$db_libver not found])])
>+
>Index: ldapserver/m4/mozldap.m4
>===================================================================
>RCS file: /cvs/dirsec/ldapserver/m4/mozldap.m4,v
>retrieving revision 1.5
>diff -u -8 -r1.5 mozldap.m4
>--- ldapserver/m4/mozldap.m4	22 Nov 2006 03:00:30 -0000	1.5
>+++ ldapserver/m4/mozldap.m4	12 Jan 2007 02:06:23 -0000
>@@ -72,32 +72,39 @@
> # if LDAPSDK is not found yet, try pkg-config
> 
> # 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)
>   if test -n "$PKG_CONFIG"; then
>     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_bindir=`$PKG_CONFIG --variable=bindir mozldap6`
>-      AC_MSG_RESULT([using system mozldap6])
>+	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_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)
> if test -z "$ldapsdk_bindir" ; then
>-  ldapsdk_bindir=$libdir/mozldap6
>+  if [ -d $libdir/mozldap6 ] ; then
>+    ldapsdk_bindir=$libdir/mozldap6
>+  else
>+    ldapsdk_bindir=$libdir/mozldap
>+  fi
> 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=],
>Index: ldapserver/m4/svrcore.m4
>===================================================================
>RCS file: /cvs/dirsec/ldapserver/m4/svrcore.m4,v
>retrieving revision 1.2
>diff -u -8 -r1.2 svrcore.m4
>--- ldapserver/m4/svrcore.m4	19 Oct 2006 16:53:05 -0000	1.2
>+++ ldapserver/m4/svrcore.m4	12 Jan 2007 02:06:23 -0000
>@@ -63,19 +63,19 @@
>     ],
>     AC_MSG_RESULT(no))
> 
> dnl svrcore not given - look for pkg-config
> if test -z "$svrcore_inc" -o -z "$svrcore_lib"; then
>   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`
>+    if $PKG_CONFIG --exists svrcore; then
>+      svrcore_inc=`$PKG_CONFIG --cflags-only-I svrcore`
>+      svrcore_lib=`$PKG_CONFIG --libs-only-L svrcore`
>       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],

Actions: View | Diff

Attachments on bug 222398: 145417 | 145418 | 145461