* Ralf Wildenhues wrote on Sun, Nov 06, 2005 at 10:46:28PM CET: > > A bit more fallout. OK to apply to branch-1-5 and forward-port? > > - unset is not portable. Should I rather set lt_unset somewhere > in the initialization code and use that instead? > - the ld_shlibs_F77 test expands before it is set. OTOH, at the end of > AC_LIBTOOL_PROG_LD_SHLIBS, there is a similar test anyway. > - During the archive_cmds_need_lc test at the end of > AC_LIBTOOL_PROG_LD_SHLIBS, archive_cmds is expanded; the expansion may > need pic_flag on some systems.
Applied to branch-1-5, and HEAD, as shown below. Cheers, Ralf > * libtool.m4 (AC_LIBTOOL_LANG_CXX_CONFIG): Use $as_unset, > not unset. > (AC_LIBTOOL_LANG_F77_CONFIG): Remove bogus ld_shlibs test. > (AC_LIBTOOL_PROG_LD_SHLIBS): Also set pic_flag. * 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 test. Index: libltdl/m4/libtool.m4 =================================================================== RCS file: /cvsroot/libtool/libtool/libltdl/m4/libtool.m4,v retrieving revision 1.37 diff -u -r1.37 libtool.m4 --- libltdl/m4/libtool.m4 9 Nov 2005 22:18:44 -0000 1.37 +++ libltdl/m4/libtool.m4 9 Nov 2005 22:31:02 -0000 @@ -4720,6 +4724,7 @@ 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 +5015,12 @@ 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 +6210,6 @@ 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" @@ -6339,8 +6342,6 @@ # Make sure either enable_shared or enable_static is yes. 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"