diff options
| -rw-r--r-- | Makefile.am | 18 | ||||
| -rw-r--r-- | configure.ac | 6 | ||||
| -rw-r--r-- | libcanberra.schemas | 16 |
3 files changed, 0 insertions, 40 deletions
diff --git a/Makefile.am b/Makefile.am index ffa7265..6041587 100644 --- a/Makefile.am +++ b/Makefile.am @@ -22,7 +22,6 @@ EXTRA_DIST = \ bootstrap.sh \ autogen.sh \ LGPL \ - libcanberra.schemas \ vala/libcanberra.vapi \ vala/libcanberra-gtk.vapi @@ -49,23 +48,6 @@ endif vapi_DATA += vala/libcanberra-gtk.vapi -schemasdir = $(GCONF_SCHEMA_FILE_DIR) -schemas_DATA = libcanberra.schemas - -if GCONF_SCHEMAS_INSTALL -install-data-local: - if test -z "$(DESTDIR)" ; then \ - for p in $(schemas_DATA) ; do \ - GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(top_srcdir)/$$p ; \ - done ; \ - fi -else -install-data-local: -endif -else -install-data-local: -endif - DISTCHECK_CONFIGURE_FLAGS = \ --enable-gtk-doc \ --with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir) diff --git a/configure.ac b/configure.ac index 184a561..36a7d44 100644 --- a/configure.ac +++ b/configure.ac @@ -392,9 +392,6 @@ if test "x${gtk}" != xno ; then HAVE_GTK=1 AC_DEFINE([HAVE_GTK], 1, [Have GTK?]) - AC_PATH_PROG(GCONFTOOL, gconftool-2) - AM_GCONF_SOURCE_2 - GTK_VERSION=`$PKG_CONFIG --variable=gtk_binary_version gtk+-2.0` GTK_MODULES_DIR="${libdir}/gtk-2.0/modules" ], @@ -431,9 +428,6 @@ if test "x${gtk3}" != xno ; then HAVE_GTK3=1 AC_DEFINE([HAVE_GTK3], 1, [Have GTK3?]) - AC_PATH_PROG(GCONFTOOL, gconftool-2) - AM_GCONF_SOURCE_2 - GTK3_VERSION=`$PKG_CONFIG --variable=gtk_binary_version gtk+-3.0` GTK3_MODULES_DIR="${libdir}/gtk-3.0/modules" ], diff --git a/libcanberra.schemas b/libcanberra.schemas deleted file mode 100644 index 7002844..0000000 --- a/libcanberra.schemas +++ /dev/null @@ -1,16 +0,0 @@ -<?xml version="1.0"?> -<gconfschemafile> - <schemalist> - <schema> - <key>/schemas/apps/gnome_settings_daemon/gtk-modules/canberra-gtk-module</key> - <applyto>/apps/gnome_settings_daemon/gtk-modules/canberra-gtk-module</applyto> - <owner>libcanberra</owner> - <type>bool</type> - <default>true</default> - <locale name="C"> - <short>GTK+ module for event sounds</short> - <long>This key determines the GTK+ module to load for event sound support.</long> - </locale> - </schema> - </schemalist> -</gconfschemafile> |