Completely remove gconf support

Build --without-gconf for the emacs25 flavor (as we already do for
lucid and nox), since GConf has been deprecated for years.

Thanks to intrigeri for reporting the issue.

Closes: 869085

diff --git a/debian/control b/debian/control
index 94423225742c7be2b83134716206ee5e0f7ae915..a7ab7c4ca5f664cc50e8c0eaedc2468462ac034b 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -14,7 +14,7 @@ Build-Depends: bsd-mailx | mailx, libncurses5-dev, texinfo, liblockfile-dev, lib
  autoconf, automake, autotools-dev, dpkg-dev (>> 1.10.0), quilt (>= 0.42),
  debhelper (>= 9), libxaw7-dev, sharutils, imagemagick, libgtk-3-dev,
  libgnutls28-dev, libxml2-dev, libselinux1-dev [linux-any],
- libgconf2-dev, libasound2-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64],
+ libasound2-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64],
  libmagick++-6.q16-dev,
  libacl1-dev,
  liboss4-salsa-dev [hurd-i386 kfreebsd-i386 kfreebsd-amd64],

diff --git a/debian/control.in b/debian/control.in
index 31f8d1a15e4a5272a5176869f3824b21211a3b45..cbba36fd6fe32c2db1451cde87da4cc44275466a 100644 (file)
--- a/debian/control.in
+++ b/debian/control.in
@@ -14,7 +14,7 @@ Build-Depends: bsd-mailx | mailx, libncurses5-dev, texinfo, liblockfile-dev, lib
  autoconf, automake, autotools-dev, dpkg-dev (>> 1.10.0), quilt (>= 0.42),
  debhelper (>= 9), libxaw7-dev, sharutils, imagemagick, libgtk-3-dev,
  libgnutls28-dev, libxml2-dev, libselinux1-dev [linux-any],
- libgconf2-dev, libasound2-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64],
+ libasound2-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64],
  libmagick++-6.q16-dev,
  libacl1-dev,
  liboss4-salsa-dev [hurd-i386 kfreebsd-i386 kfreebsd-amd64],

diff --git a/debian/rules b/debian/rules
index fb4418971bc553f78826a5d26f13610a6a10a270..94d0632f9f852bdbd09744d487e7453de44f507a 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -300,6 +300,7 @@ confflags += --mandir=/usr/share/man
 confflags += --with-pop=yes
 confflags += --enable-locallisppath=$(local_lpath)
 confflags += --with-sound=alsa
+confflags += --without-gconf
 
 # x configure flags
 confflags_x := $(confflags) 
@@ -313,7 +314,6 @@ confflags_x += --with-toolkit-scroll-bars
 # nox configure flags
 confflags_nox := $(confflags) 
 confflags_nox += --with-x=no
-confflags_nox += --without-gconf
 confflags_nox += --without-gsettings
 
 # lucid configure flags
@@ -321,7 +321,6 @@ confflags_lucid := $(confflags)
 confflags_lucid += --with-x=yes
 confflags_lucid += --with-x-toolkit=lucid
 confflags_lucid += --with-toolkit-scroll-bars
-confflags_lucid += --without-gconf
 confflags_lucid += --without-gsettings
 
 define cfg_tree