From: David MacKenzie <djm@djmnet.org>
Date: Sun, 20 Mar 1994 00:39:50 +0000 (+0000)
Subject: (AC_LANG_RESTORE): Only emit shell code to change the current language
X-Git-Tag: fsf-origin~778
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=02de1b387fe476ad5efd95f66d5d7cdc699aec91;p=thirdparty%2Fautoconf.git

(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 33160cf53..b2a7a5ad0 100644
--- 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 33160cf53..b2a7a5ad0 100644
--- 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