| 1 |
nirbheek 09/12/27 04:07:52 |
| 2 |
|
| 3 |
Added: libgsf-1.14.16-gconf-automagic.patch |
| 4 |
Log: |
| 5 |
Fix gconf automagic, patch by Jan Aniŝĉuk and Sylvain BERTRAND, bug 289856 |
| 6 |
(Portage version: 2.1.7.16/cvs/Linux i686) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 gnome-extra/libgsf/files/libgsf-1.14.16-gconf-automagic.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-extra/libgsf/files/libgsf-1.14.16-gconf-automagic.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-extra/libgsf/files/libgsf-1.14.16-gconf-automagic.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: libgsf-1.14.16-gconf-automagic.patch |
| 15 |
=================================================================== |
| 16 |
Fix automagic gconf for thumbnailer |
| 17 |
|
| 18 |
http://bugs.gentoo.org/attachment.cgi?id=207912&action=view |
| 19 |
|
| 20 |
--- |
| 21 |
--- configure.in |
| 22 |
+++ configure.in |
| 23 |
@@ -499,21 +499,41 @@ |
| 24 |
|
| 25 |
# =================== |
| 26 |
# GConf configuration |
| 27 |
+AC_ARG_WITH([gconf], |
| 28 |
+ AC_HELP_STRING([--without-gconf],[disable the use of gconf (default: auto)]), |
| 29 |
+ [], |
| 30 |
+ [with_gconf=auto]) |
| 31 |
+ |
| 32 |
+have_gconf=not_tested |
| 33 |
+if test "x$with_gconf" = "xyes" -o "x$with_gconf" = "xauto" ; then |
| 34 |
+ PKG_CHECK_EXISTS([gconf-2.0 >= 2.24.0],[have_gconf=yes],[have_gconf=no]) |
| 35 |
+fi |
| 36 |
|
| 37 |
-dnl The following conditional is set in AM_GCONF_SOURCE_2. |
| 38 |
-dnl Because we may skip its execution, we have to set a default here. |
| 39 |
-AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL], [false]) |
| 40 |
- |
| 41 |
-dnl Don't publish the GCONFTOOL variable, AM_GCONF_SOURCE_2 has ``gconftool-2'' hardwired. |
| 42 |
-m4_pattern_allow([^AM_GCONF_SOURCE_2$]) |
| 43 |
-GCONFTOOL= |
| 44 |
-AC_CHECK_PROG([GCONFTOOL], [gconftool-2], [gconftool-2], [no]) |
| 45 |
-if test "x$GCONFTOOL" = "xno"; then |
| 46 |
- AC_MSG_WARN([thumbnailer will not be built, unable to find gconftool-2]) |
| 47 |
-else |
| 48 |
- AM_GCONF_SOURCE_2 |
| 49 |
+if test "x$with_gconf" = "xyes" -a "x$have_gconf" != "xyes" ; then |
| 50 |
+ AC_MSG_ERROR([gconf support requested, but not available.]) |
| 51 |
fi |
| 52 |
-AM_CONDITIONAL(WITH_GCONF, test "x$GCONFTOOL" != "xno") |
| 53 |
+m4_pattern_allow([AM_GCONF_SOURCE_2])dnl in case no autotools are available |
| 54 |
+AM_GCONF_SOURCE_2 |
| 55 |
+# =================== |
| 56 |
+ |
| 57 |
+# =================== |
| 58 |
+# thumbnailer configuration |
| 59 |
+build_thumbnailer=dont_know |
| 60 |
+case "${with_gconf}" in |
| 61 |
+no) |
| 62 |
+ AC_MSG_WARN([gconf support disabled as requested (the thumbnailer won't be built)]); |
| 63 |
+ build_thumbnailer=no;; |
| 64 |
+yes) |
| 65 |
+ build_thumbnailer=yes;; |
| 66 |
+auto) |
| 67 |
+ if test "xhave_conf" = "xyes"; then |
| 68 |
+ build_thumbnailer=yes; |
| 69 |
+ else |
| 70 |
+ build_thumbnailer=no; |
| 71 |
+ fi;; |
| 72 |
+esac |
| 73 |
+AM_CONDITIONAL(WITH_GCONF, test "x$build_thumbnailer" = "xyes") |
| 74 |
+# =================== |
| 75 |
|
| 76 |
LDFLAGS="-no-undefined $LDFLAGS" |
Archives