diff -urN do-plugins-0.3.0-orig/Makefile.am do-plugins-0.3.0/Makefile.am --- do-plugins-0.3.0-orig/Makefile.am 2008-02-26 10:16:37.000000000 +0530 +++ do-plugins-0.3.0/Makefile.am 2008-02-27 10:35:14.000000000 +0530 @@ -1,3 +1,21 @@ -SUBDIRS = Evolution Epiphany Rhythmbox Pidgin LocateFiles Thunderbird GoogleCalculator OpenSearch Pastebin Templates Amarok GNOME-Session SimplePlugins +ENABLED_SUBDIRS = + +if ENABLE_EVO_PLUGIN +ENABLED_SUBDIRS += Evolution +endif + +if ENABLE_AMAROK_PLUGIN +ENABLED_SUBDIRS += Amarok +endif + +if ENABLE_OPENSEARCH_PLUGIN +ENABLED_SUBDIRS += OpenSearch +endif + +if ENABLE_PASTEBIN_PLUGIN +ENABLED_SUBDIRS += Pastebin +endif + +SUBDIRS = $(ENABLED_SUBDIRS) Epiphany Rhythmbox Pidgin LocateFiles Thunderbird GoogleCalculator Templates GNOME-Session SimplePlugins EXTRA_DIST = DoPlugins.mds Packages.mdse COPYRIGHT diff -urN do-plugins-0.3.0-orig/configure.ac do-plugins-0.3.0/configure.ac --- do-plugins-0.3.0-orig/configure.ac 2008-02-26 10:16:37.000000000 +0530 +++ do-plugins-0.3.0/configure.ac 2008-02-27 10:34:42.000000000 +0530 @@ -38,11 +38,61 @@ PKG_CHECK_MODULES([DO_ADDINS], [do.addins]) PKG_CHECK_MODULES([DO_DBUS], [do.dbus]) -PKG_CHECK_MODULES([EVOLUTION_SHARP], [evolution-sharp]) - AC_SUBST(DO_ADDINS_LIBS) AC_SUBST(DO_DBUS_LIBS) + +dnl - Evolution plugin + +AC_ARG_ENABLE([evolution-plugin], + AC_HELP_STRING([--enable-evolution-plugin], [Enable the Evolution plugin]), + enable_evo_plugin=$enableval, + enable_evo_plugin=yes) + +if test "x$enable_evo_plugin" = "xyes" ; then +PKG_CHECK_MODULES([EVOLUTION_SHARP], + [evolution-sharp], + has_evo_deps=yes, + has_evo_deps=no) AC_SUBST(EVOLUTION_SHARP_LIBS) +fi + +if test "x$has_evo_deps" != "xyes" ; then + if test "x$enable_evo_plugin" = "xyes" ; then + dnl Error out if explicitly asked for the Evolution plugin + AC_MSG_ERROR([Could not find evolution-sharp]) + fi + enable_evo_plugin="no" +else + if test "x$enable_evo_plugin" != "xyes" ; then + enable_evo_plugin="no" + fi +fi + +AM_CONDITIONAL(ENABLE_EVO_PLUGIN, test "x$enable_evo_plugin" = "xyes") + +dnl - Amarok plugin +AC_ARG_ENABLE([amarok-plugin], + AC_HELP_STRING([--enable-amarok-plugin], [Enable the Amarok plugin]), + enable_amarok_plugin=$enableval, + enable_amarok_plugin=yes) + +AM_CONDITIONAL(ENABLE_AMAROK_PLUGIN, test "x$enable_amarok_plugin" = "xyes") + +dnl - OpenSearch plugin +AC_ARG_ENABLE([opensearch-plugin], + AC_HELP_STRING([--enable-opensearch-plugin], [Enable the OpenSearch plugin]), + enable_opensearch_plugin=$enableval, + enable_opensearch_plugin=yes) + +AM_CONDITIONAL(ENABLE_OPENSEARCH_PLUGIN, test "x$enable_opensearch_plugin" = "xyes") + +dnl - Pastebin plugin +AC_ARG_ENABLE([pastebin-plugin], + AC_HELP_STRING([--enable-pastebin-plugin], [Enable the Pastebin plugin]), + enable_pastebin_plugin=$enableval, + enable_pastebin_plugin=yes) + +AM_CONDITIONAL(ENABLE_PASTEBIN_PLUGIN, test "x$enable_pastebin_plugin" = "xyes") dnl Plugin install paths