* libtool.m4 (AC_LIBTOOL_PROG_LD_SHLIBS): Move setting of

`variables_saved_for_relink'..
(AC_LIBTOOL_SYS_DYNAMIC_LINKER): here, when both `shlibpath_var'
and `runpath_var' have been set.
Reported by Mike Frysinger <vapier@gentoo.org>.

diff --git a/ChangeLog b/ChangeLog
index f086a838faaa02d34206d55da66c0501b0798c15..24fd4c69bfd82e1051ac810e5a0799d4d71c6cd4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2005-11-09  Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
 
+       * libtool.m4 (AC_LIBTOOL_PROG_LD_SHLIBS): Move setting of
+       `variables_saved_for_relink'..
+       (AC_LIBTOOL_SYS_DYNAMIC_LINKER): here, when both `shlibpath_var'
+       and `runpath_var' have been set.
+       Reported by Mike Frysinger <vapier@gentoo.org>.
+
        * libtool.m4 (AC_LIBTOOL_LANG_C_CONFIG): Move static_flag
        check..
        (AC_LIBTOOL_PROG_COMPILER_PIC): ..here, so that both

diff --git a/libtool.m4 b/libtool.m4
index 5c08f7d6b8ad15a29bc4a7dfdb262c8337a51bf6..b3f200bb7f0cbba964f05270bdcbd3170f70a687 100644 (file)
--- a/libtool.m4
+++ b/libtool.m4
@@ -2770,12 +2770,12 @@ lt_save_path_LD=$lt_cv_path_LD
 if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
   lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
 else
-  unset lt_cv_prog_gnu_ld
+  $as_unset lt_cv_prog_gnu_ld
 fi
 if test -n "${lt_cv_path_LDCXX+set}"; then
   lt_cv_path_LD=$lt_cv_path_LDCXX
 else
-  unset lt_cv_path_LD
+  $as_unset lt_cv_path_LD
 fi
 test -z "${LDCXX+set}" || LD=$LDCXX
 CC=${CXX-"c++"}
@@ -3909,8 +3909,6 @@ AC_MSG_CHECKING([whether to build static libraries])
 test "$enable_shared" = yes || enable_static=yes
 AC_MSG_RESULT([$enable_static])
 
-test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
-
 _LT_AC_TAGVAR(GCC, $1)="$G77"
 _LT_AC_TAGVAR(LD, $1)="$LD"
 
@@ -6096,6 +6094,7 @@ x|xyes)
         libobjs=conftest.$ac_objext
         deplibs=
         wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)
+       pic_flag=$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)
         compiler_flags=-v
         linker_flags=-v
         verstring=