From b87994b81ae853e72f4910f6e6ecefa45290079a Mon Sep 17 00:00:00 2001 From: Romain B Date: Wed, 8 Nov 2017 23:31:19 +0100 Subject: [PATCH] Fix build on FreeBSD / DragonFlyBSD - Fix the DPMS detection by adding correct lib/cflags on Xext AC_CHECK_LIB, so -lXext is correctly added on link time (taken from xfwm4) - Also uses XDT_CHECK_LIBX11_REQUIRE to detect X11 - Fix Bug #13984 --- common/Makefile.am | 2 +- configure.ac.in | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/common/Makefile.am b/common/Makefile.am index 2775818..278b4c1 100644 --- a/common/Makefile.am +++ b/common/Makefile.am @@ -28,7 +28,7 @@ libxfpmcommon_la_LIBADD = \ $(GTK_LIBS) \ $(GLIB_LIBS) \ $(XRANDR_LIBS) \ - $(X11_LIBS) \ + $(LIBX11_LIBS) \ $(DBUS_GLIB_LIBS) \ $(UPOWER_LIBS) diff --git a/configure.ac.in b/configure.ac.in index 9a54083..33faf1c 100644 --- a/configure.ac.in +++ b/configure.ac.in @@ -57,6 +57,11 @@ AC_CHECK_LIB([m], [round]) XDT_I18N([@LINGUAS@]) +# ===================================================== # +# Check for X11 support # +# ===================================================== # +XDT_CHECK_LIBX11_REQUIRE() + #==================================================== # # Check for required packages # #=====================================================# @@ -71,7 +76,6 @@ m4_define([libxfce4panel_minimum_version],[4.12.0]) m4_define([libnotify_minimum_version], [0.4.1]) m4_define([upower_minimum_version], [0.99.0]) m4_define([xrandr_minimum_version], [1.2.0]) -m4_define([x11_minimum_version], [1.0.0]) XDT_CHECK_PACKAGE([GTK], [gtk+-3.0], [gtk_minimum_version]) XDT_CHECK_PACKAGE([GLIB], [glib-2.0], [glib_minimum_version]) @@ -85,7 +89,6 @@ XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0],[libxfce4util_minimum_versi XDT_CHECK_PACKAGE([LIBNOTIFY],[libnotify], [libnotify_minimum_version]) XDT_CHECK_PACKAGE([UPOWER],[upower-glib], [upower_minimum_version]) XDT_CHECK_PACKAGE([XRANDR],[xrandr], [xrandr_minimum_version]) -XDT_CHECK_PACKAGE([X11], [x11], [x11_minimum_version]) #=======================================================# # Polkit? # @@ -108,7 +111,7 @@ AM_CONDITIONAL([ENABLE_POLKIT], [test "x$polkit" = "xyes"]) #=======================================================# # Check for DPMS support # #=======================================================# -AC_CHECK_LIB([Xext], [DPMSQueryExtension], [DPMS_LIBS=" -lXext -lX11"],[]) +AC_CHECK_LIB([Xext], [DPMSQueryExtension], [DPMS_LIBS=" -lXext -lX11"],[], [$LIBX11_CFLAGS $LIBX11_LDFLAGS $LIBX11_LIBS]) AC_SUBST([DPMS_LIBS]) #=======================================================# -- 2.15.0