aboutsummaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
authorSebastien Bacher <seb128@ubuntu.com>2012-07-13 17:09:25 +0200
committerSebastien Bacher <seb128@ubuntu.com>2012-07-13 17:09:25 +0200
commited02493a8c6534f1aaf76e005100ad7be7820891 (patch)
tree84597b1501fd36b6f2a3702e12fa35360a5db2e2 /configure.ac
parent75d3c8be473b6c2600f187f77ffb25b21700a373 (diff)
parente2e14906d2f574abf672862c2bf4dac1d044dd3c (diff)
downloadayatana-indicator-datetime-ed02493a8c6534f1aaf76e005100ad7be7820891.tar.gz
ayatana-indicator-datetime-ed02493a8c6534f1aaf76e005100ad7be7820891.tar.bz2
ayatana-indicator-datetime-ed02493a8c6534f1aaf76e005100ad7be7820891.zip
Import upstream version 12.10.0
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac48
1 files changed, 11 insertions, 37 deletions
diff --git a/configure.ac b/configure.ac
index 508fc9a..e8b3eb2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
AC_INIT([indicator-datetime],
- [0.3.94],
+ [12.10.0],
[http://bugs.launchpad.net/indicator-datetime],
[indicator-datetime],
[http://launchpad.net/indicator-datetime])
@@ -43,16 +43,6 @@ 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 for the indicator @<:@default=3@:>@])],
- [],
- [with_gtk=3])
-
-###########################
# Dependencies
###########################
@@ -71,22 +61,11 @@ GLIB_REQUIRED_VERSION=2.29.19
GTK3_REQUIRED_VERSION=3.1.4
GCONF_REQUIRED_VERSION=2.31
-AS_IF([test "x$with_gtk" = x3],
- [PKG_CHECK_MODULES(INDICATOR, indicator3-0.4 >= $INDICATOR_REQUIRED_VERSION
- glib-2.0 >= $GLIB_REQUIRED_VERSION
- dbusmenu-glib-0.4 >= $DBUSMENUGLIB_REQUIRED_VERSION
- dbusmenu-gtk3-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION
- libido3-0.1 >= $INDICATOR_DISPLAY_OBJECTS)
- ],
- [test "x$with_gtk" = x2],
- [PKG_CHECK_MODULES(INDICATOR, indicator-0.4 >= $INDICATOR_REQUIRED_VERSION
- glib-2.0 >= $GLIB_REQUIRED_VERSION
- dbusmenu-glib-0.4 >= $DBUSMENUGLIB_REQUIRED_VERSION
- dbusmenu-gtk-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION
- libido-0.1 >= $INDICATOR_DISPLAY_OBJECTS)
- ],
- [AC_MSG_FAILURE([Value for --with-gtk was neither 2 nor 3])]
-)
+PKG_CHECK_MODULES(INDICATOR, indicator3-0.4 >= $INDICATOR_REQUIRED_VERSION
+ glib-2.0 >= $GLIB_REQUIRED_VERSION
+ dbusmenu-glib-0.4 >= $DBUSMENUGLIB_REQUIRED_VERSION
+ dbusmenu-gtk3-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION
+ libido3-0.1 >= $INDICATOR_DISPLAY_OBJECTS)
PKG_CHECK_MODULES(SERVICE, indicator3-0.4 >= $INDICATOR_REQUIRED_VERSION
glib-2.0 >= $GLIB_REQUIRED_VERSION
@@ -123,7 +102,7 @@ if test x"$with_ccpanel" != x"no" ; then
if test x${have_ccpanel} = xyes; then
AC_DEFINE(HAVE_CCPANEL, 1, [Define to 1 to enable Control Center panel])
PKG_CHECK_MODULES(LIBMAP, gio-2.0 >= $GIO_REQUIRED_VERSION
- gtk+-3.0 >= $GTK3_REQUIRED_VERSION)
+ gtk+-3.0 >= $GTK3_REQUIRED_VERSION)
fi
if test x${with_ccpanel} = xyes && test x${have_ccpanel} = xno; then
AC_MSG_ERROR([Control Center panel configured but not found])
@@ -167,15 +146,10 @@ AS_IF([test "x$with_localinstall" = "xyes"],
INDICATORDIR="${libdir}/indicators/2/"
INDICATORICONSDIR="${datadir}/libindicate/icons/"
],
- [AS_IF([test "x$with_gtk" = "x2"],
- [
- INDICATORDIR=`$PKG_CONFIG --variable=indicatordir indicator-0.4`
- INDICATORICONSDIR=`$PKG_CONFIG --variable=iconsdir indicator-0.4`
- ],
- [
- INDICATORDIR=`$PKG_CONFIG --variable=indicatordir indicator3-0.4`
- INDICATORICONSDIR=`$PKG_CONFIG --variable=iconsdir indicator3-0.4`
- ])])
+ [
+ INDICATORDIR=`$PKG_CONFIG --variable=indicatordir indicator3-0.4`
+ INDICATORICONSDIR=`$PKG_CONFIG --variable=iconsdir indicator3-0.4`
+ ])
AC_SUBST(INDICATORDIR)
AC_SUBST(INDICATORICONSDIR)