aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggert2013-03-05 09:25:50 -0800
committerPaul Eggert2013-03-05 09:25:50 -0800
commit3b108d19a0fd9aaa37709d0be4bfc67884120f43 (patch)
treec5c2406ce90162147a005465a717920af735fbac
parent408ffa0fef7a4e9a91a2b864700d5ced8783dd59 (diff)
downloademacs-3b108d19a0fd9aaa37709d0be4bfc67884120f43.tar.gz
emacs-3b108d19a0fd9aaa37709d0be4bfc67884120f43.zip
* configure.ac (TERM_HEADER): Remove duplicate definition.
It can mess up 'configure' runs. Fixes: debbugs:13872
-rw-r--r--ChangeLog5
-rw-r--r--configure.ac5
2 files changed, 5 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index fd524c6955b..5c701479698 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
12013-03-05 Paul Eggert <eggert@cs.ucla.edu>
2
3 * configure.ac (TERM_HEADER): Remove duplicate definition (Bug#13872).
4 It can mess up 'configure' runs.
5
12013-03-05 Glenn Morris <rgm@gnu.org> 62013-03-05 Glenn Morris <rgm@gnu.org>
2 7
3 * Makefile.in (install-man): Ignore gzip exit status. 8 * Makefile.in (install-man): Ignore gzip exit status.
diff --git a/configure.ac b/configure.ac
index ef65e7eaee6..62f53a3fac2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1646,11 +1646,6 @@ dnl use the toolkit if we have gtk, or X11R5 or newer.
1646 ;; 1646 ;;
1647esac 1647esac
1648 1648
1649if test -n "${term_header}"; then
1650 AC_DEFINE_UNQUOTED(TERM_HEADER, "${term_header}",
1651 [Define to the header for the built-in window system.])
1652fi
1653
1654if test "$window_system" = none && test "X$with_x" != "Xno"; then 1649if test "$window_system" = none && test "X$with_x" != "Xno"; then
1655 AC_CHECK_PROG(HAVE_XSERVER, X, true, false) 1650 AC_CHECK_PROG(HAVE_XSERVER, X, true, false)
1656 if test "$HAVE_XSERVER" = true || 1651 if test "$HAVE_XSERVER" = true ||