From 1292dfb7dfc9a4c782cd2c0073ba0eeace5ee602 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Guelfucci?= Date: Sun, 27 Feb 2011 17:54:44 +0100 Subject: [PATCH] Add missing libX11 linking. --- configure.ac.in | 35 ++++++++++++++++++----------------- src/Makefile.am | 5 +++-- 2 files changed, 21 insertions(+), 19 deletions(-) diff --git a/configure.ac.in b/configure.ac.in index 933de54..9f96e7f 100644 --- a/configure.ac.in +++ b/configure.ac.in @@ -95,6 +95,7 @@ XDT_CHECK_PACKAGE([DBUS_GLIB], [dbus-glib-1], [dbus_glib_minimum_version]) XDT_CHECK_PACKAGE([LIBXFCE4GUI], [libxfcegui4-1.0],[libxfcegui4_minimum_version]) XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0],[libxfce4util_minimum_version]) +XDT_CHECK_LIBX11() #=======================================================# # Check for availability of libnotify # @@ -102,7 +103,7 @@ XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0],[libxfce4util_minimum_versi LIBNOTIFY_FOUND="no" XDT_CHECK_OPTIONAL_PACKAGE([LIBNOTIFY], [libnotify], [libnotify_minimum_version], - [libnotify], + [libnotify], [libnotify library], [yes]) # Taken from Gnome system tools @@ -133,9 +134,9 @@ fi # TagLib support # #=======================================================# TAGLIB_FOUND="no" -XDT_CHECK_OPTIONAL_PACKAGE([TAGLIB], +XDT_CHECK_OPTIONAL_PACKAGE([TAGLIB], [taglib], [1.4], - [taglib], + [taglib], [tag lib], [yes]) if test x"$TAGLIB_FOUND" = x"yes"; then @@ -178,7 +179,7 @@ if test x"$ac_tray_plugin" = x"yes"; then XDT_CHECK_OPTIONAL_PACKAGE([LIBNOTIFY], [libnotify], [libnotify_minimum_version], [libnotify], - [libnotify library], [yes]) + [libnotify library], [yes]) fi # Window title plugin. @@ -242,31 +243,31 @@ echo " ------------------------------------------------------ Parole Media Player $VERSION ==================================== - + Installation: ============= prefix: $prefix pixmapsdir: $pixmapsdir Debug: $enable_debug Building plugin api docs: ${enable_gtk_doc} - + Optional dependencies: ====================== Libnotify: $LIBNOTIFY_FOUND Taglib: $TAGLIB_FOUND - + Plugins to build: ================= - Stream Properties: ${ac_properties_plugin}" - if test x${ac_properties_plugin} = x"yes"; then - echo " (With taglib $TAGLIB_FOUND)" - fi - echo " - System Tray icon: ${ac_tray_plugin}" - if test x${ac_tray_plugin} = x"yes"; then - echo " (With notification $LIBNOTIFY_FOUND)" - fi - + Stream Properties: ${ac_properties_plugin}" + if test x${ac_properties_plugin} = x"yes"; then + echo " (With taglib $TAGLIB_FOUND)" + fi + echo " + System Tray icon: ${ac_tray_plugin}" + if test x${ac_tray_plugin} = x"yes"; then + echo " (With notification $LIBNOTIFY_FOUND)" + fi + echo " Window title: ${ac_window_title_plugin} Power Manager: ${ac_power_manager_plugin} diff --git a/src/Makefile.am b/src/Makefile.am index b2928a8..1353694 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -85,8 +85,9 @@ parole_LDADD = \ $(LIBXFCE4GUI_LIBS) \ $(GST_VIDEO_LIBS) \ $(GST_INTERFACES_LIBS) \ - $(TAGLIBC_LIBS) - + $(TAGLIBC_LIBS) \ + $(LIBX11_LIBS) + parole_glib_enum_headers = \ parole-conf.h \ parole-button.h -- 1.7.2.3