INN commit: trunk (BOOTSTRAP configure.ac doc/pod/hacking.pod)
INN Commit
rra at isc.org
Sat Oct 26 20:30:03 UTC 2013
Date: Saturday, October 26, 2013 @ 13:30:02
Author: iulius
Revision: 9550
use at least Autoconf 2.64 to bootstrap INN
AC_INIT has been supporting 5 parameters since Autoconf 2.64.
Switch to this newer version.
Also improve HACKING as for the files taken from other projects when
releasing a new version of INN:
- mention the paths of these files in the libtool tarball,
- mention rra-c-util,
and document how to run a single test, as well as a pointer where
to find automatic build logs of INN.
Modified:
trunk/BOOTSTRAP
trunk/configure.ac
trunk/doc/pod/hacking.pod
---------------------+
BOOTSTRAP | 2 -
configure.ac | 81 +++++++++++++++++++++++++-------------------------
doc/pod/hacking.pod | 65 +++++++++++++++++++++++++++-------------
3 files changed, 87 insertions(+), 61 deletions(-)
Modified: BOOTSTRAP
===================================================================
--- BOOTSTRAP 2013-10-26 18:36:31 UTC (rev 9549)
+++ BOOTSTRAP 2013-10-26 20:30:02 UTC (rev 9550)
@@ -9,7 +9,7 @@
./configure
make bootstrap
-You will need to have Autoconf 2.61 or later, Perl, a make that supports
+You will need to have Autoconf 2.64 or later, Perl, a make that supports
file inclusion, and a compiler installed. This should generate, among
other things, the README and HACKING files, which you can then read for
more information about INN.
Modified: configure.ac
===================================================================
--- configure.ac 2013-10-26 18:36:31 UTC (rev 9549)
+++ configure.ac 2013-10-26 20:30:02 UTC (rev 9550)
@@ -26,9 +26,10 @@
dnl useful information for someone debugging a problem than configure-time
dnl errors.
-AC_INIT([INN], [2.6.0], [inn-workers at lists.isc.org])
-AC_PREREQ(2.61)
-AC_REVISION($Revision$)
+AC_INIT([INN], [2.6.0], [inn-workers at lists.isc.org],
+ [inn], [https://www.isc.org/software/inn/])
+AC_PREREQ([2.64])
+AC_REVISION([$Revision$])
AC_CONFIG_AUX_DIR([support])
dnl Lots of our macros are stored in separate files for ease of maintenance.
@@ -127,7 +128,7 @@
AC_ARG_ENABLE([ipv6],
[AS_HELP_STRING([--enable-ipv6], [Enable IPv6 support])],
[if test "x$enableval" = xyes ; then
- AC_DEFINE([HAVE_INET6], 1, [Define to enable IPv6 support.])
+ AC_DEFINE([HAVE_INET6], [1], [Define to enable IPv6 support.])
fi])
dnl Whether to use a different (less tested) history algorithm. This will
@@ -142,7 +143,7 @@
[if test "x$enableval" = xyes ; then
DO_DBZ_TAGGED_HASH=DO
inn_enable_tagged_hash=yes
- AC_DEFINE([DO_TAGGED_HASH], 1,
+ AC_DEFINE([DO_TAGGED_HASH], [1],
[Define to use tagged hash for the history file.])
fi])
AC_SUBST([DO_DBZ_TAGGED_HASH])
@@ -167,7 +168,7 @@
inn_enable_largefiles=no
AC_ARG_ENABLE([largefiles],
[AS_HELP_STRING([--enable-largefiles],
- [Support for files larger than 2GB [default=no]])],
+ [Support for files larger than 2GB @<:@default=no@:>@])],
if test x"$enableval" = xyes ; then
inn_enable_largefiles=yes
fi)
@@ -207,7 +208,7 @@
dnl right definitions of pread and pwrite and to get some other functions
dnl (like asprintf) that we use.
*linux*)
- AC_DEFINE([_GNU_SOURCE], 1,
+ AC_DEFINE([_GNU_SOURCE], [1],
[Define if compiling on Linux to get prototypes for some functions.])
;;
@@ -286,7 +287,7 @@
dnl We have a replacement function if we can't find it, and then we also need
dnl to check for pstat.
AC_SEARCH_LIBS([setproctitle], [util],
- [AC_DEFINE([HAVE_SETPROCTITLE], 1,
+ [AC_DEFINE([HAVE_SETPROCTITLE], [1],
[Define if you have the setproctitle function.])],
[AC_LIBOBJ([setproctitle])
AC_CHECK_FUNCS([pstat])])
@@ -297,8 +298,9 @@
dnl it isn't necessary it will totally break networking. Unisys also
dnl includes gethostbyname in libsocket but needs libnsl for socket().
AC_SEARCH_LIBS([gethostbyname], [nsl])
-AC_SEARCH_LIBS([socket], [socket], ,
- [AC_CHECK_LIB([nsl], [socket], LIBS="$LIBS -lsocket -lnsl", , -lsocket)])
+AC_SEARCH_LIBS([socket], [socket], [],
+ [AC_CHECK_LIB([nsl], [socket], [LIBS="$LIBS -lsocket -lnsl"], [],
+ [-lsocket])])
dnl Check for inet_aton. We have our own, but on Solaris the version in
dnl libresolv is more lenient in ways that Solaris's internal DNS resolution
@@ -318,14 +320,14 @@
[AC_CHECK_HEADERS([pam/pam_appl.h], [], [inn_check_pam=0])])
if test x"$inn_check_pam" = x1; then
INN_SEARCH_AUX_LIBS([pam_start], [pam], [PAM_LIBS],
- [AC_DEFINE([HAVE_PAM], 1, [Define if you have PAM.])])
+ [AC_DEFINE([HAVE_PAM], [1], [Define if you have PAM.])])
fi
INN_HEADER_PAM_CONST
dnl If keyword generation support was requested, check for the appropriate
dnl libraries.
if test x"$inn_enable_keywords" = x1 ; then
- INN_SEARCH_AUX_LIBS([regexec], [regex], [REGEX_LIBS], ,
+ INN_SEARCH_AUX_LIBS([regexec], [regex], [REGEX_LIBS], [],
[AC_MSG_ERROR([no usable regular expression library found])])
fi
@@ -340,7 +342,7 @@
dnl If Kerberos is found, define KRB5_AUTH to auth_krb5 so as to build
dnl that program.
AS_IF([test x"$KRB5_LIBS" != x],
- [KRB5_AUTH=auth_krb5])
+ [KRB5_AUTH=auth_krb5])
AC_SUBST([KRB5_AUTH])
dnl The dbm libraries are a special case. If we're building with Berkeley DB,
@@ -350,7 +352,7 @@
fi
if test x"$inn_cv_lib_berkeleydb_ndbm_works" != xyes ; then
INN_SEARCH_AUX_LIBS([dbm_open], [ndbm dbm gdbm "gdbm_compat -lgdbm"], [DBM_LIBS],
- [AC_DEFINE([HAVE_DBM], 1, [Define if you have a dbm library.])])
+ [AC_DEFINE([HAVE_DBM], [1], [Define if you have a dbm library.])])
DBM_CPPFLAGS=
else
DBM_CPPFLAGS="$DB_CPPFLAGS"
@@ -383,12 +385,12 @@
dnl Check for whether various symbols are declared.
AC_CHECK_DECLS([pread, pwrite, snprintf, setproctitle, strlcat,
strlcpy, vsnprintf])
-AC_CHECK_DECLS([h_errno], , , [#include <netdb.h>])
-AC_CHECK_DECLS([inet_aton, inet_ntoa], , ,
-[#include <sys/types.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>])
-AC_CHECK_DECLS([altzone], , , [#include <time.h>])
+AC_CHECK_DECLS([h_errno], [], [], [#include <netdb.h>])
+AC_CHECK_DECLS([inet_aton, inet_ntoa], [], [],
+ [#include <sys/types.h>
+ #include <netinet/in.h>
+ #include <arpa/inet.h>])
+AC_CHECK_DECLS([altzone], [], [], [#include <time.h>])
dnl Checks for compiler characteristics.
AC_C_BIGENDIAN
@@ -400,9 +402,9 @@
AC_STRUCT_TIMEZONE
AC_CHECK_MEMBERS([struct stat.st_blksize])
AC_CHECK_MEMBERS([struct tm.tm_gmtoff])
-AC_CHECK_MEMBERS([struct sockaddr.sa_len], , ,
-[#include <sys/types.h>
-#include <sys/socket.h>])
+AC_CHECK_MEMBERS([struct sockaddr.sa_len], [], [],
+ [#include <sys/types.h>
+ #include <sys/socket.h>])
dnl Checks for types.
AC_TYPE_INT8_T
@@ -419,25 +421,25 @@
AC_FUNC_GETGROUPS
AC_TYPE_UID_T
AC_CHECK_TYPES([ptrdiff_t])
-AC_CHECK_TYPES([sig_atomic_t], , ,
-[#include <sys/types.h>
-#include <signal.h>])
-AC_CHECK_TYPES([socklen_t], , ,
-[#include <sys/types.h>
-#include <sys/socket.h>])
-AC_CHECK_TYPES([union semun], , ,
-[#include <sys/types.h>
-#include <sys/ipc.h>
-#include <sys/sem.h>])
+AC_CHECK_TYPES([sig_atomic_t], [], [],
+ [#include <sys/types.h>
+ #include <signal.h>])
+AC_CHECK_TYPES([socklen_t], [], [],
+ [#include <sys/types.h>
+ #include <sys/socket.h>])
+AC_CHECK_TYPES([union semun], [], [],
+ [#include <sys/types.h>
+ #include <sys/ipc.h>
+ #include <sys/sem.h>])
dnl See if struct sockaddr_storage is available, and if so, how its members
dnl are named.
AC_CHECK_TYPES([struct sockaddr_storage],
- [AC_CHECK_MEMBERS([struct sockaddr_storage.ss_family], , ,
+ [AC_CHECK_MEMBERS([struct sockaddr_storage.ss_family], [], [],
[#include <sys/types.h>
- #include <sys/socket.h>])], ,
+ #include <sys/socket.h>])], [],
[#include <sys/types.h>
- #include <sys/socket.h>])
+ #include <sys/socket.h>])
dnl Checks for macros.
INN_MACRO_IN6_ARE_ADDR_EQUAL
@@ -461,7 +463,7 @@
AC_CHECK_FUNCS([getrlimit getdtablesize ulimit], [break])
dnl Probe for the appropriate stat functions.
-AC_CHECK_FUNCS([statvfs], ,
+AC_CHECK_FUNCS([statvfs], [],
[AC_CHECK_FUNCS([statfs])
AC_CHECK_HEADERS([sys/vfs.h sys/param.h])
AC_CHECK_HEADERS(sys/mount.h, [], [],
@@ -513,9 +515,8 @@
AC_CONFIG_FILES([support/fixscript], [chmod +x support/fixscript])
dnl Include some additional files at the beginning of config.h.
-AH_TOP(
-[#include "inn/defines.h"
-#include "inn/options.h"])
+AH_TOP([#include "inn/defines.h"
+ #include "inn/options.h"])
dnl Most configuration information goes here.
AC_CONFIG_HEADER([include/config.h])
Modified: doc/pod/hacking.pod
===================================================================
--- doc/pod/hacking.pod 2013-10-26 18:36:31 UTC (rev 9549)
+++ doc/pod/hacking.pod 2013-10-26 20:30:02 UTC (rev 9550)
@@ -17,7 +17,7 @@
<http://inn.eyrie.org/trac/browser/>
-You will need S<autoconf 2.61> or later to use the development tree. After
+You will need S<autoconf 2.64> or later to use the development tree. After
checking out the tree, run C<./autogen> to generate the necessary autoconf
files.
@@ -64,25 +64,25 @@
instead, note in your patch that those files must be regenerated. These
(and all other) generated files should not be checked into Subversion.
-At the time of this writing, S<Autoconf 2.61> or later is required.
+At the time of this writing, S<autoconf 2.64> or later is required.
The supporting files for B<autoconf> are in the F<support> subdirectory,
-including the files F<config.guess> and F<config.sub> to determine the
-system name and F<ltmain.sh> for libtool support. The latter file comes
-from the libtool distribution available from
-L<http://www.gnu.org/software/libtool/>; the canonical version of the
-former two are available from L<ftp://ftp.gnu.org/gnu/config/> (which
-currently redirects to
-L<http://git.savannah.gnu.org/gitweb/?p=config.git;a=tree>). In addition,
-F<m4/libtool.m4> is just a copy of F<libtool.m4> from the libtool
-distribution. (Using libtool without using B<automake> requires a few odd
-hacks.) New versions should be checked in periodically when available.
-There are no INN-specific modifications to those files except for
-F<ltmain.sh> which recognizes the additional B<-B> flag that INN's
+including the files F<config.guess> and F<config.sub> to determine
+the system name and F<ltmain.sh> for libtool support. The latter
+file comes from the bootstrapped libtool distribution available
+from L<http://www.gnu.org/software/libtool/> (F<ltmain.sh> is in the
+F<libltdl/config> subdirectory); the canonical version of the former
+two are available from L<ftp://ftp.gnu.org/gnu/config/> (which currently
+redirects to L<http://git.savannah.gnu.org/gitweb/?p=config.git;a=tree>).
+In addition, F<m4/libtool.m4> and a few others m4 files are just a copy
+of the corresponding files in the F<libltdl/m4> subdirectory of the
+libtool distribution. (Using libtool without using B<automake> requires
+a few odd hacks.) New versions should be checked in periodically when
+available. There are no INN-specific modifications to those files except
+for F<ltmain.sh> which recognizes the additional B<-B> flag that INN's
B<install-sh> script uses. This script should also be updated at the same
-time from
-L<http://git.savannah.gnu.org/gitweb/?p=automake.git;a=tree;f=lib>; it
-similarly contains local modifications in order to support the additional
+time from L<http://git.savannah.gnu.org/gitweb/?p=automake.git;a=tree;f=lib>;
+it similarly contains local modifications in order to support the additional
B<-B> flag, as well as a few other changes mentioned in a comment at the
beginning of the file.
@@ -92,6 +92,11 @@
writing, with both static and shared compiles, but the dependencies aren't
quite right for C<make -j> using libtool.
+=head1 Autobuilds
+
+Automatic build logs on several platforms are available at
+L<http://usenet.trigofacile.com/autobuild/inn/>.
+
=head1 Documentation
INN's documentation is currently somewhat in a state of flux. Much of the
@@ -237,7 +242,8 @@
For C tests, you probably want to use the functions in F<libtest.c>
(prototypes in F<libtest.h>) to handle all of the output. For shell script
-tests, see the existing tests for some helpful shell functions.
+tests, F<libtest.sh> contains helpful shell functions. See the existing tests
+for some hints about how to write new tests.
One naming convention: to distinguish more easily between for example
F<lib/error.c> (the implementation) and F<tests/lib/error-t.c> (the test
@@ -254,6 +260,16 @@
Additions to the test suite, no matter how simple, are very welcome.
+Running the test suite is done with:
+
+ make check
+
+A single test can be run with verbose ouput via:
+
+ tests/runtests -o <name-of-test>
+
+Using B<runtests> ensures that necessary environment variables are set up.
+
=head1 Makefiles
All INN makefiles include F<Makefile.global> at the top level, and only
@@ -656,15 +672,24 @@
because the test suite has not yet been updated to use the new format of C
TAP Harness).
-=back
+=item *
-=item 2.
+Make sure that the latest version of rra-c-util is used for the librairies.
+It is available from L<http://www.eyrie.org/~eagle/software/rra-c-util/>.
+=item *
+
Make sure that F<samples/control.ctl> and F<samples/nocem.ctl> are in sync
with the master version at
L<ftp://ftp.isc.org/pub/usenet/CONFIG/control.ctl> and
L<http://rosalind.home.xs4all.nl/nocemreg/nocemreg.html>.
+=back
+
+=item 2.
+
+Update copyright years in F<LICENSE>.
+
=item 3.
Update F<doc/pod/news.pod> and regenerate F<NEWS>. Be more detailed for
More information about the inn-committers
mailing list