diff options
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 33 |
1 files changed, 3 insertions, 30 deletions
diff --git a/configure.in b/configure.in index eb646c0d..dbf956e6 100644 --- a/configure.in +++ b/configure.in @@ -113,20 +113,13 @@ dnl work; see https://bugzilla.gnome.org/show_bug.cgi?id=650513 with_gtk=2.0 GTK_API_VERSION=2.0 GTK_MIN_VERSION=2.20.0 +GIO_MIN_VERSION=2.25.10 CANBERRA_GTK=libcanberra-gtk -METACITY_PC_MODULES="gtk+-$GTK_API_VERSION >= $GTK_MIN_VERSION pango >= 1.2.0" +METACITY_PC_MODULES="gtk+-$GTK_API_VERSION >= $GTK_MIN_VERSION gio-2.0 >= $GIO_MIN_VERSION pango >= 1.2.0 gsettings-desktop-schemas" AC_SUBST(GTK_API_VERSION) -AC_ARG_ENABLE(gconf, - AC_HELP_STRING([--disable-gconf], - [disable gconf usage, for embedded/size-sensitive non-GNOME builds]),, - enable_gconf=yes) - -if test x$enable_gconf = xyes; then - AC_DEFINE(HAVE_GCONF,1,[Build with gconf support]) - METACITY_PC_MODULES="$METACITY_PC_MODULES gconf-2.0 >= 1.2.0" -fi +GLIB_GSETTINGS AC_ARG_ENABLE(canberra, AC_HELP_STRING([--disable-canberra], @@ -492,18 +485,6 @@ fi AC_SUBST(GDK_PIXBUF_CSOURCE) -if test x$enable_gconf = xyes; then - AC_PATH_PROG(GCONFTOOL, gconftool-2, no) - if test x"$GCONFTOOL" = xno; then - AC_MSG_ERROR([gconftool-2 executable not found in your path - should be installed with GConf]) - fi - - AM_GCONF_SOURCE_2 -else - GCONF_SCHEMAS_INSTALL_TRUE='#' - GCONF_SCHEMAS_INSTALL_FALSE= -fi - AC_PATH_PROG(ZENITY, zenity, no) if test x"$ZENITY" = xno; then AC_MSG_ERROR([zenity not found in your path - needed for dialogs]) @@ -539,13 +520,6 @@ po/Makefile.in AC_OUTPUT -if test x$enable_gconf = xno; then - echo "*** WARNING WARNING WARNING WARNING WARNING" - echo "*** Building without GConf. This means there's no" - echo "*** way to change prefs except hacking source code." - echo "*** This is intended for embedded systems etc., not for normal use." -fi - if test x$enable_verbose_mode = xno; then echo "*** WARNING WARNING WARNING WARNING WARNING" echo "*** Building without verbose mode" @@ -562,7 +536,6 @@ metacity-$VERSION (using gtk+-${GTK_API_VERSION}): source code location: ${srcdir} compiler: ${CC} - GConf: ${enable_gconf} Canberra: ${enable_canberra} XFree86 Xinerama: ${use_xfree_xinerama} Solaris Xinerama: ${use_solaris_xinerama} |