ayatana-commits team mailing list archive

[Treviño (Marco Trevisan) <mail@xxxxxxxxx>]

Treviño (Marco Trevisan) has proposed merging lp:~3v1n0/indicator-me/compile-with-gtk2 into lp:indicator-me.

Requested reviews:
  Indicator Applet Developers (indicator-applet-developers)

For more details, see:
https://code.launchpad.net/~3v1n0/indicator-me/compile-with-gtk2/+merge/67415

Get the compilation with gtk2 back also in trunk (I think it's a good thing to keep the retro-compatibility until we easily can).
-- 
https://code.launchpad.net/~3v1n0/indicator-me/compile-with-gtk2/+merge/67415
Your team ayatana-commits is subscribed to branch lp:indicator-me.

=== modified file 'configure.ac'
--- configure.ac	2011-07-08 14:04:20 +0000
+++ configure.ac	2011-07-09 04:07:25 +0000
@@ -40,16 +40,6 @@
 INDICATOR_DISPLAY_OBJECTS=0.1
 GIO_UNIX_REQUIRED_VERSION=2.22
 
-PKG_CHECK_MODULES(MESERVICE,     dbusmenu-glib-0.4 >= $DBUSMENUGLIB_REQUIRED_VERSION
-                                 glib-2.0 >= $GLIB_REQUIRED_VERSION
-                                 dbus-glib-1
-                                 indicator3-0.4 >= $INDICATOR_REQUIRED_VERSION
-                                 gwibber-0.1 >= $GWIBBER_REQUIRED_VERSION
-                                 gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION
-                                 telepathy-glib >= $TELEPATHYGLIB_REQUIRED_VERSION)
-AC_SUBST(MESERVICE_CFLAGS)
-AC_SUBST(MESERVICE_LIBS)
-
 AC_ARG_WITH([gtk],
   [AS_HELP_STRING([--with-gtk],
     [Which version of gtk to use for the indicator @<:@default=3@:>@])],
@@ -57,6 +47,29 @@
   [with_gtk=3])
 
 AS_IF([test "x$with_gtk" = x3],
+    [PKG_CHECK_MODULES(MESERVICE, dbusmenu-glib-0.4 >= $DBUSMENUGLIB_REQUIRED_VERSION
+                                  glib-2.0 >= $GLIB_REQUIRED_VERSION
+                                  dbus-glib-1
+                                  indicator3-0.4 >= $INDICATOR_REQUIRED_VERSION
+                                  gwibber-0.1 >= $GWIBBER_REQUIRED_VERSION
+                                  gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION
+                                  telepathy-glib >= $TELEPATHYGLIB_REQUIRED_VERSION)
+    ],
+    [test "x$with_gtk" = x2],
+    [PKG_CHECK_MODULES(MESERVICE, dbusmenu-glib-0.4 >= $DBUSMENUGLIB_REQUIRED_VERSION
+                                  glib-2.0 >= $GLIB_REQUIRED_VERSION
+                                  dbus-glib-1
+                                  indicator-0.4 >= $INDICATOR_REQUIRED_VERSION
+                                  gwibber-0.1 >= $GWIBBER_REQUIRED_VERSION
+                                  gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION
+                                  telepathy-glib >= $TELEPATHYGLIB_REQUIRED_VERSION)
+    ],
+    [AC_MSG_FAILURE([Value for --with-gtk was neither 2 nor 3])]
+)
+AC_SUBST(MESERVICE_CFLAGS)
+AC_SUBST(MESERVICE_LIBS)
+
+AS_IF([test "x$with_gtk" = x3],
         [PKG_CHECK_MODULES(APPLET, gtk+-3.0 >= $GTK3_REQUIRED_VERSION
                                    indicator3-0.4 >= $INDICATOR_REQUIRED_VERSION
 				   libido3-0.1 >= $INDICATOR_DISPLAY_OBJECTS
@@ -168,5 +181,6 @@
 Me Indicator Configuration:
 
 	Prefix:        $prefix
+	Indicator Dir: $INDICATORDIR
 	GTK:           $with_gtk
 ])