* New upstream release.

  * Update for libindicator 0.4

1 files changed, 23 insertions, 27 deletions

diff --git a/configure b/configure
index 3f7989e..77e964d 100755
--- a/configure
+++ b/configure
@@ -2722,7 +2722,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE=indicator-messages
- VERSION=0.4.90
+ VERSION=0.4.91
 
 
 cat >>confdefs.h <<_ACEOF
@@ -9166,10 +9166,6 @@ _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=
@@ -12902,12 +12898,12 @@ if test -n "$APPLET_CFLAGS"; then
     if test -n "$PKG_CONFIG" && \
     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-3.0 >= \$GTK3_REQUIRED_VERSION
                                    gio-unix-2.0 >= \$GIO_UNIX_REQUIRED_VERSION
-                                   indicator3 >= \$INDICATOR_REQUIRED_VERSION
+                                   indicator3-0.4 >= \$INDICATOR_REQUIRED_VERSION
                                    indicate-0.5 >= \$INDICATE_REQUIRED_VERSION
                                    dbusmenu-gtk3-0.4 >= \$DBUSMENUGTK_REQUIRED_VERSION\""; } >&5
   ($PKG_CONFIG --exists --print-errors "gtk+-3.0 >= $GTK3_REQUIRED_VERSION
                                    gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION
-                                   indicator3 >= $INDICATOR_REQUIRED_VERSION
+                                   indicator3-0.4 >= $INDICATOR_REQUIRED_VERSION
                                    indicate-0.5 >= $INDICATE_REQUIRED_VERSION
                                    dbusmenu-gtk3-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION") 2>&5
   ac_status=$?
@@ -12915,7 +12911,7 @@ if test -n "$APPLET_CFLAGS"; then
   test $ac_status = 0; }; then
   pkg_cv_APPLET_CFLAGS=`$PKG_CONFIG --cflags "gtk+-3.0 >= $GTK3_REQUIRED_VERSION
                                    gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION
-                                   indicator3 >= $INDICATOR_REQUIRED_VERSION
+                                   indicator3-0.4 >= $INDICATOR_REQUIRED_VERSION
                                    indicate-0.5 >= $INDICATE_REQUIRED_VERSION
                                    dbusmenu-gtk3-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -12931,12 +12927,12 @@ if test -n "$APPLET_LIBS"; then
     if test -n "$PKG_CONFIG" && \
     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-3.0 >= \$GTK3_REQUIRED_VERSION
                                    gio-unix-2.0 >= \$GIO_UNIX_REQUIRED_VERSION
-                                   indicator3 >= \$INDICATOR_REQUIRED_VERSION
+                                   indicator3-0.4 >= \$INDICATOR_REQUIRED_VERSION
                                    indicate-0.5 >= \$INDICATE_REQUIRED_VERSION
                                    dbusmenu-gtk3-0.4 >= \$DBUSMENUGTK_REQUIRED_VERSION\""; } >&5
   ($PKG_CONFIG --exists --print-errors "gtk+-3.0 >= $GTK3_REQUIRED_VERSION
                                    gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION
-                                   indicator3 >= $INDICATOR_REQUIRED_VERSION
+                                   indicator3-0.4 >= $INDICATOR_REQUIRED_VERSION
                                    indicate-0.5 >= $INDICATE_REQUIRED_VERSION
                                    dbusmenu-gtk3-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION") 2>&5
   ac_status=$?
@@ -12944,7 +12940,7 @@ if test -n "$APPLET_LIBS"; then
   test $ac_status = 0; }; then
   pkg_cv_APPLET_LIBS=`$PKG_CONFIG --libs "gtk+-3.0 >= $GTK3_REQUIRED_VERSION
                                    gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION
-                                   indicator3 >= $INDICATOR_REQUIRED_VERSION
+                                   indicator3-0.4 >= $INDICATOR_REQUIRED_VERSION
                                    indicate-0.5 >= $INDICATE_REQUIRED_VERSION
                                    dbusmenu-gtk3-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -12969,13 +12965,13 @@ fi
         if test $_pkg_short_errors_supported = yes; then
 	        APPLET_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gtk+-3.0 >= $GTK3_REQUIRED_VERSION
                                    gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION
-                                   indicator3 >= $INDICATOR_REQUIRED_VERSION
+                                   indicator3-0.4 >= $INDICATOR_REQUIRED_VERSION
                                    indicate-0.5 >= $INDICATE_REQUIRED_VERSION
                                    dbusmenu-gtk3-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION" 2>&1`
         else
 	        APPLET_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gtk+-3.0 >= $GTK3_REQUIRED_VERSION
                                    gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION
-                                   indicator3 >= $INDICATOR_REQUIRED_VERSION
+                                   indicator3-0.4 >= $INDICATOR_REQUIRED_VERSION
                                    indicate-0.5 >= $INDICATE_REQUIRED_VERSION
                                    dbusmenu-gtk3-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION" 2>&1`
         fi
@@ -12984,7 +12980,7 @@ fi
 
 	as_fn_error $? "Package requirements (gtk+-3.0 >= $GTK3_REQUIRED_VERSION
                                    gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION
-                                   indicator3 >= $INDICATOR_REQUIRED_VERSION
+                                   indicator3-0.4 >= $INDICATOR_REQUIRED_VERSION
                                    indicate-0.5 >= $INDICATE_REQUIRED_VERSION
                                    dbusmenu-gtk3-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION) were not met:
 
@@ -13031,12 +13027,12 @@ if test -n "$APPLET_CFLAGS"; then
     if test -n "$PKG_CONFIG" && \
     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= \$GTK_REQUIRED_VERSION
                                    gio-unix-2.0 >= \$GIO_UNIX_REQUIRED_VERSION
-                                   indicator >= \$INDICATOR_REQUIRED_VERSION
+                                   indicator-0.4 >= \$INDICATOR_REQUIRED_VERSION
                                    indicate-0.5 >= \$INDICATE_REQUIRED_VERSION
                                    dbusmenu-gtk-0.4 >= \$DBUSMENUGTK_REQUIRED_VERSION\""; } >&5
   ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= $GTK_REQUIRED_VERSION
                                    gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION
-                                   indicator >= $INDICATOR_REQUIRED_VERSION
+                                   indicator-0.4 >= $INDICATOR_REQUIRED_VERSION
                                    indicate-0.5 >= $INDICATE_REQUIRED_VERSION
                                    dbusmenu-gtk-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION") 2>&5
   ac_status=$?
@@ -13044,7 +13040,7 @@ if test -n "$APPLET_CFLAGS"; then
   test $ac_status = 0; }; then
   pkg_cv_APPLET_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= $GTK_REQUIRED_VERSION
                                    gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION
-                                   indicator >= $INDICATOR_REQUIRED_VERSION
+                                   indicator-0.4 >= $INDICATOR_REQUIRED_VERSION
                                    indicate-0.5 >= $INDICATE_REQUIRED_VERSION
                                    dbusmenu-gtk-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -13060,12 +13056,12 @@ if test -n "$APPLET_LIBS"; then
     if test -n "$PKG_CONFIG" && \
     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= \$GTK_REQUIRED_VERSION
                                    gio-unix-2.0 >= \$GIO_UNIX_REQUIRED_VERSION
-                                   indicator >= \$INDICATOR_REQUIRED_VERSION
+                                   indicator-0.4 >= \$INDICATOR_REQUIRED_VERSION
                                    indicate-0.5 >= \$INDICATE_REQUIRED_VERSION
                                    dbusmenu-gtk-0.4 >= \$DBUSMENUGTK_REQUIRED_VERSION\""; } >&5
   ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= $GTK_REQUIRED_VERSION
                                    gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION
-                                   indicator >= $INDICATOR_REQUIRED_VERSION
+                                   indicator-0.4 >= $INDICATOR_REQUIRED_VERSION
                                    indicate-0.5 >= $INDICATE_REQUIRED_VERSION
                                    dbusmenu-gtk-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION") 2>&5
   ac_status=$?
@@ -13073,7 +13069,7 @@ if test -n "$APPLET_LIBS"; then
   test $ac_status = 0; }; then
   pkg_cv_APPLET_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= $GTK_REQUIRED_VERSION
                                    gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION
-                                   indicator >= $INDICATOR_REQUIRED_VERSION
+                                   indicator-0.4 >= $INDICATOR_REQUIRED_VERSION
                                    indicate-0.5 >= $INDICATE_REQUIRED_VERSION
                                    dbusmenu-gtk-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -13098,13 +13094,13 @@ fi
         if test $_pkg_short_errors_supported = yes; then
 	        APPLET_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gtk+-2.0 >= $GTK_REQUIRED_VERSION
                                    gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION
-                                   indicator >= $INDICATOR_REQUIRED_VERSION
+                                   indicator-0.4 >= $INDICATOR_REQUIRED_VERSION
                                    indicate-0.5 >= $INDICATE_REQUIRED_VERSION
                                    dbusmenu-gtk-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION" 2>&1`
         else
 	        APPLET_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gtk+-2.0 >= $GTK_REQUIRED_VERSION
                                    gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION
-                                   indicator >= $INDICATOR_REQUIRED_VERSION
+                                   indicator-0.4 >= $INDICATOR_REQUIRED_VERSION
                                    indicate-0.5 >= $INDICATE_REQUIRED_VERSION
                                    dbusmenu-gtk-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION" 2>&1`
         fi
@@ -13113,7 +13109,7 @@ fi
 
 	as_fn_error $? "Package requirements (gtk+-2.0 >= $GTK_REQUIRED_VERSION
                                    gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION
-                                   indicator >= $INDICATOR_REQUIRED_VERSION
+                                   indicator-0.4 >= $INDICATOR_REQUIRED_VERSION
                                    indicate-0.5 >= $INDICATE_REQUIRED_VERSION
                                    dbusmenu-gtk-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION) were not met:
 
@@ -13179,11 +13175,11 @@ if test "x$with_localinstall" = "xyes"; then
 	INDICATORDIR="${libdir}/indicators/2/"
 	INDICATORICONSDIR="${datadir}/libindicate/icons/"
 elif test "x$with_indicator_gtk" = x2; then
-	INDICATORDIR=`$PKG_CONFIG --variable=indicatordir indicator`
-	INDICATORICONSDIR=`$PKG_CONFIG --variable=iconsdir indicator`
+	INDICATORDIR=`$PKG_CONFIG --variable=indicatordir indicator-0.4`
+	INDICATORICONSDIR=`$PKG_CONFIG --variable=iconsdir indicator-0.4`
 else
-	INDICATORDIR=`$PKG_CONFIG --variable=indicatordir indicator3`
-	INDICATORICONSDIR=`$PKG_CONFIG --variable=iconsdir indicator3`
+	INDICATORDIR=`$PKG_CONFIG --variable=indicatordir indicator3-0.4`
+	INDICATORICONSDIR=`$PKG_CONFIG --variable=iconsdir indicator3-0.4`
 fi