On Fri, Mar 30, 2001 at 08:13:59AM -0600, Ohrberg, Mick wrote:
Hmm, Maybe I'm just messing up horribly on this wonderful Friday morning. I can't compile syslog-ng 1.5.5!
... checking whether to enable Sun STREAMS support... yes checking whether to enable Sun door support... yes checking libol version >= 0.2.22... ./configure: !: not found ok updating cache ./config.cache ...
Woah there! I DO have libol 0.2.22 installed! I found a problem in my configure... Anyone else run into this problem? Instead of doing
if ! test -x ...
I changed it to
if [ ! -x ... ]; do
ops... bash eats the first construct, but it doesn't seem to be portable. nscache.h seems to be missing from the dist. The patch below fixes the problem above, and adds nscache.h: diff -urN syslog-ng-1.5.5/configure syslog-ng-1.5.5a/configure --- syslog-ng-1.5.5/configure Fri Mar 30 14:12:39 2001 +++ syslog-ng-1.5.5a/configure Fri Mar 30 17:03:02 2001 @@ -700,7 +700,7 @@ PACKAGE=syslog-ng -VERSION="1.5.5" +VERSION="1.5.5a" if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; } @@ -2670,7 +2670,7 @@ echo "configure:2671: checking libol version >= $LIBOL_REQ_MAJOR.$LIBOL_REQ_MINOR.$LIBOL_REQ_PATCH" >&5 if test "$with_libol" = ""; then - if ! test -x `which libol-config` ; then + if test ! -x `which libol-config` ; then { echo "configure: error: libol-config not found, either install libol or supply its location with --with-libol" 1>&2; exit 1; } fi LIBOL_VERSION=`libol-config --version` @@ -2678,7 +2678,7 @@ LIBOL_LIBS=`libol-config --static-libs` MAKE_CLASS="make_class" else - if ! test -x $with_libol/libol-config; then + if test ! -x $with_libol/libol-config; then { echo "configure: error: libol-config not found in the specified location" 1>&2; exit 1; } fi LIBOL_VERSION=`$with_libol/libol-config --version` diff -urN syslog-ng-1.5.5/configure.in syslog-ng-1.5.5a/configure.in --- syslog-ng-1.5.5/configure.in Fri Mar 30 14:12:37 2001 +++ syslog-ng-1.5.5a/configure.in Fri Mar 30 17:02:31 2001 @@ -1,8 +1,8 @@ -dnl $Id: configure.in,v 1.32 2001/02/25 12:01:38 bazsi Exp $ +dnl $Id: configure.in,v 1.33 2001/03/30 15:02:31 bazsi Exp $ dnl Process this file with autoconf to produce a configure script. AC_INIT(src/affile.c) -AM_INIT_AUTOMAKE(syslog-ng, "1.5.5") +AM_INIT_AUTOMAKE(syslog-ng, "1.5.5a") LIBOL_REQ_MAJOR=0 LIBOL_REQ_MINOR=2 LIBOL_REQ_PATCH=22 @@ -148,7 +148,7 @@ AC_MSG_CHECKING(libol version >= $LIBOL_REQ_MAJOR.$LIBOL_REQ_MINOR.$LIBOL_REQ_PATCH) if test "$with_libol" = ""; then - if ! test -x `which libol-config` ; then + if test ! -x `which libol-config` ; then AC_ERROR([libol-config not found, either install libol or supply its location with --with-libol]) fi LIBOL_VERSION=`libol-config --version` @@ -156,7 +156,7 @@ LIBOL_LIBS=`libol-config --static-libs` MAKE_CLASS="make_class" else - if ! test -x $with_libol/libol-config; then + if test ! -x $with_libol/libol-config; then AC_ERROR(libol-config not found in the specified location) fi LIBOL_VERSION=`$with_libol/libol-config --version` diff -urN syslog-ng-1.5.5/doc/sgml/syslog-ng.sgml syslog-ng-1.5.5a/doc/sgml/syslog-ng.sgml --- syslog-ng-1.5.5/doc/sgml/syslog-ng.sgml Fri Mar 30 14:41:01 2001 +++ syslog-ng-1.5.5a/doc/sgml/syslog-ng.sgml Fri Mar 30 15:08:27 2001 @@ -1074,7 +1074,7 @@ as commands to the SQL server. </entry> <entry> - a format conforming to default logfile format. + yes </entry> </row> </tbody> diff -urN syslog-ng-1.5.5/doc/sgml/syslog-ng.txt syslog-ng-1.5.5a/doc/sgml/syslog-ng.txt --- syslog-ng-1.5.5/doc/sgml/syslog-ng.txt Fri Mar 30 14:41:50 2001 +++ syslog-ng-1.5.5a/doc/sgml/syslog-ng.txt Fri Mar 30 17:03:37 2001 @@ -553,8 +553,7 @@ template_escape() yes or no Turns on escaping ' and " in templated output files. It is useful for generating SQL statements and quoting string contents so that parts of your log message don't get - interpreted as commands to the SQL server. a format conforming to - default logfile format. + interpreted as commands to the SQL server. yes _________________________________________________________________ pipe() diff -urN syslog-ng-1.5.5/src/Makefile.am syslog-ng-1.5.5a/src/Makefile.am --- syslog-ng-1.5.5/src/Makefile.am Sun Feb 25 13:00:22 2001 +++ syslog-ng-1.5.5a/src/Makefile.am Fri Mar 30 17:02:31 2001 @@ -1,5 +1,5 @@ ## Run automake to produce Makefile.in -## $Id: Makefile.am,v 1.43 2001/02/24 12:38:02 bazsi Exp $ +## $Id: Makefile.am,v 1.44 2001/03/30 15:02:31 bazsi Exp $ YFLAGS = @YFLAGS@ MAKE_CLASS = @MAKE_CLASS@ @@ -21,7 +21,8 @@ afstreams.h \ afprogram.h \ utils.h \ - syslog-names.h + syslog-names.h \ + nscache.h dist_x_files = \ cfgfile.h.x \ diff -urN syslog-ng-1.5.5/src/Makefile.in syslog-ng-1.5.5a/src/Makefile.in --- syslog-ng-1.5.5/src/Makefile.in Fri Mar 30 14:41:41 2001 +++ syslog-ng-1.5.5a/src/Makefile.in Fri Mar 30 17:03:22 2001 @@ -71,7 +71,7 @@ SUBDIRS = . tests -dist_h_files = syslog-ng.h cfgfile.h sources.h center.h filters.h destinations.h log.h afinter.h affile.h afsocket.h afuser.h afstreams.h afprogram.h utils.h syslog-names.h +dist_h_files = syslog-ng.h cfgfile.h sources.h center.h filters.h destinations.h log.h afinter.h affile.h afsocket.h afuser.h afstreams.h afprogram.h utils.h syslog-names.h nscache.h dist_x_files = cfgfile.h.x destinations.h.x log.h.x sources.c.x sources.h.x cfgfile.h.x center.h.x center.c.x afsocket.h.x afsocket.c.x afunix.c.x afinet.c.x affile.c.x afuser.c.x afstreams.c.x afprogram.c.x filters.h.x filters.c.x main.c.x diff -urN syslog-ng-1.5.5/src/nscache.h syslog-ng-1.5.5a/src/nscache.h --- syslog-ng-1.5.5/src/nscache.h Thu Jan 1 01:00:00 1970 +++ syslog-ng-1.5.5a/src/nscache.h Mon Mar 19 15:13:47 2001 @@ -0,0 +1,24 @@ +#ifndef __NSCACHE_H +#define __NSCACHE_H + +#include <config.h> + +#if WITH_DEBUG +#define NSCACHE_DEBUG +#endif + +#include <netinet/in.h> + +struct nscache; + +struct nscache * nscache_new(int size, int expire, int expire_failed); +void nscache_free(struct nscache *); +char * nscache_lookup(struct nscache *, struct in_addr); + +#ifdef NSCACHE_DEBUG +void nscache_dump(struct nscache *); +#else +#define nscache_dump(cache) {} +#endif + +#endif diff -urN syslog-ng-1.5.5/syslog-ng.spec syslog-ng-1.5.5a/syslog-ng.spec --- syslog-ng-1.5.5/syslog-ng.spec Fri Mar 30 14:15:52 2001 +++ syslog-ng-1.5.5a/syslog-ng.spec Fri Mar 30 17:03:07 2001 @@ -1,5 +1,5 @@ %define name syslog-ng -%define version 1.5.5 +%define version 1.5.5a %define release 0 %define prefix /usr -- Bazsi PGP info: KeyID 9AF8D0A9 Fingerprint CD27 CFB0 802C 0944 9CFD 804E C82C 8EB1