diff options
| author | Ted Gould <ted@gould.cx> | 2010-12-03 13:36:33 -0600 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2010-12-03 13:36:33 -0600 |
| commit | 8e1fbde30cfce799b64477113b404d5cda3306aa (patch) | |
| tree | cbd19c9bc5ff7638b2aabe9e81028cdd87fb4a79 /configure.ac | |
| parent | 83b6ed9560abbeebeae87c8bc5f81955d6c0799c (diff) | |
| parent | 803f8f9c0a81d34c9d94c7b27e3b78fb0a6ecab3 (diff) | |
| download | ayatana-indicator-datetime-8e1fbde30cfce799b64477113b404d5cda3306aa.tar.gz ayatana-indicator-datetime-8e1fbde30cfce799b64477113b404d5cda3306aa.tar.bz2 ayatana-indicator-datetime-8e1fbde30cfce799b64477113b404d5cda3306aa.zip | |
Import upstream version 0.1.90
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 70 |
1 files changed, 59 insertions, 11 deletions
diff --git a/configure.ac b/configure.ac index 74b9e70..dc0448c 100644 --- a/configure.ac +++ b/configure.ac @@ -1,11 +1,11 @@ -AC_INIT(indicator-datetime, 0.0.6, ted@canonical.com) +AC_INIT(indicator-datetime, 0.1.90, ted@canonical.com) AC_COPYRIGHT([Copyright 2009,2010 Canonical]) AC_PREREQ(2.53) AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE(indicator-datetime, 0.0.6) +AM_INIT_AUTOMAKE(indicator-datetime, 0.1.90) AM_MAINTAINER_MODE @@ -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 ########################### @@ -38,16 +57,37 @@ DBUSMENUGTK_REQUIRED_VERSION=0.1.1 GIO_REQUIRED_VERSION=2.25.11 # Note: the GIO check below also ensures the proper glib with gsettings support is present INDICATOR_DISPLAY_OBJECTS=0.1.10 - -PKG_CHECK_MODULES(INDICATOR, indicator >= $INDICATOR_REQUIRED_VERSION +GEOCLUE_REQUIRED_VERSION=0.12.0 +OOBS_REQUIRED_VERSION=2.31.0 + +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) + 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 ########################### @@ -65,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) |