[Fedora-directory-commits] adminutil Makefile.am, 1.8, 1.9 configure.ac, 1.8, 1.9 aclocal.m4, 1.11, 1.12 configure, 1.11, 1.12 missing, 1.10, 1.11 install-sh, 1.10, 1.11 depcomp, 1.10, 1.11 compile, 1.10, 1.11 Makefile.in, 1.11, 1.12 config.sub, 1.10, 1.11 config.guess, 1.10, 1.11
Richard Allen Megginson (rmeggins)
fedora-directory-commits at redhat.com
Thu Oct 11 02:32:46 UTC 2007
- Previous message (by thread): [Fedora-directory-commits] adminutil/m4 fhs.m4,1.1,1.2
- Next message (by thread): [Fedora-directory-commits] adminutil configure.ac, 1.9, 1.10 aclocal.m4, 1.12, 1.13 configure, 1.12, 1.13 missing, 1.11, 1.12 install-sh, 1.11, 1.12 depcomp, 1.11, 1.12 config.sub, 1.11, 1.12 config.guess, 1.11, 1.12 compile, 1.11, 1.12 Makefile.in, 1.12, 1.13
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: rmeggins
Update of /cvs/dirsec/adminutil
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22701/adminutil
Modified Files:
Makefile.am configure.ac aclocal.m4 configure missing
install-sh depcomp compile Makefile.in config.sub config.guess
Log Message:
Resolves: bug 323381
Bug Description: Solaris: setup-ds-admin.pl fails due to extra ICU links
Reviewed by: nhosoi (Thanks!)
Fix Description: The problem is that when we link against libadminutil.la, libtool adds more -L paths to the link line, and in this case, it adds the path where libadminutil will be installed, which is /usr/lib/sparcv9. There appears to be no way to fix libtool. So the solution is to just use NSPR_LINK as the first link item and move libadminutil.la to the end. This will make sure that the path to nspr will always be first, which will either be $libdir/dirsec or $libdir. On the platforms where it is $libdir/dirsec, the correct version of ICU will either be in that directory, so it will link against that one first, or it will be installed in libdir, in which case it will be found.
Platforms tested: Solaris 9 64-bit
Flag Day: no
Doc impact: no
QA impact: should be covered by regular nightly and manual testing
New Tests integrated into TET: none
Index: Makefile.am
===================================================================
RCS file: /cvs/dirsec/adminutil/Makefile.am,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Makefile.am 2 Aug 2007 03:18:03 -0000 1.8
+++ Makefile.am 11 Oct 2007 02:32:43 -0000 1.9
@@ -143,7 +143,7 @@
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)
Index: configure.ac
===================================================================
RCS file: /cvs/dirsec/adminutil/configure.ac,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- configure.ac 2 Aug 2007 03:18:03 -0000 1.8
+++ configure.ac 11 Oct 2007 02:32:43 -0000 1.9
@@ -106,6 +106,18 @@
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)
@@ -149,6 +161,17 @@
# 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])
Index: configure
===================================================================
RCS file: /cvs/dirsec/adminutil/configure,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- configure 2 Aug 2007 03:18:03 -0000 1.11
+++ configure 11 Oct 2007 02:32:43 -0000 1.12
@@ -1040,6 +1040,8 @@
--disable-libtool-lock avoid locking (might break parallel builds)
--enable-debug Enable debug features
--enable-tests Enable tests to be built (default: yes)
+ --enable-rpath Allow libtool to add an rpath to $libdir (default:
+ $enable_rpath)
Optional Packages:
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
@@ -4286,7 +4288,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 4289 "configure"' > conftest.$ac_ext
+ echo '#line 4291 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -5421,7 +5423,7 @@
# Provide some information about the compiler.
-echo "$as_me:5424:" \
+echo "$as_me:5426:" \
"checking for Fortran 77 compiler version" >&5
ac_compiler=`set X $ac_compile; echo $2`
{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
@@ -6484,11 +6486,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:6487: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:6489: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:6491: \$? = $ac_status" >&5
+ echo "$as_me:6493: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -6752,11 +6754,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:6755: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:6757: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:6759: \$? = $ac_status" >&5
+ echo "$as_me:6761: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -6856,11 +6858,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:6859: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:6861: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:6863: \$? = $ac_status" >&5
+ echo "$as_me:6865: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -8325,7 +8327,7 @@
libsuff=
case "$host_cpu" in
x86_64*|s390x*|powerpc64*)
- echo '#line 8328 "configure"' > conftest.$ac_ext
+ echo '#line 8330 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -9222,7 +9224,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 9225 "configure"
+#line 9227 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -9322,7 +9324,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 9325 "configure"
+#line 9327 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -11665,11 +11667,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:11668: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:11670: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:11672: \$? = $ac_status" >&5
+ echo "$as_me:11674: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -11769,11 +11771,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:11772: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:11774: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:11776: \$? = $ac_status" >&5
+ echo "$as_me:11778: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -12305,7 +12307,7 @@
libsuff=
case "$host_cpu" in
x86_64*|s390x*|powerpc64*)
- echo '#line 12308 "configure"' > conftest.$ac_ext
+ echo '#line 12310 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -13363,11 +13365,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:13366: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13368: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:13370: \$? = $ac_status" >&5
+ echo "$as_me:13372: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -13467,11 +13469,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:13470: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13472: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:13474: \$? = $ac_status" >&5
+ echo "$as_me:13476: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -14916,7 +14918,7 @@
libsuff=
case "$host_cpu" in
x86_64*|s390x*|powerpc64*)
- echo '#line 14919 "configure"' > conftest.$ac_ext
+ echo '#line 14921 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -15694,11 +15696,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:15697: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:15699: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:15701: \$? = $ac_status" >&5
+ echo "$as_me:15703: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -15962,11 +15964,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:15965: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:15967: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:15969: \$? = $ac_status" >&5
+ echo "$as_me:15971: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -16066,11 +16068,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16069: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:16071: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:16073: \$? = $ac_status" >&5
+ echo "$as_me:16075: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -17535,7 +17537,7 @@
libsuff=
case "$host_cpu" in
x86_64*|s390x*|powerpc64*)
- echo '#line 17538 "configure"' > conftest.$ac_ext
+ echo '#line 17540 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -22937,6 +22939,24 @@
+# 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.
+echo "$as_me:$LINENO: checking for --enable-rpath" >&5
+echo $ECHO_N "checking for --enable-rpath... $ECHO_C" >&6
+enable_rpath=no
+# Check whether --enable-rpath or --disable-rpath was given.
+if test "${enable_rpath+set}" = set; then
+ enableval="$enable_rpath"
+
+fi;
+echo "$as_me:$LINENO: result: $enable_rpath" >&5
+echo "${ECHO_T}$enable_rpath" >&6
+
# BEGIN COPYRIGHT BLOCK
# Copyright (C) 2006 Red Hat, Inc.
# All rights reserved.
@@ -23863,6 +23883,8 @@
withval="$with_fhs"
with_fhs=yes
+ echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
else
echo "$as_me:$LINENO: result: no" >&5
@@ -23920,6 +23942,18 @@
fi
+if test "$enable_rpath" != "yes" ; then
+ { echo "$as_me:$LINENO: Fixing libtool to remove automatic rpath to $libdir . . ." >&5
+echo "$as_me: Fixing libtool to remove automatic rpath to $libdir . . ." >&6;}
+ 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="$ac_config_files Makefile adminutil.pc"
ac_config_files="$ac_config_files lib/libadminutil/genrb_wrapper"
Index: Makefile.in
===================================================================
RCS file: /cvs/dirsec/adminutil/Makefile.in,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- Makefile.in 2 Aug 2007 03:18:03 -0000 1.11
+++ Makefile.in 11 Oct 2007 02:32:43 -0000 1.12
@@ -88,9 +88,9 @@
lib/libadminutil/libadminutil_la-strlist.lo \
lib/libadminutil/libadminutil_la-uginfo.lo
libadminutil_la_OBJECTS = $(am_libadminutil_la_OBJECTS)
-libadmsslutil_la_DEPENDENCIES = libadminutil.la $(am__DEPENDENCIES_1) \
+libadmsslutil_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2)
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) libadminutil.la
am_libadmsslutil_la_OBJECTS = \
lib/libadmsslutil/libadmsslutil_la-admsslutil.lo \
lib/libadmsslutil/libadmsslutil_la-certmgt.lo \
@@ -417,7 +417,7 @@
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))
@CXXLINK_REQUIRED_FALSE at libadmsslutil_la_LINK = $(LINK)
@CXXLINK_REQUIRED_TRUE at libadmsslutil_la_LINK = $(CXXLINK)
- Previous message (by thread): [Fedora-directory-commits] adminutil/m4 fhs.m4,1.1,1.2
- Next message (by thread): [Fedora-directory-commits] adminutil configure.ac, 1.9, 1.10 aclocal.m4, 1.12, 1.13 configure, 1.12, 1.13 missing, 1.11, 1.12 install-sh, 1.11, 1.12 depcomp, 1.11, 1.12 config.sub, 1.11, 1.12 config.guess, 1.11, 1.12 compile, 1.11, 1.12 Makefile.in, 1.12, 1.13
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Fedora-directory-commits
mailing list