From: Richard M. Stallman <rms@gnu.org>
Date: Sun, 2 Oct 2011 22:43:52 +0000 (-0400)
Subject: Rename `linux' to `gnu_linux'.
X-Git-Tag: emacs-pretest-24.0.91~220
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=423dbf9b1e682291f32cf901ad71c586eeca3958;p=emacs.git

Rename `linux' to `gnu_linux'.
---

diff --git a/ChangeLog b/ChangeLog
index 3e76c91b196..6f17289a614 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-10-02  Richard Stallman  <rms@gnu.org>
+
+	* configure.in: Rename xlinux_first_failure to xgnu_linux_first_failure
+	and xlinux_second_failure to xgnu_linux_second_failure.
+
 2011-09-29  Eli Zaretskii  <eliz@gnu.org>
 
 	* .bzrignore: Add ./GNUmakefile.unix, lib/SYS, lib/alloca.in-h,
diff --git a/configure.in b/configure.in
index d2ffdd5a19e..b8de80baf5d 100644
--- a/configure.in
+++ b/configure.in
@@ -1792,9 +1792,9 @@ if test "${HAVE_X11}" = "yes"; then
     AC_MSG_CHECKING(whether X on GNU/Linux needs -b to link)
     AC_LINK_IFELSE([AC_LANG_PROGRAM([[]],
      [[XOpenDisplay ("foo");]])],
-     [xlinux_first_failure=no],
-     [xlinux_first_failure=yes])
-    if test "${xlinux_first_failure}" = "yes"; then
+     [xgnu_linux_first_failure=no],
+     [xgnu_linux_first_failure=yes])
+    if test "${xgnu_linux_first_failure}" = "yes"; then
       OLD_LD_SWITCH_X_SITE="$LD_SWITCH_X_SITE"
       OLD_C_SWITCH_X_SITE="$C_SWITCH_X_SITE"
       OLD_CPPFLAGS="$CPPFLAGS"
@@ -1805,9 +1805,9 @@ if test "${HAVE_X11}" = "yes"; then
       LIBS="$LIBS -b i486-linuxaout"
       AC_LINK_IFELSE([AC_LANG_PROGRAM([[]],
        [[XOpenDisplay ("foo");]])],
-       [xlinux_second_failure=no],
-       [xlinux_second_failure=yes])
-      if test "${xlinux_second_failure}" = "yes"; then
+       [xgnu_linux_second_failure=no],
+       [xgnu_linux_second_failure=yes])
+      if test "${xgnu_linux_second_failure}" = "yes"; then
 	# If we get the same failure with -b, there is no use adding -b.
 	# So take it out.  This plays safe.
 	LD_SWITCH_X_SITE="$OLD_LD_SWITCH_X_SITE"