Autogen

1 files changed, 275 insertions, 180 deletions

diff --git a/configure b/configure
index 8827a4d..02dbf98 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-application 0.2.90.
+# Generated by GNU Autoconf 2.67 for libappindicator 0.2.90.
 #
 # Report bugs to <ted@canonical.com>.
 #
@@ -701,10 +701,10 @@ MFLAGS=
 MAKEFLAGS=
 
 # Identity of this package.
-PACKAGE_NAME='indicator-application'
-PACKAGE_TARNAME='indicator-application'
+PACKAGE_NAME='libappindicator'
+PACKAGE_TARNAME='libappindicator'
 PACKAGE_VERSION='0.2.90'
-PACKAGE_STRING='indicator-application 0.2.90'
+PACKAGE_STRING='libappindicator 0.2.90'
 PACKAGE_BUGREPORT='ted@canonical.com'
 PACKAGE_URL=''
 
@@ -762,9 +762,6 @@ PYTHON_EXEC_PREFIX
 PYTHON_PREFIX
 PYTHON_VERSION
 PYTHON
-DBUSSERVICEDIR
-INDICATORICONSDIR
-INDICATORDIR
 NUNIT_LIBS
 NUNIT_CFLAGS
 GAPI_FIXUP
@@ -784,6 +781,8 @@ AL
 MONO_DEPENDENCY_LIBS
 MONO_DEPENDENCY_CFLAGS
 VALA_API_GEN
+INTROSPECTION_TEN_FALSE
+INTROSPECTION_TEN_TRUE
 HAVE_INTROSPECTION_FALSE
 HAVE_INTROSPECTION_TRUE
 INTROSPECTION_MAKEFILE
@@ -794,10 +793,12 @@ INTROSPECTION_GIRDIR
 INTROSPECTION_GENERATE
 INTROSPECTION_COMPILER
 INTROSPECTION_SCANNER
+TESTDEPS_LIBS
+TESTDEPS_CFLAGS
 USE_GTK3_FALSE
 USE_GTK3_TRUE
-INDICATOR_LIBS
-INDICATOR_CFLAGS
+LIBRARY_LIBS
+LIBRARY_CFLAGS
 GTK_DOC_USE_REBASE_FALSE
 GTK_DOC_USE_REBASE_TRUE
 GTK_DOC_USE_LIBTOOL_FALSE
@@ -959,8 +960,10 @@ CPP
 PKG_CONFIG
 PKG_CONFIG_PATH
 PKG_CONFIG_LIBDIR
-INDICATOR_CFLAGS
-INDICATOR_LIBS
+LIBRARY_CFLAGS
+LIBRARY_LIBS
+TESTDEPS_CFLAGS
+TESTDEPS_LIBS
 MONO_DEPENDENCY_CFLAGS
 MONO_DEPENDENCY_LIBS
 GTK_SHARP_CFLAGS
@@ -1513,7 +1516,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-application 0.2.90 to adapt to many kinds of systems.
+\`configure' configures libappindicator 0.2.90 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1561,8 +1564,7 @@ Fine tuning of the installation directories:
   --infodir=DIR           info documentation [DATAROOTDIR/info]
   --localedir=DIR         locale-dependent data [DATAROOTDIR/locale]
   --mandir=DIR            man documentation [DATAROOTDIR/man]
-  --docdir=DIR            documentation root
-                          [DATAROOTDIR/doc/indicator-application]
+  --docdir=DIR            documentation root [DATAROOTDIR/doc/libappindicator]
   --htmldir=DIR           html documentation [DOCDIR]
   --dvidir=DIR            dvi documentation [DOCDIR]
   --pdfdir=DIR            pdf documentation [DOCDIR]
@@ -1584,7 +1586,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of indicator-application 0.2.90:";;
+     short | recursive ) echo "Configuration of libappindicator 0.2.90:";;
    esac
   cat <<\_ACEOF
 
@@ -1634,10 +1636,14 @@ Some influential environment variables:
               directories to add to pkg-config's search path
   PKG_CONFIG_LIBDIR
               path overriding pkg-config's built-in search path
-  INDICATOR_CFLAGS
-              C compiler flags for INDICATOR, overriding pkg-config
-  INDICATOR_LIBS
-              linker flags for INDICATOR, overriding pkg-config
+  LIBRARY_CFLAGS
+              C compiler flags for LIBRARY, overriding pkg-config
+  LIBRARY_LIBS
+              linker flags for LIBRARY, overriding pkg-config
+  TESTDEPS_CFLAGS
+              C compiler flags for TESTDEPS, overriding pkg-config
+  TESTDEPS_LIBS
+              linker flags for TESTDEPS, overriding pkg-config
   MONO_DEPENDENCY_CFLAGS
               C compiler flags for MONO_DEPENDENCY, overriding pkg-config
   MONO_DEPENDENCY_LIBS
@@ -1722,7 +1728,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-indicator-application configure 0.2.90
+libappindicator configure 0.2.90
 generated by GNU Autoconf 2.67
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -2002,7 +2008,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-application $as_me 0.2.90, which was
+It was created by libappindicator $as_me 0.2.90, which was
 generated by GNU Autoconf 2.67.  Invocation command line was
 
   $ $0 $@
@@ -2822,7 +2828,7 @@ fi
 
 
 # Define the identity of the package.
- PACKAGE=indicator-application
+ PACKAGE=libappindicator
  VERSION=0.2.90
 
 
@@ -5647,13 +5653,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:5650: $ac_compile\"" >&5)
+  (eval echo "\"\$as_me:5656: $ac_compile\"" >&5)
   (eval "$ac_compile" 2>conftest.err)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:5653: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+  (eval echo "\"\$as_me:5659: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
   (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:5656: output\"" >&5)
+  (eval echo "\"\$as_me:5662: output\"" >&5)
   cat conftest.out >&5
   if $GREP 'External.*some_variable' conftest.out > /dev/null; then
     lt_cv_nm_interface="MS dumpbin"
@@ -6858,7 +6864,7 @@ ia64-*-hpux*)
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 6861 "configure"' > conftest.$ac_ext
+  echo '#line 6867 "configure"' > conftest.$ac_ext
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -8137,11 +8143,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:8140: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8146: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:8144: \$? = $ac_status" >&5
+   echo "$as_me:8150: \$? = $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.
@@ -8476,11 +8482,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:8479: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8485: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:8483: \$? = $ac_status" >&5
+   echo "$as_me:8489: \$? = $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.
@@ -8581,11 +8587,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:8584: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8590: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:8588: \$? = $ac_status" >&5
+   echo "$as_me:8594: \$? = $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
@@ -8636,11 +8642,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:8639: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8645: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:8643: \$? = $ac_status" >&5
+   echo "$as_me:8649: \$? = $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
@@ -11020,7 +11026,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 11023 "configure"
+#line 11029 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -11116,7 +11122,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 11119 "configure"
+#line 11125 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -11801,9 +11807,10 @@ fi
 
 GTK_REQUIRED_VERSION=2.18
 GTK3_REQUIRED_VERSION=2.91
+GLIB_REQUIRED_VERSION=2.26
+GIO_REQUIRED_VERSION=2.26
 INDICATOR_REQUIRED_VERSION=0.3.5
-DBUSMENUGTK_REQUIRED_VERSION=0.2.2
-JSON_GLIB_REQUIRED_VERSION=0.7.6
+DBUSMENUGTK_REQUIRED_VERSION=0.3.90
 DBUS_GLIB_REQUIRED_VERSION=0.82
 
 
@@ -11817,59 +11824,59 @@ fi
 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; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBRARY" >&5
+$as_echo_n "checking for LIBRARY... " >&6; }
 
-if test -n "$INDICATOR_CFLAGS"; then
-    pkg_cv_INDICATOR_CFLAGS="$INDICATOR_CFLAGS"
+if test -n "$LIBRARY_CFLAGS"; then
+    pkg_cv_LIBRARY_CFLAGS="$LIBRARY_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-3.0 >= \$GTK3_REQUIRED_VERSION
-                                       indicator3 >= \$INDICATOR_REQUIRED_VERSION
-                                       json-glib-1.0 >= \$JSON_GLIB_REQUIRED_VERSION
-                                       dbus-glib-1 >= \$DBUS_GLIB_REQUIRED_VERSION
-                                       dbusmenu-gtk3 >= \$DBUSMENUGTK_REQUIRED_VERSION\""; } >&5
+                                     glib-2.0 >= \$GLIB_REQUIRED_VERSION
+                                     gio-2.0 >= \$GIO_REQUIRED_VERSION
+                                     indicator3 >= \$INDICATOR_REQUIRED_VERSION
+                                     dbusmenu-gtk3-0.4 >= \$DBUSMENUGTK_REQUIRED_VERSION\""; } >&5
   ($PKG_CONFIG --exists --print-errors "gtk+-3.0 >= $GTK3_REQUIRED_VERSION
-                                       indicator3 >= $INDICATOR_REQUIRED_VERSION
-                                       json-glib-1.0 >= $JSON_GLIB_REQUIRED_VERSION
-                                       dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION
-                                       dbusmenu-gtk3 >= $DBUSMENUGTK_REQUIRED_VERSION") 2>&5
+                                     glib-2.0 >= $GLIB_REQUIRED_VERSION
+                                     gio-2.0 >= $GIO_REQUIRED_VERSION
+                                     indicator3 >= $INDICATOR_REQUIRED_VERSION
+                                     dbusmenu-gtk3-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION") 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 "gtk+-3.0 >= $GTK3_REQUIRED_VERSION
-                                       indicator3 >= $INDICATOR_REQUIRED_VERSION
-                                       json-glib-1.0 >= $JSON_GLIB_REQUIRED_VERSION
-                                       dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION
-                                       dbusmenu-gtk3 >= $DBUSMENUGTK_REQUIRED_VERSION" 2>/dev/null`
+  pkg_cv_LIBRARY_CFLAGS=`$PKG_CONFIG --cflags "gtk+-3.0 >= $GTK3_REQUIRED_VERSION
+                                     glib-2.0 >= $GLIB_REQUIRED_VERSION
+                                     gio-2.0 >= $GIO_REQUIRED_VERSION
+                                     indicator3 >= $INDICATOR_REQUIRED_VERSION
+                                     dbusmenu-gtk3-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION" 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"
+if test -n "$LIBRARY_LIBS"; then
+    pkg_cv_LIBRARY_LIBS="$LIBRARY_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-3.0 >= \$GTK3_REQUIRED_VERSION
-                                       indicator3 >= \$INDICATOR_REQUIRED_VERSION
-                                       json-glib-1.0 >= \$JSON_GLIB_REQUIRED_VERSION
-                                       dbus-glib-1 >= \$DBUS_GLIB_REQUIRED_VERSION
-                                       dbusmenu-gtk3 >= \$DBUSMENUGTK_REQUIRED_VERSION\""; } >&5
+                                     glib-2.0 >= \$GLIB_REQUIRED_VERSION
+                                     gio-2.0 >= \$GIO_REQUIRED_VERSION
+                                     indicator3 >= \$INDICATOR_REQUIRED_VERSION
+                                     dbusmenu-gtk3-0.4 >= \$DBUSMENUGTK_REQUIRED_VERSION\""; } >&5
   ($PKG_CONFIG --exists --print-errors "gtk+-3.0 >= $GTK3_REQUIRED_VERSION
-                                       indicator3 >= $INDICATOR_REQUIRED_VERSION
-                                       json-glib-1.0 >= $JSON_GLIB_REQUIRED_VERSION
-                                       dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION
-                                       dbusmenu-gtk3 >= $DBUSMENUGTK_REQUIRED_VERSION") 2>&5
+                                     glib-2.0 >= $GLIB_REQUIRED_VERSION
+                                     gio-2.0 >= $GIO_REQUIRED_VERSION
+                                     indicator3 >= $INDICATOR_REQUIRED_VERSION
+                                     dbusmenu-gtk3-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION") 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 "gtk+-3.0 >= $GTK3_REQUIRED_VERSION
-                                       indicator3 >= $INDICATOR_REQUIRED_VERSION
-                                       json-glib-1.0 >= $JSON_GLIB_REQUIRED_VERSION
-                                       dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION
-                                       dbusmenu-gtk3 >= $DBUSMENUGTK_REQUIRED_VERSION" 2>/dev/null`
+  pkg_cv_LIBRARY_LIBS=`$PKG_CONFIG --libs "gtk+-3.0 >= $GTK3_REQUIRED_VERSION
+                                     glib-2.0 >= $GLIB_REQUIRED_VERSION
+                                     gio-2.0 >= $GIO_REQUIRED_VERSION
+                                     indicator3 >= $INDICATOR_REQUIRED_VERSION
+                                     dbusmenu-gtk3-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION" 2>/dev/null`
 else
   pkg_failed=yes
 fi
@@ -11889,34 +11896,34 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        INDICATOR_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gtk+-3.0 >= $GTK3_REQUIRED_VERSION
-                                       indicator3 >= $INDICATOR_REQUIRED_VERSION
-                                       json-glib-1.0 >= $JSON_GLIB_REQUIRED_VERSION
-                                       dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION
-                                       dbusmenu-gtk3 >= $DBUSMENUGTK_REQUIRED_VERSION" 2>&1`
+	        LIBRARY_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gtk+-3.0 >= $GTK3_REQUIRED_VERSION
+                                     glib-2.0 >= $GLIB_REQUIRED_VERSION
+                                     gio-2.0 >= $GIO_REQUIRED_VERSION
+                                     indicator3 >= $INDICATOR_REQUIRED_VERSION
+                                     dbusmenu-gtk3-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION" 2>&1`
         else
-	        INDICATOR_PKG_ERRORS=`$PKG_CONFIG --print-errors "gtk+-3.0 >= $GTK3_REQUIRED_VERSION
-                                       indicator3 >= $INDICATOR_REQUIRED_VERSION
-                                       json-glib-1.0 >= $JSON_GLIB_REQUIRED_VERSION
-                                       dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION
-                                       dbusmenu-gtk3 >= $DBUSMENUGTK_REQUIRED_VERSION" 2>&1`
+	        LIBRARY_PKG_ERRORS=`$PKG_CONFIG --print-errors "gtk+-3.0 >= $GTK3_REQUIRED_VERSION
+                                     glib-2.0 >= $GLIB_REQUIRED_VERSION
+                                     gio-2.0 >= $GIO_REQUIRED_VERSION
+                                     indicator3 >= $INDICATOR_REQUIRED_VERSION
+                                     dbusmenu-gtk3-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
-	echo "$INDICATOR_PKG_ERRORS" >&5
+	echo "$LIBRARY_PKG_ERRORS" >&5
 
 	as_fn_error $? "Package requirements (gtk+-3.0 >= $GTK3_REQUIRED_VERSION
-                                       indicator3 >= $INDICATOR_REQUIRED_VERSION
-                                       json-glib-1.0 >= $JSON_GLIB_REQUIRED_VERSION
-                                       dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION
-                                       dbusmenu-gtk3 >= $DBUSMENUGTK_REQUIRED_VERSION) were not met:
+                                     glib-2.0 >= $GLIB_REQUIRED_VERSION
+                                     gio-2.0 >= $GIO_REQUIRED_VERSION
+                                     indicator3 >= $INDICATOR_REQUIRED_VERSION
+                                     dbusmenu-gtk3-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION) were not met:
 
-$INDICATOR_PKG_ERRORS
+$LIBRARY_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 LIBRARY_CFLAGS
+and LIBRARY_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
@@ -11927,15 +11934,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 LIBRARY_CFLAGS
+and LIBRARY_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
+	LIBRARY_CFLAGS=$pkg_cv_LIBRARY_CFLAGS
+	LIBRARY_LIBS=$pkg_cv_LIBRARY_LIBS
         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 
@@ -11949,59 +11956,59 @@ $as_echo "#define HAVE_GTK3 1" >>confdefs.h
 elif test "x$with_gtk" = x2; then :
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for INDICATOR" >&5
-$as_echo_n "checking for INDICATOR... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBRARY" >&5
+$as_echo_n "checking for LIBRARY... " >&6; }
 
-if test -n "$INDICATOR_CFLAGS"; then
-    pkg_cv_INDICATOR_CFLAGS="$INDICATOR_CFLAGS"
+if test -n "$LIBRARY_CFLAGS"; then
+    pkg_cv_LIBRARY_CFLAGS="$LIBRARY_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= \$GTK_REQUIRED_VERSION
-                                       indicator >= \$INDICATOR_REQUIRED_VERSION
-                                       json-glib-1.0 >= \$JSON_GLIB_REQUIRED_VERSION
-                                       dbus-glib-1 >= \$DBUS_GLIB_REQUIRED_VERSION
-                                       dbusmenu-gtk >= \$DBUSMENUGTK_REQUIRED_VERSION\""; } >&5
+                                     glib-2.0 >= \$GLIB_REQUIRED_VERSION
+                                     gio-2.0 >= \$GIO_REQUIRED_VERSION
+                                     indicator >= \$INDICATOR_REQUIRED_VERSION
+                                     dbusmenu-gtk-0.4 >= \$DBUSMENUGTK_REQUIRED_VERSION\""; } >&5
   ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= $GTK_REQUIRED_VERSION
-                                       indicator >= $INDICATOR_REQUIRED_VERSION
-                                       json-glib-1.0 >= $JSON_GLIB_REQUIRED_VERSION
-                                       dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION
-                                       dbusmenu-gtk >= $DBUSMENUGTK_REQUIRED_VERSION") 2>&5
+                                     glib-2.0 >= $GLIB_REQUIRED_VERSION
+                                     gio-2.0 >= $GIO_REQUIRED_VERSION
+                                     indicator >= $INDICATOR_REQUIRED_VERSION
+                                     dbusmenu-gtk-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION") 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 "gtk+-2.0 >= $GTK_REQUIRED_VERSION
-                                       indicator >= $INDICATOR_REQUIRED_VERSION
-                                       json-glib-1.0 >= $JSON_GLIB_REQUIRED_VERSION
-                                       dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION
-                                       dbusmenu-gtk >= $DBUSMENUGTK_REQUIRED_VERSION" 2>/dev/null`
+  pkg_cv_LIBRARY_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= $GTK_REQUIRED_VERSION
+                                     glib-2.0 >= $GLIB_REQUIRED_VERSION
+                                     gio-2.0 >= $GIO_REQUIRED_VERSION
+                                     indicator >= $INDICATOR_REQUIRED_VERSION
+                                     dbusmenu-gtk-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION" 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"
+if test -n "$LIBRARY_LIBS"; then
+    pkg_cv_LIBRARY_LIBS="$LIBRARY_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= \$GTK_REQUIRED_VERSION
-                                       indicator >= \$INDICATOR_REQUIRED_VERSION
-                                       json-glib-1.0 >= \$JSON_GLIB_REQUIRED_VERSION
-                                       dbus-glib-1 >= \$DBUS_GLIB_REQUIRED_VERSION
-                                       dbusmenu-gtk >= \$DBUSMENUGTK_REQUIRED_VERSION\""; } >&5
+                                     glib-2.0 >= \$GLIB_REQUIRED_VERSION
+                                     gio-2.0 >= \$GIO_REQUIRED_VERSION
+                                     indicator >= \$INDICATOR_REQUIRED_VERSION
+                                     dbusmenu-gtk-0.4 >= \$DBUSMENUGTK_REQUIRED_VERSION\""; } >&5
   ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= $GTK_REQUIRED_VERSION
-                                       indicator >= $INDICATOR_REQUIRED_VERSION
-                                       json-glib-1.0 >= $JSON_GLIB_REQUIRED_VERSION
-                                       dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION
-                                       dbusmenu-gtk >= $DBUSMENUGTK_REQUIRED_VERSION") 2>&5
+                                     glib-2.0 >= $GLIB_REQUIRED_VERSION
+                                     gio-2.0 >= $GIO_REQUIRED_VERSION
+                                     indicator >= $INDICATOR_REQUIRED_VERSION
+                                     dbusmenu-gtk-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION") 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 "gtk+-2.0 >= $GTK_REQUIRED_VERSION
-                                       indicator >= $INDICATOR_REQUIRED_VERSION
-                                       json-glib-1.0 >= $JSON_GLIB_REQUIRED_VERSION
-                                       dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION
-                                       dbusmenu-gtk >= $DBUSMENUGTK_REQUIRED_VERSION" 2>/dev/null`
+  pkg_cv_LIBRARY_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= $GTK_REQUIRED_VERSION
+                                     glib-2.0 >= $GLIB_REQUIRED_VERSION
+                                     gio-2.0 >= $GIO_REQUIRED_VERSION
+                                     indicator >= $INDICATOR_REQUIRED_VERSION
+                                     dbusmenu-gtk-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION" 2>/dev/null`
 else
   pkg_failed=yes
 fi
@@ -12021,34 +12028,34 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        INDICATOR_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gtk+-2.0 >= $GTK_REQUIRED_VERSION
-                                       indicator >= $INDICATOR_REQUIRED_VERSION
-                                       json-glib-1.0 >= $JSON_GLIB_REQUIRED_VERSION
-                                       dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION
-                                       dbusmenu-gtk >= $DBUSMENUGTK_REQUIRED_VERSION" 2>&1`
+	        LIBRARY_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gtk+-2.0 >= $GTK_REQUIRED_VERSION
+                                     glib-2.0 >= $GLIB_REQUIRED_VERSION
+                                     gio-2.0 >= $GIO_REQUIRED_VERSION
+                                     indicator >= $INDICATOR_REQUIRED_VERSION
+                                     dbusmenu-gtk-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION" 2>&1`
         else
-	        INDICATOR_PKG_ERRORS=`$PKG_CONFIG --print-errors "gtk+-2.0 >= $GTK_REQUIRED_VERSION
-                                       indicator >= $INDICATOR_REQUIRED_VERSION
-                                       json-glib-1.0 >= $JSON_GLIB_REQUIRED_VERSION
-                                       dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION
-                                       dbusmenu-gtk >= $DBUSMENUGTK_REQUIRED_VERSION" 2>&1`
+	        LIBRARY_PKG_ERRORS=`$PKG_CONFIG --print-errors "gtk+-2.0 >= $GTK_REQUIRED_VERSION
+                                     glib-2.0 >= $GLIB_REQUIRED_VERSION
+                                     gio-2.0 >= $GIO_REQUIRED_VERSION
+                                     indicator >= $INDICATOR_REQUIRED_VERSION
+                                     dbusmenu-gtk-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
-	echo "$INDICATOR_PKG_ERRORS" >&5
+	echo "$LIBRARY_PKG_ERRORS" >&5
 
 	as_fn_error $? "Package requirements (gtk+-2.0 >= $GTK_REQUIRED_VERSION
-                                       indicator >= $INDICATOR_REQUIRED_VERSION
-                                       json-glib-1.0 >= $JSON_GLIB_REQUIRED_VERSION
-                                       dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION
-                                       dbusmenu-gtk >= $DBUSMENUGTK_REQUIRED_VERSION) were not met:
+                                     glib-2.0 >= $GLIB_REQUIRED_VERSION
+                                     gio-2.0 >= $GIO_REQUIRED_VERSION
+                                     indicator >= $INDICATOR_REQUIRED_VERSION
+                                     dbusmenu-gtk-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION) were not met:
 
-$INDICATOR_PKG_ERRORS
+$LIBRARY_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 LIBRARY_CFLAGS
+and LIBRARY_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
@@ -12059,15 +12066,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 LIBRARY_CFLAGS
+and LIBRARY_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
+	LIBRARY_CFLAGS=$pkg_cv_LIBRARY_CFLAGS
+	LIBRARY_LIBS=$pkg_cv_LIBRARY_LIBS
         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 
@@ -12091,6 +12098,98 @@ else
 fi
 
 
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for TESTDEPS" >&5
+$as_echo_n "checking for TESTDEPS... " >&6; }
+
+if test -n "$TESTDEPS_CFLAGS"; then
+    pkg_cv_TESTDEPS_CFLAGS="$TESTDEPS_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbus-glib-1\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "dbus-glib-1") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_TESTDEPS_CFLAGS=`$PKG_CONFIG --cflags "dbus-glib-1" 2>/dev/null`
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+if test -n "$TESTDEPS_LIBS"; then
+    pkg_cv_TESTDEPS_LIBS="$TESTDEPS_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbus-glib-1\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "dbus-glib-1") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_TESTDEPS_LIBS=`$PKG_CONFIG --libs "dbus-glib-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
+	        TESTDEPS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "dbus-glib-1" 2>&1`
+        else
+	        TESTDEPS_PKG_ERRORS=`$PKG_CONFIG --print-errors "dbus-glib-1" 2>&1`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$TESTDEPS_PKG_ERRORS" >&5
+
+	as_fn_error $? "Package requirements (dbus-glib-1) were not met:
+
+$TESTDEPS_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 TESTDEPS_CFLAGS
+and TESTDEPS_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 TESTDEPS_CFLAGS
+and TESTDEPS_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
+	TESTDEPS_CFLAGS=$pkg_cv_TESTDEPS_CFLAGS
+	TESTDEPS_LIBS=$pkg_cv_TESTDEPS_LIBS
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+fi
+
+
+
 ###########################
 # GObject Introspection
 ###########################
@@ -12132,7 +12231,7 @@ fi
   test $ac_status = 0; }; then
   found_introspection=yes
 else
-  as_fn_error $? "You need to have gobject-introspection >= 0.6.7 installed to build indicator-application" "$LINENO" 5
+  as_fn_error $? "You need to have gobject-introspection >= 0.6.7 installed to build libappindicator" "$LINENO" 5
 fi
      ;; #(
       auto) :
@@ -12189,6 +12288,26 @@ fi
 
 
 
+if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gobject-introspection-1.0 >= 0.10\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "gobject-introspection-1.0 >= 0.10") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  introspection_ten=yes
+else
+  introspection_ten=no
+fi
+
+ if test "x$introspection_ten" = "xyes"; then
+  INTROSPECTION_TEN_TRUE=
+  INTROSPECTION_TEN_FALSE='#'
+else
+  INTROSPECTION_TEN_TRUE='#'
+  INTROSPECTION_TEN_FALSE=
+fi
+
+
 ###########################
 # Vala API Generation
 ###########################
@@ -12918,31 +13037,6 @@ fi
 
 
 ###########################
-# Indicator Info
-###########################
-
-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`
-fi
-
-
-
-###########################
-# DBus Service Info
-###########################
-
-if test "x$with_localinstall" = "xyes"; then
-	DBUSSERVICEDIR="${datadir}/dbus-1/services/"
-else
-	DBUSSERVICEDIR=`$PKG_CONFIG --variable=session_bus_services_dir dbus-1`
-fi
-
-
-###########################
 # Python
 ###########################
 
@@ -13304,7 +13398,7 @@ $as_echo "$PYGTK_CODEGEN" >&6; }
 # Files
 ###########################
 
-ac_config_files="$ac_config_files Makefile src/Makefile src/appindicator-0.1.pc src/appindicator3-0.1.pc bindings/Makefile bindings/mono/Makefile bindings/mono/appindicator-sharp.dll.config bindings/mono/appindicator-sharp-0.1.pc bindings/mono/examples/Makefile bindings/mono/examples/indicator-example bindings/python/Makefile data/Makefile tests/Makefile example/Makefile docs/Makefile docs/reference/Makefile docs/reference/version.xml docs/reference/libappindicator-docs.sgml"
+ac_config_files="$ac_config_files Makefile src/Makefile src/appindicator-0.1.pc src/appindicator3-0.1.pc bindings/Makefile bindings/mono/Makefile bindings/mono/appindicator-sharp.dll.config bindings/mono/appindicator-sharp-0.1.pc bindings/mono/examples/Makefile bindings/mono/examples/indicator-example bindings/python/Makefile tests/Makefile example/Makefile docs/Makefile docs/reference/Makefile docs/reference/version.xml docs/reference/libappindicator-docs.sgml"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -13456,6 +13550,10 @@ if test -z "${HAVE_INTROSPECTION_TRUE}" && test -z "${HAVE_INTROSPECTION_FALSE}"
   as_fn_error $? "conditional \"HAVE_INTROSPECTION\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
+if test -z "${INTROSPECTION_TEN_TRUE}" && test -z "${INTROSPECTION_TEN_FALSE}"; then
+  as_fn_error $? "conditional \"INTROSPECTION_TEN\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 
 : ${CONFIG_STATUS=./config.status}
 ac_write_fail=0
@@ -13864,7 +13962,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-application $as_me 0.2.90, which was
+This file was extended by libappindicator $as_me 0.2.90, which was
 generated by GNU Autoconf 2.67.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -13930,7 +14028,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-application config.status 0.2.90
+libappindicator config.status 0.2.90
 configured by $0, generated by GNU Autoconf 2.67,
   with options \\"\$ac_cs_config\\"
 
@@ -14328,7 +14426,6 @@ do
     "bindings/mono/examples/Makefile") CONFIG_FILES="$CONFIG_FILES bindings/mono/examples/Makefile" ;;
     "bindings/mono/examples/indicator-example") CONFIG_FILES="$CONFIG_FILES bindings/mono/examples/indicator-example" ;;
     "bindings/python/Makefile") CONFIG_FILES="$CONFIG_FILES bindings/python/Makefile" ;;
-    "data/Makefile") CONFIG_FILES="$CONFIG_FILES data/Makefile" ;;
     "tests/Makefile") CONFIG_FILES="$CONFIG_FILES tests/Makefile" ;;
     "example/Makefile") CONFIG_FILES="$CONFIG_FILES example/Makefile" ;;
     "docs/Makefile") CONFIG_FILES="$CONFIG_FILES docs/Makefile" ;;
@@ -15702,17 +15799,15 @@ fi
 
 { $as_echo "$as_me:${as_lineno-$LINENO}:
 
-Application Indicator Configuration:
+Libappindicator Configuration:
 
 	Prefix:        $prefix
-	Indicator Dir: $INDICATORDIR
 	GTK+ Version:  $with_gtk
 " >&5
 $as_echo "$as_me:
 
-Application Indicator Configuration:
+Libappindicator Configuration:
 
 	Prefix:        $prefix
-	Indicator Dir: $INDICATORDIR
 	GTK+ Version:  $with_gtk
 " >&6;}