From 316d319e524b23e7efcce7cc98a5ba7662019479 Mon Sep 17 00:00:00 2001 From: Stephane Bortzmeyer Date: Mon, 14 Jun 2004 14:36:24 +0000 Subject: [PATCH] A few cleanings and better docs --- SRC/INSTALL | 15 ++++++--------- SRC/configure | 2 -- SRC/configure.ac | 1 - SRC/plugins/Makefile.am | 2 +- SRC/plugins/Makefile.in | 2 +- SRC/plugins/configure-plugins.ac | 4 ++-- SRC/plugins/dns/configure | 4 ++-- SRC/plugins/postgresql/Makefile.in | 1 + SRC/plugins/postgresql/configure | 4 ++-- SRC/plugins/whois/Makefile.am | 2 ++ SRC/plugins/whois/Makefile.in | 1 + SRC/plugins/whois/configure | 4 ++-- 12 files changed, 20 insertions(+), 22 deletions(-) diff --git a/SRC/INSTALL b/SRC/INSTALL index e940df7..aa2386d 100644 --- a/SRC/INSTALL +++ b/SRC/INSTALL @@ -6,14 +6,9 @@ times). You do not have to be root to install it. -Just type "./configure", then "make", "make test" if you wish (some -tests depend on local servers and/or Internet access, interpret with -care) and then (as root if necessary), "make install". - -(The Makefile has the GNU syntax so, on BSD machines, you will need -GNU make. Typically, you install the port "gmake" and run "gmake" -instead of "make". Otherwise, you will have an error message like -"Need an operator") +Just type "./configure --config-cache", then "make", "make test" if +you wish (some tests depend on local servers and/or Internet access, +interpret with care) and then (as root if necessary), "make install". There is also a 'make fulltest' if you want to test more things (which may not be available on your platform). @@ -49,7 +44,9 @@ better and easier parsing of options and, more important, is necessary for resuming parsing, something that the plugins rely heavily on. If your system does not support dlopen() or if you do not want to install the popt library (which is free and runs on every Unix), you have no -other choices than using echoping 5. +other choices than using echoping 5. popt can be retrieved from, for +instance, ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.1.x/popt-1.7.tar.gz or +ask Freshmeat at http://freshmeat.net/projects/popt/. Standard "autoconf/configure" options are supported such as --prefix to set the installation root directory. diff --git a/SRC/configure b/SRC/configure index b8818f5..e26763c 100755 --- a/SRC/configure +++ b/SRC/configure @@ -22101,8 +22101,6 @@ fi interpolate() { old=$1 - { echo "$as_me:$LINENO: WARNING: DEBUG-INTERPOLATE $old" >&5 -echo "$as_me: WARNING: DEBUG-INTERPOLATE $old" >&2;} eval new=$old if test "$new" != "$old" ; then interpolate $new diff --git a/SRC/configure.ac b/SRC/configure.ac index 96fa1f9..82424c2 100644 --- a/SRC/configure.ac +++ b/SRC/configure.ac @@ -276,7 +276,6 @@ fi interpolate() { old=$1 - AC_MSG_WARN(DEBUG-INTERPOLATE $old) eval new=$old if test "$new" != "$old" ; then interpolate $new diff --git a/SRC/plugins/Makefile.am b/SRC/plugins/Makefile.am index 8a6c654..9ec48f7 100644 --- a/SRC/plugins/Makefile.am +++ b/SRC/plugins/Makefile.am @@ -1,5 +1,5 @@ SUBDIRS=@subdirs@ -CONFIGURE_DEPENDENCIES=list-of-dirs.m4 +CONFIGURE_DEPENDENCIES=list-of-dirs.m4 ../configure-common.ac configure-plugins.ac list-of-dirs.m4: @echo "dnl Created automatically on `date`" > $@ diff --git a/SRC/plugins/Makefile.in b/SRC/plugins/Makefile.in index efa76c2..4469b49 100644 --- a/SRC/plugins/Makefile.in +++ b/SRC/plugins/Makefile.in @@ -168,7 +168,7 @@ subdirs = @subdirs@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ SUBDIRS = @subdirs@ -CONFIGURE_DEPENDENCIES = list-of-dirs.m4 +CONFIGURE_DEPENDENCIES = list-of-dirs.m4 ../configure-common.ac configure-plugins.ac all: all-recursive .SUFFIXES: diff --git a/SRC/plugins/configure-plugins.ac b/SRC/plugins/configure-plugins.ac index 2f29681..9fbd690 100644 --- a/SRC/plugins/configure-plugins.ac +++ b/SRC/plugins/configure-plugins.ac @@ -1,6 +1,6 @@ LIBIDN=1 AC_ARG_WITH(libidn, - [--with-libidn[=DIR] Internationalized Domain Names support (needs GNU libidn)],dnl + [ --with-libidn[=DIR] Internationalized Domain Names support (needs GNU libidn)],dnl [if test "$withval" != "no"; then if test "$withval" != "yes"; then IDNROOT=$withval @@ -16,7 +16,7 @@ AC_DEFINE(LIBIDN,,[Internationalized Domain Names support]) fi AC_ARG_WITH(popt, - [--with-popt[=DIR] popt command-line parsing library],dnl + [ --with-popt[=DIR] popt command-line parsing library],dnl [if test "$withval" != "no"; then if test "$withval" != "yes"; then POPTROOT=$withval diff --git a/SRC/plugins/dns/configure b/SRC/plugins/dns/configure index 6c38a0a..0028358 100755 --- a/SRC/plugins/dns/configure +++ b/SRC/plugins/dns/configure @@ -1042,8 +1042,8 @@ Optional Packages: both] --with-tags[=TAGS] include additional configurations [automatic] ---with-libidn=DIR Internationalized Domain Names support (needs GNU libidn) ---with-popt=DIR popt command-line parsing library + --with-libidn=DIR Internationalized Domain Names support (needs GNU libidn) + --with-popt=DIR popt command-line parsing library Some influential environment variables: CC C compiler command diff --git a/SRC/plugins/postgresql/Makefile.in b/SRC/plugins/postgresql/Makefile.in index 176c2b4..23a50eb 100644 --- a/SRC/plugins/postgresql/Makefile.in +++ b/SRC/plugins/postgresql/Makefile.in @@ -192,6 +192,7 @@ target_alias = @target_alias@ @PGSQLBUILD_TRUE@postgresql_la_SOURCES = postgresql.c @PGSQLBUILD_TRUE@postgresql_la_LDFLAGS = -module @PGSQLBUILD_TRUE@man_MANS = echoping_postgresql.1 +EXTRA_DIST = $(man_MANS) all: config.h $(MAKE) $(AM_MAKEFLAGS) all-am diff --git a/SRC/plugins/postgresql/configure b/SRC/plugins/postgresql/configure index 1b2bc30..3ba3542 100755 --- a/SRC/plugins/postgresql/configure +++ b/SRC/plugins/postgresql/configure @@ -1042,8 +1042,8 @@ Optional Packages: both] --with-tags[=TAGS] include additional configurations [automatic] ---with-libidn=DIR Internationalized Domain Names support (needs GNU libidn) ---with-popt=DIR popt command-line parsing library + --with-libidn=DIR Internationalized Domain Names support (needs GNU libidn) + --with-popt=DIR popt command-line parsing library Some influential environment variables: CC C compiler command diff --git a/SRC/plugins/whois/Makefile.am b/SRC/plugins/whois/Makefile.am index f6f3d77..51c5d07 100644 --- a/SRC/plugins/whois/Makefile.am +++ b/SRC/plugins/whois/Makefile.am @@ -1,3 +1,5 @@ +CONFIGURE_DEPENDENCIES=../../configure-common.ac ../configure-plugins.ac + pkglib_LTLIBRARIES = whois.la whois_la_SOURCES = whois.c whois_la_LDFLAGS = -module diff --git a/SRC/plugins/whois/Makefile.in b/SRC/plugins/whois/Makefile.in index e65c40a..1b90eab 100644 --- a/SRC/plugins/whois/Makefile.in +++ b/SRC/plugins/whois/Makefile.in @@ -186,6 +186,7 @@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +CONFIGURE_DEPENDENCIES = ../../configure-common.ac ../configure-plugins.ac pkglib_LTLIBRARIES = whois.la whois_la_SOURCES = whois.c whois_la_LDFLAGS = -module diff --git a/SRC/plugins/whois/configure b/SRC/plugins/whois/configure index da3b98f..8bcd4fb 100755 --- a/SRC/plugins/whois/configure +++ b/SRC/plugins/whois/configure @@ -1042,8 +1042,8 @@ Optional Packages: both] --with-tags[=TAGS] include additional configurations [automatic] ---with-libidn=DIR Internationalized Domain Names support (needs GNU libidn) ---with-popt=DIR popt command-line parsing library + --with-libidn=DIR Internationalized Domain Names support (needs GNU libidn) + --with-popt=DIR popt command-line parsing library Some influential environment variables: CC C compiler command