[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[SCM] GNU Libtool branch, master, updated. v2.2.6-117-g57013d8
|
From: |
Peter O'Gorman |
|
Subject: |
[SCM] GNU Libtool branch, master, updated. v2.2.6-117-g57013d8 |
|
Date: |
Tue, 02 Jun 2009 13:45:32 +0000 |
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Libtool".
The branch, master has been updated
via 57013d8e689ed32f0a4fb8d3b0549ed5e793e2d6 (commit)
via 94537d111dcd64b0937ffe36dda485f794b47fbb (commit)
via f4c14adc49a89beccbecb6177c8fae4d13040b9d (commit)
via 848215b440b53cae6979dd5a65ea41e9d5ab5b3d (commit)
via 26d36541aded9124add202e288a79f3c08242687 (commit)
via 5ef9367f2a030124e7b5ed4a4194a12c545d6fce (commit)
via 7f0ba74e84f5dd7e72908835a5a8335c9ecb3eba (commit)
via 5d560c68d815824d284661354e525d1936c823b9 (commit)
via 81a734cdda29f4ba61ee1f3bbbb2513ed4ed6323 (commit)
from 2ff7159eb45c8ae9ca1588e65d198a2aeea3eed6 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 57013d8e689ed32f0a4fb8d3b0549ed5e793e2d6
Author: Peter O'Gorman <address@hidden>
Date: Wed May 27 14:19:57 2009 -0500
Don't run compiler checks twice.
libltdl/m4/libtool.m4 (_LT_PROG_FC, _LT_PROG_F77,
_LT_PROG_CXX): Remove these macros.
libltdl/m4/lt~obsolete.m4: Add removed macros here.
libltdl/m4/libtool.m4 (_LT_LANG_FC_CONFIG, _LT_LANG_F77_CONFIG,
_LT_LANG_CXX_CONFIG): Remove references to removed macros, and
move functionality here.
NEWS: Update.
commit 94537d111dcd64b0937ffe36dda485f794b47fbb
Author: Rainer Emrich <address@hidden>
Date: Tue May 5 22:51:03 2009 +0200
Fix cross compilation for HPPA/64 with a BSD file command.
* libltdl/m4/libtool.m4 (_LT_CHECK_MAGIC_METHOD)
[hpux10.20*, hpux11*, !ia64] <lt_cv_deplibs_check_method>:
Match the dot in `PA-RISC 2.0' literally. Adjust hppa*64*
pattern to also match BSD `file' output, used in cross
compilation setups.
* THANKS: Update.
Report and initial patch by Rainer Emrich, refined by Peter
Rosin.
Signed-off-by: Ralf Wildenhues <address@hidden>
commit f4c14adc49a89beccbecb6177c8fae4d13040b9d
Author: Ralf Wildenhues <address@hidden>
Date: Tue May 5 07:39:16 2009 +0200
libtoolize: ignore trailing junk on scriptversion line.
* libtoolize.m4sh (func_install_update): Ignore semi-colon or
comment-sign and all following characters when parsing a
`scriptversion' line in one of the auxiliary scripts; recent
Automake-provided script have a stylized comment to induce
Emacs to use UTC.
Exposed by the `libtoolize config files serial update' test.
Signed-off-by: Ralf Wildenhues <address@hidden>
commit 848215b440b53cae6979dd5a65ea41e9d5ab5b3d
Author: Ralf Wildenhues <address@hidden>
Date: Sat May 2 10:55:23 2009 +0200
Skip localization test when setlocale is not functional.
* tests/localization.at (localized compiler messages): Skip
test when there is a warning about `LC_ALL'.
* THANKS: Update.
Report by Maciej Helminiak.
Signed-off-by: Ralf Wildenhues <address@hidden>
commit 26d36541aded9124add202e288a79f3c08242687
Author: Alan Hourihane <address@hidden>
Date: Sat May 2 10:42:39 2009 +0200
Improved support for FreeMiNT.
* libltdl/m4/libtool.m4 (LT_CMD_MAX_LEN) [mint]: Hard-code
command line length limit to 8192, to avoid long test.
* NEWS, THANKS: Update.
Signed-off-by: Ralf Wildenhues <address@hidden>
commit 5ef9367f2a030124e7b5ed4a4194a12c545d6fce
Author: Ralf Wildenhues <address@hidden>
Date: Sat May 2 10:36:17 2009 +0200
Initial port for BlueGene BG/L.
* libltdl/m4/libtool.m4 (_LT_COMPILER_PIC, _LT_LINKER_SHLIBS)
(_LT_LANG_CXX_CONFIG) [linux]: Detect bgxl*, bgf*, mpixl*
compilers.
* NEWS, THANKS: Update.
Report, feedback and testing by John R. Cary and Christian
Rössel.
Signed-off-by: Ralf Wildenhues <address@hidden>
commit 7f0ba74e84f5dd7e72908835a5a8335c9ecb3eba
Author: Ralf Wildenhues <address@hidden>
Date: Sat May 2 10:31:18 2009 +0200
manual: fix grammaros.
* doc/libtool.texi (Dlpreopening): Fix grammaro.
(C header files): Remove duplicate word.
Signed-off-by: Ralf Wildenhues <address@hidden>
commit 5d560c68d815824d284661354e525d1936c823b9
Author: Ralf Wildenhues <address@hidden>
Date: Sat May 2 10:24:28 2009 +0200
Allow through -tp=* at link time, for pgcc.
* libltdl/config/ltmain.m4sh (func_mode_link): Portlant Group
pgcc uses `-tp=PROCESSOR' for target processor selection; allow
the flag through at link time.
Report by Ethan Mallove.
Signed-off-by: Ralf Wildenhues <address@hidden>
commit 81a734cdda29f4ba61ee1f3bbbb2513ed4ed6323
Author: Ralf Wildenhues <address@hidden>
Date: Sat May 2 09:57:47 2009 +0200
Fix quoting of eval'ed variable.
* libltdl/m4/libtool.m4 (_LT_CMD_GLOBAL_SYMBOLS): Double-quote
$lt_cv_sys_global_symbol_pipe for eval, like we do in ltmain,
in order to preserve TABs and multiple adjacent whitespace.
Report by Bruno Haible.
Signed-off-by: Ralf Wildenhues <address@hidden>
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 76 +++++++++++++++++++++++++++++++
NEWS | 4 ++
THANKS | 4 ++
doc/libtool.texi | 4 +-
libltdl/config/ltmain.m4sh | 3 +-
libltdl/m4/libtool.m4 | 106 +++++++++++++------------------------------
libltdl/m4/lt~obsolete.m4 | 3 +
libtoolize.m4sh | 1 +
tests/localization.at | 3 +
9 files changed, 127 insertions(+), 77 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 0c20a92..a1927bf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,79 @@
+2009-05-27 Peter O'Gorman <address@hidden>
+
+ Don't run compiler checks twice.
+ libltdl/m4/libtool.m4 (_LT_PROG_FC, _LT_PROG_F77,
+ _LT_PROG_CXX): Remove these macros.
+ libltdl/m4/lt~obsolete.m4: Add removed macros here.
+ libltdl/m4/libtool.m4 (_LT_LANG_FC_CONFIG, _LT_LANG_F77_CONFIG,
+ _LT_LANG_CXX_CONFIG): Remove references to removed macros, and
+ move functionality here.
+ NEWS: Update.
+
+2009-05-05 Rainer Emrich <address@hidden> (tiny change)
+ Peter Rosin <address@hidden>
+ Ralf Wildenhues <address@hidden>
+
+ Fix cross compilation for HPPA/64 with a BSD file command.
+ * libltdl/m4/libtool.m4 (_LT_CHECK_MAGIC_METHOD)
+ [hpux10.20*, hpux11*, !ia64] <lt_cv_deplibs_check_method>:
+ Match the dot in `PA-RISC 2.0' literally. Adjust hppa*64*
+ pattern to also match BSD `file' output, used in cross
+ compilation setups.
+ * THANKS: Update.
+ Report and initial patch by Rainer Emrich, refined by Peter
+ Rosin.
+
+2009-05-05 Ralf Wildenhues <address@hidden>
+
+ libtoolize: ignore trailing junk on scriptversion line.
+ * libtoolize.m4sh (func_install_update): Ignore semi-colon or
+ comment-sign and all following characters when parsing a
+ `scriptversion' line in one of the auxiliary scripts; recent
+ Automake-provided script have a stylized comment to induce
+ Emacs to use UTC.
+ Exposed by the `libtoolize config files serial update' test.
+
+2009-05-02 Ralf Wildenhues <address@hidden>
+
+ Skip localization test when setlocale is not functional.
+ * tests/localization.at (localized compiler messages): Skip
+ test when there is a warning about `LC_ALL'.
+ * THANKS: Update.
+ Report by Maciej Helminiak.
+
+2009-05-02 Alan Hourihane <address@hidden> (tiny change)
+
+ Improved support for FreeMiNT.
+ * libltdl/m4/libtool.m4 (LT_CMD_MAX_LEN) [mint]: Hard-code
+ command line length limit to 8192, to avoid long test.
+ * NEWS, THANKS: Update.
+
+2009-05-02 Ralf Wildenhues <address@hidden>
+
+ Initial port for BlueGene BG/L.
+ * libltdl/m4/libtool.m4 (_LT_COMPILER_PIC, _LT_LINKER_SHLIBS)
+ (_LT_LANG_CXX_CONFIG) [linux]: Detect bgxl*, bgf*, mpixl*
+ compilers.
+ * NEWS, THANKS: Update.
+ Report, feedback and testing by John R. Cary and Christian
+ Rössel.
+
+ manual: fix grammaros.
+ * doc/libtool.texi (Dlpreopening): Fix grammaro.
+ (C header files): Remove duplicate word.
+
+ Allow through -tp=* at link time, for pgcc.
+ * libltdl/config/ltmain.m4sh (func_mode_link): Portlant Group
+ pgcc uses `-tp=PROCESSOR' for target processor selection; allow
+ the flag through at link time.
+ Report by Ethan Mallove.
+
+ Fix quoting of eval'ed variable.
+ * libltdl/m4/libtool.m4 (_LT_CMD_GLOBAL_SYMBOLS): Double-quote
+ $lt_cv_sys_global_symbol_pipe for eval, like we do in ltmain,
+ in order to preserve TABs and multiple adjacent whitespace.
+ Report by Bruno Haible.
+
2009-04-22 Ralf Wildenhues <address@hidden>
Cope better with missing `makeinfo' in `bootstrap'.
diff --git a/NEWS b/NEWS
index ec9c835..42d3c69 100644
--- a/NEWS
+++ b/NEWS
@@ -18,6 +18,8 @@ New in 2.2.8 2009-??-??: git version 2.2.7a, Libtool team:
- Improved support for 64bit Windows (mingw64).
- Improved support for cegcc (Windows CE/PocketPC).
- Support for GNU/kOpenSolaris (kopensolaris*-gnu).
+ - Initial support for compilers on BlueGene BG/L.
+ - Improved support for Atari FreeMiNT.
* Bug fixes:
@@ -33,6 +35,8 @@ New in 2.2.8 2009-??-??: git version 2.2.7a, Libtool team:
- Argument mangling of execute mode has been improved (i.e., lessened).
- Fix 2.1b regression that caused nm to not be the default name lister.
The regression affected mainly (arguably broken) cross compiles.
+ - Fix long standing bug that caused compiler checks for Fortran and
+ C++ compilers to run twice.
* Miscellaneous changes:
diff --git a/THANKS b/THANKS
index 431a308..f9c7a86 100644
--- a/THANKS
+++ b/THANKS
@@ -67,6 +67,7 @@
their time and energy in helping to track down bugs, port to new systems,
and generally assist in the libtool maintainership process:
+ Alan Hourihane address@hidden
Alexei Sheplyakov address@hidden
Alon Bar-Lev address@hidden
Andreas Schwab address@hidden
@@ -105,12 +106,14 @@
Joel N. Weber II address@hidden
Joerg Sonnenberger address@hidden
John Bowler address@hidden
+ John R. Cary address@hidden
John Wolfe address@hidden
Joseph Beckenbach III address@hidden
Karl Berry address@hidden
Kenneth Albanowski address@hidden
Kevin Ryde address@hidden
Kurt D. Zeilenga address@hidden
+ Maciej Helminiak address@hidden
Maciej W. Rozycki address@hidden
Manfred Weichel address@hidden
Marc Espie address@hidden
@@ -129,6 +132,7 @@
Peter Eisentraut address@hidden
Peter Jeremy address@hidden
Peter Kjellerstedt address@hidden
+ Rainer Emrich address@hidden
Rainer Orth address@hidden
Rainer Tammer address@hidden
Ralf Menzel address@hidden
diff --git a/doc/libtool.texi b/doc/libtool.texi
index 2f90ca3..5e25531 100644
--- a/doc/libtool.texi
+++ b/doc/libtool.texi
@@ -3059,7 +3059,7 @@ Also the only thing that must go outside the
@code{BEGIN_C_DECLS}/@code{END_C_DECLS} pair are @code{#include} lines.
Strictly speaking it is only C symbol names that need to be protected,
but your header files will be more maintainable if you have a single
-pair of of these macros around the majority of the header contents.
+pair of these macros around the majority of the header contents.
You should use these definitions of @code{PARAMS}, @code{BEGIN_C_DECLS},
and @code{END_C_DECLS} into your own headers. Then, you may use them to
@@ -3293,7 +3293,7 @@ though Libtool takes care of that detail if you use
An array of @var{lt_symbol} structures, representing all the preloaded
symbols linked into the program proper. For each module
@option{-dlpreopen}ed by the Libtool linked program
-there is an element with the @var{name} of the module and a @var{address}
+there is an element with the @var{name} of the module and an @var{address}
of @code{0}, followed by all symbols exported from this file.
For the executable itself the special name @samp{@@PROGRAM@@} is used.
The last element of all has a @var{name} and @var{address} of
diff --git a/libltdl/config/ltmain.m4sh b/libltdl/config/ltmain.m4sh
index fd5b1c7..5609304 100644
--- a/libltdl/config/ltmain.m4sh
+++ b/libltdl/config/ltmain.m4sh
@@ -4494,8 +4494,9 @@ func_mode_link ()
# -F/path gives path to uninstalled frameworks, gcc on darwin
# -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC
# @file GCC response files
+ # -tp=* Portland pgcc target processor selection
-64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
- -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*)
+ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*)
func_quote_for_eval "$arg"
arg="$func_quote_for_eval_result"
func_append compile_command " $arg"
diff --git a/libltdl/m4/libtool.m4 b/libltdl/m4/libtool.m4
index 63e831e..3596384 100644
--- a/libltdl/m4/libtool.m4
+++ b/libltdl/m4/libtool.m4
@@ -1451,6 +1451,11 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
lt_cv_sys_max_cmd_len=8192;
;;
+ mint*)
+ # On MiNT this can take a long time and run out of memory.
+ lt_cv_sys_max_cmd_len=8192;
+ ;;
+
amigaos*)
# On AmigaOS with pdksh, this test takes hours, literally.
# So we just punt and use a minimum line length of 8192.
@@ -2987,11 +2992,11 @@ hpux10.20* | hpux11*)
lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
;;
hppa*64*)
- [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9])
shared object file - PA-RISC [0-9].[0-9]']
+ [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF[
-][0-9][0-9])(-bit)?( [LM]SB)? shared object( file)?[, -]* PA-RISC
[0-9]\.[0-9]']
lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
;;
*)
- lt_cv_deplibs_check_method='file_magic
(s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]].[[0-9]]) shared library'
+ lt_cv_deplibs_check_method='file_magic
(s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]]\.[[0-9]]) shared library'
lt_cv_file_magic_test_file=/usr/lib/libc.sl
;;
esac
@@ -3380,7 +3385,7 @@ _LT_EOF
if AC_TRY_EVAL(ac_compile); then
# Now try to grab the symbols.
nlist=conftest.nm
- if AC_TRY_EVAL(NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \>
$nlist) && test -s "$nlist"; then
+ if AC_TRY_EVAL(NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe"
\> $nlist) && test -s "$nlist"; then
# Try sorting and uniquifying the output.
if sort "$nlist" | uniq > "$nlist"T; then
mv -f "$nlist"T "$nlist"
@@ -3680,8 +3685,8 @@ m4_if([$1], [CXX], [
_LT_TAGVAR(lt_prog_compiler_pic, $1)=
_LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
;;
- xlc* | xlC*)
- # IBM XL 8.0 on PPC
+ xlc* | xlC* | bgxl[[cC]]* | mpixl[[cC]]*)
+ # IBM XL 8.0, 9.0 on PPC and BlueGene
_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
_LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic'
_LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink'
@@ -3964,8 +3969,8 @@ m4_if([$1], [CXX], [
# All Alpha code is PIC.
_LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
;;
- xl*)
- # IBM XL C 8.0/Fortran 10.1 on PPC
+ xl* | bgxl* | bgf* | mpixl*)
+ # IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene
_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
_LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic'
_LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink'
@@ -4342,7 +4347,7 @@ _LT_EOF
lf95*) # Lahey Fortran 8.1
_LT_TAGVAR(whole_archive_flag_spec, $1)=
tmp_sharedflag='--shared' ;;
- xl[[cC]]*) # IBM XL C 8.0 on PPC (deal with xlf
below)
+ xl[[cC]]* | bgxl[[cC]]* | mpixl[[cC]]*) # IBM XL C 8.0 on PPC (deal
with xlf below)
tmp_sharedflag='-qmkshrobj'
tmp_addflag= ;;
esac
@@ -4364,7 +4369,7 @@ _LT_EOF
fi
case $cc_basename in
- xlf*)
+ xlf* | bgf* | bgxlf* | mpixlf*)
# IBM XL Fortran 10.1 on PPC cannot create shared libs itself
_LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience
--no-whole-archive'
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
@@ -5274,37 +5279,21 @@ CC="$lt_save_CC"
])# _LT_LANG_C_CONFIG
-# _LT_PROG_CXX
-# ------------
-# Since AC_PROG_CXX is broken, in that it returns g++ if there is no c++
-# compiler, we have our own version here.
-m4_defun([_LT_PROG_CXX],
-[
-pushdef([AC_MSG_ERROR], [_lt_caught_CXX_error=yes])
-AC_PROG_CXX
-if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
- ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
- (test "X$CXX" != "Xg++"))) ; then
- AC_PROG_CXXCPP
-else
- _lt_caught_CXX_error=yes
-fi
-popdef([AC_MSG_ERROR])
-])# _LT_PROG_CXX
-
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([_LT_PROG_CXX], [])
-
-
# _LT_LANG_CXX_CONFIG([TAG])
# --------------------------
# Ensure that the configuration variables for a C++ compiler are suitably
# defined. These variables are subsequently used by _LT_CONFIG to write
# the compiler configuration to `libtool'.
m4_defun([_LT_LANG_CXX_CONFIG],
-[AC_REQUIRE([_LT_PROG_CXX])dnl
-m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
m4_require([_LT_DECL_EGREP])dnl
+if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
+ ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
+ (test "X$CXX" != "Xg++"))) ; then
+ AC_PROG_CXXCPP
+else
+ _lt_caught_CXX_error=yes
+fi
AC_LANG_PUSH(C++)
_LT_TAGVAR(archive_cmds_need_lc, $1)=no
@@ -5910,7 +5899,7 @@ if test "$_lt_caught_CXX_error" != yes; then
# dependencies.
output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v
conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED
"s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in
conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac;
done; func_echo_all "X$list" | $Xsed'
;;
- xl*)
+ xl* | mpixl* | bgxl*)
# IBM XL 8.0 on PPC, with GNU ld
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
@@ -6527,32 +6516,16 @@ _LT_TAGDECL([], [compiler_lib_search_path], [1],
])# _LT_SYS_HIDDEN_LIBDEPS
-# _LT_PROG_F77
-# ------------
-# Since AC_PROG_F77 is broken, in that it returns the empty string
-# if there is no fortran compiler, we have our own version here.
-m4_defun([_LT_PROG_F77],
-[
-pushdef([AC_MSG_ERROR], [_lt_disable_F77=yes])
-AC_PROG_F77
-if test -z "$F77" || test "X$F77" = "Xno"; then
- _lt_disable_F77=yes
-fi
-popdef([AC_MSG_ERROR])
-])# _LT_PROG_F77
-
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([_LT_PROG_F77], [])
-
-
# _LT_LANG_F77_CONFIG([TAG])
# --------------------------
# Ensure that the configuration variables for a Fortran 77 compiler are
# suitably defined. These variables are subsequently used by _LT_CONFIG
# to write the compiler configuration to `libtool'.
m4_defun([_LT_LANG_F77_CONFIG],
-[AC_REQUIRE([_LT_PROG_F77])dnl
-AC_LANG_PUSH(Fortran 77)
+[AC_LANG_PUSH(Fortran 77)
+if test -z "$F77" || test "X$F77" = "Xno"; then
+ _lt_disable_F77=yes
+fi
_LT_TAGVAR(archive_cmds_need_lc, $1)=no
_LT_TAGVAR(allow_undefined_flag, $1)=
@@ -6672,32 +6645,17 @@ AC_LANG_POP
])# _LT_LANG_F77_CONFIG
-# _LT_PROG_FC
-# -----------
-# Since AC_PROG_FC is broken, in that it returns the empty string
-# if there is no fortran compiler, we have our own version here.
-m4_defun([_LT_PROG_FC],
-[
-pushdef([AC_MSG_ERROR], [_lt_disable_FC=yes])
-AC_PROG_FC
-if test -z "$FC" || test "X$FC" = "Xno"; then
- _lt_disable_FC=yes
-fi
-popdef([AC_MSG_ERROR])
-])# _LT_PROG_FC
-
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([_LT_PROG_FC], [])
-
-
# _LT_LANG_FC_CONFIG([TAG])
# -------------------------
# Ensure that the configuration variables for a Fortran compiler are
# suitably defined. These variables are subsequently used by _LT_CONFIG
# to write the compiler configuration to `libtool'.
m4_defun([_LT_LANG_FC_CONFIG],
-[AC_REQUIRE([_LT_PROG_FC])dnl
-AC_LANG_PUSH(Fortran)
+[AC_LANG_PUSH(Fortran)
+
+if test -z "$FC" || test "X$FC" = "Xno"; then
+ _lt_disable_FC=yes
+fi
_LT_TAGVAR(archive_cmds_need_lc, $1)=no
_LT_TAGVAR(allow_undefined_flag, $1)=
diff --git a/libltdl/m4/lt~obsolete.m4 b/libltdl/m4/lt~obsolete.m4
index 5f6a956..544ae45 100644
--- a/libltdl/m4/lt~obsolete.m4
+++ b/libltdl/m4/lt~obsolete.m4
@@ -94,3 +94,6 @@ m4_ifndef([_LT_REQUIRED_DARWIN_CHECKS],
[AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS])]
m4_ifndef([_LT_AC_PROG_CXXCPP],
[AC_DEFUN([_LT_AC_PROG_CXXCPP])])
m4_ifndef([_LT_PREPARE_SED_QUOTE_VARS],
[AC_DEFUN([_LT_PREPARE_SED_QUOTE_VARS])])
m4_ifndef([_LT_PROG_ECHO_BACKSLASH], [AC_DEFUN([_LT_PROG_ECHO_BACKSLASH])])
+m4_ifndef([_LT_PROG_F77], [AC_DEFUN([_LT_PROG_F77])])
+m4_ifndef([_LT_PROG_FC], [AC_DEFUN([_LT_PROG_FC])])
+m4_ifndef([_LT_PROG_CXX], [AC_DEFUN([_LT_PROG_CXX])])
diff --git a/libtoolize.m4sh b/libtoolize.m4sh
index 27f17a7..bff700a 100644
--- a/libtoolize.m4sh
+++ b/libtoolize.m4sh
@@ -1021,6 +1021,7 @@ func_install_update ()
$opt_debug
my_sed_install='
/^scriptversion='\''*[0-9][1-9.-]*'\''*/ {
+ s,[#;].*,,
s,^scriptversion='\''*\([0-9.-]*\)'\''*,\1,
s/-/./g
p
diff --git a/tests/localization.at b/tests/localization.at
index 119b38d..1d689aa 100644
--- a/tests/localization.at
+++ b/tests/localization.at
@@ -49,6 +49,9 @@ AT_CHECK([$LIBTOOL --mode=compile --tag=CC $CC $CPPFLAGS
$CFLAGS -c a.c || exit
[1], [stdout], [stderr])
LT_AT_NORMALIZE_COMPILER_OUTPUT([stdout], [libtool-stdout])
LT_AT_NORMALIZE_COMPILER_OUTPUT([stderr], [libtool-stderr])
+# Avoid this error:
+# /bin/sh: warning: setlocale: LC_ALL: cannot change locale (de_DE)
+AT_CHECK([grep LC_ALL stdout stderr && exit 77], [1])
AT_CHECK([diff expected-stderr libtool-stderr])
AT_CHECK([diff expected-stdout libtool-stdout])
hooks/post-receive
--
GNU Libtool
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [SCM] GNU Libtool branch, master, updated. v2.2.6-117-g57013d8,
Peter O'Gorman <=