diff options
author | Ted Gould <ted@canonical.com> | 2009-05-19 05:11:04 +0200 |
---|---|---|
committer | Ted Gould <ted@canonical.com> | 2009-05-19 05:11:04 +0200 |
commit | f9ea57e39f9025dc93642fe306fd36c9ee61b28e (patch) | |
tree | a619ffcb13d740f17912e4ecb7ffee88549549b6 | |
parent | e84ef2f86d5005d6b7c298be37fd25c527d1a6fe (diff) | |
download | libdbusmenu-f9ea57e39f9025dc93642fe306fd36c9ee61b28e.tar.gz libdbusmenu-f9ea57e39f9025dc93642fe306fd36c9ee61b28e.tar.bz2 libdbusmenu-f9ea57e39f9025dc93642fe306fd36c9ee61b28e.zip |
Getting the libs into the gtk library
-rw-r--r-- | configure.ac | 14 | ||||
-rw-r--r-- | libdbusmenu-gtk/Makefile.am | 5 |
2 files changed, 17 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index 96b23fc..9770814 100644 --- a/configure.ac +++ b/configure.ac @@ -35,6 +35,20 @@ AC_SUBST(DBUSMENUGLIB_CFLAGS) AC_SUBST(DBUSMENUGLIB_LIBS) ########################### +# Dependencies - GTK +########################### + +GTK_REQUIRED_VERSION=2.16 + +PKG_CHECK_MODULES(DBUSMENUGTK, gtk+-2.0 >= $GTK_REQUIRED_VERSION + glib-2.0 >= $GLIB_REQUIRED_VERSION + dbus-glib-1 >= $DBUS_REQUIRED_VERSION + libxml-2.0 >= $XML_REQUIRED_VERSION) + +AC_SUBST(DBUSMENUGTK_CFLAGS) +AC_SUBST(DBUSMENUGTK_LIBS) + +########################### # Lib versioning ########################### diff --git a/libdbusmenu-gtk/Makefile.am b/libdbusmenu-gtk/Makefile.am index 364da62..e73c8c1 100644 --- a/libdbusmenu-gtk/Makefile.am +++ b/libdbusmenu-gtk/Makefile.am @@ -19,10 +19,11 @@ libdbusmenu_gtk_la_LDFLAGS = \ -export-symbols-regex "^[^_].*" libdbusmenu_gtk_la_CFLAGS = \ - $(LIBDBUSMENU_GTK_CFLAGS) + $(DBUSMENUGTK_CFLAGS) libdbusmenu_gtk_la_LIBADD = \ - $(LIBDBUSMENU_GTK_LIBS) + ../libdbusmenu-glib/libdbusmenu-glib.la \ + $(DBUSMENUGTK_LIBS) pkgconfig_DATA = dbusmenu-gtk.pc pkgconfigdir = $(libdir)/pkgconfig |