From dd6ce2d6ba36c818729bc6a2fa66fc3a8631350e Mon Sep 17 00:00:00 2001 From: Stéphane Loeuillet Date: Fri, 17 Sep 2004 22:13:07 +0000 Subject: update esound, gconf, alsa and ogg m4 files from upstream versions Original commit message from CVS: update esound, gconf, alsa and ogg m4 files from upstream versions --- m4/gconf-2.m4 | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'm4/gconf-2.m4') diff --git a/m4/gconf-2.m4 b/m4/gconf-2.m4 index e1ccc5a2..088c93f9 100644 --- a/m4/gconf-2.m4 +++ b/m4/gconf-2.m4 @@ -20,9 +20,7 @@ AC_DEFUN([AM_GCONF_SOURCE_2], AC_MSG_RESULT([Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation]) if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then - GCONF_SCHEMA_FILE_DIR='$(sysconfdir)/gconf/schemas/' - else - GCONF_SCHEMA_FILE_DIR=$GCONF_SCHEMA_FILE_DIR + GCONF_SCHEMA_FILE_DIR='$(sysconfdir)/gconf/schemas' fi AC_ARG_WITH(gconf-schema-file-dir, @@ -30,4 +28,13 @@ AC_DEFUN([AM_GCONF_SOURCE_2], AC_SUBST(GCONF_SCHEMA_FILE_DIR) AC_MSG_RESULT([Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files]) + + AC_ARG_ENABLE(schemas-install, + [ --disable-schemas-install Disable the schemas installation], + [case "${enableval}" in + yes) schemas_install=true ;; + no) schemas_install=false ;; + *) AC_MSG_ERROR(bad value ${enableval} for --disable-schemas-install) ;; + esac],[schemas_install=true]) + AM_CONDITIONAL(GCONF_SCHEMAS_INSTALL, test x$schemas_install = xtrue) ]) -- cgit