[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
FYI: fix nesting of lt_saved variables [libtool--release--2.0--patch-18]
From: |
Gary V. Vaughan |
Subject: |
FYI: fix nesting of lt_saved variables [libtool--release--2.0--patch-18] |
Date: |
Sat, 9 Oct 2004 21:45:07 +0100 (BST) |
User-agent: |
mailnotify/0.4 |
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Applied to branch-2-0 and HEAD.
* looking for address@hidden/libtool--release--2.0--patch-17 to compare with
* comparing to address@hidden/libtool--release--2.0--patch-17
M ChangeLog
M m4/libtool.m4
* modified files
Index: Changelog
from Gary V. Vaughan <address@hidden>
* m4/libtool.m4 (_LT_LANG_F77_CONFIG): Make sure the save and
restore code for CC is nested at the same depth.
(_LT_LANG_CXX_CONFIG): Ditto, but for several variables.
--- orig/m4/libtool.m4
+++ mod/m4/libtool.m4
@@ -4472,11 +4472,11 @@
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++" && `g++ -v >/dev/null 2>&1` ) ||
(test "X$CXX" != "Xg++"))) ; then
AC_PROG_CXXCPP
-else
- _lt_caught_CXX_error=yes
+else
+ _lt_caught_CXX_error=yes
fi
popdef([AC_MSG_ERROR])
])# _LT_PROG_CXX
@@ -5404,18 +5404,19 @@
_LT_CONFIG($1)
fi # test -n "$compiler"
+
+ CC=$lt_save_CC
+ LDCXX=$LD
+ LD=$lt_save_LD
+ GCC=$lt_save_GCC
+ with_gnu_ld=$lt_save_with_gnu_ld
+ lt_cv_path_LDCXX=$lt_cv_path_LD
+ lt_cv_path_LD=$lt_save_path_LD
+ lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld
+ lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
fi # test "$_lt_caught_CXX_error" != yes
AC_LANG_POP
-CC=$lt_save_CC
-LDCXX=$LD
-LD=$lt_save_LD
-GCC=$lt_save_GCC
-with_gnu_ld=$lt_save_with_gnu_ld
-lt_cv_path_LDCXX=$lt_cv_path_LD
-lt_cv_path_LD=$lt_save_path_LD
-lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld
-lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
])# _LT_LANG_CXX_CONFIG
@@ -5580,7 +5581,7 @@
pushdef([AC_MSG_ERROR], [_lt_caught_F77_error=yes])
AC_PROG_F77
if test -z "$F77"; then
- _lt_caught_F77_error=yes
+ _lt_caught_F77_error=yes
fi
popdef([AC_MSG_ERROR])
])# _LT_PROG_F77
@@ -5690,10 +5691,11 @@
_LT_CONFIG($1)
fi # test -n "$compiler"
+
+ CC="$lt_save_CC"
fi # test "$_lt_caught_F77_error" != yes
AC_LANG_POP
-CC="$lt_save_CC"
])# _LT_LANG_F77_CONFIG
- --
Gary V. Vaughan ())_. address@hidden,gnu.org}
Research Scientist ( '/ http://tkd.kicks-ass.net
GNU Hacker / )= http://www.gnu.org/software/libtool
Technical Author `(_~)_ http://sources.redhat.com/autobook
_________________________________________________________
This patch notification generated by tlaapply version 0.7
http://tkd.kicks-ass.net/arch/address@hidden/cvs-utils--tla--1.0
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.4 (Darwin)
iD8DBQFBaE3SFRMICSmD1gYRAtRFAKCOGdPsrx23gmP89kCuIfTp0SnLWgCgzPFn
KdGQAmVP2olGVjzX39MeUAc=
=Who0
-----END PGP SIGNATURE-----
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- FYI: fix nesting of lt_saved variables [libtool--release--2.0--patch-18],
Gary V. Vaughan <=