mirror of
git://git.savannah.gnu.org/libtool.git
synced 2024-11-21 01:40:57 +08:00
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.
This commit is contained in:
parent
94537d111d
commit
57013d8e68
11
ChangeLog
11
ChangeLog
@ -1,3 +1,14 @@
|
||||
2009-05-27 Peter O'Gorman <peter@pogma.com>
|
||||
|
||||
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 <r.emrich@de.tecosim.com> (tiny change)
|
||||
Peter Rosin <peda@lysator.liu.se>
|
||||
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
|
||||
|
2
NEWS
2
NEWS
@ -35,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:
|
||||
|
||||
|
81
libltdl/m4/libtool.m4
vendored
81
libltdl/m4/libtool.m4
vendored
@ -5279,14 +5279,14 @@ 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
|
||||
# _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],
|
||||
[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
|
||||
@ -5294,22 +5294,6 @@ if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
|
||||
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_DECL_EGREP])dnl
|
||||
|
||||
AC_LANG_PUSH(C++)
|
||||
_LT_TAGVAR(archive_cmds_need_lc, $1)=no
|
||||
@ -6532,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)=
|
||||
@ -6677,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)=
|
||||
|
3
libltdl/m4/lt~obsolete.m4
vendored
3
libltdl/m4/lt~obsolete.m4
vendored
@ -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])])
|
||||
|
Loading…
Reference in New Issue
Block a user