* New upstream release.

  * Add support for building GTK2 and GTK3 versions
* debian/control: Add recommends for geoclue-ubuntu-geoip

1 files changed, 349 insertions, 68 deletions

diff --git a/configure b/configure
index 870f205..b6adbd4 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.67 for indicator-datetime 0.0.6.
+# Generated by GNU Autoconf 2.67 for indicator-datetime 0.1.90.
 #
 # Report bugs to <ted@canonical.com>.
 #
@@ -703,8 +703,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='indicator-datetime'
 PACKAGE_TARNAME='indicator-datetime'
-PACKAGE_VERSION='0.0.6'
-PACKAGE_STRING='indicator-datetime 0.0.6'
+PACKAGE_VERSION='0.1.90'
+PACKAGE_STRING='indicator-datetime 0.1.90'
 PACKAGE_BUGREPORT='ted@canonical.com'
 PACKAGE_URL=''
 
@@ -768,6 +768,8 @@ GSETTINGS_RULES
 GLIB_COMPILE_SCHEMAS
 gsettingsschemadir
 GSETTINGS_DISABLE_SCHEMAS_COMPILE
+SERVICE_LIBS
+SERVICE_CFLAGS
 INDICATOR_LIBS
 INDICATOR_CFLAGS
 PKG_CONFIG_LIBDIR
@@ -928,6 +930,8 @@ enable_fast_install
 with_gnu_ld
 enable_libtool_lock
 enable_silent_rules
+enable_deprecations
+with_gtk
 enable_schemas_compile
 enable_localinstall
 '
@@ -944,7 +948,9 @@ PKG_CONFIG
 PKG_CONFIG_PATH
 PKG_CONFIG_LIBDIR
 INDICATOR_CFLAGS
-INDICATOR_LIBS'
+INDICATOR_LIBS
+SERVICE_CFLAGS
+SERVICE_LIBS'
 
 
 # Initialize some variables set by options.
@@ -1487,7 +1493,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures indicator-datetime 0.0.6 to adapt to many kinds of systems.
+\`configure' configures indicator-datetime 0.1.90 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1558,7 +1564,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of indicator-datetime 0.0.6:";;
+     short | recursive ) echo "Configuration of indicator-datetime 0.1.90:";;
    esac
   cat <<\_ACEOF
 
@@ -1578,6 +1584,7 @@ Optional Features:
   --disable-libtool-lock  avoid locking (might break parallel builds)
   --enable-silent-rules          less verbose build output (undo: `make V=1')
   --disable-silent-rules         verbose build output (undo: `make V=0')
+  --enable-deprecations   allow deprecated API usage [default=yes]
   --disable-schemas-compile
                           Disable regeneration of gschemas.compiled on install
   --enable-localinstall   install all of the files localy instead of system
@@ -1589,6 +1596,7 @@ Optional Packages:
   --with-pic              try to use only PIC/non-PIC objects [default=use
                           both]
   --with-gnu-ld           assume the C compiler uses GNU ld [default=no]
+  --with-gtk              Which version of gtk to use [default=2]
 
 Some influential environment variables:
   CC          C compiler command
@@ -1608,6 +1616,10 @@ Some influential environment variables:
               C compiler flags for INDICATOR, overriding pkg-config
   INDICATOR_LIBS
               linker flags for INDICATOR, overriding pkg-config
+  SERVICE_CFLAGS
+              C compiler flags for SERVICE, overriding pkg-config
+  SERVICE_LIBS
+              linker flags for SERVICE, overriding pkg-config
 
 Use these variables to override the choices made by `configure' or to help
 it to find libraries and programs with nonstandard names/locations.
@@ -1675,7 +1687,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-indicator-datetime configure 0.0.6
+indicator-datetime configure 0.1.90
 generated by GNU Autoconf 2.67
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -2046,7 +2058,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by indicator-datetime $as_me 0.0.6, which was
+It was created by indicator-datetime $as_me 0.1.90, which was
 generated by GNU Autoconf 2.67.  Invocation command line was
 
   $ $0 $@
@@ -2867,7 +2879,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE=indicator-datetime
- VERSION=0.0.6
+ VERSION=0.1.90
 
 
 cat >>confdefs.h <<_ACEOF
@@ -6281,13 +6293,13 @@ if test "${lt_cv_nm_interface+set}" = set; then :
 else
   lt_cv_nm_interface="BSD nm"
   echo "int some_variable = 0;" > conftest.$ac_ext
-  (eval echo "\"\$as_me:6284: $ac_compile\"" >&5)
+  (eval echo "\"\$as_me:6296: $ac_compile\"" >&5)
   (eval "$ac_compile" 2>conftest.err)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:6287: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+  (eval echo "\"\$as_me:6299: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
   (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:6290: output\"" >&5)
+  (eval echo "\"\$as_me:6302: output\"" >&5)
   cat conftest.out >&5
   if $GREP 'External.*some_variable' conftest.out > /dev/null; then
     lt_cv_nm_interface="MS dumpbin"
@@ -7492,7 +7504,7 @@ ia64-*-hpux*)
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 7495 "configure"' > conftest.$ac_ext
+  echo '#line 7507 "configure"' > conftest.$ac_ext
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -8712,6 +8724,10 @@ _lt_linker_boilerplate=`cat conftest.err`
 $RM -r conftest*
 
 
+## CAVEAT EMPTOR:
+## There is no encapsulation within the following macros, do not change
+## the running order or otherwise move them around unless you know exactly
+## what you are doing...
 if test -n "$compiler"; then
 
 lt_prog_compiler_no_builtin_flag=
@@ -8737,11 +8753,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:8740: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8756: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:8744: \$? = $ac_status" >&5
+   echo "$as_me:8760: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -9076,11 +9092,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:9079: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:9095: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:9083: \$? = $ac_status" >&5
+   echo "$as_me:9099: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -9181,11 +9197,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:9184: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:9200: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:9188: \$? = $ac_status" >&5
+   echo "$as_me:9204: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -9236,11 +9252,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:9239: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:9255: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:9243: \$? = $ac_status" >&5
+   echo "$as_me:9259: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -11620,7 +11636,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 11623 "configure"
+#line 11639 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -11716,7 +11732,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 11719 "configure"
+#line 11735 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -11960,6 +11976,18 @@ esac
 AM_BACKSLASH='\'
 
 
+# Check whether --enable-deprecations was given.
+if test "${enable_deprecations+set}" = set; then :
+  enableval=$enable_deprecations;
+else
+  enable_deprecations=yes
+fi
+
+if test "x$enable_deprecations" = xno; then :
+  CFLAGS="$CFLAGS -DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGSEAL_ENABLE -DGTK_DISABLE_SINGLE_INCLUDES"
+
+fi
+
 # Extract the first word of "glib-mkenums", so it can be a program name with args.
 set dummy glib-mkenums; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
@@ -12162,6 +12190,19 @@ $as_echo "no" >&6; }
 fi
 
 ###########################
+# GTK+ version option
+###########################
+
+
+# Check whether --with-gtk was given.
+if test "${with_gtk+set}" = set; then :
+  withval=$with_gtk;
+else
+  with_gtk=2
+fi
+
+
+###########################
 # Dependencies
 ###########################
 
@@ -12174,6 +12215,125 @@ INDICATOR_DISPLAY_OBJECTS=0.1.10
 GEOCLUE_REQUIRED_VERSION=0.12.0
 OOBS_REQUIRED_VERSION=2.31.0
 
+if test "x$with_gtk" = x3; then :
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for INDICATOR" >&5
+$as_echo_n "checking for INDICATOR... " >&6; }
+
+if test -n "$INDICATOR_CFLAGS"; then
+    pkg_cv_INDICATOR_CFLAGS="$INDICATOR_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"indicator3 >= \$INDICATOR_REQUIRED_VERSION
+                                  dbusmenu-glib >= \$DBUSMENUGLIB_REQUIRED_VERSION
+                                  dbusmenu-gtk3 >= \$DBUSMENUGTK_REQUIRED_VERSION
+                                  libido3-0.1 >= \$INDICATOR_DISPLAY_OBJECTS\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "indicator3 >= $INDICATOR_REQUIRED_VERSION
+                                  dbusmenu-glib >= $DBUSMENUGLIB_REQUIRED_VERSION
+                                  dbusmenu-gtk3 >= $DBUSMENUGTK_REQUIRED_VERSION
+                                  libido3-0.1 >= $INDICATOR_DISPLAY_OBJECTS") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_INDICATOR_CFLAGS=`$PKG_CONFIG --cflags "indicator3 >= $INDICATOR_REQUIRED_VERSION
+                                  dbusmenu-glib >= $DBUSMENUGLIB_REQUIRED_VERSION
+                                  dbusmenu-gtk3 >= $DBUSMENUGTK_REQUIRED_VERSION
+                                  libido3-0.1 >= $INDICATOR_DISPLAY_OBJECTS" 2>/dev/null`
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+if test -n "$INDICATOR_LIBS"; then
+    pkg_cv_INDICATOR_LIBS="$INDICATOR_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"indicator3 >= \$INDICATOR_REQUIRED_VERSION
+                                  dbusmenu-glib >= \$DBUSMENUGLIB_REQUIRED_VERSION
+                                  dbusmenu-gtk3 >= \$DBUSMENUGTK_REQUIRED_VERSION
+                                  libido3-0.1 >= \$INDICATOR_DISPLAY_OBJECTS\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "indicator3 >= $INDICATOR_REQUIRED_VERSION
+                                  dbusmenu-glib >= $DBUSMENUGLIB_REQUIRED_VERSION
+                                  dbusmenu-gtk3 >= $DBUSMENUGTK_REQUIRED_VERSION
+                                  libido3-0.1 >= $INDICATOR_DISPLAY_OBJECTS") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_INDICATOR_LIBS=`$PKG_CONFIG --libs "indicator3 >= $INDICATOR_REQUIRED_VERSION
+                                  dbusmenu-glib >= $DBUSMENUGLIB_REQUIRED_VERSION
+                                  dbusmenu-gtk3 >= $DBUSMENUGTK_REQUIRED_VERSION
+                                  libido3-0.1 >= $INDICATOR_DISPLAY_OBJECTS" 2>/dev/null`
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi
+        if test $_pkg_short_errors_supported = yes; then
+	        INDICATOR_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "indicator3 >= $INDICATOR_REQUIRED_VERSION
+                                  dbusmenu-glib >= $DBUSMENUGLIB_REQUIRED_VERSION
+                                  dbusmenu-gtk3 >= $DBUSMENUGTK_REQUIRED_VERSION
+                                  libido3-0.1 >= $INDICATOR_DISPLAY_OBJECTS" 2>&1`
+        else
+	        INDICATOR_PKG_ERRORS=`$PKG_CONFIG --print-errors "indicator3 >= $INDICATOR_REQUIRED_VERSION
+                                  dbusmenu-glib >= $DBUSMENUGLIB_REQUIRED_VERSION
+                                  dbusmenu-gtk3 >= $DBUSMENUGTK_REQUIRED_VERSION
+                                  libido3-0.1 >= $INDICATOR_DISPLAY_OBJECTS" 2>&1`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$INDICATOR_PKG_ERRORS" >&5
+
+	as_fn_error $? "Package requirements (indicator3 >= $INDICATOR_REQUIRED_VERSION
+                                  dbusmenu-glib >= $DBUSMENUGLIB_REQUIRED_VERSION
+                                  dbusmenu-gtk3 >= $DBUSMENUGTK_REQUIRED_VERSION
+                                  libido3-0.1 >= $INDICATOR_DISPLAY_OBJECTS) were not met:
+
+$INDICATOR_PKG_ERRORS
+
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+Alternatively, you may set the environment variables INDICATOR_CFLAGS
+and INDICATOR_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details." "$LINENO" 5
+elif test $pkg_failed = untried; then
+     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+
+Alternatively, you may set the environment variables INDICATOR_CFLAGS
+and INDICATOR_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+See \`config.log' for more details" "$LINENO" 5 ; }
+else
+	INDICATOR_CFLAGS=$pkg_cv_INDICATOR_CFLAGS
+	INDICATOR_LIBS=$pkg_cv_INDICATOR_LIBS
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+fi
+
+elif test "x$with_gtk" = x2; then :
 
 pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for INDICATOR" >&5
@@ -12184,15 +12344,138 @@ if test -n "$INDICATOR_CFLAGS"; then
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"indicator >= \$INDICATOR_REQUIRED_VERSION
+                                  dbusmenu-glib >= \$DBUSMENUGLIB_REQUIRED_VERSION
+                                  dbusmenu-gtk >= \$DBUSMENUGTK_REQUIRED_VERSION
+                                  libido-0.1 >= \$INDICATOR_DISPLAY_OBJECTS\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "indicator >= $INDICATOR_REQUIRED_VERSION
+                                  dbusmenu-glib >= $DBUSMENUGLIB_REQUIRED_VERSION
+                                  dbusmenu-gtk >= $DBUSMENUGTK_REQUIRED_VERSION
+                                  libido-0.1 >= $INDICATOR_DISPLAY_OBJECTS") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_INDICATOR_CFLAGS=`$PKG_CONFIG --cflags "indicator >= $INDICATOR_REQUIRED_VERSION
+                                  dbusmenu-glib >= $DBUSMENUGLIB_REQUIRED_VERSION
+                                  dbusmenu-gtk >= $DBUSMENUGTK_REQUIRED_VERSION
+                                  libido-0.1 >= $INDICATOR_DISPLAY_OBJECTS" 2>/dev/null`
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+if test -n "$INDICATOR_LIBS"; then
+    pkg_cv_INDICATOR_LIBS="$INDICATOR_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"indicator >= \$INDICATOR_REQUIRED_VERSION
+                                  dbusmenu-glib >= \$DBUSMENUGLIB_REQUIRED_VERSION
+                                  dbusmenu-gtk >= \$DBUSMENUGTK_REQUIRED_VERSION
+                                  libido-0.1 >= \$INDICATOR_DISPLAY_OBJECTS\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "indicator >= $INDICATOR_REQUIRED_VERSION
+                                  dbusmenu-glib >= $DBUSMENUGLIB_REQUIRED_VERSION
+                                  dbusmenu-gtk >= $DBUSMENUGTK_REQUIRED_VERSION
+                                  libido-0.1 >= $INDICATOR_DISPLAY_OBJECTS") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_INDICATOR_LIBS=`$PKG_CONFIG --libs "indicator >= $INDICATOR_REQUIRED_VERSION
+                                  dbusmenu-glib >= $DBUSMENUGLIB_REQUIRED_VERSION
+                                  dbusmenu-gtk >= $DBUSMENUGTK_REQUIRED_VERSION
+                                  libido-0.1 >= $INDICATOR_DISPLAY_OBJECTS" 2>/dev/null`
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi
+        if test $_pkg_short_errors_supported = yes; then
+	        INDICATOR_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "indicator >= $INDICATOR_REQUIRED_VERSION
+                                  dbusmenu-glib >= $DBUSMENUGLIB_REQUIRED_VERSION
+                                  dbusmenu-gtk >= $DBUSMENUGTK_REQUIRED_VERSION
+                                  libido-0.1 >= $INDICATOR_DISPLAY_OBJECTS" 2>&1`
+        else
+	        INDICATOR_PKG_ERRORS=`$PKG_CONFIG --print-errors "indicator >= $INDICATOR_REQUIRED_VERSION
+                                  dbusmenu-glib >= $DBUSMENUGLIB_REQUIRED_VERSION
+                                  dbusmenu-gtk >= $DBUSMENUGTK_REQUIRED_VERSION
+                                  libido-0.1 >= $INDICATOR_DISPLAY_OBJECTS" 2>&1`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$INDICATOR_PKG_ERRORS" >&5
+
+	as_fn_error $? "Package requirements (indicator >= $INDICATOR_REQUIRED_VERSION
+                                  dbusmenu-glib >= $DBUSMENUGLIB_REQUIRED_VERSION
+                                  dbusmenu-gtk >= $DBUSMENUGTK_REQUIRED_VERSION
+                                  libido-0.1 >= $INDICATOR_DISPLAY_OBJECTS) were not met:
+
+$INDICATOR_PKG_ERRORS
+
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+Alternatively, you may set the environment variables INDICATOR_CFLAGS
+and INDICATOR_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details." "$LINENO" 5
+elif test $pkg_failed = untried; then
+     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+
+Alternatively, you may set the environment variables INDICATOR_CFLAGS
+and INDICATOR_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+See \`config.log' for more details" "$LINENO" 5 ; }
+else
+	INDICATOR_CFLAGS=$pkg_cv_INDICATOR_CFLAGS
+	INDICATOR_LIBS=$pkg_cv_INDICATOR_LIBS
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+fi
+
+else
+  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "Value for --with-gtk was neither 2 nor 3
+See \`config.log' for more details" "$LINENO" 5 ; }
+
+fi
+
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SERVICE" >&5
+$as_echo_n "checking for SERVICE... " >&6; }
+
+if test -n "$SERVICE_CFLAGS"; then
+    pkg_cv_SERVICE_CFLAGS="$SERVICE_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"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\""; } >&5
   ($PKG_CONFIG --exists --print-errors "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
@@ -12200,9 +12483,8 @@ if test -n "$INDICATOR_CFLAGS"; then
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_INDICATOR_CFLAGS=`$PKG_CONFIG --cflags "indicator >= $INDICATOR_REQUIRED_VERSION
+  pkg_cv_SERVICE_CFLAGS=`$PKG_CONFIG --cflags "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
@@ -12213,20 +12495,18 @@ fi
  else
     pkg_failed=untried
 fi
-if test -n "$INDICATOR_LIBS"; then
-    pkg_cv_INDICATOR_LIBS="$INDICATOR_LIBS"
+if test -n "$SERVICE_LIBS"; then
+    pkg_cv_SERVICE_LIBS="$SERVICE_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"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\""; } >&5
   ($PKG_CONFIG --exists --print-errors "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
@@ -12234,9 +12514,8 @@ if test -n "$INDICATOR_LIBS"; then
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_INDICATOR_LIBS=`$PKG_CONFIG --libs "indicator >= $INDICATOR_REQUIRED_VERSION
+  pkg_cv_SERVICE_LIBS=`$PKG_CONFIG --libs "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
@@ -12260,40 +12539,37 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        INDICATOR_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "indicator >= $INDICATOR_REQUIRED_VERSION
+	        SERVICE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "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" 2>&1`
         else
-	        INDICATOR_PKG_ERRORS=`$PKG_CONFIG --print-errors "indicator >= $INDICATOR_REQUIRED_VERSION
+	        SERVICE_PKG_ERRORS=`$PKG_CONFIG --print-errors "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" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
-	echo "$INDICATOR_PKG_ERRORS" >&5
+	echo "$SERVICE_PKG_ERRORS" >&5
 
 	as_fn_error $? "Package requirements (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) were not met:
 
-$INDICATOR_PKG_ERRORS
+$SERVICE_PKG_ERRORS
 
 Consider adjusting the PKG_CONFIG_PATH environment variable if you
 installed software in a non-standard prefix.
 
-Alternatively, you may set the environment variables INDICATOR_CFLAGS
-and INDICATOR_LIBS to avoid the need to call pkg-config.
+Alternatively, you may set the environment variables SERVICE_CFLAGS
+and SERVICE_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details." "$LINENO" 5
 elif test $pkg_failed = untried; then
      	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
@@ -12304,15 +12580,15 @@ as_fn_error $? "The pkg-config script could not be found or is too old.  Make su
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
 
-Alternatively, you may set the environment variables INDICATOR_CFLAGS
-and INDICATOR_LIBS to avoid the need to call pkg-config.
+Alternatively, you may set the environment variables SERVICE_CFLAGS
+and SERVICE_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details.
 
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
 See \`config.log' for more details" "$LINENO" 5 ; }
 else
-	INDICATOR_CFLAGS=$pkg_cv_INDICATOR_CFLAGS
-	INDICATOR_LIBS=$pkg_cv_INDICATOR_LIBS
+	SERVICE_CFLAGS=$pkg_cv_SERVICE_CFLAGS
+	SERVICE_LIBS=$pkg_cv_SERVICE_LIBS
         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 
@@ -12321,6 +12597,9 @@ fi
 
 
 
+
+
+
 ###########################
 # Grab the GSettings Macros
 ###########################
@@ -12517,7 +12796,7 @@ mostlyclean-am: clean-gsettings-schemas
 gsettings__enum_file = $(addsuffix .enums.xml,$(gsettings_ENUM_NAMESPACE))
 
 %.gschema.valid: %.gschema.xml $(gsettings__enum_file)
-	$(AM_V_GEN) if test -f "$<"; then d=; else d="$(srcdir)/"; fi; $(GLIB_COMPILE_SCHEMAS) --dry-run $(addprefix --schema-file=,$(gsettings__enum_file)) --schema-file=$${d}$< && touch $@
+	$(AM_V_GEN) if test -f "$<"; then d=; else d="$(srcdir)/"; fi; $(GLIB_COMPILE_SCHEMAS) --strict --dry-run $(addprefix --schema-file=,$(gsettings__enum_file)) --schema-file=$${d}$< && touch $@
 
 all-am: $(gsettings_SCHEMAS:.xml=.valid)
 uninstall-am: uninstall-gsettings-schemas
@@ -12525,23 +12804,13 @@ install-data-am: install-gsettings-schemas
 
 .SECONDARY: $(gsettings_SCHEMAS)
 
-gsettings__base_list = \
-  sed "$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g" | \
-  sed "$$!N;$$!N;$$!N;$$!N;s/\n/ /g"
-
-install-gsettings-schemas: $(gsettings_SCHEMAS:.xml=.valid) $(gsettings__enum_file)
+install-gsettings-schemas: $(gsettings_SCHEMAS) $(gsettings__enum_file)
 	@$(NORMAL_INSTALL)
-	test -z "$(gsettingsschemadir)" || $(MKDIR_P) "$(DESTDIR)$(gsettingsschemadir)"
-	@list='\''$(gsettings__enum_file) $(gsettings_SCHEMAS)'\''; test -n "$(gsettingsschemadir)" || list=; \
-	for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  echo "$$d$$p"; \
-	done | $(gsettings__base_list) | \
-	while read files; do \
-	  echo " $(INSTALL_DATA) $$files '\''$(DESTDIR)$(gsettingsschemadir)'\''"; \
-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(gsettingsschemadir)" || exit $$?; \
-	done
-	test -n "$(GSETTINGS_DISABLE_SCHEMAS_COMPILE)$(DESTDIR)" || $(GLIB_COMPILE_SCHEMAS) $(gsettingsschemadir)
+	if test -n "$^"; then \
+		test -z "$(gsettingsschemadir)" || $(MKDIR_P) "$(DESTDIR)$(gsettingsschemadir)"; \
+		$(INSTALL_DATA) $^ "$(DESTDIR)$(gsettingsschemadir)"; \
+		test -n "$(GSETTINGS_DISABLE_SCHEMAS_COMPILE)$(DESTDIR)" || $(GLIB_COMPILE_SCHEMAS) $(gsettingsschemadir); \
+	fi
 
 uninstall-gsettings-schemas:
 	@$(NORMAL_UNINSTALL)
@@ -12584,16 +12853,28 @@ fi
 # Indicator Info
 ###########################
 
-if test "x$with_localinstall" = "xyes"; then
+if test "x$with_localinstall" = "xyes"; then :
+
 	INDICATORDIR="${libdir}/indicators/2/"
 	INDICATORICONSDIR="${datadir}/libindicate/icons/"
+
 else
-	INDICATORDIR=`$PKG_CONFIG --variable=indicatordir indicator`
-	INDICATORICONSDIR=`$PKG_CONFIG --variable=iconsdir indicator`
+  if test "x$with_gtk" = "x2"; then :
+
+		INDICATORDIR=`$PKG_CONFIG --variable=indicatordir indicator`
+		INDICATORICONSDIR=`$PKG_CONFIG --variable=iconsdir indicator`
+
+else
+
+		INDICATORDIR=`$PKG_CONFIG --variable=indicatordir indicator3`
+		INDICATORICONSDIR=`$PKG_CONFIG --variable=iconsdir indicator3`
+
+fi
 fi
 
 
 
+
 ###########################
 # DBus Service Info
 ###########################
@@ -13881,7 +14162,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by indicator-datetime $as_me 0.0.6, which was
+This file was extended by indicator-datetime $as_me 0.1.90, which was
 generated by GNU Autoconf 2.67.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -13947,7 +14228,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-indicator-datetime config.status 0.0.6
+indicator-datetime config.status 0.1.90
 configured by $0, generated by GNU Autoconf 2.67,
   with options \\"\$ac_cs_config\\"