From: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Date: Wed, 9 Nov 2005 22:36:22 +0000 (+0000)
Subject: * libltdl/m4/libtool.m4 (_LT_LINKER_SHLIBS): Also set pic_flag.
X-Git-Tag: release-2-1b~416
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c0bb251e2a859e023aa0b0eedc715492f1f1f13c;p=thirdparty%2Flibtool.git

* libltdl/m4/libtool.m4 (_LT_LINKER_SHLIBS): Also set pic_flag.
(_LT_LANG_CXX_CONFIG): Use $as_unset, not unset.
(_LT_LANG_F77_CONFIG, _LT_LANG_FC_CONFIG): Remove bogus
ld_shlibs tests.
---

diff --git a/ChangeLog b/ChangeLog
index eb0c6405c..9bd366199 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2005-11-09  Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
 
+	* libltdl/m4/libtool.m4 (_LT_LINKER_SHLIBS): Also set pic_flag.
+	(_LT_LANG_CXX_CONFIG): Use $as_unset, not unset.
+	(_LT_LANG_F77_CONFIG, _LT_LANG_FC_CONFIG): Remove bogus
+	ld_shlibs tests.
+
 	* libltdl/m4/libtool.m4 (_LT_LINKER_SHLIBS): Move setting of
 	`variables_saved_for_relink'..
 	(_LT_SYS_DYNAMIC_LINKER): here, when both `shlibpath_var'
diff --git a/libltdl/m4/libtool.m4 b/libltdl/m4/libtool.m4
index 3c6fab4cf..b51b6a2c9 100644
--- a/libltdl/m4/libtool.m4
+++ b/libltdl/m4/libtool.m4
@@ -4720,6 +4720,7 @@ x|xyes)
         libobjs=conftest.$ac_objext
         deplibs=
         wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1)
+	pic_flag=$_LT_TAGVAR(lt_prog_compiler_pic, $1)
         compiler_flags=-v
         linker_flags=-v
         verstring=
@@ -5010,12 +5011,12 @@ if test "$_lt_caught_CXX_error" != yes; then
   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++"}
@@ -6205,8 +6206,6 @@ if test "$_lt_disable_F77" != yes; then
     test "$enable_shared" = yes || enable_static=yes
     AC_MSG_RESULT([$enable_static])
 
-    test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
-
     _LT_TAGVAR(GCC, $1)="$G77"
     _LT_TAGVAR(LD, $1)="$LD"
 
@@ -6340,8 +6339,6 @@ if test "$_lt_disable_FC" != yes; then
     test "$enable_shared" = yes || enable_static=yes
     AC_MSG_RESULT([$enable_static])
 
-    test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
-
     _LT_TAGVAR(GCC, $1)="$ac_cv_fc_compiler_gnu"
     _LT_TAGVAR(LD, $1)="$LD"