From 33da9014b2140603fa6738e0790272b5683b4535 Mon Sep 17 00:00:00 2001 From: Ralf Wildenhues Date: Wed, 9 Nov 2005 22:37:42 +0000 Subject: [PATCH] * 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 . --- ChangeLog | 6 ++++++ libtool.m4 | 7 +++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index f086a838f..24fd4c69b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ 2005-11-09 Ralf Wildenhues + * 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 . + * 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 5c08f7d6b..b3f200bb7 100644 --- 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= -- 2.47.3