From: Glenn Morris Date: Fri, 28 Mar 2014 22:03:42 +0000 (-0400) Subject: Add system-configuration-features, summarising some configure results X-Git-Tag: emacs-25.0.90~2640^2~309 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=c3153003fb0bfeef7ade4c060501c23f0556195d;p=emacs.git Add system-configuration-features, summarising some configure results * configure.ac (ACL_SUMMARY): Rename from acl_summary, for consistency. (EMACS_CONFIG_FEATURES): New define. * src/emacs.c (syms_of_emacs) : New var. * lisp/mail/emacsbug.el (report-emacs-bug): Include system-configuration-features. * etc/NEWS: Mention this. --- diff --git a/ChangeLog b/ChangeLog index adc1768b0ce..f8c4c599cd6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2014-03-28 Glenn Morris + + * configure.ac (ACL_SUMMARY): Rename from acl_summary, for consistency. + (EMACS_CONFIG_FEATURES): New define. + 2014-03-27 Paul Eggert * configure.ac: Suggest './configure MAKE=gmake' in diagnostic. diff --git a/configure.ac b/configure.ac index e1d6fc249a4..1b622c9de3c 100644 --- a/configure.ac +++ b/configure.ac @@ -4925,9 +4925,9 @@ if test "${HAVE_GTK}" = "yes"; then fi if test $USE_ACL -ne 0; then - acl_summary="yes $LIB_ACL" + ACL_SUMMARY="yes $LIB_ACL" else - acl_summary=no + ACL_SUMMARY=no fi echo " @@ -4952,6 +4952,23 @@ else echo " Where do we find X Windows libraries? Standard dirs" fi +optsep= +emacs_config_features= +for opt in XAW3D XPM JPEG TIFF GIF PNG RSVG IMAGEMAGICK SOUND GPM DBUS \ + GCONF GSETTINGS NOTIFY ACL LIBSELINUX GNUTLS LIBXML2 FREETYPE M17N_FLT \ + LIBOTF XFT ZLIB; do + + case $opt in + NOTIFY|ACL) eval val=\${${opt}_SUMMARY} ;; + *) eval val=\${HAVE_$opt} ;; + esac + test x"$val" = xno && continue + AS_VAR_APPEND([emacs_config_features], ["$optsep$opt"]) + optsep=' ' +done +AC_DEFINE_UNQUOTED(EMACS_CONFIG_FEATURES, "${emacs_config_features}", + [Summary of some of the main features enabled by configure.]) + echo " Does Emacs use -lXaw3d? ${HAVE_XAW3D}" echo " Does Emacs use -lXpm? ${HAVE_XPM}" echo " Does Emacs use -ljpeg? ${HAVE_JPEG}" @@ -4968,7 +4985,7 @@ 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 a file notification library? ${NOTIFY_SUMMARY}" -echo " Does Emacs use access control lists? ${acl_summary}" +echo " Does Emacs use access control lists? ${ACL_SUMMARY}" echo " Does Emacs use -lselinux? ${HAVE_LIBSELINUX}" echo " Does Emacs use -lgnutls? ${HAVE_GNUTLS}" echo " Does Emacs use -lxml2? ${HAVE_LIBXML2}" diff --git a/etc/NEWS b/etc/NEWS index 0265f2604bf..4da6aafd7ec 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -41,6 +41,11 @@ otherwise leave it unmarked. The function `tty-run-terminal-initialization' consults this variable when deciding what terminal-specific initialization code to run. +--- +** New variable `system-configuration-features', listing some of the +main features that Emacs was compiled with. This is mainly intended +for use in Emacs bug reports. + * Editing Changes in Emacs 24.5 diff --git a/lisp/ChangeLog b/lisp/ChangeLog index ee50bed6209..24f17f004f5 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,12 +1,15 @@ +2014-03-28 Glenn Morris + + * mail/emacsbug.el (report-emacs-bug): + Include system-configuration-features. + 2014-03-28 Michal Nazarewicz * simple.el (cycle-spacing): Never delete spaces on first run by default, but do so in a new 'fast mode and if there are already N spaces (the previous behaviour). - Compare N with its value in previous invocation so that changing prefix argument restarts `cycle-spacing' sequence. - The idea is that with this change, binding M-SPC to `cycle-spacing' should not introduce any changes in behaviour of the binding so long as users do not type M-SPC twice in a raw with diff --git a/lisp/mail/emacsbug.el b/lisp/mail/emacsbug.el index b994949e94d..54f7b6a21ea 100644 --- a/lisp/mail/emacsbug.el +++ b/lisp/mail/emacsbug.el @@ -1,7 +1,7 @@ ;;; emacsbug.el --- command to report Emacs bugs to appropriate mailing list -;; Copyright (C) 1985, 1994, 1997-1998, 2000-2014 Free Software -;; Foundation, Inc. +;; Copyright (C) 1985, 1994, 1997-1998, 2000-2014 +;; Free Software Foundation, Inc. ;; Author: K. Shane Hartman ;; Maintainer: emacs-devel@gnu.org @@ -251,6 +251,8 @@ usually do not have translators for other languages.\n\n"))) (insert "Configured using:\n `configure " system-configuration-options "'\n\n") (fill-region (line-beginning-position -1) (point))) + (insert "Configured features:\n" system-configuration-features "\n\n") + (fill-region (line-beginning-position -1) (point)) (insert "Important settings:\n") (mapc (lambda (var) diff --git a/src/ChangeLog b/src/ChangeLog index 6ac67ca5592..1527c98f052 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2014-03-28 Glenn Morris + + * emacs.c (syms_of_emacs) : New var. + 2014-03-27 Paul Eggert Port recent signal-related changes to FreeBSD. diff --git a/src/emacs.c b/src/emacs.c index 9d070bda51b..07deccd16ec 100644 --- a/src/emacs.c +++ b/src/emacs.c @@ -2460,6 +2460,12 @@ Emacs is running. */); doc: /* String containing the configuration options Emacs was built with. */); Vsystem_configuration_options = build_string (EMACS_CONFIG_OPTIONS); + DEFVAR_LISP ("system-configuration-features", Vsystem_configuration_features, + doc: /* String listing some of the main features this Emacs was compiled with. +An element of the form \"FOO\" generally means that HAVE_FOO was +defined during the build. */); + Vsystem_configuration_features = build_string (EMACS_CONFIG_FEATURES); + DEFVAR_BOOL ("noninteractive", noninteractive1, doc: /* Non-nil means Emacs is running without interactive terminal. */);