diff options
| author | Michael Biebl <biebl@debian.org> | 2015-07-14 19:39:12 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2015-07-14 19:39:12 +0200 |
| commit | 34b1c46437df982495d08a8bbb8bd0b262d8af48 (patch) | |
| tree | 1db29ec39d9f733922b3a33cabcc8e6486fa06aa /m4 | |
| parent | 50fc50153b0036516b853aa576dc435bd53ce736 (diff) | |
| parent | 50a58f0fabd8a34c1b6108a107e08abe3c1ccd24 (diff) | |
Merge tag 'upstream/1.0.4'
Upstream version 1.0.4
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/ax_lib_readline.m4 | 2 | ||||
| -rw-r--r-- | m4/compiler_warnings.m4 | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/m4/ax_lib_readline.m4 b/m4/ax_lib_readline.m4 index fe56c5bf..af32fdaf 100644 --- a/m4/ax_lib_readline.m4 +++ b/m4/ax_lib_readline.m4 @@ -87,7 +87,7 @@ AC_DEFUN([AX_LIB_READLINE], [ ]) if test -z "$ax_cv_lib_readline"; then - AC_MSG_ERROR([readline library with terminfo support is required (one of ncurses, curses, or termcap)]) + AC_MSG_ERROR([readline library with terminfo support is required (one of readline, edit, or editline, AND one of ncurses, curses, or termcap)]) fi ORIG_LIBS="$LIBS" diff --git a/m4/compiler_warnings.m4 b/m4/compiler_warnings.m4 index 5c8d2077..a1c4e128 100644 --- a/m4/compiler_warnings.m4 +++ b/m4/compiler_warnings.m4 @@ -22,7 +22,7 @@ AC_DEFUN([NM_COMPILER_WARNING], [ AC_DEFUN([NM_COMPILER_WARNINGS], [AC_ARG_ENABLE(more-warnings, AS_HELP_STRING([--enable-more-warnings], [Possible values: no/yes/error]), - set_more_warnings="$enableval",set_more_warnings=error) + set_more_warnings="$enableval",set_more_warnings=yes) AC_MSG_CHECKING(for more warnings) if test "$GCC" = "yes" -a "$set_more_warnings" != "no"; then AC_MSG_RESULT(yes) |