INN commit: trunk (14 files)

INN Commit Russ_Allbery at isc.org
Sun May 24 12:28:19 UTC 2009


    Date: Sunday, May 24, 2009 @ 05:28:19
  Author: iulius
Revision: 8495

Use AS_HELP_STRING instead of obsolete AC_HELP_STRING.

Modified:
  trunk/configure.ac
  trunk/m4/berkeleydb.m4
  trunk/m4/compress.m4
  trunk/m4/krb5.m4
  trunk/m4/modes.m4
  trunk/m4/openssl.m4
  trunk/m4/paths.m4
  trunk/m4/perl.m4
  trunk/m4/python.m4
  trunk/m4/sasl.m4
  trunk/m4/sendmail.m4
  trunk/m4/syslog.m4
  trunk/m4/users.m4
  trunk/m4/zlib.m4

------------------+
 configure.ac     |   10 +++++-----
 m4/berkeleydb.m4 |    2 +-
 m4/compress.m4   |    2 +-
 m4/krb5.m4       |    2 +-
 m4/modes.m4      |    6 +++---
 m4/openssl.m4    |    2 +-
 m4/paths.m4      |   20 ++++++++++----------
 m4/perl.m4       |    2 +-
 m4/python.m4     |    2 +-
 m4/sasl.m4       |    2 +-
 m4/sendmail.m4   |    2 +-
 m4/syslog.m4     |    2 +-
 m4/users.m4      |    6 +++---
 m4/zlib.m4       |    2 +-
 14 files changed, 31 insertions(+), 31 deletions(-)

Modified: configure.ac
===================================================================
--- configure.ac	2009-05-24 12:13:39 UTC (rev 8494)
+++ configure.ac	2009-05-24 12:28:19 UTC (rev 8495)
@@ -133,7 +133,7 @@
 dnl innbind by default only allows ports 119, 433 and 563 below 1024; if the user
 dnl wants to use some other port as well, they must use this option.
 AC_ARG_WITH([innd-port],
-    [AC_HELP_STRING([--with-innd-port=PORT],
+    [AS_HELP_STRING([--with-innd-port=PORT],
         [Additional low-numbered port for innbind])],
     [AC_DEFINE_UNQUOTED([INND_PORT], [$with_innd_port],
         [Additional permitted low-numbered port for innbind.])])
@@ -142,7 +142,7 @@
 dnl this will be automatically detected and always turned on, but it's not
 dnl quite mature enough yet.
 AC_ARG_ENABLE([ipv6],
-    [AC_HELP_STRING([--enable-ipv6], [Enable IPv6 support])],
+    [AS_HELP_STRING([--enable-ipv6], [Enable IPv6 support])],
     [if test "x$enableval" = xyes ; then
         AC_DEFINE([HAVE_INET6], 1, [Define to enable IPv6 support.])
     fi])
@@ -154,7 +154,7 @@
 DO_DBZ_TAGGED_HASH=DONT
 inn_enable_tagged_hash=no
 AC_ARG_ENABLE([tagged-hash],
-    [AC_HELP_STRING([--enable-tagged-hash],
+    [AS_HELP_STRING([--enable-tagged-hash],
         [Use tagged hash table for history])],
     [if test "x$enableval" = xyes ; then
         DO_DBZ_TAGGED_HASH=DO
@@ -168,7 +168,7 @@
 dnl requires a regular expression library, which is checked for later on.
 inn_enable_keywords=0
 AC_ARG_ENABLE([keywords],
-    [AC_HELP_STRING([--enable-keywords],
+    [AS_HELP_STRING([--enable-keywords],
         [Automatic innd keyword generation support])],
     if test x"$enableval" = xyes ; then
         inn_enable_keywords=1
@@ -183,7 +183,7 @@
 dnl support due to assumptions about the size of off_t.
 inn_enable_largefiles=no
 AC_ARG_ENABLE([largefiles],
-    [AC_HELP_STRING([--enable-largefiles],
+    [AS_HELP_STRING([--enable-largefiles],
         [Support for files larger than 2GB [default=no]])],
     if test x"$enableval" = xyes ; then
         inn_enable_largefiles=yes

Modified: m4/berkeleydb.m4
===================================================================
--- m4/berkeleydb.m4	2009-05-24 12:13:39 UTC (rev 8494)
+++ m4/berkeleydb.m4	2009-05-24 12:28:19 UTC (rev 8495)
@@ -11,7 +11,7 @@
 DB_LDFLAGS=
 DB_LIBS=
 AC_ARG_WITH([berkeleydb],
-    [AC_HELP_STRING([--with-berkeleydb@<:@=PATH@:>@],
+    [AS_HELP_STRING([--with-berkeleydb@<:@=PATH@:>@],
         [Enable Berkeley DB (for ovdb overview method)])],
     DB_DIR=$with_berkeleydb,
     DB_DIR=no)

Modified: m4/compress.m4
===================================================================
--- m4/compress.m4	2009-05-24 12:13:39 UTC (rev 8494)
+++ m4/compress.m4	2009-05-24 12:28:19 UTC (rev 8495)
@@ -15,7 +15,7 @@
 dnl just the name of the compression type.
 AC_DEFUN([INN_ARG_COMPRESS],
 [AC_ARG_WITH([log-compress],
-    [AC_HELP_STRING([--with-log-compress=METHOD],
+    [AS_HELP_STRING([--with-log-compress=METHOD],
         [Log compression method [gzip]])],
     LOG_COMPRESS=$with_log_compress,
     LOG_COMPRESS=gzip)

Modified: m4/krb5.m4
===================================================================
--- m4/krb5.m4	2009-05-24 12:13:39 UTC (rev 8494)
+++ m4/krb5.m4	2009-05-24 12:28:19 UTC (rev 8495)
@@ -14,7 +14,7 @@
 KRB5_LIBS=
 KRB5_AUTH=
 AC_ARG_WITH([kerberos],
-    [AC_HELP_STRING([--with-kerberos@<:@=PATH@:>@],
+    [AS_HELP_STRING([--with-kerberos@<:@=PATH@:>@],
         [Enable Kerberos v5 (for auth_krb5)])],
     KRB5_DIR=$with_kerberos,
     KRB5_DIR=no)

Modified: m4/modes.m4
===================================================================
--- m4/modes.m4	2009-05-24 12:13:39 UTC (rev 8494)
+++ m4/modes.m4	2009-05-24 12:28:19 UTC (rev 8495)
@@ -15,7 +15,7 @@
 DIRMODE=0775
 RUNDIRMODE=0770
 AC_ARG_WITH([news-umask],
-    [AC_HELP_STRING([--with-news-umask=UMASK], [umask for news files [002]])],
+    [AS_HELP_STRING([--with-news-umask=UMASK], [umask for news files [002]])],
     with_news_umask=`echo "$with_news_umask" | sed 's/^0*//'`
     if test "x$with_news_umask" = x22 ; then
         NEWSUMASK=022
@@ -44,7 +44,7 @@
 dnl it's explicitly requested at configure time.
 INEWSMODE=0550
 AC_ARG_ENABLE([setgid-inews],
-    [AC_HELP_STRING([--enable-setgid-inews], [Install inews setgid])],
+    [AS_HELP_STRING([--enable-setgid-inews], [Install inews setgid])],
     if test "x$enableval" = xyes ; then
         INEWSMODE=02555
     fi)
@@ -57,7 +57,7 @@
 RNEWSGRP=$RUNASGROUP
 RNEWSMODE=0500
 AC_ARG_ENABLE([uucp-rnews],
-    [AC_HELP_STRING([--enable-uucp-rnews],
+    [AS_HELP_STRING([--enable-uucp-rnews],
         [Install rnews setuid, group uucp])],
     if test "x$enableval" = xyes ; then
         RNEWSGRP=uucp

Modified: m4/openssl.m4
===================================================================
--- m4/openssl.m4	2009-05-24 12:13:39 UTC (rev 8494)
+++ m4/openssl.m4	2009-05-24 12:28:19 UTC (rev 8495)
@@ -17,7 +17,7 @@
 SSL_CPPFLAGS=
 SSL_LIBS=
 AC_ARG_WITH([openssl],
-    [AC_HELP_STRING([--with-openssl@<:@=PATH@:>@],
+    [AS_HELP_STRING([--with-openssl@<:@=PATH@:>@],
         [Enable OpenSSL (for NNTP over TLS/SSL support)])],
     SSL_DIR=$with_openssl,
     SSL_DIR=no)

Modified: m4/paths.m4
===================================================================
--- m4/paths.m4	2009-05-24 12:13:39 UTC (rev 8494)
+++ m4/paths.m4	2009-05-24 12:28:19 UTC (rev 8495)
@@ -18,34 +18,34 @@
 dnl And here are all the paths.
 AC_DEFUN([INN_ARG_PATHS],
 [_INN_ARG_DIR([control], ['${bindir}/control'], [CONTROLDIR],
-    [AC_HELP_STRING([--with-control-dir=PATH],
+    [AS_HELP_STRING([--with-control-dir=PATH],
         [Path for control programs [PREFIX/bin/control]])])
 _INN_ARG_DIR([db], ['${prefix}/db'], [DBDIR],
-    [AC_HELP_STRING([--with-db-dir=PATH],
+    [AS_HELP_STRING([--with-db-dir=PATH],
         [Path for news database files [PREFIX/db]])])
 _INN_ARG_DIR([doc], ['${prefix}/doc'], [docdir],
-    [AC_HELP_STRING([--with-doc-dir=PATH],
+    [AS_HELP_STRING([--with-doc-dir=PATH],
         [Path for news documentation [PREFIX/doc]])])
 _INN_ARG_DIR([filter], ['${bindir}/filter'], [FILTERDIR],
-    [AC_HELP_STRING([--with-filter-dir=PATH],
+    [AS_HELP_STRING([--with-filter-dir=PATH],
         [Path for embedded filters [PREFIX/bin/filter]])])
 _INN_ARG_DIR([http], ['${prefix}/http'], [HTTPDIR],
-    [AC_HELP_STRING([--with-http-dir=PATH],
+    [AS_HELP_STRING([--with-http-dir=PATH],
         [Path for web pages [PREFIX/http]])])
 _INN_ARG_DIR([libperl], ['${libdir}/perl'], [LIBPERLDIR],
-    [AC_HELP_STRING([--with-libperl-dir=PATH],
+    [AS_HELP_STRING([--with-libperl-dir=PATH],
         [Path for Perl modules [PREFIX/lib/perl]])])
 _INN_ARG_DIR([log], ['${prefix}/log'], [LOGDIR],
-    [AC_HELP_STRING([--with-log-dir=PATH],
+    [AS_HELP_STRING([--with-log-dir=PATH],
         [Path for news logs [PREFIX/log]])])
 _INN_ARG_DIR([run], ['${prefix}/run'], [RUNDIR],
-    [AC_HELP_STRING([--with-run-dir=PATH],
+    [AS_HELP_STRING([--with-run-dir=PATH],
         [Path for news PID/runtime files [PREFIX/run]])])
 _INN_ARG_DIR([spool], ['${prefix}/spool'], [SPOOLDIR],
-    [AC_HELP_STRING([--with-spool-dir=PATH],
+    [AS_HELP_STRING([--with-spool-dir=PATH],
         [Path for news storage [PREFIX/spool]])])
 _INN_ARG_DIR([tmp], ['${prefix}/tmp'], [tmpdir],
-    [AC_HELP_STRING([--with-tmp-dir=PATH],
+    [AS_HELP_STRING([--with-tmp-dir=PATH],
         [Path for temporary files [PREFIX/tmp]])])
 
 dnl Some additional paths used by inn/paths.h.

Modified: m4/perl.m4
===================================================================
--- m4/perl.m4	2009-05-24 12:13:39 UTC (rev 8494)
+++ m4/perl.m4	2009-05-24 12:28:19 UTC (rev 8495)
@@ -32,7 +32,7 @@
 AC_DEFUN([INN_ARG_PERL],
 [AC_ARG_VAR([PERL], [Location of Perl interpretor])
 AC_ARG_WITH([perl],
-    [AC_HELP_STRING([--with-perl], [Embedded Perl script support [no]])],
+    [AS_HELP_STRING([--with-perl], [Embedded Perl script support [no]])],
     [case $withval in
     yes) DO_PERL=DO
          AC_DEFINE(DO_PERL, 1, [Define to compile in Perl script support.])

Modified: m4/python.m4
===================================================================
--- m4/python.m4	2009-05-24 12:13:39 UTC (rev 8494)
+++ m4/python.m4	2009-05-24 12:28:19 UTC (rev 8495)
@@ -8,7 +8,7 @@
 AC_DEFUN([INN_ARG_PYTHON],
 [AC_ARG_VAR([PYTHON], [Location of Python interpretor])
 AC_ARG_WITH([python],
-    [AC_HELP_STRING([--with-python], [Embedded Python module support [no]])],
+    [AS_HELP_STRING([--with-python], [Embedded Python module support [no]])],
     [case $withval in
     yes) DO_PYTHON=DO
          AC_DEFINE(DO_PYTHON, 1,

Modified: m4/sasl.m4
===================================================================
--- m4/sasl.m4	2009-05-24 12:13:39 UTC (rev 8494)
+++ m4/sasl.m4	2009-05-24 12:28:19 UTC (rev 8495)
@@ -12,7 +12,7 @@
 SASL_LDFLAGS=
 SASL_LIBS=
 AC_ARG_WITH([sasl],
-    [AC_HELP_STRING([--with-sasl@<:@=PATH@:>@],
+    [AS_HELP_STRING([--with-sasl@<:@=PATH@:>@],
         [Enable SASL (for imapfeed authentication)])],
     SASL_DIR=$with_sasl,
     SASL_DIR=no)

Modified: m4/sendmail.m4
===================================================================
--- m4/sendmail.m4	2009-05-24 12:13:39 UTC (rev 8494)
+++ m4/sendmail.m4	2009-05-24 12:28:19 UTC (rev 8495)
@@ -9,7 +9,7 @@
 AC_DEFUN([INN_ARG_SENDMAIL],
 [AC_ARG_VAR([SENDMAIL], [Location of sendmail binary to use])
 AC_ARG_WITH([sendmail],
-    [AC_HELP_STRING([--with-sendmail=PATH], [Path to sendmail])],
+    [AS_HELP_STRING([--with-sendmail=PATH], [Path to sendmail])],
     SENDMAIL=$with_sendmail)])
 
 dnl Search for sendmail, honoring the path set by the user if they've done so

Modified: m4/syslog.m4
===================================================================
--- m4/syslog.m4	2009-05-24 12:13:39 UTC (rev 8494)
+++ m4/syslog.m4	2009-05-24 12:28:19 UTC (rev 8495)
@@ -12,7 +12,7 @@
 dnl inn_syslog_facility variable for later use.
 AC_DEFUN([INN_ARG_SYSLOG],
 [AC_ARG_WITH([syslog-facility],
-    [AC_HELP_STRING([--with-syslog-facility=LOG_FAC],
+    [AS_HELP_STRING([--with-syslog-facility=LOG_FAC],
         [Syslog facility [LOG_NEWS or LOG_LOCAL1]])],
     SYSLOG_FACILITY=$with_syslog_facility,
     SYSLOG_FACILITY=none)])

Modified: m4/users.m4
===================================================================
--- m4/users.m4	2009-05-24 12:13:39 UTC (rev 8494)
+++ m4/users.m4	2009-05-24 12:28:19 UTC (rev 8495)
@@ -15,12 +15,12 @@
 dnl And here they are.
 AC_DEFUN([INN_ARG_USERS],
 [_INN_ARG_USER([user], [news], [RUNASUSER],
-    [AC_HELP_STRING([--with-news-user=USER], [News user name [news]])],
+    [AS_HELP_STRING([--with-news-user=USER], [News user name [news]])],
     [The user that INN should run as.])
 _INN_ARG_USER([group], [news], [RUNASGROUP],
-    [AC_HELP_STRING([--with-news-group=GROUP], [News group name [news]])],
+    [AS_HELP_STRING([--with-news-group=GROUP], [News group name [news]])],
     [The group that INN should run as.])
 _INN_ARG_USER([master], [usenet], [NEWSMASTER],
-    [AC_HELP_STRING([--with-news-master=USER],
+    [AS_HELP_STRING([--with-news-master=USER],
         [News master (address for reports) [usenet]])],
     [The user who gets all INN-related e-mail.])])

Modified: m4/zlib.m4
===================================================================
--- m4/zlib.m4	2009-05-24 12:13:39 UTC (rev 8494)
+++ m4/zlib.m4	2009-05-24 12:28:19 UTC (rev 8495)
@@ -13,7 +13,7 @@
 ZLIB_LDFLAGS=
 ZLIB_LIBS=
 AC_ARG_WITH([zlib],
-    [AC_HELP_STRING([--with-zlib@<:@=PATH@:>@],
+    [AS_HELP_STRING([--with-zlib@<:@=PATH@:>@],
         [Enable zlib (used by ovdb)])],
     ZLIB_DIR=$with_zlib,
     [if test x"$DB_LIBS" != x ; then




More information about the inn-committers mailing list