From: Lars Wendler <polynomial-c@gentoo.org>
Date: Tue, 1 Mar 2022 15:05:52 +0000 (+0100)
Subject: Emit an error when --with-x was given but no X11 libs were found
X-Git-Tag: dbus-1.15.0~101^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=17c88a894499da64460a0ef76db1d8b88ceb9eeb;p=thirdparty%2Fdbus.git

Emit an error when --with-x was given but no X11 libs were found
---

diff --git a/configure.ac b/configure.ac
index a51e72653..4420c6d37 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1121,12 +1121,13 @@ else if test "x$with_x" != xno; then
 	     have_x11=yes
 	     DBUS_X_LIBS="$X_LIBS"
 	     DBUS_X_CFLAGS="$X_CFLAGS"
-            ],
-            [ have_x11=no ])
-
-    if test "x$have_x11" = xno; then
-        AC_MSG_WARN([Couldn't found X11, tried with pkg-config.])
-    fi
+            ], [
+             AS_IF([test "x$with_x" = xyes],
+                [AC_MSG_ERROR([Couldn't find X11, tried with pkg-config.])],
+                [AC_MSG_WARN([Couldn't find X11, tried with pkg-config.])]
+             )
+             have_x11=no
+            ])
 else
     AS_IF([test "x$enable_x11_autolaunch" = "xyes"], [
       AC_MSG_ERROR([--enable-x11-autolaunch and --without-x are not compatible])