------------------------------------------------------------
revno: 116906
fixes bug: http://debbugs.gnu.org/17118
committer: Jan D. <jan.h.d@swipnet.se>
branch nick: trunk
timestamp: Sat 2014-03-29 13:08:47 +0100
message:
  * configure.ac: Add check that GSettings is in libgio.
diff:
=== modified file 'ChangeLog'
--- ChangeLog	2014-03-29 00:14:16 +0000
+++ ChangeLog	2014-03-29 12:08:47 +0000
@@ -1,3 +1,7 @@
+2014-03-29  Jan Djärv  <jan.h.d@swipnet.se>
+
+	* configure.ac: Add check that GSettings is in libgio (Bug#17118).
+
 2014-03-28  Glenn Morris  <rgm@gnu.org>
 
 	* configure.ac (AC_INIT): Add "GNU" in package, add bug address.

=== modified file 'configure.ac'
--- configure.ac	2014-03-28 23:11:39 +0000
+++ configure.ac	2014-03-29 12:08:47 +0000
@@ -2432,9 +2432,26 @@
 if test "${HAVE_X11}" = "yes" && test "${with_gsettings}" = "yes"; then
    PKG_CHECK_MODULES(GSETTINGS, gio-2.0 >= 2.26, HAVE_GSETTINGS=yes, HAVE_GSETTINGS=no)
    if test "$HAVE_GSETTINGS" = "yes"; then
-      AC_DEFINE(HAVE_GSETTINGS, 1, [Define to 1 if using GSettings.])
-      SETTINGS_CFLAGS="$GSETTINGS_CFLAGS"
-      SETTINGS_LIBS="$GSETTINGS_LIBS"
+      AC_MSG_CHECKING([whether GSettings is in gio])
+      GSETTINGS_COMPILES=no
+      AC_LINK_IFELSE(
+         [AC_LANG_PROGRAM(
+ 	     [[/* Check that gsettings really is present.  */
+             #include <glib-object.h>
+	     #include <gio/gio.h>
+ 	     ]],
+ 	     [[
+	       GSettings *settings;
+	       GVariant *val = g_settings_get_value (settings, "");
+ 	     ]])],
+ 	 [GSETTINGS_COMPILES=yes])
+      AC_MSG_RESULT([$GSETTINGS_COMPILES])
+
+      if test "$$GSETTINGS_COMPILES" = "yes"; then
+        AC_DEFINE(HAVE_GSETTINGS, 1, [Define to 1 if using GSettings.])
+ 	SETTINGS_CFLAGS="$GSETTINGS_CFLAGS"
+ 	SETTINGS_LIBS="$GSETTINGS_LIBS"
+      fi
    fi
 fi
------------------------------------------------------------
revno: 116905
committer: Glenn Morris <rgm@gnu.org>
branch nick: trunk
timestamp: Fri 2014-03-28 19:59:51 -0700
message:
  ede autoload tweak
  
  * lisp/cedet/ede/dired.el (ede-dired-minor-mode): Add autoload cookie.
  (generated-autoload-file, generated-autoload-load-name):
  Set file-local values.
  
  * lisp/cedet/ede.el: Load ede/loaddefs at compile time too.
  (ede-dired-minor-mode): Remove hand-written autoload.
diff:
=== modified file 'lisp/cedet/ChangeLog'
--- lisp/cedet/ChangeLog	2014-03-04 08:37:48 +0000
+++ lisp/cedet/ChangeLog	2014-03-29 02:59:51 +0000
@@ -1,3 +1,11 @@
+2014-03-29  Glenn Morris  <rgm@gnu.org>
+
+	* ede/dired.el (ede-dired-minor-mode): Add autoload cookie.
+	(generated-autoload-file, generated-autoload-load-name):
+	Set file-local values.
+	* ede.el: Load ede/loaddefs at compile time too.
+	(ede-dired-minor-mode): Remove hand-written autoload.
+
 2014-03-04  Glenn Morris  <rgm@gnu.org>
 
 	* semantic/util.el (semantic-complete-symbol):

=== modified file 'lisp/cedet/ede.el'
--- lisp/cedet/ede.el	2014-01-01 07:43:34 +0000
+++ lisp/cedet/ede.el	2014-03-29 02:59:51 +0000
@@ -46,7 +46,8 @@
 (require 'ede/base)
 (require 'ede/auto)
 
-(load "ede/loaddefs" nil 'nomessage)
+(eval-and-compile
+  (load "ede/loaddefs" nil 'nomessage))
 
 (declare-function ede-commit-project "ede/custom")
 (declare-function ede-convert-path "ede/files")
@@ -450,8 +451,6 @@
 
 ;;; Mode Declarations
 ;;
-(eval-and-compile
-  (autoload 'ede-dired-minor-mode "ede/dired" "EDE commands for dired" t))
 
 (defun ede-apply-target-options ()
   "Apply options to the current buffer for the active project/target."

=== modified file 'lisp/cedet/ede/dired.el'
--- lisp/cedet/ede/dired.el	2014-01-01 07:43:34 +0000
+++ lisp/cedet/ede/dired.el	2014-03-29 02:59:51 +0000
@@ -1,7 +1,6 @@
 ;;; ede/dired.el --- EDE extensions to dired.
 
-;; Copyright (C) 1998-2000, 2003, 2009-2014 Free Software Foundation,
-;; Inc.
+;; Copyright (C) 1998-2000, 2003, 2009-2014 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;; Version: 0.4
@@ -56,6 +55,7 @@
     map)
   "Keymap used for ede dired minor mode.")
 
+;;;###autoload
 (define-minor-mode ede-dired-minor-mode
   "A minor mode that should only be activated in DIRED buffers.
 If ARG is nil or a positive number, force on, if
@@ -84,4 +84,9 @@
 
 (provide 'ede/dired)
 
+;; Local variables:
+;; generated-autoload-file: "loaddefs.el"
+;; generated-autoload-load-name: "ede/dired"
+;; End:
+
 ;;; ede/dired.el ends here