Commits

Mikel Olasagasti Uranga  committed ecd61ac

Make applet building conditional and disabled by default so it works on clean GNOME3 installations.

  • Participants
  • Parent commits 2472ae8

Comments (0)

Files changed (4)

File configure.ac

 RVL_FDO_MIME()
 
 RVL_PYTHON_MODULE(Crypto, yes)
-RVL_PYTHON_MODULE(bonobo, yes)
 RVL_PYTHON_MODULE(gconf, yes)
 RVL_PYTHON_MODULE(gtk, yes)
 RVL_PYTHON_MODULE(gnome, yes)
-RVL_PYTHON_MODULE(gnomeapplet, yes)
 RVL_PYTHON_MODULE(gio, yes)
 RVL_PYTHON_MODULE(gobject, yes)
 RVL_PYTHON_MODULE(pango, yes)
 
 
+dnl Enable applet installation
+AC_ARG_WITH(applet,
+	AS_HELP_STRING([--with-applet],[Build with applet (default=no)]),
+	,with_applet=no)
+if test "x$with_applet" = "xyes" ; then
+	RVL_PYTHON_MODULE(bonobo, yes)
+	RVL_PYTHON_MODULE(gnomeapplet, yes)
+fi
+AM_CONDITIONAL([WITH_APPLET], [test "x$with_applet" = "xyes"])
+
 dnl output files
 AC_OUTPUT([
 	Makefile
 	src/wrap/crack/Makefile
 ])
 
+echo "
+
+------------------------------------------------------------------
+-- revelation compilation options
+
+revelation version:        ${PACKAGE_VERSION}
+With applet:               $with_applet
+------------------------------------------------------------------
+"
+

File data/Makefile.am

 # $Id$
 #
 
-SUBDIRS		= bonobo cracklib gconf icons mime ui
+SUBDIRS	= cracklib gconf icons mime ui
 
+if WITH_APPLET
+SUBDIRS +=bonobo
+endif

File data/gconf/Makefile.am

 #
 
 schemadir		= @GCONF_SCHEMA_FILE_DIR@
-dist_schema_DATA	= revelation.schemas revelation-applet.schemas
+dist_schema_DATA	= revelation.schemas
 
+if WITH_APPLET
+dist_schema_DATA	+= revelation-applet.schemas
+endif
 
 install-data-hook:
 if GCONF_SCHEMAS_INSTALL

File src/Makefile.am

 
 SUBDIRS		= bundle lib wrap
 bin_SCRIPTS	= revelation
+EXTRA_DIST	= revelation.in
+CLEANFILES	= revelation
+
+
+if WITH_APPLET
 libexec_SCRIPTS	= revelation-applet
-EXTRA_DIST	= revelation.in revelation-applet.in
-CLEANFILES	= revelation revelation-applet
-
+EXTRA_DIST	+= revelation.in revelation-applet.in
+CLEANFILES	+= revelation revelation-applet
+endif
 
 revelation: revelation.in
 	sed \