Import upstream version 0.1.95

1 files changed, 525 insertions, 26 deletions

diff --git a/configure b/configure
index 32ec7d3..a0ea9a1 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.1.94.
+# Generated by GNU Autoconf 2.67 for indicator-datetime 0.1.95.
 #
 # 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.1.94'
-PACKAGE_STRING='indicator-datetime 0.1.94'
+PACKAGE_VERSION='0.1.95'
+PACKAGE_STRING='indicator-datetime 0.1.95'
 PACKAGE_BUGREPORT='ted@canonical.com'
 PACKAGE_URL=''
 
@@ -768,6 +768,11 @@ GSETTINGS_RULES
 GLIB_COMPILE_SCHEMAS
 gsettingsschemadir
 GSETTINGS_DISABLE_SCHEMAS_COMPILE
+LIBMAP_LDFLAGS
+LIBMAP_LIBS
+LIBMAP_CFLAGS
+PREF_LIBS
+PREF_CFLAGS
 SERVICE_LIBS
 SERVICE_CFLAGS
 INDICATOR_LIBS
@@ -950,7 +955,11 @@ PKG_CONFIG_LIBDIR
 INDICATOR_CFLAGS
 INDICATOR_LIBS
 SERVICE_CFLAGS
-SERVICE_LIBS'
+SERVICE_LIBS
+PREF_CFLAGS
+PREF_LIBS
+LIBMAP_CFLAGS
+LIBMAP_LIBS'
 
 
 # Initialize some variables set by options.
@@ -1493,7 +1502,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.1.94 to adapt to many kinds of systems.
+\`configure' configures indicator-datetime 0.1.95 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1564,7 +1573,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of indicator-datetime 0.1.94:";;
+     short | recursive ) echo "Configuration of indicator-datetime 0.1.95:";;
    esac
   cat <<\_ACEOF
 
@@ -1620,6 +1629,11 @@ Some influential environment variables:
               C compiler flags for SERVICE, overriding pkg-config
   SERVICE_LIBS
               linker flags for SERVICE, overriding pkg-config
+  PREF_CFLAGS C compiler flags for PREF, overriding pkg-config
+  PREF_LIBS   linker flags for PREF, overriding pkg-config
+  LIBMAP_CFLAGS
+              C compiler flags for LIBMAP, overriding pkg-config
+  LIBMAP_LIBS linker flags for LIBMAP, 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.
@@ -1687,7 +1701,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-indicator-datetime configure 0.1.94
+indicator-datetime configure 0.1.95
 generated by GNU Autoconf 2.67
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -2058,7 +2072,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.1.94, which was
+It was created by indicator-datetime $as_me 0.1.95, which was
 generated by GNU Autoconf 2.67.  Invocation command line was
 
   $ $0 $@
@@ -2879,7 +2893,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE=indicator-datetime
- VERSION=0.1.94
+ VERSION=0.1.95
 
 
 cat >>confdefs.h <<_ACEOF
@@ -6293,13 +6307,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:6296: $ac_compile\"" >&5)
+  (eval echo "\"\$as_me:6310: $ac_compile\"" >&5)
   (eval "$ac_compile" 2>conftest.err)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:6299: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+  (eval echo "\"\$as_me:6313: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
   (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:6302: output\"" >&5)
+  (eval echo "\"\$as_me:6316: output\"" >&5)
   cat conftest.out >&5
   if $GREP 'External.*some_variable' conftest.out > /dev/null; then
     lt_cv_nm_interface="MS dumpbin"
@@ -7504,7 +7518,7 @@ ia64-*-hpux*)
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 7507 "configure"' > conftest.$ac_ext
+  echo '#line 7521 "configure"' > conftest.$ac_ext
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -8724,6 +8738,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=
@@ -8749,11 +8767,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:8752: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8770: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:8756: \$? = $ac_status" >&5
+   echo "$as_me:8774: \$? = $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.
@@ -9088,11 +9106,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:9091: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:9109: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:9095: \$? = $ac_status" >&5
+   echo "$as_me:9113: \$? = $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.
@@ -9193,11 +9211,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:9196: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:9214: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:9200: \$? = $ac_status" >&5
+   echo "$as_me:9218: \$? = $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
@@ -9248,11 +9266,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:9251: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:9269: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:9255: \$? = $ac_status" >&5
+   echo "$as_me:9273: \$? = $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
@@ -11632,7 +11650,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 11635 "configure"
+#line 11653 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -11728,7 +11746,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 11731 "configure"
+#line 11749 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12216,6 +12234,8 @@ ICAL_REQUIRED_VERSION=0.44
 CAIRO_REQUIRED_VERSION=1.10
 GDK_REQUIRED_VERSION=2.22
 GLIB_REQUIRED_VERSION=2.26
+GTK_REQUIRED_VERSION=2.12
+GTK3_REQUIRED_VERSION=3.0
 
 if test "x$with_gtk" = x3; then :
 
@@ -12903,6 +12923,484 @@ See \`config.log' for more details" "$LINENO" 5 ; }
 
 fi
 
+# FIXME: polkit-gtk-1 isn't gtk3-compatible
+if test "x$with_gtk" = x3; then :
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PREF" >&5
+$as_echo_n "checking for PREF... " >&6; }
+
+if test -n "$PREF_CFLAGS"; then
+    pkg_cv_PREF_CFLAGS="$PREF_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gio-2.0 >= \$GIO_REQUIRED_VERSION
+	                         gtk+-3.0 >= \$GTK3_REQUIRED_VERSION
+                                 unique-3.0
+                                 json-glib-1.0
+                                 polkit-gtk-1\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "gio-2.0 >= $GIO_REQUIRED_VERSION
+	                         gtk+-3.0 >= $GTK3_REQUIRED_VERSION
+                                 unique-3.0
+                                 json-glib-1.0
+                                 polkit-gtk-1") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_PREF_CFLAGS=`$PKG_CONFIG --cflags "gio-2.0 >= $GIO_REQUIRED_VERSION
+	                         gtk+-3.0 >= $GTK3_REQUIRED_VERSION
+                                 unique-3.0
+                                 json-glib-1.0
+                                 polkit-gtk-1" 2>/dev/null`
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+if test -n "$PREF_LIBS"; then
+    pkg_cv_PREF_LIBS="$PREF_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gio-2.0 >= \$GIO_REQUIRED_VERSION
+	                         gtk+-3.0 >= \$GTK3_REQUIRED_VERSION
+                                 unique-3.0
+                                 json-glib-1.0
+                                 polkit-gtk-1\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "gio-2.0 >= $GIO_REQUIRED_VERSION
+	                         gtk+-3.0 >= $GTK3_REQUIRED_VERSION
+                                 unique-3.0
+                                 json-glib-1.0
+                                 polkit-gtk-1") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_PREF_LIBS=`$PKG_CONFIG --libs "gio-2.0 >= $GIO_REQUIRED_VERSION
+	                         gtk+-3.0 >= $GTK3_REQUIRED_VERSION
+                                 unique-3.0
+                                 json-glib-1.0
+                                 polkit-gtk-1" 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
+	        PREF_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gio-2.0 >= $GIO_REQUIRED_VERSION
+	                         gtk+-3.0 >= $GTK3_REQUIRED_VERSION
+                                 unique-3.0
+                                 json-glib-1.0
+                                 polkit-gtk-1" 2>&1`
+        else
+	        PREF_PKG_ERRORS=`$PKG_CONFIG --print-errors "gio-2.0 >= $GIO_REQUIRED_VERSION
+	                         gtk+-3.0 >= $GTK3_REQUIRED_VERSION
+                                 unique-3.0
+                                 json-glib-1.0
+                                 polkit-gtk-1" 2>&1`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$PREF_PKG_ERRORS" >&5
+
+	as_fn_error $? "Package requirements (gio-2.0 >= $GIO_REQUIRED_VERSION
+	                         gtk+-3.0 >= $GTK3_REQUIRED_VERSION
+                                 unique-3.0
+                                 json-glib-1.0
+                                 polkit-gtk-1) were not met:
+
+$PREF_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 PREF_CFLAGS
+and PREF_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 PREF_CFLAGS
+and PREF_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
+	PREF_CFLAGS=$pkg_cv_PREF_CFLAGS
+	PREF_LIBS=$pkg_cv_PREF_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 PREF" >&5
+$as_echo_n "checking for PREF... " >&6; }
+
+if test -n "$PREF_CFLAGS"; then
+    pkg_cv_PREF_CFLAGS="$PREF_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gio-2.0 >= \$GIO_REQUIRED_VERSION
+	                         gtk+-2.0 >= \$GTK_REQUIRED_VERSION
+                                 unique-1.0
+                                 json-glib-1.0
+                                 polkit-gtk-1\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "gio-2.0 >= $GIO_REQUIRED_VERSION
+	                         gtk+-2.0 >= $GTK_REQUIRED_VERSION
+                                 unique-1.0
+                                 json-glib-1.0
+                                 polkit-gtk-1") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_PREF_CFLAGS=`$PKG_CONFIG --cflags "gio-2.0 >= $GIO_REQUIRED_VERSION
+	                         gtk+-2.0 >= $GTK_REQUIRED_VERSION
+                                 unique-1.0
+                                 json-glib-1.0
+                                 polkit-gtk-1" 2>/dev/null`
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+if test -n "$PREF_LIBS"; then
+    pkg_cv_PREF_LIBS="$PREF_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gio-2.0 >= \$GIO_REQUIRED_VERSION
+	                         gtk+-2.0 >= \$GTK_REQUIRED_VERSION
+                                 unique-1.0
+                                 json-glib-1.0
+                                 polkit-gtk-1\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "gio-2.0 >= $GIO_REQUIRED_VERSION
+	                         gtk+-2.0 >= $GTK_REQUIRED_VERSION
+                                 unique-1.0
+                                 json-glib-1.0
+                                 polkit-gtk-1") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_PREF_LIBS=`$PKG_CONFIG --libs "gio-2.0 >= $GIO_REQUIRED_VERSION
+	                         gtk+-2.0 >= $GTK_REQUIRED_VERSION
+                                 unique-1.0
+                                 json-glib-1.0
+                                 polkit-gtk-1" 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
+	        PREF_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gio-2.0 >= $GIO_REQUIRED_VERSION
+	                         gtk+-2.0 >= $GTK_REQUIRED_VERSION
+                                 unique-1.0
+                                 json-glib-1.0
+                                 polkit-gtk-1" 2>&1`
+        else
+	        PREF_PKG_ERRORS=`$PKG_CONFIG --print-errors "gio-2.0 >= $GIO_REQUIRED_VERSION
+	                         gtk+-2.0 >= $GTK_REQUIRED_VERSION
+                                 unique-1.0
+                                 json-glib-1.0
+                                 polkit-gtk-1" 2>&1`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$PREF_PKG_ERRORS" >&5
+
+	as_fn_error $? "Package requirements (gio-2.0 >= $GIO_REQUIRED_VERSION
+	                         gtk+-2.0 >= $GTK_REQUIRED_VERSION
+                                 unique-1.0
+                                 json-glib-1.0
+                                 polkit-gtk-1) were not met:
+
+$PREF_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 PREF_CFLAGS
+and PREF_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 PREF_CFLAGS
+and PREF_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
+	PREF_CFLAGS=$pkg_cv_PREF_CFLAGS
+	PREF_LIBS=$pkg_cv_PREF_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
+
+if test "x$with_gtk" = x3; then :
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBMAP" >&5
+$as_echo_n "checking for LIBMAP... " >&6; }
+
+if test -n "$LIBMAP_CFLAGS"; then
+    pkg_cv_LIBMAP_CFLAGS="$LIBMAP_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gio-2.0 >= \$GIO_REQUIRED_VERSION
+	                           gtk+-3.0 >= \$GTK3_REQUIRED_VERSION\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "gio-2.0 >= $GIO_REQUIRED_VERSION
+	                           gtk+-3.0 >= $GTK3_REQUIRED_VERSION") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_LIBMAP_CFLAGS=`$PKG_CONFIG --cflags "gio-2.0 >= $GIO_REQUIRED_VERSION
+	                           gtk+-3.0 >= $GTK3_REQUIRED_VERSION" 2>/dev/null`
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+if test -n "$LIBMAP_LIBS"; then
+    pkg_cv_LIBMAP_LIBS="$LIBMAP_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gio-2.0 >= \$GIO_REQUIRED_VERSION
+	                           gtk+-3.0 >= \$GTK3_REQUIRED_VERSION\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "gio-2.0 >= $GIO_REQUIRED_VERSION
+	                           gtk+-3.0 >= $GTK3_REQUIRED_VERSION") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_LIBMAP_LIBS=`$PKG_CONFIG --libs "gio-2.0 >= $GIO_REQUIRED_VERSION
+	                           gtk+-3.0 >= $GTK3_REQUIRED_VERSION" 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
+	        LIBMAP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gio-2.0 >= $GIO_REQUIRED_VERSION
+	                           gtk+-3.0 >= $GTK3_REQUIRED_VERSION" 2>&1`
+        else
+	        LIBMAP_PKG_ERRORS=`$PKG_CONFIG --print-errors "gio-2.0 >= $GIO_REQUIRED_VERSION
+	                           gtk+-3.0 >= $GTK3_REQUIRED_VERSION" 2>&1`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$LIBMAP_PKG_ERRORS" >&5
+
+	as_fn_error $? "Package requirements (gio-2.0 >= $GIO_REQUIRED_VERSION
+	                           gtk+-3.0 >= $GTK3_REQUIRED_VERSION) were not met:
+
+$LIBMAP_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 LIBMAP_CFLAGS
+and LIBMAP_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 LIBMAP_CFLAGS
+and LIBMAP_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
+	LIBMAP_CFLAGS=$pkg_cv_LIBMAP_CFLAGS
+	LIBMAP_LIBS=$pkg_cv_LIBMAP_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 LIBMAP" >&5
+$as_echo_n "checking for LIBMAP... " >&6; }
+
+if test -n "$LIBMAP_CFLAGS"; then
+    pkg_cv_LIBMAP_CFLAGS="$LIBMAP_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gio-2.0 >= \$GIO_REQUIRED_VERSION
+	                           gtk+-2.0 >= \$GTK_REQUIRED_VERSION\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "gio-2.0 >= $GIO_REQUIRED_VERSION
+	                           gtk+-2.0 >= $GTK_REQUIRED_VERSION") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_LIBMAP_CFLAGS=`$PKG_CONFIG --cflags "gio-2.0 >= $GIO_REQUIRED_VERSION
+	                           gtk+-2.0 >= $GTK_REQUIRED_VERSION" 2>/dev/null`
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+if test -n "$LIBMAP_LIBS"; then
+    pkg_cv_LIBMAP_LIBS="$LIBMAP_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gio-2.0 >= \$GIO_REQUIRED_VERSION
+	                           gtk+-2.0 >= \$GTK_REQUIRED_VERSION\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "gio-2.0 >= $GIO_REQUIRED_VERSION
+	                           gtk+-2.0 >= $GTK_REQUIRED_VERSION") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_LIBMAP_LIBS=`$PKG_CONFIG --libs "gio-2.0 >= $GIO_REQUIRED_VERSION
+	                           gtk+-2.0 >= $GTK_REQUIRED_VERSION" 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
+	        LIBMAP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gio-2.0 >= $GIO_REQUIRED_VERSION
+	                           gtk+-2.0 >= $GTK_REQUIRED_VERSION" 2>&1`
+        else
+	        LIBMAP_PKG_ERRORS=`$PKG_CONFIG --print-errors "gio-2.0 >= $GIO_REQUIRED_VERSION
+	                           gtk+-2.0 >= $GTK_REQUIRED_VERSION" 2>&1`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$LIBMAP_PKG_ERRORS" >&5
+
+	as_fn_error $? "Package requirements (gio-2.0 >= $GIO_REQUIRED_VERSION
+	                           gtk+-2.0 >= $GTK_REQUIRED_VERSION) were not met:
+
+$LIBMAP_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 LIBMAP_CFLAGS
+and LIBMAP_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 LIBMAP_CFLAGS
+and LIBMAP_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
+	LIBMAP_CFLAGS=$pkg_cv_LIBMAP_CFLAGS
+	LIBMAP_LIBS=$pkg_cv_LIBMAP_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
+
+
+
+
+
+
+
+
 
 
 
@@ -13934,7 +14432,7 @@ $as_echo "$LINGUAS" >&6; }
 # Files
 ###########################
 
-ac_config_files="$ac_config_files Makefile src/Makefile data/Makefile tests/Makefile po/Makefile.in"
+ac_config_files="$ac_config_files Makefile libmap/Makefile src/Makefile data/Makefile tests/Makefile po/Makefile.in"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -14470,7 +14968,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.1.94, which was
+This file was extended by indicator-datetime $as_me 0.1.95, which was
 generated by GNU Autoconf 2.67.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -14536,7 +15034,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.1.94
+indicator-datetime config.status 0.1.95
 configured by $0, generated by GNU Autoconf 2.67,
   with options \\"\$ac_cs_config\\"
 
@@ -14926,6 +15424,7 @@ do
     "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;;
     "default-1") CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
+    "libmap/Makefile") CONFIG_FILES="$CONFIG_FILES libmap/Makefile" ;;
     "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
     "data/Makefile") CONFIG_FILES="$CONFIG_FILES data/Makefile" ;;
     "tests/Makefile") CONFIG_FILES="$CONFIG_FILES tests/Makefile" ;;