|
Line
Link Here
|
|
-- |
|
|
| 1 |
configure.in | 46 +++++++++++++++++++++++++++++++++------------- |
|
configure.in | 46 +++++++++++++++++++++++++++++++++------------- |
| 2 |
m4/gconf-2.m4 | 44 ++++++++++++++++++++++++++++++++++++++++++++ |
1 |
m4/gconf-2.m4 | 44 ++++++++++++++++++++++++++++++++++++++++++++ |
| 3 |
2 files changed, 77 insertions(+), 13 deletions(-) |
2 |
2 files changed, 77 insertions(+), 13 deletions(-) |
| 4 |
create mode 100644 m4/gconf-2.m4 |
3 |
create mode 100644 m4/gconf-2.m4 |
| 5 |
-- a/configure.in |
4 |
++ b/configure.in |
|
Lines 499-519
AM_CONDITIONAL(WITH_LIBGSF_BONOBO, test $have_bonobo = yes)
Link Here
|
| 499 |
|
499 |
|
| 500 |
# =================== |
500 |
# =================== |
| 501 |
# GConf configuration |
501 |
# GConf configuration |
|
|
502 |
AC_ARG_WITH([gconf], |
| 503 |
AC_HELP_STRING([--without-gconf],[disable the use of gconf (default: auto)]), |
| 504 |
[], |
| 505 |
[with_gconf=auto]) |
| 506 |
|
| 507 |
have_gconf=not_tested |
| 508 |
if test "x$with_gconf" = "xyes" -o "x$with_gconf" = "xauto" ; then |
| 509 |
PKG_CHECK_EXISTS([gconf-2.0 >= 2.24.0],[have_gconf=yes],[have_gconf=no]) |
| 510 |
fi |
| 502 |
|
511 |
|
| 503 |
dnl The following conditional is set in AM_GCONF_SOURCE_2. |
512 |
if test "x$with_gconf" = "xyes" -a "x$have_gconf" != "xyes" ; then |
| 504 |
dnl Because we may skip its execution, we have to set a default here. |
513 |
AC_MSG_ERROR([gconf support requested, but not available.]) |
| 505 |
AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL], [false]) |
|
|
| 506 |
|
| 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= |
| 510 |
AC_CHECK_PROG([GCONFTOOL], [gconftool-2], [gconftool-2], [no]) |
| 511 |
if test "x$GCONFTOOL" = "xno"; then |
| 512 |
AC_MSG_WARN([thumbnailer will not be built, unable to find gconftool-2]) |
| 513 |
else |
| 514 |
AM_GCONF_SOURCE_2 |
| 515 |
fi |
514 |
fi |
| 516 |
AM_CONDITIONAL(WITH_GCONF, test "x$GCONFTOOL" != "xno") |
515 |
m4_pattern_allow([AM_GCONF_SOURCE_2])dnl in case no autotools are available |
|
|
516 |
AM_GCONF_SOURCE_2 |
| 517 |
# =================== |
| 518 |
|
| 519 |
# =================== |
| 520 |
# thumbnailer configuration |
| 521 |
build_thumbnailer=dont_know |
| 522 |
case "${with_gconf}" in |
| 523 |
no) |
| 524 |
AC_MSG_WARN([gconf support disabled as requested (the thumbnailer won't be built)]); |
| 525 |
build_thumbnailer=no;; |
| 526 |
yes) |
| 527 |
build_thumbnailer=yes;; |
| 528 |
auto) |
| 529 |
if test "xhave_conf" = "xyes"; then |
| 530 |
build_thumbnailer=yes; |
| 531 |
else |
| 532 |
build_thumbnailer=no; |
| 533 |
fi;; |
| 534 |
esac |
| 535 |
AM_CONDITIONAL(WITH_GCONF, test "x$build_thumbnailer" = "xyes") |
| 536 |
# =================== |
| 517 |
|
537 |
|
| 518 |
LDFLAGS="-no-undefined $LDFLAGS" |
538 |
LDFLAGS="-no-undefined $LDFLAGS" |
| 519 |
-- /dev/null |
539 |
++ b/m4/gconf-2.m4 |
|
Line 0
Link Here
|
|
|
1 |
dnl AM_GCONF_SOURCE_2 |
| 2 |
dnl Defines GCONF_SCHEMA_CONFIG_SOURCE which is where you should install schemas |
| 3 |
dnl (i.e. pass to gconftool-2 |
| 4 |
dnl Defines GCONF_SCHEMA_FILE_DIR which is a filesystem directory where |
| 5 |
dnl you should install foo.schemas files |
| 6 |
dnl |
| 7 |
|
| 8 |
AC_DEFUN([AM_GCONF_SOURCE_2], |
| 9 |
[ |
| 10 |
if test "x$GCONF_SCHEMA_INSTALL_SOURCE" = "x"; then |
| 11 |
GCONF_SCHEMA_CONFIG_SOURCE=`gconftool-2 --get-default-source` |
| 12 |
else |
| 13 |
GCONF_SCHEMA_CONFIG_SOURCE=$GCONF_SCHEMA_INSTALL_SOURCE |
| 14 |
fi |
| 15 |
|
| 16 |
AC_ARG_WITH([gconf-source], |
| 17 |
AC_HELP_STRING([--with-gconf-source=sourceaddress], |
| 18 |
[Config database for installing schema files.]), |
| 19 |
[GCONF_SCHEMA_CONFIG_SOURCE="$withval"],) |
| 20 |
|
| 21 |
AC_SUBST(GCONF_SCHEMA_CONFIG_SOURCE) |
| 22 |
AC_MSG_RESULT([Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation]) |
| 23 |
|
| 24 |
if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then |
| 25 |
GCONF_SCHEMA_FILE_DIR='$(sysconfdir)/gconf/schemas' |
| 26 |
fi |
| 27 |
|
| 28 |
AC_ARG_WITH([gconf-schema-file-dir], |
| 29 |
AC_HELP_STRING([--with-gconf-schema-file-dir=dir], |
| 30 |
[Directory for installing schema files.]), |
| 31 |
[GCONF_SCHEMA_FILE_DIR="$withval"],) |
| 32 |
|
| 33 |
AC_SUBST(GCONF_SCHEMA_FILE_DIR) |
| 34 |
AC_MSG_RESULT([Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files]) |
| 35 |
|
| 36 |
AC_ARG_ENABLE(schemas-install, |
| 37 |
AC_HELP_STRING([--disable-schemas-install], |
| 38 |
[Disable the schemas installation]), |
| 39 |
[case ${enableval} in |
| 40 |
yes|no) ;; |
| 41 |
*) AC_MSG_ERROR([bad value ${enableval} for --enable-schemas-install]) ;; |
| 42 |
esac]) |
| 43 |
AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL], [test "$enable_schemas_install" != no]) |
| 44 |
]) |
