Attachment 147419 Details for Bug 227452 – diffs

[patch] diffs

cvsdiffs (text/plain), 9.74 KB, created by Rich Megginson on 2007-02-05 23:45:35 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Rich Megginson

Created: 2007-02-05 23:45:35 UTC

Size: 9.74 KB

patch

obsolete

>Index: ldapserver/Makefile.am
>===================================================================
>RCS file: /cvs/dirsec/ldapserver/Makefile.am,v
>retrieving revision 1.19
>diff -u -8 -r1.19 Makefile.am
>--- ldapserver/Makefile.am	2 Feb 2007 20:27:29 -0000	1.19
>+++ ldapserver/Makefile.am	5 Feb 2007 23:38:31 -0000
>@@ -32,16 +32,20 @@
> 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
> 
>+LIBSOCKET=@LIBSOCKET@
>+LIBNSL=@LIBNSL@
>+LIBDL=@LIBDL@
>+
> #------------------------
> # Generated Sources
> #------------------------
> BUILT_SOURCES = dirver.h dberrstrs.h
> 
> CLEANFILES =  dirver.h dberrstrs.h ns-slapd.properties
> 
> dirver.h: Makefile
>@@ -675,17 +679,17 @@
> 	ldap/servers/plugins/replication/urp_glue.c \
> 	ldap/servers/plugins/replication/urp_tombstone.c \
> 	ldap/servers/plugins/replication/windows_connection.c \
> 	ldap/servers/plugins/replication/windows_inc_protocol.c \
> 	ldap/servers/plugins/replication/windows_private.c \
> 	ldap/servers/plugins/replication/windows_protocol_util.c \
> 	ldap/servers/plugins/replication/windows_tot_protocol.c
> 
>-libreplication_plugin_la_CPPFLAGS = @icu_inc@ @db_inc@ $(PLUGIN_CPPFLAGS)
>+libreplication_plugin_la_CPPFLAGS = $(PLUGIN_CPPFLAGS) @icu_inc@ @db_inc@
> libreplication_plugin_la_LIBADD = $(ICU_LINK) $(DB_LINK)
> 
> #------------------------
> # libretrocl-plugin
> #------------------------
> libretrocl_plugin_la_SOURCES = ldap/servers/plugins/retrocl/retrocl.c \
> 	ldap/servers/plugins/retrocl/retrocl_cn.c \
> 	ldap/servers/plugins/retrocl/retrocl_create.c \
>@@ -759,33 +763,33 @@
> # ds_newinst
> #------------------------
> ds_newinst_bin_SOURCES = ldap/admin/src/cfg_sspt.c \
> 	ldap/admin/src/create_instance.c \
> 	ldap/admin/src/ds_newinst.c \
> 	ldap/admin/src/script-gen.c
> 
> ds_newinst_bin_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/ldap/admin/include @ldapsdk_inc@ @nss_inc@ @nspr_inc@
>-ds_newinst_bin_LDADD = libds_admin.la $(NSPR_LINK) $(NSS_LINK) $(LDAPSDK_LINK) $(SASL_LINK)
>+ds_newinst_bin_LDADD = libds_admin.la $(NSPR_LINK) $(NSS_LINK) $(LDAPSDK_LINK) $(SASL_LINK) $(LIBNSL) $(LIBSOCKET)
> 
> #------------------------
> # dsktune
> #------------------------
> dsktune_bin_SOURCES = ldap/systools/idsktune.c \
> 	ldap/systools/pio.c
> 
> #------------------------
> # infadd
> #------------------------
> infadd_bin_SOURCES = ldap/servers/slapd/tools/rsearch/addthread.c \
> 	ldap/servers/slapd/tools/rsearch/infadd.c \
> 	ldap/servers/slapd/tools/rsearch/nametable.c
> 
> infadd_bin_CPPFLAGS = $(AM_CPPFLAGS) @ldapsdk_inc@ @nss_inc@ @nspr_inc@
>-infadd_bin_LDADD = $(NSPR_LINK) $(NSS_LINK) $(LDAPSDK_LINK) $(SASL_LINK)
>+infadd_bin_LDADD = $(NSPR_LINK) $(NSS_LINK) $(LDAPSDK_LINK) $(SASL_LINK) $(LIBSOCKET)
> 
> #------------------------
> # ldap-agent
> #------------------------
> ldap_agent_bin_SOURCES = ldap/servers/snmp/main.c \
> 	ldap/servers/snmp/ldap-agent.c \
> 	ldap/servers/slapd/agtmmap.c
> 
>@@ -807,17 +811,17 @@
> 	ldap/servers/slapd/tools/ldclt/version.c \
> 	ldap/servers/slapd/tools/ldclt/workarounds.c
> 
> if SOLARIS
> ldclt_bin_SOURCES += ldap/servers/slapd/tools/ldclt/opCheck.c
> endif
> 
> ldclt_bin_CPPFLAGS = $(AM_CPPFLAGS) @ldapsdk_inc@ @nss_inc@ @nspr_inc@
>-ldclt_bin_LDADD = $(NSPR_LINK) $(NSS_LINK) $(LDAPSDK_LINK) $(SASL_LINK)
>+ldclt_bin_LDADD = $(NSPR_LINK) $(NSS_LINK) $(LDAPSDK_LINK) $(SASL_LINK) $(LIBNSL) $(LIBSOCKET) $(LIBDL)
> 
> #------------------------
> # ldif
> #------------------------
> ldif_bin_SOURCES = ldap/servers/slapd/tools/ldif.c
> 
> ldif_bin_CPPFLAGS = $(AM_CPPFLAGS) @ldapsdk_inc@ @nss_inc@ @nspr_inc@
> ldif_bin_LDADD = $(NSPR_LINK) $(NSS_LINK) $(LDAPSDK_LINK) $(SASL_LINK)
>@@ -873,17 +877,17 @@
> 	ldap/servers/slapd/strdup.c \
> 	ldap/servers/slapd/stubs.c \
> 	ldap/servers/slapd/tempnam.c  \
> 	ldap/servers/slapd/unbind.c
> 
> ns_slapd_CPPFLAGS = $(AM_CPPFLAGS) @sasl_inc@ @ldapsdk_inc@ @nss_inc@ \
> 	@nspr_inc@ @svrcore_inc@
> ns_slapd_LDADD = libslapd.la libldaputil.a $(LDAPSDK_LINK) $(NSS_LINK) \
>-	$(NSPR_LINK) $(SASL_LINK) $(SVRCORE_LINK)
>+	$(NSPR_LINK) $(SASL_LINK) $(SVRCORE_LINK) $(LIBNSL) $(LIBSOCKET)
> 
> #------------------------
> # pwdhash
> #------------------------
> pwdhash_bin_SOURCES = ldap/servers/slapd/tools/pwenc.c
> 
> pwdhash_bin_CPPFLAGS = $(AM_CPPFLAGS) @ldapsdk_inc@ @nss_inc@ @nspr_inc@
> pwdhash_bin_LDADD = libslapd.la $(NSPR_LINK) $(NSS_LINK) $(SVRCORE_LINK) $(LDAPSDK_LINK) $(SASL_LINK)
>@@ -892,17 +896,17 @@
> # rsearch
> #------------------------
> rsearch_bin_SOURCES = ldap/servers/slapd/tools/rsearch/nametable.c \
> 	ldap/servers/slapd/tools/rsearch/rsearch.c \
> 	ldap/servers/slapd/tools/rsearch/sdattable.c \
> 	ldap/servers/slapd/tools/rsearch/searchthread.c
> 
> rsearch_bin_CPPFLAGS = $(AM_CPPFLAGS) @ldapsdk_inc@ @nss_inc@ @nspr_inc@
>-rsearch_bin_LDADD = $(NSPR_LINK) $(NSS_LINK) $(LDAPSDK_LINK) $(SASL_LINK)
>+rsearch_bin_LDADD = $(NSPR_LINK) $(NSS_LINK) $(LDAPSDK_LINK) $(SASL_LINK) $(LIBSOCKET)
> 
> # these are for the config files and scripts that we need to generate and replace
> # the paths and other tokens with the real values set during configure/make
> # note that we cannot just use AC_OUTPUT to do this for us, since it will do things like this:
> # LD_LIBRARY_PATH = ${prefix}/lib/fedora-ds
> # i.e. it literally copies in '${prefix}' rather than expanding it out - we want this instead:
> # LD_LIBRARY_PATH = /usr/lib/fedora-ds
> fixupcmd = sed \
>Index: ldapserver/configure.ac
>===================================================================
>RCS file: /cvs/dirsec/ldapserver/configure.ac,v
>retrieving revision 1.14
>diff -u -8 -r1.14 configure.ac
>--- ldapserver/configure.ac	2 Feb 2007 20:27:29 -0000	1.14
>+++ ldapserver/configure.ac	5 Feb 2007 23:38:31 -0000
>@@ -56,57 +56,16 @@
> [
>   AC_MSG_RESULT(no)
>   debug_defs=""
> ])
> AC_SUBST([debug_defs])
> 
> AC_PREFIX_DEFAULT([/opt/fedora-ds])
> 
>-# Check for library dependencies
>-m4_include(m4/nspr.m4)
>-m4_include(m4/nss.m4)
>-m4_include(m4/mozldap.m4)
>-m4_include(m4/db.m4)
>-m4_include(m4/sasl.m4)
>-m4_include(m4/svrcore.m4)
>-m4_include(m4/icu.m4)
>-m4_include(m4/netsnmp.m4)
>-m4_include(m4/fhs.m4)
>-
>-# write out paths for binary components
>-AC_SUBST(nspr_inc)
>-AC_SUBST(nspr_lib)
>-AC_SUBST(nspr_libdir)
>-AC_SUBST(nss_inc)
>-AC_SUBST(nss_lib)
>-AC_SUBST(nss_libdir)
>-AC_SUBST(ldapsdk_inc)
>-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 - 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
>   ac_default_prefix=/usr
>   prefix=$ac_default_prefix
>   exec_prefix=$prefix
> dnl as opposed to the default /usr/etc
>@@ -179,23 +138,70 @@
>     AC_DEFINE([__svr4__], [1], [SVR4])
>     AC_DEFINE([_SVID_GETTOD], [1], [SVID_GETTOD])
>     AC_DEFINE([SOLARIS], [1], [SOLARIS])
>     AC_DEFINE([CPU_sparc], [], [cpu type sparc])
>     AC_DEFINE([OS_solaris], [1], [OS SOLARIS])
>     AC_DEFINE([sunos5], [1], [SunOS5])
>     AC_DEFINE([OSVERSION], [509], [OS version])
>     AC_DEFINE([_REENTRANT], [1], [_REENTRANT])
>+    LIBSOCKET=-lsocket
>+    AC_SUBST([LIBSOCKET], [$LIBSOCKET])
>+    LIBNSL=-lnsl
>+    AC_SUBST([LIBNSL], [$LIBNSL])
>+    LIBDL=-ldl
>+    AC_SUBST([LIBDL], [$LIBDL])
>     platform="solaris"
>     ;;
>   *)
>     platform=""
>     ;;
> esac
> 
> AM_CONDITIONAL(SOLARIS,test "$platform" = "solaris")
> 
>+# Check for library dependencies
>+m4_include(m4/nspr.m4)
>+m4_include(m4/nss.m4)
>+m4_include(m4/mozldap.m4)
>+m4_include(m4/db.m4)
>+m4_include(m4/sasl.m4)
>+m4_include(m4/svrcore.m4)
>+m4_include(m4/icu.m4)
>+m4_include(m4/netsnmp.m4)
>+m4_include(m4/fhs.m4)
>+
>+# write out paths for binary components
>+AC_SUBST(nspr_inc)
>+AC_SUBST(nspr_lib)
>+AC_SUBST(nspr_libdir)
>+AC_SUBST(nss_inc)
>+AC_SUBST(nss_lib)
>+AC_SUBST(nss_libdir)
>+AC_SUBST(ldapsdk_inc)
>+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)
>+
> AC_DEFINE([LDAP_DEBUG], [1], [LDAP debug flag])
> AC_DEFINE([LDAP_DONT_USE_SMARTHEAP], [1], [Don't use smartheap])
> 
> AC_CONFIG_FILES([Makefile])
> 
> AC_OUTPUT
>Index: ldapserver/m4/db.m4
>===================================================================
>RCS file: /cvs/dirsec/ldapserver/m4/db.m4,v
>retrieving revision 1.4
>diff -u -8 -r1.4 db.m4
>--- ldapserver/m4/db.m4	12 Jan 2007 16:18:15 -0000	1.4
>+++ ldapserver/m4/db.m4	5 Feb 2007 23:38:31 -0000
>@@ -67,11 +67,13 @@
> 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])])
>+dnl use true so libdb won't be added to LIBS
>+AC_CHECK_LIB([db-$db_libver], [db_create], [true],
>+  [AC_MSG_ERROR([$db_incdir/db.h is version $db_libver but libdb-$db_libver not found])],
>+  [$LIBNSL])
>

Actions: View | Diff

Attachments on bug 227452: 147419 | 147420