[gnome-packagekit/gnome-2-28] Ensure we detect and use x11 to fix the compile when linking with --as-needed
- From: Richard Hughes <rhughes src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [gnome-packagekit/gnome-2-28] Ensure we detect and use x11 to fix the compile when linking with --as-needed
- Date: Wed, 27 Jan 2010 16:28:37 +0000 (UTC)
commit dd4334c46b85b20d9a3ba1288c3ee341b503782d
Author: Richard Hughes <richard hughsie com>
Date: Wed Jan 6 19:00:53 2010 +0000
Ensure we detect and use x11 to fix the compile when linking with --as-needed
configure.ac | 4 ++++
src/Makefile.am | 1 +
2 files changed, 5 insertions(+), 0 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index ff7ebf9..14170bb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -185,6 +185,10 @@ PKG_CHECK_MODULES(CANBERRA, libcanberra-gtk >= $CANBERRA_REQUIRED)
AC_SUBST(CANBERRA_CFLAGS)
AC_SUBST(CANBERRA_LIBS)
+PKG_CHECK_MODULES(X11, x11)
+AC_SUBST(X11_CFLAGS)
+AC_SUBST(X11_LIBS)
+
dnl ---------------------------------------------------------------------------
dnl - GUdev integration (default enabled)
dnl ---------------------------------------------------------------------------
diff --git a/src/Makefile.am b/src/Makefile.am
index fb6624a..782ab9f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -119,6 +119,7 @@ shared_LIBS = \
$(GNOME_MENUS_LIBS) \
$(DEVKIT_LIBS) \
$(CANBERRA_LIBS) \
+ $(X11_LIBS) \
$(NULL)
gpk_install_provide_file_SOURCES = \
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]