Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 289856 | Differences between
and this patch

Collapse All | Expand All

(-)libgsf-1.14.16.orig/configure.in (-6 / +16 lines)
Lines 500-519 Link Here
500
# ===================
500
# ===================
501
# GConf configuration
501
# GConf configuration
502
502
503
AC_ARG_WITH([gconf],
504
            AS_HELP_STRING([--without-gconf], [Build without gconf (default: check)]),
505
            [],
506
            [with_gconf=check])
507
503
dnl The following conditional is set in AM_GCONF_SOURCE_2.
508
dnl The following conditional is set in AM_GCONF_SOURCE_2.
504
dnl Because we may skip its execution, we have to set a default here.
509
dnl Because we may skip its execution, we have to set a default here.
505
AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL], [false])
510
AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL], [false])
506
511
507
dnl Don't publish the GCONFTOOL variable, AM_GCONF_SOURCE_2 has ``gconftool-2'' hardwired.
508
m4_pattern_allow([^AM_GCONF_SOURCE_2$])
509
GCONFTOOL=
512
GCONFTOOL=
510
AC_CHECK_PROG([GCONFTOOL], [gconftool-2], [gconftool-2], [no])
513
if test "x$with_gconf" = "xyes" -o "x$with_gconf" = "xcheck"; then
511
if test "x$GCONFTOOL" = "xno"; then
514
	dnl Don't publish the GCONFTOOL variable, AM_GCONF_SOURCE_2 has ``gconftool-2'' hardwired.
512
    AC_MSG_WARN([thumbnailer will not be built, unable to find gconftool-2])
515
	m4_pattern_allow([^AM_GCONF_SOURCE_2$])
516
	AC_CHECK_PROG([GCONFTOOL], [gconftool-2], [gconftool-2], [no])
517
	if test "x$GCONFTOOL" = "xno"; then
518
	    AC_MSG_WARN([thumbnailer will not be built, unable to find gconftool-2])
519
	else
520
	    AM_GCONF_SOURCE_2
521
	fi
513
else
522
else
514
    AM_GCONF_SOURCE_2
523
	AC_MSG_WARN([thumbnailer will not be built, gconf support is disabled])
515
fi
524
fi
516
AM_CONDITIONAL(WITH_GCONF, test "x$GCONFTOOL" != "xno")
525
AM_CONDITIONAL(WITH_GCONF, test "x$GCONFTOOL" != "xno")
526
# ===================
517
527
518
LDFLAGS="-no-undefined $LDFLAGS"
528
LDFLAGS="-no-undefined $LDFLAGS"
519
529

Return to bug 289856