diff options
| author | Yanko Kaneti <yaneti@declera.com> | 2001-08-28 13:29:17 +0000 |
|---|---|---|
| committer | Yanko Kaneti <yaneti@src.gnome.org> | 2001-08-28 13:29:17 +0000 |
| commit | 6cdf3a98ff62bf0e5e6ef38d6717c6a5b6fc3538 (patch) | |
| tree | 649fe654503174feaaf0e50ccc4c6e12663ecc3d /gconf-2.m4.in | |
| parent | 454d537602eff895b1ed507d5e3be764f7f14fef (diff) | |
| download | gconf-6cdf3a98ff62bf0e5e6ef38d6717c6a5b6fc3538.tar.gz | |
Merge from stable.
2001-08-28 Yanko Kaneti <yaneti@declera.com>
Merge from stable.
* gconf.m4.in: add --with-gconf-schema-dir -> GCONF_SCHEMA_FILE_DIR
to the AM_GCONF_SOURCE macro.
* doc/gconf/gconf.sgml: update the docs wrt the above change.
Diffstat (limited to 'gconf-2.m4.in')
| -rw-r--r-- | gconf-2.m4.in | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/gconf-2.m4.in b/gconf-2.m4.in index 2e8c9f93..d4f208ab 100644 --- a/gconf-2.m4.in +++ b/gconf-2.m4.in @@ -1,17 +1,21 @@ dnl AM_GCONF_SOURCE -dnl Define GCONF_SCHEMA_CONFIG_SOURCE +dnl Define GCONF_SCHEMA_CONFIG_SOURCE and GCONF_SCHEMA_FILE_DIR dnl -AC_DEFUN(AM_GCONF_SOURCE_2, +AC_DEFUN(AM_GCONF_SOURCE, [ -if test "x$GCONF_SCHEMA_INSTALL_SOURCE" = "x"; then - GCONF_SCHEMA_CONFIG_SOURCE=`gconftool --get-default-source` -else - GCONF_SCHEMA_CONFIG_SOURCE=$GCONF_SCHEMA_INSTALL_SOURCE -fi - AC_ARG_WITH(gconf-source, -[ --with-gconf-source=sourceaddress Where to install schema files.],GCONF_SCHEMA_CONFIG_SOURCE="$withval",) +[ --with-gconf-source=sourceaddress Where to install the schema.], + GCONF_SCHEMA_CONFIG_SOURCE="$withval", + GCONF_SCHEMA_CONFIG_SOURCE=`gconftool --get-default-source`) AC_SUBST(GCONF_SCHEMA_CONFIG_SOURCE) AC_MSG_RESULT("Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation") + +AC_ARG_WITH(gconf-schema-dir, +[ --with-gconf-schema-dir=dir Directory to install the schema files.], + GCONF_SCHEMA_FILE_DIR="$withval", + GCONF_SCHEMA_FILE_DIR=@EXPANDED_SYSCONFDIR@/gconf/schemas/) + + AC_SUBST(GCONF_SCHEMA_FILE_DIR) + AC_MSG_RESULT("Using $GCONF_SCHEMA_FILE_DIR as schema files dir") ]) |