diff options
| author | Tim-Philipp Müller <tim.muller@collabora.co.uk> | 2011-06-15 14:37:29 +0100 |
|---|---|---|
| committer | Tim-Philipp Müller <tim.muller@collabora.co.uk> | 2011-06-15 14:37:29 +0100 |
| commit | 728732438bbbe81f3d44e0890e2dd243340722ad (patch) | |
| tree | 2747e6333701f3610eae918343cc56fe68433ce6 /m4 | |
| parent | 83678af5e0b3cdc8d3df875ef661746a0971613c (diff) | |
Remove gconf elements and plugin
GConf was deprecated in favour of GSettings etc.
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/Makefile.am | 1 | ||||
| -rw-r--r-- | m4/gconf-2.m4 | 40 |
2 files changed, 0 insertions, 41 deletions
diff --git a/m4/Makefile.am b/m4/Makefile.am index a2a60f8b8..82e52b5f1 100644 --- a/m4/Makefile.am +++ b/m4/Makefile.am @@ -9,7 +9,6 @@ EXTRA_DIST = \ codeset.m4 \ esd.m4 \ freetype2.m4 \ - gconf-2.m4 \ gettext.m4 \ glibc21.m4 \ glib.m4 \ diff --git a/m4/gconf-2.m4 b/m4/gconf-2.m4 deleted file mode 100644 index 088c93f9a..000000000 --- a/m4/gconf-2.m4 +++ /dev/null @@ -1,40 +0,0 @@ -dnl AM_GCONF_SOURCE_2 -dnl Defines GCONF_SCHEMA_CONFIG_SOURCE which is where you should install schemas -dnl (i.e. pass to gconftool-2 -dnl Defines GCONF_SCHEMA_FILE_DIR which is a filesystem directory where -dnl you should install foo.schemas files -dnl - -AC_DEFUN([AM_GCONF_SOURCE_2], -[ - if test "x$GCONF_SCHEMA_INSTALL_SOURCE" = "x"; then - GCONF_SCHEMA_CONFIG_SOURCE=`gconftool-2 --get-default-source` - else - GCONF_SCHEMA_CONFIG_SOURCE=$GCONF_SCHEMA_INSTALL_SOURCE - fi - - AC_ARG_WITH(gconf-source, - [ --with-gconf-source=sourceaddress Config database for installing schema files.],GCONF_SCHEMA_CONFIG_SOURCE="$withval",) - - AC_SUBST(GCONF_SCHEMA_CONFIG_SOURCE) - 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' - fi - - AC_ARG_WITH(gconf-schema-file-dir, - [ --with-gconf-schema-file-dir=dir Directory for installing schema files.],GCONF_SCHEMA_FILE_DIR="$withval",) - - 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) -]) |