[byzanz] Make the panel applet optional
- From: Jasper St. Pierre <jstpierre src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [byzanz] Make the panel applet optional
- Date: Tue, 19 Mar 2013 17:38:34 +0000 (UTC)
commit d574a750f7bb3a6a6155ad62d99c13ae73fc962a
Author: Jasper St. Pierre <jstpierre mecheye net>
Date: Tue Mar 19 13:30:03 2013 -0400
Make the panel applet optional
configure.ac | 9 ++++++---
src/Makefile.am | 10 +++++-----
2 files changed, 11 insertions(+), 8 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 8b1108d..4ffa20f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -77,9 +77,12 @@ PKG_CHECK_MODULES(GTK, cairo >= $CAIRO_REQ gtk+-3.0 >= $GTK_REQ x11 gio-2.0 >= $
PKG_CHECK_MODULES(XDAMAGE, xdamage >= $XDAMAGE_REQ)
LIBPANEL_APPLET="libpanelapplet-4.0"
-PKG_CHECK_MODULES(APPLET, $LIBPANEL_APPLET >= $APPLET_REQ)
-appletdir=`$PKG_CONFIG --variable=libpanel_applet_dir $LIBPANEL_APPLET`
-AC_SUBST(appletdir)
+PKG_CHECK_MODULES(APPLET, $LIBPANEL_APPLET >= $APPLET_REQ,
+ have_applet=yes, have_applet=no)
+AM_CONDITIONAL(HAVE_APPLET, [test x$have_applet = xyes])
+AS_IF([test x$have_applet = xyes],
+ [appletdir=`$PKG_CONFIG --variable=libpanel_applet_dir $LIBPANEL_APPLET`
+ AC_SUBST(appletdir)],[])
PKG_CHECK_MODULES(GST, gstreamer-app-0.10 >= $GST_REQ gstreamer-0.10 >= $GST_REQ)
diff --git a/src/Makefile.am b/src/Makefile.am
index 0b25857..4f7e9f0 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,6 +1,6 @@
+
noinst_LTLIBRARIES = libbyzanz.la
bin_PROGRAMS = byzanz-record byzanz-playback
-libexec_PROGRAMS = byzanz-applet
man_MANS = byzanz.1 byzanz-record.1 byzanz-playback.1
BUILT_SOURCES = \
@@ -50,7 +50,7 @@ libbyzanz_la_SOURCES = \
libbyzanz_la_CFLAGS = $(BYZANZ_CFLAGS) -I$(top_srcdir)/gifenc
libbyzanz_la_LIBADD = $(BYZANZ_LIBS) $(top_builddir)/gifenc/libgifenc.la
-
+
byzanz_playback_SOURCES = \
playback.c
@@ -64,6 +64,8 @@ byzanz_record_SOURCES = \
byzanz_record_CFLAGS = $(BYZANZ_CFLAGS)
byzanz_record_LDADD = $(BYZANZ_LIBS) ./libbyzanz.la
+if HAVE_APPLET
+libexec_PROGRAMS = byzanz-applet
byzanz_applet_SOURCES = \
byzanzapplet.c \
@@ -73,7 +75,6 @@ byzanz_applet_SOURCES = \
byzanz_applet_CFLAGS = -DBYZANZ_MENU_UI_DIR=\""$(uidir)"\" $(APPLET_CFLAGS)
byzanz_applet_LDADD = $(APPLET_LIBS) ./libbyzanz.la
-
byzanzmarshal.h: byzanzmarshal.list
$(GLIB_GENMARSHAL) --prefix=byzanz_marshal $(srcdir)/byzanzmarshal.list --header > byzanzmarshal.h
@@ -124,5 +125,4 @@ EXTRA_DIST = \
$(gsettings_schemas_in_in) \
$(man_MANS) \
$(ui_DATA)
-
-
+endif
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]