| 1 |
graaff 08/03/03 20:46:04 |
| 2 |
|
| 3 |
Added: do-plugins-optional-ext-dep.patch |
| 4 |
Log: |
| 5 |
Initial version |
| 6 |
(Portage version: 2.1.4.4) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 gnome-extra/gnome-do-plugins/files/do-plugins-optional-ext-dep.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-extra/gnome-do-plugins/files/do-plugins-optional-ext-dep.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-extra/gnome-do-plugins/files/do-plugins-optional-ext-dep.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: do-plugins-optional-ext-dep.patch |
| 15 |
=================================================================== |
| 16 |
diff -urN do-plugins-0.3.0-orig/Makefile.am do-plugins-0.3.0/Makefile.am |
| 17 |
--- do-plugins-0.3.0-orig/Makefile.am 2008-02-26 10:16:37.000000000 +0530 |
| 18 |
+++ do-plugins-0.3.0/Makefile.am 2008-02-27 10:35:14.000000000 +0530 |
| 19 |
@@ -1,3 +1,21 @@ |
| 20 |
-SUBDIRS = Evolution Epiphany Rhythmbox Pidgin LocateFiles Thunderbird GoogleCalculator OpenSearch Pastebin Templates Amarok GNOME-Session SimplePlugins |
| 21 |
+ENABLED_SUBDIRS = |
| 22 |
+ |
| 23 |
+if ENABLE_EVO_PLUGIN |
| 24 |
+ENABLED_SUBDIRS += Evolution |
| 25 |
+endif |
| 26 |
+ |
| 27 |
+if ENABLE_AMAROK_PLUGIN |
| 28 |
+ENABLED_SUBDIRS += Amarok |
| 29 |
+endif |
| 30 |
+ |
| 31 |
+if ENABLE_OPENSEARCH_PLUGIN |
| 32 |
+ENABLED_SUBDIRS += OpenSearch |
| 33 |
+endif |
| 34 |
+ |
| 35 |
+if ENABLE_PASTEBIN_PLUGIN |
| 36 |
+ENABLED_SUBDIRS += Pastebin |
| 37 |
+endif |
| 38 |
+ |
| 39 |
+SUBDIRS = $(ENABLED_SUBDIRS) Epiphany Rhythmbox Pidgin LocateFiles Thunderbird GoogleCalculator Templates GNOME-Session SimplePlugins |
| 40 |
|
| 41 |
EXTRA_DIST = DoPlugins.mds Packages.mdse COPYRIGHT |
| 42 |
diff -urN do-plugins-0.3.0-orig/configure.ac do-plugins-0.3.0/configure.ac |
| 43 |
--- do-plugins-0.3.0-orig/configure.ac 2008-02-26 10:16:37.000000000 +0530 |
| 44 |
+++ do-plugins-0.3.0/configure.ac 2008-02-27 10:34:42.000000000 +0530 |
| 45 |
@@ -38,11 +38,61 @@ |
| 46 |
|
| 47 |
PKG_CHECK_MODULES([DO_ADDINS], [do.addins]) |
| 48 |
PKG_CHECK_MODULES([DO_DBUS], [do.dbus]) |
| 49 |
-PKG_CHECK_MODULES([EVOLUTION_SHARP], [evolution-sharp]) |
| 50 |
- |
| 51 |
AC_SUBST(DO_ADDINS_LIBS) |
| 52 |
AC_SUBST(DO_DBUS_LIBS) |
| 53 |
+ |
| 54 |
+dnl - Evolution plugin |
| 55 |
+ |
| 56 |
+AC_ARG_ENABLE([evolution-plugin], |
| 57 |
+ AC_HELP_STRING([--enable-evolution-plugin], [Enable the Evolution plugin]), |
| 58 |
+ enable_evo_plugin=$enableval, |
| 59 |
+ enable_evo_plugin=yes) |
| 60 |
+ |
| 61 |
+if test "x$enable_evo_plugin" = "xyes" ; then |
| 62 |
+PKG_CHECK_MODULES([EVOLUTION_SHARP], |
| 63 |
+ [evolution-sharp], |
| 64 |
+ has_evo_deps=yes, |
| 65 |
+ has_evo_deps=no) |
| 66 |
AC_SUBST(EVOLUTION_SHARP_LIBS) |
| 67 |
+fi |
| 68 |
+ |
| 69 |
+if test "x$has_evo_deps" != "xyes" ; then |
| 70 |
+ if test "x$enable_evo_plugin" = "xyes" ; then |
| 71 |
+ dnl Error out if explicitly asked for the Evolution plugin |
| 72 |
+ AC_MSG_ERROR([Could not find evolution-sharp]) |
| 73 |
+ fi |
| 74 |
+ enable_evo_plugin="no" |
| 75 |
+else |
| 76 |
+ if test "x$enable_evo_plugin" != "xyes" ; then |
| 77 |
+ enable_evo_plugin="no" |
| 78 |
+ fi |
| 79 |
+fi |
| 80 |
+ |
| 81 |
+AM_CONDITIONAL(ENABLE_EVO_PLUGIN, test "x$enable_evo_plugin" = "xyes") |
| 82 |
+ |
| 83 |
+dnl - Amarok plugin |
| 84 |
+AC_ARG_ENABLE([amarok-plugin], |
| 85 |
+ AC_HELP_STRING([--enable-amarok-plugin], [Enable the Amarok plugin]), |
| 86 |
+ enable_amarok_plugin=$enableval, |
| 87 |
+ enable_amarok_plugin=yes) |
| 88 |
+ |
| 89 |
+AM_CONDITIONAL(ENABLE_AMAROK_PLUGIN, test "x$enable_amarok_plugin" = "xyes") |
| 90 |
+ |
| 91 |
+dnl - OpenSearch plugin |
| 92 |
+AC_ARG_ENABLE([opensearch-plugin], |
| 93 |
+ AC_HELP_STRING([--enable-opensearch-plugin], [Enable the OpenSearch plugin]), |
| 94 |
+ enable_opensearch_plugin=$enableval, |
| 95 |
+ enable_opensearch_plugin=yes) |
| 96 |
+ |
| 97 |
+AM_CONDITIONAL(ENABLE_OPENSEARCH_PLUGIN, test "x$enable_opensearch_plugin" = "xyes") |
| 98 |
+ |
| 99 |
+dnl - Pastebin plugin |
| 100 |
+AC_ARG_ENABLE([pastebin-plugin], |
| 101 |
+ AC_HELP_STRING([--enable-pastebin-plugin], [Enable the Pastebin plugin]), |
| 102 |
+ enable_pastebin_plugin=$enableval, |
| 103 |
+ enable_pastebin_plugin=yes) |
| 104 |
+ |
| 105 |
+AM_CONDITIONAL(ENABLE_PASTEBIN_PLUGIN, test "x$enable_pastebin_plugin" = "xyes") |
| 106 |
|
| 107 |
dnl Plugin install paths |
| 108 |
|
| 109 |
|
| 110 |
|
| 111 |
|
| 112 |
-- |
| 113 |
gentoo-commits@l.g.o mailing list |
Archives