Merge lp:~3v1n0/indicator-appmenu/use-indicator-0.4-API into lp:indicator-appmenu/0.3

[Marco Trevisan (Treviño)]

Compile with new libindicator-0.4

=== modified file 'configure.ac'
--- configure.ac	2011-06-21 21:12:16 +0000
+++ configure.ac	2011-07-09 02:57:06 +0000
@@ -62,14 +62,14 @@
 AS_IF([test "x$with_gtk" = x3],
         [PKG_CHECK_MODULES(INDICATOR,  gtk+-3.0 >= $GTK3_REQUIRED_VERSION
                                        gio-2.0 >= $GIO_REQUIRED_VERSION
-                                       indicator3 >= $INDICATOR_REQUIRED_VERSION
+                                       indicator3-0.4 >= $INDICATOR_REQUIRED_VERSION
                                        dbusmenu-gtk3-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION
                                        libbamf3 >= $BAMF_REQUIRED_VERSION)
         ],
       [test "x$with_gtk" = x2],
         [PKG_CHECK_MODULES(INDICATOR,  gtk+-2.0 >= $GTK_REQUIRED_VERSION
                                        gio-2.0 >= $GIO_REQUIRED_VERSION
-                                       indicator >= $INDICATOR_REQUIRED_VERSION
+                                       indicator-0.4 >= $INDICATOR_REQUIRED_VERSION
                                        dbusmenu-gtk-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION
                                        libbamf >= $BAMF_REQUIRED_VERSION)
         ],
@@ -113,11 +113,11 @@
 	INDICATORDIR="${libdir}/indicators/3/"
 	INDICATORICONSDIR="${datadir}/libindicate/icons/"
 elif test "x$with_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
 AC_SUBST(INDICATORDIR)
 AC_SUBST(INDICATORICONSDIR)