A few cleanings and better docs

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
+Just type "./configure --config-cache", then "make", "make test" if
-tests depend on local servers and/or Internet access, interpret with
+you wish (some tests depend on local servers and/or Internet access,
-care) and then (as root if necessary), "make install".
+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")
 
 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.

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

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

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`" > $@

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:

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

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-libidn=DIR   Internationalized Domain Names support (needs GNU libidn)
---with-popt=DIR  popt command-line parsing library
+  --with-popt=DIR  popt command-line parsing library
 
 Some influential environment variables:
   CC          C compiler command

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
 

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-libidn=DIR   Internationalized Domain Names support (needs GNU libidn)
---with-popt=DIR  popt command-line parsing library
+  --with-popt=DIR  popt command-line parsing library
 
 Some influential environment variables:
   CC          C compiler command

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

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

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-libidn=DIR   Internationalized Domain Names support (needs GNU libidn)
---with-popt=DIR  popt command-line parsing library
+  --with-popt=DIR  popt command-line parsing library
 
 Some influential environment variables:
   CC          C compiler command