63 lines
2.1 KiB
Diff
63 lines
2.1 KiB
Diff
From 123ece3c3313101048d43a5ef2f9bd66c4e97fb7 Mon Sep 17 00:00:00 2001
|
|
From: Florian Weimer <fweimer@redhat.com>
|
|
Date: Fri, 23 Dec 2022 18:49:25 +0100
|
|
Subject: [PATCH] configure: Remove obsolete check for -b i486-linuxaout
|
|
|
|
If there are still a.out system arounds, they shouldn't need this
|
|
anymore because the toolchain has been fixed.
|
|
|
|
* configure.ac (emacs_cv_b_link): Remove obsolete check.
|
|
|
|
(cherry picked from commit 6c1413d5ef0d1fea639b0d8c83a0c0065d99359b)
|
|
---
|
|
configure.ac | 33 ---------------------------------
|
|
1 file changed, 33 deletions(-)
|
|
|
|
diff --git a/configure.ac b/configure.ac
|
|
index 5dd182ae6e5..8a20caa8c4e 100644
|
|
--- a/configure.ac
|
|
+++ b/configure.ac
|
|
@@ -2695,39 +2695,6 @@ if test "${HAVE_X11}" = "yes"; then
|
|
export LD_RUN_PATH
|
|
fi
|
|
|
|
- if test "${opsys}" = "gnu-linux"; then
|
|
- AC_CACHE_CHECK([whether X on GNU/Linux needs -b to link], [emacs_cv_b_link],
|
|
- [AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <X11/Xlib.h>]],
|
|
- [[XOpenDisplay ("foo");]])],
|
|
- [xgnu_linux_first_failure=no],
|
|
- [xgnu_linux_first_failure=yes])
|
|
- if test "${xgnu_linux_first_failure}" = "yes"; then
|
|
- OLD_CPPFLAGS="$CPPFLAGS"
|
|
- OLD_LIBS="$LIBS"
|
|
- CPPFLAGS="$CPPFLAGS -b i486-linuxaout"
|
|
- LIBS="$LIBS -b i486-linuxaout"
|
|
- AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <X11/Xlib.h>]],
|
|
- [[XOpenDisplay ("foo");]])],
|
|
- [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 leave it out. This plays safe.
|
|
- emacs_cv_b_link=no
|
|
- else
|
|
- emacs_cv_b_link=yes
|
|
- fi
|
|
- CPPFLAGS=$OLD_CPPFLAGS
|
|
- LIBS=$OLD_LIBS
|
|
- else
|
|
- emacs_cv_b_link=no
|
|
- fi])
|
|
- if test "x$emacs_cv_b_link" = xyes ; then
|
|
- LD_SWITCH_X_SITE="$LD_SWITCH_X_SITE -b i486-linuxaout"
|
|
- C_SWITCH_X_SITE="$C_SWITCH_X_SITE -b i486-linuxaout"
|
|
- fi
|
|
- fi
|
|
-
|
|
# Reportedly, some broken Solaris systems have XKBlib.h but are missing
|
|
# header files included from there.
|
|
AC_CACHE_CHECK([for Xkb], [emacs_cv_xkb],
|
|
--
|
|
2.41.0
|
|
|