diff options
| author | Ted Gould <ted@gould.cx> | 2010-11-11 15:10:59 -0600 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2010-11-11 15:10:59 -0600 |
| commit | a1601926d6c0aa546c96aae96222554963d1a21e (patch) | |
| tree | b7965ad5c3356b956c7ead2dfe301acf863e7bca | |
| parent | 13be17f55dae82a632ede4adb9e66556da7992a9 (diff) | |
| download | ayatana-indicator-datetime-a1601926d6c0aa546c96aae96222554963d1a21e.tar.gz ayatana-indicator-datetime-a1601926d6c0aa546c96aae96222554963d1a21e.tar.bz2 ayatana-indicator-datetime-a1601926d6c0aa546c96aae96222554963d1a21e.zip | |
Adding a separate pkgcheck line for the service vs. the indicator
| -rw-r--r-- | configure.ac | 11 | ||||
| -rw-r--r-- | src/Makefile.am | 4 |
2 files changed, 13 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index d75e574..7a2b2cb 100644 --- a/configure.ac +++ b/configure.ac @@ -49,9 +49,20 @@ PKG_CHECK_MODULES(INDICATOR, indicator >= $INDICATOR_REQUIRED_VERSION geoclue >= $GEOCLUE_REQUIRED_VERSION liboobs-1 >= $OOBS_REQUIRED_VERSION) +PKG_CHECK_MODULES(SERVICE, indicator >= $INDICATOR_REQUIRED_VERSION + dbusmenu-glib >= $DBUSMENUGLIB_REQUIRED_VERSION + dbusmenu-gtk >= $DBUSMENUGTK_REQUIRED_VERSION + libido-0.1 >= $INDICATOR_DISPLAY_OBJECTS + gio-2.0 >= $GIO_REQUIRED_VERSION + geoclue >= $GEOCLUE_REQUIRED_VERSION + liboobs-1 >= $OOBS_REQUIRED_VERSION) + AC_SUBST(INDICATOR_CFLAGS) AC_SUBST(INDICATOR_LIBS) +AC_SUBST(SERVICE_CFLAGS) +AC_SUBST(SERVICE_LIBS) + ########################### # Grab the GSettings Macros ########################### diff --git a/src/Makefile.am b/src/Makefile.am index 98d4733..ebe466d 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -12,10 +12,10 @@ indicator_datetime_service_SOURCES = \ indicator_datetime_service_CFLAGS = \ -Wall \ -Werror \ - $(INDICATOR_CFLAGS) \ + $(SERVICE_CFLAGS) \ -DTIMEZONE_FILE="\"/etc/timezone\"" indicator_datetime_service_LDADD = \ - $(INDICATOR_LIBS) + $(SERVICE_LIBS) datetimelibdir = $(INDICATORDIR) datetimelib_LTLIBRARIES = libdatetime.la |