[dasher] configure: Ada removed support for GSettings etc. in 2015 (a2dc350a39c0)
- From: Patrick Welche <pwelche src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [dasher] configure: Ada removed support for GSettings etc. in 2015 (a2dc350a39c0)
- Date: Fri, 25 Dec 2020 12:59:58 +0000 (UTC)
commit 806c049a36420e6aed6f6a091b1d91fb98b25c55
Author: Patrick Welche <prlw1 cam ac uk>
Date: Thu Dec 24 16:01:33 2020 +0000
configure: Ada removed support for GSettings etc. in 2015 (a2dc350a39c0)
INSTALL.Linux | 16 ----------------
configure.ac | 33 ---------------------------------
m4/dgconf-2.m4 | 51 ---------------------------------------------------
3 files changed, 100 deletions(-)
---
diff --git a/INSTALL.Linux b/INSTALL.Linux
index 16e2813a..5e36b644 100644
--- a/INSTALL.Linux
+++ b/INSTALL.Linux
@@ -59,22 +59,6 @@ know!
--with-qte Build binaries using the QTE environment.
-GSettings
-=========
-
-Note that in the GNOME 3 world, GSettings, part of glib, replace
-GConf. By default, dasher's "configure" will use GSettings if
-found. If not it will use GConf if found. This can be influenced
-by the --with-gsettings flag to configure. If on running dasher,
-you see
-
- GLib-GIO-ERROR **: Settings schema 'org.gnome.Dasher' is not installed
-
- aborting...
-
-try adding the directory which contains "dasher.gschema.xml",
-usually ${prefix}/share/glib-2.0/schemas, to the environment variable
-GSETTINGS_SCHEMA_DIR.
Desktop Shortcuts
=================
diff --git a/configure.ac b/configure.ac
index 621830bd..da58f2aa 100644
--- a/configure.ac
+++ b/configure.ac
@@ -135,12 +135,6 @@ AC_ARG_WITH([cairo],
fi,
WITHCAIRO=true)
-AC_ARG_WITH([gsettings],
- [AS_HELP_STRING([--with-gsettings],
- [store user preferences using GSettings (default is YES)])])
-AC_ARG_VAR([GLIB_COMPILE_SCHEMAS],
- [Path to glib-compile-schemas, used for compiling GSettings schema])
-
if test x"$WITHGTK" = xtrue
then
PKG_CHECK_MODULES(GTK, gtk+-3.0,
@@ -157,7 +151,6 @@ else
BUILDGTK=false
fi
-DAM_GCONF_SOURCE_2
if test x$BUILDGTK = xtrue
then
PKG_CHECK_MODULES(GIO, gio-2.0,
@@ -180,32 +173,6 @@ then
CFLAGS="$save_CFLAGS"
LIBS="$save_LIBS"
- AS_IF([test "x$with_gsettings" != "xno" -a "x$ac_cv_func_g_settings_new" = "xyes"],
- [AC_CHECK_TOOLS([GLIB_COMPILE_SCHEMAS], [glib-compile-schemas])
- have_gsettings=true
- have_gconf=false
- AC_DEFINE([WITH_GSETTINGS], 1, [Use GSettings])],
- [have_gsettings=false
- PKG_CHECK_MODULES(GCONF, gconf-2.0,
- [have_gconf=true
- AC_DEFINE([WITH_GCONF], 1, [Use GConf])
- SETTINGS_CFLAGS=$GCONF_CFLAGS
- SETTINGS_LIBS=$GCONF_LIBS],
- [have_gconf=false
- AC_MSG_WARN([Neither a glib with GSettings, nor GConf were detected - user
preferences will not be stored.])])
- ])
- AS_IF([test "x$with_gsettings" = "xyes" -a $have_gsettings = false],
- [AC_MSG_ERROR([GSettings requested but not found])])
- AC_MSG_CHECKING([which settings store to use])
- AS_IF(
- [test $have_gsettings = true -a $have_gconf = false],
- [AC_MSG_RESULT([GSettings])],
- [test $have_gsettings = false -a $have_gconf = true],
- [AC_MSG_RESULT([GConf])],
- [test $have_gsettings = false -a $have_gconf = false],
- [AC_MSG_RESULT([none])],
- [AC_MSG_ERROR([Logic error in configure.ac - please send bug report!])])
-
# GtkBuilder's autoconnect feature requires dasher to be
# linked with the --export-dynamic flag. pkg-config does not
# provide it, and libtool knows what to do with -export-dynamic.
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]