Attachment 148375 Details for Bug 229286 – diffs

[patch] diffs

cvsdiffs (text/plain), 5.29 KB, created by Rich Megginson on 2007-02-19 22:57:48 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Rich Megginson

Created: 2007-02-19 22:57:48 UTC

Size: 5.29 KB

patch

obsolete

>Index: ldapserver/Makefile.am
>===================================================================
>RCS file: /cvs/dirsec/ldapserver/Makefile.am,v
>retrieving revision 1.26
>diff -u -8 -r1.26 Makefile.am
>--- ldapserver/Makefile.am	16 Feb 2007 23:25:06 -0000	1.26
>+++ ldapserver/Makefile.am	19 Feb 2007 22:56:40 -0000
>@@ -41,16 +41,18 @@
> 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@
>+LIBCSTD=@LIBCSTD@
>+LIBCRUN=@LIBCRUN@
> 
> #------------------------
> # Generated Sources
> #------------------------
> BUILT_SOURCES = dirver.h dberrstrs.h
> 
> CLEANFILES =  dirver.h dberrstrs.h ns-slapd.properties
> 
>@@ -490,18 +492,19 @@
> 	ldap/servers/plugins/acl/acllas.c \
> 	ldap/servers/plugins/acl/acllist.c \
> 	ldap/servers/plugins/acl/aclparse.c \
> 	ldap/servers/plugins/acl/aclplugin.c \
> 	ldap/servers/plugins/acl/aclproxy.c \
> 	ldap/servers/plugins/acl/aclutil.c
> 
> libacl_plugin_la_CPPFLAGS = -I$(srcdir)/include/libaccess $(PLUGIN_CPPFLAGS)
>-libacl_plugin_la_LIBADD = libns-dshttpd.la
>+libacl_plugin_la_LIBADD = libns-dshttpd.la $(LIBCSTD) $(LIBCRUN)
> libacl_plugin_la_LDFLAGS = -avoid-version
>+libacl_plugin_la_LINK = $(CXXLINK)
> 
> #------------------------
> # libattr-unique-plugin
> #------------------------
> libattr_unique_plugin_la_SOURCES = ldap/servers/plugins/uiduniq/7bit.c \
> 	ldap/servers/plugins/uiduniq/uid.c \
> 	ldap/servers/plugins/shared/utils.c
> 
>@@ -578,18 +581,19 @@
> #------------------------
> # libcollation-plugin
> #------------------------
> libcollation_plugin_la_SOURCES = ldap/servers/plugins/collation/collate.c \
> 	ldap/servers/plugins/collation/config.c \
> 	ldap/servers/plugins/collation/orfilter.c
> 
> libcollation_plugin_la_CPPFLAGS = @icu_inc@ $(PLUGIN_CPPFLAGS)
>-libcollation_plugin_la_LIBADD = $(ICU_LINK)
>+libcollation_plugin_la_LIBADD = $(ICU_LINK) $(LIBCSTD) $(LIBCRUN)
> libcollation_plugin_la_LDFLAGS = -avoid-version
>+libcollation_plugin_la_LINK = $(CXXLINK)
> 
> #------------------------
> # libpam-passthru-plugin
> #------------------------
> libpam_passthru_plugin_la_SOURCES = ldap/servers/plugins/pam_passthru/pam_ptconfig.c \
> 	ldap/servers/plugins/pam_passthru/pam_ptdebug.c \
> 	ldap/servers/plugins/pam_passthru/pam_ptimpl.c \
> 	ldap/servers/plugins/pam_passthru/pam_ptpreop.c
>Index: ldapserver/configure.ac
>===================================================================
>RCS file: /cvs/dirsec/ldapserver/configure.ac,v
>retrieving revision 1.20
>diff -u -8 -r1.20 configure.ac
>--- ldapserver/configure.ac	16 Feb 2007 23:25:06 -0000	1.20
>+++ ldapserver/configure.ac	19 Feb 2007 22:56:40 -0000
>@@ -8,16 +8,18 @@
> AM_INIT_AUTOMAKE([1.9 foreign subdir-objects])
> AM_MAINTAINER_MODE
> AC_CANONICAL_HOST
> 
> # Checks for programs.
> AC_PROG_CXX
> AC_PROG_CC
> AM_PROG_CC_C_O
>+# disable static libs by default - we only use a couple
>+AC_DISABLE_STATIC
> AC_PROG_LIBTOOL
> 
> # Checks for header files.
> AC_HEADER_DIRENT
> AC_HEADER_STDC
> AC_HEADER_SYS_WAIT
> AC_CHECK_HEADERS([arpa/inet.h fcntl.h malloc.h netdb.h netinet/in.h stdlib.h string.h strings.h sys/file.h sys/socket.h sys/time.h unistd.h])
> 
>@@ -180,22 +182,28 @@
>     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])
>+dnl socket nsl and dl are required to link several programs and libdb
>     LIBSOCKET=-lsocket
>     AC_SUBST([LIBSOCKET], [$LIBSOCKET])
>     LIBNSL=-lnsl
>     AC_SUBST([LIBNSL], [$LIBNSL])
>     LIBDL=-ldl
>     AC_SUBST([LIBDL], [$LIBDL])
>+dnl Cstd and Crun are required to link any C++ related code
>+    LIBCSTD=-lCstd
>+    AC_SUBST([LIBCSTD], [$LIBCSTD])
>+    LIBCRUN=-lCrun
>+    AC_SUBST([LIBCRUN], [$LIBCRUN])
>     platform="solaris"
>     # relative to sysconfdir
>     initdir=/init.d
>     ;;
>   *)
>     platform=""
>     ;;
> esac
>@@ -242,11 +250,33 @@
> 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])
> 
>+
>+# libtool on fedora/rhel contains some gcc-isms which cause problems
>+# if not using gcc (e.g. Forte on Solaris, aCC on HP-UX)
>+# we remove them here
>+if test "$GCC" != yes ; then
>+   AC_MSG_NOTICE([Not using gcc - fixing libtool to remove gcc-isms . . .])
>+   cp -p libtool libtool.orig
>+   cp -p libtool libtool.tmp
>+   # dnl note the special chars @<:@ and @:>@ - since m4 treats [ and ] specially,
>+   # we have to use the quadrigraph @<:@ for [ and @:>@ for ] - and you thought
>+   # perl produced write-only code . . .
>+   sed -e '/^gcc_dir/ d' \
>+       -e '/^gcc_ver/ d' \
>+       -e 's/^predep_objects=.*echo $"@<:@^"@:>@*"$.*$/predep_objects=\1/' \
>+       -e 's/^postdep_objects=.*echo $"@<:@^"@:>@*"$.*$/postdep_objects=\1/' \
>+       -e 's/^compiler_lib_search_path=.*echo $"@<:@^"@:>@*"$.*$/compiler_lib_search_path=\1/' \
>+       -e 's/^sys_lib_search_path_spec=.*echo $"@<:@^"@:>@*"$.*$/sys_lib_search_path_spec=\1/' \
>+       libtool > libtool.tmp
>+   cp -p libtool.tmp libtool
>+   rm -f libtool.tmp
>+fi
>+
> AC_CONFIG_FILES([Makefile])
> 
> AC_OUTPUT

Actions: View | Diff

Attachments on bug 229286: 148375 | 148378