diff options
| author | Paul Eggert | 2013-03-05 09:25:50 -0800 |
|---|---|---|
| committer | Paul Eggert | 2013-03-05 09:25:50 -0800 |
| commit | 3b108d19a0fd9aaa37709d0be4bfc67884120f43 (patch) | |
| tree | c5c2406ce90162147a005465a717920af735fbac | |
| parent | 408ffa0fef7a4e9a91a2b864700d5ced8783dd59 (diff) | |
| download | emacs-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-- | ChangeLog | 5 | ||||
| -rw-r--r-- | configure.ac | 5 |
2 files changed, 5 insertions, 5 deletions
| @@ -1,3 +1,8 @@ | |||
| 1 | 2013-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 | |||
| 1 | 2013-03-05 Glenn Morris <rgm@gnu.org> | 6 | 2013-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 | ;; |
| 1647 | esac | 1647 | esac |
| 1648 | 1648 | ||
| 1649 | if test -n "${term_header}"; then | ||
| 1650 | AC_DEFINE_UNQUOTED(TERM_HEADER, "${term_header}", | ||
| 1651 | [Define to the header for the built-in window system.]) | ||
| 1652 | fi | ||
| 1653 | |||
| 1654 | if test "$window_system" = none && test "X$with_x" != "Xno"; then | 1649 | if 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 || |