The branch, master has been updated
via 5eeee39cc18a1205f69dd42c626312b9456ead4b (commit)
via 796974ddf65604f0da4b53039f11ebf886957cc9 (commit)
via 75f5b3dab669ab79a6ff11f70ff75589fc1946c5 (commit)
from 710eeb2a33cb91c05251c69d7eb1a572aed44cb4 (commit)
- Log -----------------------------------------------------------------
commit 5eeee39cc18a1205f69dd42c626312b9456ead4b
Author: Thomas Adam <[email protected]>
Commit: Thomas Adam <[email protected]>
Ignore .dirstamp files
GNU automake 1.14+ uses these files for subdir-option detection. We don't
want to accidentally commit these. They're not useful to us.
---
.gitignore | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/.gitignore b/.gitignore
index 20a3bbf..ba580ed 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,6 +6,7 @@
core
tags
.deps/
+compat/.dirstamp
aclocal.m4
autom4te.cache/
config.log
commit 796974ddf65604f0da4b53039f11ebf886957cc9
Author: Thomas Adam <[email protected]>
Commit: Thomas Adam <[email protected]>
Check setupterm() in libtinfo also
Some ncurses packages have build time configuration options to separate its
different parts into separate libraries. Some Linux distributions in
particular separate out the terminfo routines in to libtinfo.
This change teaches configure that setupterm() can also be found there.
---
configure.ac | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/configure.ac b/configure.ac
index 186d753..68c50fb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -135,7 +135,7 @@ fi
# Look for curses.
AC_SEARCH_LIBS(
setupterm,
- [terminfo curses ncurses],
+ [terminfo curses ncurses tinfo],
found_curses=yes,
found_curses=no
)
commit 75f5b3dab669ab79a6ff11f70ff75589fc1946c5
Author: Thomas Adam <[email protected]>
Commit: Thomas Adam <[email protected]>
Add subdir-objects to shut automake up
automake 1.14 onwards has started emitting lots of warnings about this
option:
automake: warning: possible forward-incompatibility.
automake: At least a source file is in a subdirectory, but the
'subdir-objects'
automake: automake option hasn't been enabled. For now, the corresponding
output
automake: object file(s) will be placed in the top-level directory.
However,
automake: this behaviour will change in future Automake versions: they will
automake: unconditionally cause object files to be placed in the same
subdirectory
automake: of the corresponding sources.
automake: You are advised to start using 'subdir-objects' option throughout
your
automake: project, to avoid future incompatibilities.
So enable this in AM_INIT_AUTOMAKE.
This doesn't seem to break older automake versions.
---
configure.ac | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/configure.ac b/configure.ac
index 590b9db..186d753 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@
AC_INIT(tmux, 1.9)
AC_CONFIG_AUX_DIR(etc)
-AM_INIT_AUTOMAKE([foreign])
+AM_INIT_AUTOMAKE([foreign subdir-objects])
AC_CANONICAL_HOST
-----------------------------------------------------------------------
Summary of changes:
.gitignore | 1 +
configure.ac | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
hooks/post-receive
--
tmux
------------------------------------------------------------------------------
October Webinars: Code for Performance
Free Intel webinars can help you accelerate application performance.
Explore tips for MPI, OpenMP, advanced profiling, and more. Get the most from
the latest Intel processors and coprocessors. See abstracts and register >
http://pubads.g.doubleclick.net/gampad/clk?id=60134791&iu=/4140/ostg.clktrk
_______________________________________________
tmux-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tmux-cvs
