ayatana-commits team mailing list archive

[Ted Gould <ted@xxxxxxxx>]

Ted Gould has proposed merging lp:~ted/indicator-application/lib-deps-fixes into lp:indicator-application.

Requested reviews:
  Indicator Applet Developers (indicator-applet-developers)


Creates a separate package config line for the library which removes the extra deps, most notably on libindicator.
-- 
https://code.launchpad.net/~ted/indicator-application/lib-deps-fixes/+merge/36345
Your team ayatana-commits is subscribed to branch lp:indicator-application.

=== modified file 'configure.ac'
--- configure.ac	2010-09-22 16:13:14 +0000
+++ configure.ac	2010-09-22 16:49:43 +0000
@@ -52,6 +52,13 @@
 AC_SUBST(INDICATOR_CFLAGS)
 AC_SUBST(INDICATOR_LIBS)
 
+PKG_CHECK_MODULES(LIBRARY, gtk+-2.0 >= $GTK_REQUIRED_VERSION
+                           dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION
+                           dbusmenu-gtk >= $DBUSMENUGTK_REQUIRED_VERSION)
+
+AC_SUBST(LIBRARY_CFLAGS)
+AC_SUBST(LIBRARY_LIBS)
+
 ###########################
 # GObject Introspection
 ###########################

=== modified file 'src/Makefile.am'
--- src/Makefile.am	2010-08-10 21:59:25 +0000
+++ src/Makefile.am	2010-09-22 16:49:43 +0000
@@ -108,12 +108,12 @@
 	-export-symbols-regex "^[^_d].*"
 
 libappindicator_la_CFLAGS = \
-	$(INDICATOR_CFLAGS) \
+	$(LIBRARY_CFLAGS) \
 	-Wall -Werror \
 	-DG_LOG_DOMAIN=\"libappindicator\"
 
 libappindicator_la_LIBADD = \
-	$(INDICATOR_LIBS)
+	$(LIBRARY_LIBS)
 
 ##################################
 # DBus Specs