diff options
| author | Ted Gould <ted@gould.cx> | 2010-11-08 12:12:42 -0500 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2010-11-08 12:12:42 -0500 |
| commit | dd78c210ca89ec0a212d15ba57c56ded808bb526 (patch) | |
| tree | 46b64f3916324fe67ce93675afc36a269c2619b7 | |
| parent | 52c706605c23a2b3b06e5f4262d5ea1ab1577567 (diff) | |
| parent | eab2ebe5b34569ada5f5fda64b9e313b1d9cccca (diff) | |
| download | libayatana-appindicator-dd78c210ca89ec0a212d15ba57c56ded808bb526.tar.gz libayatana-appindicator-dd78c210ca89ec0a212d15ba57c56ded808bb526.tar.bz2 libayatana-appindicator-dd78c210ca89ec0a212d15ba57c56ded808bb526.zip | |
Merging in the lib-deps-fixes branch so that I can use those changes.
| -rw-r--r-- | configure.ac | 7 | ||||
| -rw-r--r-- | src/Makefile.am | 4 |
2 files changed, 9 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index 0ecea51..f1ae2ea 100644 --- a/configure.ac +++ b/configure.ac @@ -52,6 +52,13 @@ PKG_CHECK_MODULES(INDICATOR, gtk+-2.0 >= $GTK_REQUIRED_VERSION 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 ########################### diff --git a/src/Makefile.am b/src/Makefile.am index 1c4e7ae..091f0f2 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -108,12 +108,12 @@ libappindicator_la_LDFLAGS = \ -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 |