Attachment 223541 Details for Bug 323381 – diffs

[patch] diffs

cvsdiffs (text/plain), 3.56 KB, created by Rich Megginson on 2007-10-10 23:10:43 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Rich Megginson

Created: 2007-10-10 23:10:43 UTC

Size: 3.56 KB

patch

obsolete

>Index: adminutil/Makefile.am
>===================================================================
>RCS file: /cvs/dirsec/adminutil/Makefile.am,v
>retrieving revision 1.8
>diff -u -8 -r1.8 Makefile.am
>--- adminutil/Makefile.am	2 Aug 2007 03:18:03 -0000	1.8
>+++ adminutil/Makefile.am	10 Oct 2007 23:09:33 -0000
>@@ -138,15 +138,15 @@
> 	lib/libadmsslutil/certmgt.c \
> 	lib/libadmsslutil/psetcssl.c \
> 	lib/libadmsslutil/secpwd.c \
> 	lib/libadmsslutil/srvutilssl.c \
> 	lib/libadmsslutil/sslerror.c \
> 	lib/libadmsslutil/uginfossl.c
> 
> libadmsslutil_la_CPPFLAGS = $(AM_CPPFLAGS) @nss_inc@ @nspr_inc@ @ldapsdk_inc@ @icu_inc@
>-libadmsslutil_la_LIBADD = libadminutil.la $(NSPR_LINK) $(NSS_LINK) $(LDAPSDK_LINK) $(SASL_LINK) $(ICU_LINK)
>+libadmsslutil_la_LIBADD = $(NSPR_LINK) $(NSS_LINK) $(LDAPSDK_LINK) $(SASL_LINK) $(ICU_LINK) libadminutil.la 
> libadmsslutil_la_LDFLAGS = -version-number $(subst .,:,$(PACKAGE_VERSION))
> if CXXLINK_REQUIRED
> libadmsslutil_la_LINK = $(CXXLINK)
> else
> libadmsslutil_la_LINK = $(LINK)
> endif
>Index: adminutil/configure.ac
>===================================================================
>RCS file: /cvs/dirsec/adminutil/configure.ac,v
>retrieving revision 1.8
>diff -u -8 -r1.8 configure.ac
>--- adminutil/configure.ac	2 Aug 2007 03:18:03 -0000	1.8
>+++ adminutil/configure.ac	10 Oct 2007 23:09:33 -0000
>@@ -101,16 +101,28 @@
>   AC_MSG_RESULT(yes)
> else
>   AC_MSG_RESULT(no)
> fi
> AM_CONDITIONAL(enable_tests,test "$enable_tests" = "yes")
> 
> AC_PREFIX_DEFAULT([/opt/$PACKAGE_NAME])
> 
>+# libtool automatically adds --rpath $libdir to each executable, and
>+# there is apparently no standard way to disable this.  Also, you cannot
>+# override rpath with LD_LIBRARY_PATH, so this causes problems if you have
>+# and old version of nss/nspr installed in the system $libdir, but you
>+# want to use a different one.  So we're disabling this rpath thing by
>+# default and adding a --enable-rpath flag if you really, really want
>+# to do this.
>+AC_MSG_CHECKING(for --enable-rpath)
>+enable_rpath=no
>+AC_ARG_ENABLE(rpath, AS_HELP_STRING([--enable-rpath], [Allow libtool to add an rpath to $libdir (default: $enable_rpath)]))
>+AC_MSG_RESULT($enable_rpath)
>+
> m4_include(m4/nspr.m4)
> m4_include(m4/nss.m4)
> m4_include(m4/mozldap.m4)
> if test "$enable_tests" = "yes" ; then
> m4_include(m4/sasl.m4)
> fi
> m4_include(m4/icu.m4)
> m4_include(m4/fhs.m4)
>@@ -144,12 +156,23 @@
> AC_SUBST(icu_lib)
> AC_SUBST(icu_libdir)
> AC_SUBST(icu_bin)
> 
> # WINNT should be true if building on Windows system not using
> # cygnus, mingw, or the like and using cmd.exe as the shell
> AM_CONDITIONAL([WINNT], false)
> 
>+if test "$enable_rpath" != "yes" ; then
>+   AC_MSG_NOTICE([Fixing libtool to remove automatic rpath to $libdir . . .])
>+   cp -p libtool libtool.orig
>+   cp -p libtool libtool.tmp
>+   sed -e '/^runpath_var/ d' \
>+       -e '/^hardcode_libdir_flag_spec/ d' \
>+       libtool > libtool.tmp
>+   cp -p libtool.tmp libtool
>+   rm -f libtool.tmp
>+fi
>+
> AC_CONFIG_FILES([Makefile adminutil.pc])
> AC_CONFIG_FILES([lib/libadminutil/genrb_wrapper])
> 
> AC_OUTPUT
>Index: adminutil/m4/fhs.m4
>===================================================================
>RCS file: /cvs/dirsec/adminutil/m4/fhs.m4,v
>retrieving revision 1.1
>diff -u -8 -r1.1 fhs.m4
>--- adminutil/m4/fhs.m4	4 Apr 2007 19:37:41 -0000	1.1
>+++ adminutil/m4/fhs.m4	10 Oct 2007 23:09:33 -0000
>@@ -20,15 +20,16 @@
> 
> AC_CHECKING(for FHS)
> 
> # check for --with-fhs
> AC_MSG_CHECKING(for --with-fhs)
> AC_ARG_WITH(fhs, [  --with-fhs   Use FHS layout],
> [
>   with_fhs=yes
>+  AC_MSG_RESULT(yes)
> ],
> AC_MSG_RESULT(no))
> 
> if test "$with_fhs" = "yes"; then
>   AC_DEFINE([IS_FHS], [1], [Use FHS layout])
> fi
>

Actions: View | Diff

Attachments on bug 323381: 219921 | 223541 | 223741