diff options
| author | Ted Gould <ted@gould.cx> | 2010-12-03 12:24:40 -0600 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2010-12-03 12:24:40 -0600 |
| commit | efd1930c25caaec23c5078ae6af0f0753bedb2a6 (patch) | |
| tree | 3728471a64019c0c4c22bf740355164b22feefd5 | |
| parent | 13be17f55dae82a632ede4adb9e66556da7992a9 (diff) | |
| parent | a8641088d452531f74112703eec6bb2a6e907972 (diff) | |
| download | ayatana-indicator-datetime-efd1930c25caaec23c5078ae6af0f0753bedb2a6.tar.gz ayatana-indicator-datetime-efd1930c25caaec23c5078ae6af0f0753bedb2a6.tar.bz2 ayatana-indicator-datetime-efd1930c25caaec23c5078ae6af0f0753bedb2a6.zip | |
Merging in support for GTK3
| -rw-r--r-- | configure.ac | 58 | ||||
| -rw-r--r-- | src/Makefile.am | 4 |
2 files changed, 53 insertions, 9 deletions
diff --git a/configure.ac b/configure.ac index d75e574..2197763 100644 --- a/configure.ac +++ b/configure.ac @@ -23,12 +23,31 @@ AC_CONFIG_MACRO_DIR([m4]) m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])]) +AC_ARG_ENABLE([deprecations], + [AS_HELP_STRING([--enable-deprecations], + [allow deprecated API usage @<:@default=yes@:>@])], + [], + [enable_deprecations=yes]) +AS_IF([test "x$enable_deprecations" = xno], + [CFLAGS="$CFLAGS -DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGSEAL_ENABLE -DGTK_DISABLE_SINGLE_INCLUDES"] +) + AC_PATH_PROG([GLIB_MKENUMS], [glib-mkenums]) AC_PATH_PROG([GLIB_GENMARSHAL], [glib-genmarshal]) PKG_PROG_PKG_CONFIG ########################### +# GTK+ version option +########################### + +AC_ARG_WITH([gtk], + [AS_HELP_STRING([--with-gtk], + [Which version of gtk to use @<:@default=2@:>@])], + [], + [with_gtk=2]) + +########################### # Dependencies ########################### @@ -41,9 +60,23 @@ INDICATOR_DISPLAY_OBJECTS=0.1.10 GEOCLUE_REQUIRED_VERSION=0.12.0 OOBS_REQUIRED_VERSION=2.31.0 -PKG_CHECK_MODULES(INDICATOR, indicator >= $INDICATOR_REQUIRED_VERSION +AS_IF([test "x$with_gtk" = x3], + [PKG_CHECK_MODULES(INDICATOR, indicator3 >= $INDICATOR_REQUIRED_VERSION + dbusmenu-glib >= $DBUSMENUGLIB_REQUIRED_VERSION + dbusmenu-gtk3 >= $DBUSMENUGTK_REQUIRED_VERSION + libido3-0.1 >= $INDICATOR_DISPLAY_OBJECTS) + ], + [test "x$with_gtk" = x2], + [PKG_CHECK_MODULES(INDICATOR, indicator >= $INDICATOR_REQUIRED_VERSION + dbusmenu-glib >= $DBUSMENUGLIB_REQUIRED_VERSION + dbusmenu-gtk >= $DBUSMENUGTK_REQUIRED_VERSION + libido-0.1 >= $INDICATOR_DISPLAY_OBJECTS) + ], + [AC_MSG_FAILURE([Value for --with-gtk was neither 2 nor 3])] +) + +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 @@ -52,6 +85,9 @@ PKG_CHECK_MODULES(INDICATOR, indicator >= $INDICATOR_REQUIRED_VERSION AC_SUBST(INDICATOR_CFLAGS) AC_SUBST(INDICATOR_LIBS) +AC_SUBST(SERVICE_CFLAGS) +AC_SUBST(SERVICE_LIBS) + ########################### # Grab the GSettings Macros ########################### @@ -69,13 +105,21 @@ AC_ARG_ENABLE(localinstall, AS_HELP_STRING([--enable-localinstall], [install all # Indicator Info ########################### -if test "x$with_localinstall" = "xyes"; then +AS_IF([test "x$with_localinstall" = "xyes"], + [ INDICATORDIR="${libdir}/indicators/2/" INDICATORICONSDIR="${datadir}/libindicate/icons/" -else - INDICATORDIR=`$PKG_CONFIG --variable=indicatordir indicator` - INDICATORICONSDIR=`$PKG_CONFIG --variable=iconsdir indicator` -fi + ], + [AS_IF([test "x$with_gtk" = "x2"], + [ + INDICATORDIR=`$PKG_CONFIG --variable=indicatordir indicator` + INDICATORICONSDIR=`$PKG_CONFIG --variable=iconsdir indicator` + ], + [ + INDICATORDIR=`$PKG_CONFIG --variable=indicatordir indicator3` + INDICATORICONSDIR=`$PKG_CONFIG --variable=iconsdir indicator3` + ])]) + AC_SUBST(INDICATORDIR) AC_SUBST(INDICATORICONSDIR) 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 |