Merge lp:~ricotz/bamf/optional-webapps into lp:bamf/0.4

[Rico Tzschichholz]

Autoconf: Make libunity-webapps an optional dependency

Make libunity-webapps an optional dependency

[lp:~ricotz/bamf/optional-webapps]

488. By Rico Tzschichholz on 2012-10-08

build: make libunity-webapps an optional dependency

[Marco Trevisan (Treviño) (3v1n0)]

Looks good, thanks!

review: Approve

=== modified file 'config.h.in'
--- config.h.in	2011-09-26 11:44:10 +0000
+++ config.h.in	2012-10-08 10:26:23 +0000
@@ -30,6 +30,9 @@
 /* Define to 1 if you have the <unistd.h> header file. */
 #undef HAVE_UNISTD_H
 
+/* Use libunity-webapps */
+#undef HAVE_WEBAPPS
+
 /* Define to the sub-directory in which libtool stores uninstalled libraries.
    */
 #undef LT_OBJDIR

=== modified file 'configure.in'
--- configure.in	2012-10-01 13:57:13 +0000
+++ configure.in	2012-10-08 10:26:23 +0000
@@ -123,8 +123,16 @@
 ###########################
 # libunity_webapps
 ###########################
-PKG_CHECK_MODULES(LIBUNITY_WEBAPPS, libunity_webapps-0.2)
-
+AC_ARG_ENABLE([webapps],
+              AS_HELP_STRING([--enable-webapps],
+                             [Enable libunity-webapps support]),
+              [enable_webapps=$enableval],
+              [enable_webapps=yes])
+if test "x$enable_webapps" = "xyes"; then
+  PKG_CHECK_MODULES(LIBUNITY_WEBAPPS, libunity_webapps-0.2)
+  AC_DEFINE_UNQUOTED(HAVE_WEBAPPS, , [Use libunity-webapps])
+fi
+AM_CONDITIONAL([HAVE_WEBAPPS], [test "x$enable_webapps" = "xyes"])
 AC_SUBST(LIBUNITY_WEBAPPS_CFLAGS)
 AC_SUBST(LIBUNITY_WEBAPPS_LIBS)
 
@@ -185,6 +193,7 @@
     Install Prefix:     ${prefix}
     Introspection:      ${enable_introspection}
     GTK+ Version:       ${with_gtk}
+    Unity Webapps:      ${enable_webapps}
     Headless tests:     ${enable_headless_tests}
 
 EOF

=== modified file 'src/Makefile.am'
--- src/Makefile.am	2012-08-11 04:37:01 +0000
+++ src/Makefile.am	2012-10-08 10:26:23 +0000
@@ -53,9 +53,6 @@
 		bamf-application.c \
 		bamf-window.c \
 		bamf-tab.c \
-	        bamf-unity-webapps-tab.c \
-		bamf-unity-webapps-observer.c \
-		bamf-unity-webapps-application.c \
 		bamf-indicator-source.c \
 		bamf-indicator.c \
 		bamf-xutils.c \
@@ -76,12 +73,21 @@
 		bamf-window.h \
 		bamf-application.h \
 		bamf-tab.h \
+		bamf-indicator-source.h \
+		bamf-indicator.h \
+		bamf-xutils.h \
+		$(NULL)
+
+bamfdaemon_webapps_sources = \
+		bamf-unity-webapps-tab.c \
+		bamf-unity-webapps-observer.c \
+		bamf-unity-webapps-application.c \
+		$(NULL)
+
+bamfdaemon_webapps_headers = \
 		bamf-unity-webapps-tab.h \
 		bamf-unity-webapps-observer.h \
 		bamf-unity-webapps-application.h \
-		bamf-indicator-source.h \
-		bamf-indicator.h \
-		bamf-xutils.h \
 		$(NULL)
 
 bamfdaemon_SOURCES = \
@@ -89,6 +95,13 @@
 		$(bamfdaemon_headers) \
 		$(NULL)
 
+if HAVE_WEBAPPS
+bamfdaemon_SOURCES += \
+		$(bamfdaemon_webapps_sources) \
+		$(bamfdaemon_webapps_headers) \
+		$(NULL)
+endif
+
 nodist_bamfdaemon_SOURCES = \
 		$(bamfdaemon_built_sources) \
 		$(NULL)
@@ -159,6 +172,8 @@
 
 EXTRA_DIST += \
 		$(bamfdaemon_xml_gdbus_files) \
+		$(bamfdaemon_webapps_sources) \
+		$(bamfdaemon_webapps_headers) \
 		$(NULL)
 
 DISTCLEANFILES += \

=== modified file 'src/bamf-matcher.c'
--- src/bamf-matcher.c	2012-08-21 22:01:48 +0000
+++ src/bamf-matcher.c	2012-10-08 10:26:23 +0000
@@ -28,7 +28,9 @@
 #include "bamf-indicator-source.h"
 #include "bamf-xutils.h"
 
+#ifdef HAVE_WEBAPPS
 #include "bamf-unity-webapps-application.h"
+#endif
 #include <strings.h>
 
 G_DEFINE_TYPE (BamfMatcher, bamf_matcher, BAMF_DBUS_TYPE_MATCHER_SKELETON);
@@ -2895,6 +2897,7 @@
   return TRUE;
 }
 
+#ifdef HAVE_WEBAPPS
 static void
 on_webapp_child_added (BamfView *application,
                        BamfView *child,
@@ -2921,6 +2924,7 @@
                     self);
   bamf_unity_webapps_application_add_existing_interests (BAMF_UNITY_WEBAPPS_APPLICATION (application));
 }
+#endif
 
 static void
 bamf_matcher_init (BamfMatcher * self)
@@ -3014,12 +3018,14 @@
   g_signal_connect (self, "handle-window-stack-for-monitor",
                     G_CALLBACK (on_dbus_handle_window_stack_for_monitor), self);
   
+#ifdef HAVE_WEBAPPS
   priv->webapps_observer = bamf_unity_webapps_observer_new ();
   
   g_signal_connect (priv->webapps_observer,
                     "application-appeared",
                     G_CALLBACK (on_webapp_appeared),
                     self);
+#endif
 }
 
 static void

=== modified file 'tests/bamfdaemon/Makefile.am'
--- tests/bamfdaemon/Makefile.am	2012-08-10 18:07:11 +0000
+++ tests/bamfdaemon/Makefile.am	2012-10-08 10:26:23 +0000
@@ -14,9 +14,6 @@
 		$(top_srcdir)/src/bamf-application.c \
 		$(top_srcdir)/src/bamf-window.c \
 		$(top_srcdir)/src/bamf-tab.c \
-		$(top_srcdir)/src/bamf-unity-webapps-tab.c \
-		$(top_srcdir)/src/bamf-unity-webapps-observer.c \
-		$(top_srcdir)/src/bamf-unity-webapps-application.c \
 		$(top_srcdir)/src/bamf-indicator.c \
 		$(top_srcdir)/src/bamf-indicator-source.c \
 		$(top_srcdir)/src/bamf-xutils.c \
@@ -50,6 +47,12 @@
 		$(top_builddir)/src/bamf-gdbus-indicator-source-generated.h \
 		$(NULL)
 
+bamf_test_webapps_sources = \
+		$(top_srcdir)/src/bamf-unity-webapps-tab.c \
+		$(top_srcdir)/src/bamf-unity-webapps-observer.c \
+		$(top_srcdir)/src/bamf-unity-webapps-application.c \
+		$(NULL)
+
 test_bamf_SOURCES = \
   $(bamf_test_extra_sources) \
   $(bamf_test_extra_headers) \
@@ -59,6 +62,12 @@
   test-window.c \
   test-matcher.c
 
+if HAVE_WEBAPPS
+test_bamf_SOURCES += \
+		$(bamf_test_webapps_sources) \
+		$(NULL)
+endif
+
 test_bamf_CPPFLAGS = \
   -I$(top_srcdir) \
   -I$(top_srcdir)/src \
@@ -85,7 +94,10 @@
 		-Xlinker -export-dynamic -Wl,-O1 -Wl,-Bsymbolic-functions \
 		$(NULL)
 
-EXTRA_DIST = data
+EXTRA_DIST = \
+		data \
+		$(bamf_test_webapps_sources) \
+		$(NULL)
 
 # Run tests as part of make check
 if ENABLE_HEADLESS_TESTS