From: Ulrich Müller <ulm@gentoo.org>
Date: Wed, 31 Jan 2024 07:49:36 +0000 (+0100)
Subject: * configure.ac: Include X11/Xlib.h for XOpenDisplay.  (Bug#68842)
X-Git-Tag: archive/raspbian/1%29.4+1-4+rpi1~1^2~2^2~18^2~78
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=5f3b46c61e23786295e8e532f7eadeee8cd4340b;p=emacs.git

* configure.ac: Include X11/Xlib.h for XOpenDisplay.  (Bug#68842)

Do not merge to master.
---

diff --git a/configure.ac b/configure.ac
index 78d5475f75a..34a5a89bea9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2697,7 +2697,7 @@ if test "${HAVE_X11}" = "yes"; then
 
   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([[]],
+    [AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <X11/Xlib.h>]],
      [[XOpenDisplay ("foo");]])],
      [xgnu_linux_first_failure=no],
      [xgnu_linux_first_failure=yes])
@@ -2706,7 +2706,7 @@ if test "${HAVE_X11}" = "yes"; then
       OLD_LIBS="$LIBS"
       CPPFLAGS="$CPPFLAGS -b i486-linuxaout"
       LIBS="$LIBS -b i486-linuxaout"
-      AC_LINK_IFELSE([AC_LANG_PROGRAM([[]],
+      AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <X11/Xlib.h>]],
        [[XOpenDisplay ("foo");]])],
        [xgnu_linux_second_failure=no],
        [xgnu_linux_second_failure=yes])