* 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.

diff --git a/ChangeLog b/ChangeLog
index 69ea895189b3e742d7cfc0e881da4f4f846737bf..a5f8f63ac087c998bc03f0f188ec9fd82e3df406 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-10-09  Gary V. Vaughan  <gary@gnu.org>
+
+       * 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.
+
 2004-10-08  Gary V. Vaughan  <gary@gnu.org>
 
        Update to the latest commit and mailnotify scripts from

diff --git a/m4/libtool.m4 b/m4/libtool.m4
index 3378d2643b5d1d202776d8871596caabc35b3103..ef2e1bc6cd035afbfe2246aaf209446636be68a3 100644 (file)
--- a/m4/libtool.m4
+++ b/m4/libtool.m4
@@ -5404,18 +5404,19 @@ if test "$_lt_caught_CXX_error" != yes; then
 
     _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
 
 
@@ -5690,10 +5691,11 @@ if test "$_lt_caught_F77_error" != yes; then
 
     _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