Subject: 24.3-rc1; TERM_HEADER multiply defined during 'configure'
From: Paul Eggert <[email-masked]>
To: [email-masked]
Date: Mon, 04 Mar 2013 21:26:30 -0800
List-Id: <debbugs-submit.debbugs.gnu.org>

Building Emacs 24.3-rc1 on Fedora 17 x86-64 generates a config.log with
lots of these diagnostics:

conftest.c:242:0: warning: "TERM_HEADER" redefined [enabled by default]
conftest.c:71:0: note: this is the location of the previous definition

The problem is that TERM_HEADER is put into conftest.c twice, with
disagreeing definitions:

  #define TERM_HEADER "xterm.h"
  ...
  #define TERM_HEADER "gtkutil.h"

On this platform it happens to work, but I worry that on other
platforms the C compiler will reject any such test program (as it is
entitled to do), which will cause later configuration decisions to
go wrong.

Here's a fix.  This looks pretty safe.

=== modified file 'ChangeLog'
--- ChangeLog	2013-03-05 03:43:52 +0000
+++ ChangeLog	2013-03-05 05:21:41 +0000
@@ -1,3 +1,8 @@
+2013-03-05  Paul Eggert  <[email-masked]>
+
+	* configure.ac (TERM_HEADER): Remove duplicate definition
+	that can mess up 'configure' runs.
+
 2013-03-05  Glenn Morris  <[email-masked]>
 
 	* Makefile.in (install-man): Ignore gzip exit status.

=== modified file 'configure.ac'
--- configure.ac	2013-03-05 03:53:34 +0000
+++ configure.ac	2013-03-05 04:50:24 +0000
@@ -1646,11 +1646,6 @@
   ;;
 esac
 
-if test -n "${term_header}"; then
-    AC_DEFINE_UNQUOTED(TERM_HEADER, "${term_header}",
-        [Define to the header for the built-in window system.])
-fi
-
 if test "$window_system" = none && test "X$with_x" != "Xno"; then
    AC_CHECK_PROG(HAVE_XSERVER, X, true, false)
    if test "$HAVE_XSERVER" = true ||