(AC_LANG_RESTORE): Only emit shell code to change the current language

if it actually changed.

diff --git a/acgeneral.m4 b/acgeneral.m4
index 33160cf53a6caeacd0726b4e8b71890df10bce1a..b2a7a5ad0ae36676c354cea98d9acb864c1b7615 100644 (file)
--- a/acgeneral.m4
+++ b/acgeneral.m4
@@ -387,7 +387,7 @@ define(AC_LANG_SAVE, [pushdef([AC_LANG_STACK], AC_LANG)])dnl
 dnl
 dnl Restore the current language from the stack.
 define(AC_LANG_RESTORE,
-[ifelse(AC_LANG_STACK,C,[AC_LANG_C],[AC_LANG_CPLUSPLUS])[]popdef([AC_LANG_STACK])])dnl
+[ifelse(AC_LANG_STACK,C,[ifelse(AC_LANG,C,,[AC_LANG_C])],[ifelse(AC_LANG,CPLUSPLUS,,[AC_LANG_CPLUSPLUS])])[]popdef([AC_LANG_STACK])])dnl
 dnl
 dnl
 dnl Checks for kinds of features

diff --git a/lib/autoconf/general.m4 b/lib/autoconf/general.m4
index 33160cf53a6caeacd0726b4e8b71890df10bce1a..b2a7a5ad0ae36676c354cea98d9acb864c1b7615 100644 (file)
--- a/lib/autoconf/general.m4
+++ b/lib/autoconf/general.m4
@@ -387,7 +387,7 @@ define(AC_LANG_SAVE, [pushdef([AC_LANG_STACK], AC_LANG)])dnl
 dnl
 dnl Restore the current language from the stack.
 define(AC_LANG_RESTORE,
-[ifelse(AC_LANG_STACK,C,[AC_LANG_C],[AC_LANG_CPLUSPLUS])[]popdef([AC_LANG_STACK])])dnl
+[ifelse(AC_LANG_STACK,C,[ifelse(AC_LANG,C,,[AC_LANG_C])],[ifelse(AC_LANG,CPLUSPLUS,,[AC_LANG_CPLUSPLUS])])[]popdef([AC_LANG_STACK])])dnl
 dnl
 dnl
 dnl Checks for kinds of features