[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[SCM] GNU Inetutils branch, master, updated. inetutils-1_9_1-281-gb997e
|
From: |
Mats Erik Andersson |
|
Subject: |
[SCM] GNU Inetutils branch, master, updated. inetutils-1_9_1-281-gb997ed9 |
|
Date: |
Tue, 07 May 2013 20:42:32 +0000 |
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Inetutils ".
The branch, master has been updated
via b997ed983b4bf6e71a1f6419fe384c8f62e0004d (commit)
from 0c3f38bbdabd5721bb2ccccce624a5592ababad5 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit/inetutils.git/commit/?id=b997ed983b4bf6e71a1f6419fe384c8f62e0004d
commit b997ed983b4bf6e71a1f6419fe384c8f62e0004d
Author: Mats Erik Andersson <address@hidden>
Date: Tue May 7 21:43:49 2013 +0200
configure.ac: Minor clean-up.
diff --git a/ChangeLog b/ChangeLog
index 4473fd4..d40358d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2013-05-07 Mats Erik Andersson <address@hidden>
+
+ configure.ac: Minor clean-up.
+
+ * am/config_paths.m4 (IU_CONFIG_PATHS):
+ Replace obsolete AC_HELP_STRING by AS_HELP_STRING.
+ * am/libcurses.m4 (IU_LIB_NCURSES): Likewise.
+ * am/readline.m4 (gl_FUNC_READLINE): Likewise.
+ * configure.ac: Likewise. Use AC_CONFIG_HEADERS
+ instead of AC_CONFIG_HEADER. Call AM_PROG_AR,
+ but protect its use by means of m4_ifdef.
+ (AM_INIT_AUTOMAKE): Add `-Wall' and `-Werror'.
+ Remove second call to the same macro.
+
2013-05-01 Mats Erik Andersson <address@hidden>
* libtelnet/enc_des.c: Convert K&R style declarations
diff --git a/am/config_paths.m4 b/am/config_paths.m4
index 0c2fea9..d442eb2 100644
--- a/am/config_paths.m4
+++ b/am/config_paths.m4
@@ -47,7 +47,7 @@ AC_DEFUN([IU_CONFIG_PATHS], [
dnl We actually look for `with_' variables corresponding to each path
dnl configured.
AC_ARG_WITH([PATHVAR],
- AC_HELP_STRING([--with-PATHVAR=PATH],
+ AS_HELP_STRING([--with-PATHVAR=PATH],
[Set the value of PATHVAR to PATH
PATHVAR is the name of a \`PATH_FOO' variable,
downcased, with \`_' changed to \`-']))
diff --git a/am/libcurses.m4 b/am/libcurses.m4
index 37aa650..962a6e6 100644
--- a/am/libcurses.m4
+++ b/am/libcurses.m4
@@ -29,7 +29,7 @@ dnl -I flag to get access to ncurses include files.
dnl
AC_DEFUN([IU_LIB_NCURSES], [
AC_ARG_ENABLE([ncurses],
- AC_HELP_STRING([--disable-ncurses],
+ AS_HELP_STRING([--disable-ncurses],
[don't prefer -lncurses over -lcurses]),
, [enable_ncurses=yes])
if test "$enable_ncurses" = yes; then
@@ -39,7 +39,7 @@ AC_DEFUN([IU_LIB_NCURSES], [
# is there a better way of doing this, that avoids looking in specific
# directories?
AC_ARG_WITH([ncurses-include-dir],
- AC_HELP_STRING([--with-ncurses-include-dir=DIR],
+ AS_HELP_STRING([--with-ncurses-include-dir=DIR],
[Set directory containing the include files
for
use with -lncurses, when it isn't installed as
the default curses library. If DIR is "none",
diff --git a/am/readline.m4 b/am/readline.m4
index be4ce86..3958e71 100644
--- a/am/readline.m4
+++ b/am/readline.m4
@@ -16,7 +16,7 @@ AC_DEFUN([gl_FUNC_READLINE],
dnl Allow disabling the use of libreadline.
AC_ARG_ENABLE([readline],
- AC_HELP_STRING([--disable-readline],
+ AS_HELP_STRING([--disable-readline],
[do not build against libreadline]), ,
[enable_readline=yes])
diff --git a/configure.ac b/configure.ac
index 4fe029c..5ebc4d2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,10 +26,10 @@ AC_INIT([GNU inetutils],
AC_CONFIG_SRCDIR([src/inetd.c])
AC_CONFIG_AUX_DIR([build-aux])
-AC_CONFIG_HEADER([config.h:config.hin])
+AC_CONFIG_HEADERS([config.h:config.hin])
AC_CANONICAL_HOST
-AM_INIT_AUTOMAKE([1.11.1 dist-xz])
+AM_INIT_AUTOMAKE([1.11.1 dist-xz -Wall -Werror])
# For now, we always use libexecdir; later we may want to vary where
# the daemons go.
@@ -37,40 +37,40 @@ inetdaemondir='$(libexecdir)'
AC_SUBST(inetdaemondir)
AC_ARG_WITH([krb4],
- AC_HELP_STRING([--with-krb4[[=PATH]]],
+ AS_HELP_STRING([--with-krb4[[=PATH]]],
[Compile with Kerberos IV]),
[KERBEROS_VERSION=krb4
KERBEROS_DIR=$withval])
AC_ARG_WITH([krb5],
- AC_HELP_STRING([--with-krb5[[=PATH]]],
+ AS_HELP_STRING([--with-krb5[[=PATH]]],
[Compile with Kerberos V]),
[KERBEROS_VERSION=krb5
KERBEROS_DIR=$withval])
AC_ARG_WITH([shishi],
- AC_HELP_STRING([--with-shishi[[=PATH]]],
+ AS_HELP_STRING([--with-shishi[[=PATH]]],
[Compile with Shishi (Kerberos 5)]),
[KERBEROS_VERSION=Shishi
KERBEROS_DIR=$withval])
AC_ARG_ENABLE([servers],
- AC_HELP_STRING([--disable-servers],
+ AS_HELP_STRING([--disable-servers],
[Do not compile servers]),
, [enable_servers=yes])
AC_ARG_ENABLE([clients],
- AC_HELP_STRING([--disable-clients],
+ AS_HELP_STRING([--disable-clients],
[Do not compile clients]),
, [enable_clients=yes])
AC_ARG_ENABLE([libls],
- AC_HELP_STRING([--disable-libls],
+ AS_HELP_STRING([--disable-libls],
[Disable support for libls ]),
, [enable_libls=yes])
AC_ARG_ENABLE([encryption],
- AC_HELP_STRING([--enable-encryption],
+ AS_HELP_STRING([--enable-encryption],
[Enable encryption]),
[test -z "$KERBEROS_VERSION" &&
AC_MSG_ERROR([--enable-encryption is given, but a Kerberos version is not
provided])],
[test -z "$KERBEROS_VERSION" && enable_encryption=no])
AC_ARG_ENABLE([authentication],
- AC_HELP_STRING([--enable-authentication],
+ AS_HELP_STRING([--enable-authentication],
[Enable connection authentication]),
[test -z "$KERBEROS_VERSION" &&
AC_MSG_ERROR([--enable-authentication is given, but a Kerberos version is not
provided])],
[test -z "$KERBEROS_VERSION" && enable_authentication=no])
@@ -81,17 +81,17 @@ if test -n "$KERBEROS_VERSION"; then
fi
AC_ARG_WITH([wrap],
- AC_HELP_STRING([--with-wrap],
+ AS_HELP_STRING([--with-wrap],
[Add tcp wrapper support]))
AC_ARG_WITH([pam],
- AC_HELP_STRING([--with-pam],
+ AS_HELP_STRING([--with-pam],
[Add support for PAM]))
AC_ARG_WITH([idn],
- AC_HELP_STRING([--with-idn[[=DIR]]],
+ AS_HELP_STRING([--with-idn[[=DIR]]],
[Use IDN support, with optional inclusion directory]), ,
[with_idn=no])
AC_ARG_WITH([libidn-prefix],
- AC_HELP_STRING([--with-libidn-prefix[[=DIR]]],
+ AS_HELP_STRING([--with-libidn-prefix[[=DIR]]],
[Base directory, probes DIR/include and DIR/lib]), ,
[with_libidn_prefix=no])
@@ -123,8 +123,6 @@ IU_ENABLE_CLIENT(whois)
IU_ENABLE_CLIENT(ifconfig)
IU_ENABLE_CLIENT(traceroute)
-AM_INIT_AUTOMAKE
-
AM_SILENT_RULES([yes])
AC_ISC_POSIX
@@ -132,6 +130,7 @@ AC_ISC_POSIX
### Checks for programs.
AC_PROG_CC
gl_EARLY
+m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
AC_CHECK_TOOL(AR, ar)
AC_PATH_PROG(DD, dd, dd)
AC_PATH_PROG(MKTEMP, mktemp, mktemp)
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 14 ++++++++++++++
am/config_paths.m4 | 2 +-
am/libcurses.m4 | 4 ++--
am/readline.m4 | 2 +-
configure.ac | 31 +++++++++++++++----------------
5 files changed, 33 insertions(+), 20 deletions(-)
hooks/post-receive
--
GNU Inetutils
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [SCM] GNU Inetutils branch, master, updated. inetutils-1_9_1-281-gb997ed9,
Mats Erik Andersson <=