From f527bd029a8a4ed4071c155fc46437f4d728bea7 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Fri, 1 Jul 2011 06:19:04 -0400 Subject: [PATCH] Auto-commit of generated files. --- autogen/Makefile.in | 4 ++ autogen/config.in | 3 + autogen/configure | 140 +++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 144 insertions(+), 3 deletions(-) diff --git a/autogen/Makefile.in b/autogen/Makefile.in index d3151304c5f..fd93b0146a6 100644 --- a/autogen/Makefile.in +++ b/autogen/Makefile.in @@ -306,6 +306,8 @@ GNULIB_WRITE = @GNULIB_WRITE@ GNULIB__EXIT = @GNULIB__EXIT@ GNU_OBJC_CFLAGS = @GNU_OBJC_CFLAGS@ GREP = @GREP@ +GSETTINGS_CFLAGS = @GSETTINGS_CFLAGS@ +GSETTINGS_LIBS = @GSETTINGS_LIBS@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ GTK_OBJ = @GTK_OBJ@ @@ -619,6 +621,8 @@ REPLACE_WCTOMB = @REPLACE_WCTOMB@ REPLACE_WRITE = @REPLACE_WRITE@ RSVG_CFLAGS = @RSVG_CFLAGS@ RSVG_LIBS = @RSVG_LIBS@ +SETTINGS_CFLAGS = @SETTINGS_CFLAGS@ +SETTINGS_LIBS = @SETTINGS_LIBS@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SIG_ATOMIC_T_SUFFIX = @SIG_ATOMIC_T_SUFFIX@ diff --git a/autogen/config.in b/autogen/config.in index 23b98d256b9..8fa108844b8 100644 --- a/autogen/config.in +++ b/autogen/config.in @@ -304,6 +304,9 @@ along with GNU Emacs. If not, see . */ /* Define to 1 if you have the `grantpt' function. */ #undef HAVE_GRANTPT +/* Define to 1 if using GSettings. */ +#undef HAVE_GSETTINGS + /* Define to 1 if using GTK 3 or later. */ #undef HAVE_GTK3 diff --git a/autogen/configure b/autogen/configure index d8ec94e90b1..3543c39c3b1 100755 --- a/autogen/configure +++ b/autogen/configure @@ -1103,8 +1103,12 @@ LIBXTR6 LIBGNUTLS_LIBS LIBGNUTLS_CFLAGS LIBSELINUX_LIBS +SETTINGS_LIBS +SETTINGS_CFLAGS GCONF_LIBS GCONF_CFLAGS +GSETTINGS_LIBS +GSETTINGS_CFLAGS DBUS_OBJ DBUS_LIBS DBUS_CFLAGS @@ -1271,6 +1275,7 @@ with_ns with_gpm with_dbus with_gconf +with_gsettings with_selinux with_gnutls with_makeinfo @@ -1987,6 +1992,7 @@ Optional Packages: console --without-dbus don't compile with D-Bus support --without-gconf don't compile with GConf support + --without-gsettings don't compile with GSettings support --without-selinux don't compile with SELinux support --without-gnutls don't use -lgnutls for SSL/TLS support --without-makeinfo don't require makeinfo for building manuals @@ -3990,6 +3996,14 @@ else fi +# Check whether --with-gsettings was given. +if test "${with_gsettings+set}" = set; then : + withval=$with_gsettings; +else + with_gsettings=yes +fi + + # Check whether --with-selinux was given. if test "${with_selinux+set}" = set; then : withval=$with_selinux; @@ -11046,8 +11060,113 @@ done fi +HAVE_GSETTINGS=no +if test "${HAVE_X11}" = "yes" && test "${with_gsettings}" = "yes"; then + + succeeded=no + + # Extract the first word of "pkg-config", so it can be a program name with args. +set dummy pkg-config; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_path_PKG_CONFIG+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + case $PKG_CONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" + ;; +esac +fi +PKG_CONFIG=$ac_cv_path_PKG_CONFIG +if test -n "$PKG_CONFIG"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 +$as_echo "$PKG_CONFIG" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + + if test "$PKG_CONFIG" = "no" ; then + HAVE_GSETTINGS=no + else + PKG_CONFIG_MIN_VERSION=0.9.0 + if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for glib-2.0 >= 2.26" >&5 +$as_echo_n "checking for glib-2.0 >= 2.26... " >&6; } + + if $PKG_CONFIG --exists "glib-2.0 >= 2.26" 2>&5; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + succeeded=yes + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking GSETTINGS_CFLAGS" >&5 +$as_echo_n "checking GSETTINGS_CFLAGS... " >&6; } + GSETTINGS_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 2.26"|sed -e 's,///*,/,g'` + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GSETTINGS_CFLAGS" >&5 +$as_echo "$GSETTINGS_CFLAGS" >&6; } + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking GSETTINGS_LIBS" >&5 +$as_echo_n "checking GSETTINGS_LIBS... " >&6; } + GSETTINGS_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= 2.26"|sed -e 's,///*,/,g'` + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GSETTINGS_LIBS" >&5 +$as_echo "$GSETTINGS_LIBS" >&6; } + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + GSETTINGS_CFLAGS="" + GSETTINGS_LIBS="" + ## If we have a custom action on failure, don't print errors, but + ## do set a variable so people can do so. + GSETTINGS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "glib-2.0 >= 2.26"` + + fi + + + + else + echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer." + echo "*** See http://www.freedesktop.org/software/pkgconfig" + fi + fi + + if test $succeeded = yes; then + HAVE_GSETTINGS=yes + else + HAVE_GSETTINGS=no + fi + + if test "$HAVE_GSETTINGS" = "yes"; then + +$as_echo "#define HAVE_GSETTINGS 1" >>confdefs.h + + SETTINGS_CFLAGS="$GSETTINGS_CFLAGS" + SETTINGS_LIBS="$GSETTINGS_LIBS" + fi +fi + HAVE_GCONF=no -if test "${HAVE_X11}" = "yes" && test "${with_gconf}" = "yes"; then +if test "${HAVE_GSETTINGS}" = "no" && test "${HAVE_X11}" = "yes" && test "${with_gconf}" = "yes"; then succeeded=no @@ -11146,7 +11265,17 @@ $as_echo "no" >&6; } $as_echo "#define HAVE_GCONF 1" >>confdefs.h - for ac_func in g_type_init + SETTINGS_CFLAGS="$GSETTINGS_CFLAGS" + SETTINGS_LIBS="$GSETTINGS_LIBS" + fi +fi + +if test "$HAVE_GSETTINGS" = "yes" || test "$HAVE_GCONF" = "yes"; then + SAVE_CFLAGS="$CFLAGS" + SAVE_LDFLAGS="$LDFLAGS" + CFLAGS="$SETTINGS_CFLAGS $CFLAGS" + LDFLAGS="$SETTINGS_LIBS $LDFLAGS" + for ac_func in g_type_init do : ac_fn_c_check_func "$LINENO" "g_type_init" "ac_cv_func_g_type_init" if test "x$ac_cv_func_g_type_init" = x""yes; then : @@ -11157,9 +11286,13 @@ _ACEOF fi done - fi + CFLAGS="$SAVE_CFLAGS" + LDFLAGS="$SAVE_LDFLAGS" fi + + + HAVE_LIBSELINUX=no LIBSELINUX_LIBS= if test "${with_selinux}" = "yes"; then @@ -21106,6 +21239,7 @@ echo " Does Emacs use imagemagick? ${HAVE_IMAGEMAGI echo " Does Emacs use -lgpm? ${HAVE_GPM}" echo " Does Emacs use -ldbus? ${HAVE_DBUS}" echo " Does Emacs use -lgconf? ${HAVE_GCONF}" +echo " Does Emacs use GSettings? ${HAVE_GSETTINGS}" echo " Does Emacs use -lselinux? ${HAVE_LIBSELINUX}" echo " Does Emacs use -lgnutls (2.6.x or higher)? ${HAVE_GNUTLS}" echo " Does Emacs use -lxml2? ${HAVE_LIBXML2}" -- 2.39.2