diff options
| author | Romain B <skunnyk@alteroot.org> | 2017-11-08 23:31:19 +0100 |
|---|---|---|
| committer | Simon Steinbeiss <simon.steinbeiss@elfenbeinturm.at> | 2017-11-09 22:37:24 +0100 |
| commit | 17ac6a10f741017d1c853a884ee656a964909aa2 (patch) | |
| tree | da45b216bc3f64d12a58bcbb408b243cf05febb4 /configure.ac.in | |
| parent | 33a16c15e6eb4ae3eb8fa554686b4c7fb1540c32 (diff) | |
| download | ixfce4-power-manager-17ac6a10f741017d1c853a884ee656a964909aa2.tar.gz | |
Fix build on FreeBSD and DragonFlyBSD (Bug #13984)
- 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
Diffstat (limited to 'configure.ac.in')
| -rw-r--r-- | configure.ac.in | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/configure.ac.in b/configure.ac.in index 9a540838..33faf1c8 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]) #=======================================================# |