* 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 eb0c6405c909a4db85c84b2abb6260cdb158a50e..9bd3661992191f809b650a44de1f20496c3d0d48 100644 (file)
--- 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 3c6fab4cffb72e940375bdb8e630243bb93db0ae..b51b6a2c92e74f1c1d2c1cd2faae88aef3a35976 100644 (file)
--- 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"