diff --git a/SRC/INSTALL b/SRC/INSTALL index a58f9b2..e940df7 100644 --- a/SRC/INSTALL +++ b/SRC/INSTALL @@ -34,6 +34,7 @@ may not be available on your platform). --enable-max-iterations=MAX (limit the number of iterations (-n option for repeated tests) to MAX) --enable-max-request-size=MAX (limit the size of the request (-s option) to MAX) +--enable-plugin=LIST (list of plugins to build) There is no option to disable IPv6. echoping now uses the new (RFC 3493, but first specified in RFC 2133 in september 1997) socket diff --git a/SRC/PLUGINS b/SRC/PLUGINS index 2e2916a..6c443c7 100644 --- a/SRC/PLUGINS +++ b/SRC/PLUGINS @@ -9,7 +9,7 @@ addrinfo. But some libraries (typically, the one used by the DBMS) do not work on struct addrinfo but on strings such as "dbname=test hostname=foo.bar". Plugins using these libraries will have to use the -raw interface. +raw interface. The host name given as argument is ignored. You indicate to echoping wether you use the raw interface or the cooked one by returning a port name or NULL from the init() function. diff --git a/SRC/configure b/SRC/configure index d04435a..b8818f5 100755 --- a/SRC/configure +++ b/SRC/configure @@ -18940,7 +18940,6 @@ _ACEOF fi fi; - # Check whether --with-popt or --without-popt was given. if test "${with_popt+set}" = set; then withval="$with_popt" @@ -23753,8 +23752,7 @@ echo "" echo "Configuration of echoping:" -echo "$as_me:$LINENO: checking HTTP" >&5 -echo $ECHO_N "checking HTTP... $ECHO_C" >&6 +echo $ECHO_N HTTP ": " if eval 'test "$HTTP" = "1"' > /dev/null; then echo "$as_me:$LINENO: result: enabled" >&5 echo "${ECHO_T}enabled" >&6 @@ -23764,8 +23762,7 @@ echo "${ECHO_T}disabled" >&6 fi -echo "$as_me:$LINENO: checking ICP" >&5 -echo $ECHO_N "checking ICP... $ECHO_C" >&6 +echo $ECHO_N ICP ": " if eval 'test "$ICP" = "1"' > /dev/null; then echo "$as_me:$LINENO: result: enabled" >&5 echo "${ECHO_T}enabled" >&6 @@ -23775,8 +23772,7 @@ echo "${ECHO_T}disabled" >&6 fi -echo "$as_me:$LINENO: checking OPENSSL" >&5 -echo $ECHO_N "checking OPENSSL... $ECHO_C" >&6 +echo $ECHO_N OPENSSL ": " if eval 'test "$OPENSSL" = "1"' > /dev/null; then echo "$as_me:$LINENO: result: enabled" >&5 echo "${ECHO_T}enabled" >&6 @@ -23786,8 +23782,7 @@ echo "${ECHO_T}disabled" >&6 fi -echo "$as_me:$LINENO: checking GNUTLS" >&5 -echo $ECHO_N "checking GNUTLS... $ECHO_C" >&6 +echo $ECHO_N GNUTLS ": " if eval 'test "$GNUTLS" = "1"' > /dev/null; then echo "$as_me:$LINENO: result: enabled" >&5 echo "${ECHO_T}enabled" >&6 @@ -23797,8 +23792,7 @@ echo "${ECHO_T}disabled" >&6 fi -echo "$as_me:$LINENO: checking SMTP" >&5 -echo $ECHO_N "checking SMTP... $ECHO_C" >&6 +echo $ECHO_N SMTP ": " if eval 'test "$SMTP" = "1"' > /dev/null; then echo "$as_me:$LINENO: result: enabled" >&5 echo "${ECHO_T}enabled" >&6 @@ -23808,8 +23802,7 @@ echo "${ECHO_T}disabled" >&6 fi -echo "$as_me:$LINENO: checking LIBIDN" >&5 -echo $ECHO_N "checking LIBIDN... $ECHO_C" >&6 +echo $ECHO_N LIBIDN ": " if eval 'test "$LIBIDN" = "1"' > /dev/null; then echo "$as_me:$LINENO: result: enabled" >&5 echo "${ECHO_T}enabled" >&6 @@ -23819,8 +23812,7 @@ echo "${ECHO_T}disabled" >&6 fi -echo "$as_me:$LINENO: checking TTCP" >&5 -echo $ECHO_N "checking TTCP... $ECHO_C" >&6 +echo $ECHO_N TTCP ": " if eval 'test "$TTCP" = "1"' > /dev/null; then echo "$as_me:$LINENO: result: enabled" >&5 echo "${ECHO_T}enabled" >&6 @@ -23830,8 +23822,7 @@ echo "${ECHO_T}disabled" >&6 fi -echo "$as_me:$LINENO: checking TOS" >&5 -echo $ECHO_N "checking TOS... $ECHO_C" >&6 +echo $ECHO_N TOS ": " if eval 'test "$TOS" = "1"' > /dev/null; then echo "$as_me:$LINENO: result: enabled" >&5 echo "${ECHO_T}enabled" >&6 @@ -23841,8 +23832,7 @@ echo "${ECHO_T}disabled" >&6 fi -echo "$as_me:$LINENO: checking PRIORITY" >&5 -echo $ECHO_N "checking PRIORITY... $ECHO_C" >&6 +echo $ECHO_N PRIORITY ": " if eval 'test "$PRIORITY" = "1"' > /dev/null; then echo "$as_me:$LINENO: result: enabled" >&5 echo "${ECHO_T}enabled" >&6 @@ -23856,3 +23846,4 @@ fi + diff --git a/SRC/configure.ac b/SRC/configure.ac index 2ddbed3..96fa1f9 100644 --- a/SRC/configure.ac +++ b/SRC/configure.ac @@ -100,7 +100,6 @@ AC_ARG_WITH(gnutls, fi], dnl Default: disable it ) - dnl TODO: test if the getopt variable optreset exists and, if it dnl does, we can use getopt (Free BSDs and MacOS X). This implies to dnl maintain the two versions, popt and getopt, while echoping has @@ -309,7 +308,7 @@ AC_OUTPUT(Makefile echoping.1) AC_DEFUN([DISPLAY_SETTING], [ -AC_MSG_CHECKING($1) +echo $ECHO_N $1 ": " if [ eval 'test "$$1" = "1"' > /dev/null]; then AC_MSG_RESULT( enabled) else @@ -333,3 +332,4 @@ DISPLAY_SETTING(PRIORITY) + diff --git a/SRC/missing b/SRC/missing index 7789652..e7ef83a 100755 --- a/SRC/missing +++ b/SRC/missing @@ -1,7 +1,11 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -# Copyright (C) 1996, 1997 Free Software Foundation, Inc. -# Franc,ois Pinard , 1996. + +scriptversion=2003-09-02.23 + +# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003 +# Free Software Foundation, Inc. +# Originally by Fran,cois Pinard , 1996. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -18,11 +22,48 @@ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA # 02111-1307, USA. +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. + if test $# -eq 0; then echo 1>&2 "Try \`$0 --help' for more information" exit 1 fi +run=: + +# In the cases where this matters, `missing' is being run in the +# srcdir already. +if test -f configure.ac; then + configure_ac=configure.ac +else + configure_ac=configure.in +fi + +msg="missing on your system" + +case "$1" in +--run) + # Try to run requested program, and just exit if it succeeds. + run= + shift + "$@" && exit 0 + # Exit code 63 means version mismatch. This often happens + # when the user try to use an ancient version of a tool on + # a file that requires a minimum version. In this case we + # we should proceed has if the program had been absent, or + # if --run hadn't been passed. + if test $? = 63; then + run=: + msg="probably too old" + fi + ;; +esac + +# If it does not exist, or fails to run (possibly an outdated version), +# try to emulate it. case "$1" in -h|--h|--he|--hel|--help) @@ -35,6 +76,7 @@ error status if there is no known handling for PROGRAM. Options: -h, --help display this help and exit -v, --version output version information and exit + --run try to run the given command, and emulate it if it fails Supported PROGRAM values: aclocal touch file \`aclocal.m4' @@ -43,13 +85,17 @@ Supported PROGRAM values: automake touch all \`Makefile.in' files bison create \`y.tab.[ch]', if possible, from existing .[ch] flex create \`lex.yy.c', if possible, from existing .c + help2man touch the output file lex create \`lex.yy.c', if possible, from existing .c makeinfo touch the output file - yacc create \`y.tab.[ch]', if possible, from existing .[ch]" + tar try tar, gnutar, gtar, then tar without non-portable flags + yacc create \`y.tab.[ch]', if possible, from existing .[ch] + +Send bug reports to ." ;; -v|--v|--ve|--ver|--vers|--versi|--versio|--version) - echo "missing - GNU libit 0.0" + echo "missing $scriptversion (GNU Automake)" ;; -*) @@ -58,31 +104,46 @@ Supported PROGRAM values: exit 1 ;; - aclocal) + aclocal*) + if test -z "$run" && ($1 --version) > /dev/null 2>&1; then + # We have it, but it failed. + exit 1 + fi + echo 1>&2 "\ -WARNING: \`$1' is missing on your system. You should only need it if - you modified \`acinclude.m4' or \`configure.in'. You might want +WARNING: \`$1' is $msg. You should only need it if + you modified \`acinclude.m4' or \`${configure_ac}'. You might want to install the \`Automake' and \`Perl' packages. Grab them from any GNU archive site." touch aclocal.m4 ;; autoconf) + if test -z "$run" && ($1 --version) > /dev/null 2>&1; then + # We have it, but it failed. + exit 1 + fi + echo 1>&2 "\ -WARNING: \`$1' is missing on your system. You should only need it if - you modified \`configure.in'. You might want to install the +WARNING: \`$1' is $msg. You should only need it if + you modified \`${configure_ac}'. You might want to install the \`Autoconf' and \`GNU m4' packages. Grab them from any GNU archive site." touch configure ;; autoheader) + if test -z "$run" && ($1 --version) > /dev/null 2>&1; then + # We have it, but it failed. + exit 1 + fi + echo 1>&2 "\ -WARNING: \`$1' is missing on your system. You should only need it if - you modified \`acconfig.h' or \`configure.in'. You might want +WARNING: \`$1' is $msg. You should only need it if + you modified \`acconfig.h' or \`${configure_ac}'. You might want to install the \`Autoconf' and \`GNU m4' packages. Grab them from any GNU archive site." - files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' configure.in` + files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}` test -z "$files" && files="config.h" touch_files= for f in $files; do @@ -95,10 +156,15 @@ WARNING: \`$1' is missing on your system. You should only need it if touch $touch_files ;; - automake) + automake*) + if test -z "$run" && ($1 --version) > /dev/null 2>&1; then + # We have it, but it failed. + exit 1 + fi + echo 1>&2 "\ -WARNING: \`$1' is missing on your system. You should only need it if - you modified \`Makefile.am', \`acinclude.m4' or \`configure.in'. +WARNING: \`$1' is $msg. You should only need it if + you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'. You might want to install the \`Automake' and \`Perl' packages. Grab them from any GNU archive site." find . -type f -name Makefile.am -print | @@ -106,9 +172,37 @@ WARNING: \`$1' is missing on your system. You should only need it if while read f; do touch "$f"; done ;; + autom4te) + if test -z "$run" && ($1 --version) > /dev/null 2>&1; then + # We have it, but it failed. + exit 1 + fi + + echo 1>&2 "\ +WARNING: \`$1' is needed, but is $msg. + You might have modified some files without having the + proper tools for further handling them. + You can get \`$1' as part of \`Autoconf' from any GNU + archive site." + + file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'` + test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'` + if test -f "$file"; then + touch $file + else + test -z "$file" || exec >$file + echo "#! /bin/sh" + echo "# Created by GNU Automake missing as a replacement of" + echo "# $ $@" + echo "exit 0" + chmod +x $file + exit 1 + fi + ;; + bison|yacc) echo 1>&2 "\ -WARNING: \`$1' is missing on your system. You should only need it if +WARNING: \`$1' $msg. You should only need it if you modified a \`.y' file. You may need the \`Bison' package in order for those modifications to take effect. You can get \`Bison' from any GNU archive site." @@ -138,7 +232,7 @@ WARNING: \`$1' is missing on your system. You should only need it if lex|flex) echo 1>&2 "\ -WARNING: \`$1' is missing on your system. You should only need it if +WARNING: \`$1' is $msg. You should only need it if you modified a \`.l' file. You may need the \`Flex' package in order for those modifications to take effect. You can get \`Flex' from any GNU archive site." @@ -159,9 +253,39 @@ WARNING: \`$1' is missing on your system. You should only need it if fi ;; + help2man) + if test -z "$run" && ($1 --version) > /dev/null 2>&1; then + # We have it, but it failed. + exit 1 + fi + + echo 1>&2 "\ +WARNING: \`$1' is $msg. You should only need it if + you modified a dependency of a manual page. You may need the + \`Help2man' package in order for those modifications to take + effect. You can get \`Help2man' from any GNU archive site." + + file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'` + if test -z "$file"; then + file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'` + fi + if [ -f "$file" ]; then + touch $file + else + test -z "$file" || exec >$file + echo ".ab help2man is required to generate this page" + exit 1 + fi + ;; + makeinfo) + if test -z "$run" && (makeinfo --version) > /dev/null 2>&1; then + # We have makeinfo, but it failed. + exit 1 + fi + echo 1>&2 "\ -WARNING: \`$1' is missing on your system. You should only need it if +WARNING: \`$1' is $msg. You should only need it if you modified a \`.texi' or \`.texinfo' file, or any other file indirectly affecting the aspect of the manual. The spurious call might also be the consequence of using a buggy \`make' (AIX, @@ -175,12 +299,51 @@ WARNING: \`$1' is missing on your system. You should only need it if touch $file ;; + tar) + shift + if test -n "$run"; then + echo 1>&2 "ERROR: \`tar' requires --run" + exit 1 + fi + + # We have already tried tar in the generic part. + # Look for gnutar/gtar before invocation to avoid ugly error + # messages. + if (gnutar --version > /dev/null 2>&1); then + gnutar "$@" && exit 0 + fi + if (gtar --version > /dev/null 2>&1); then + gtar "$@" && exit 0 + fi + firstarg="$1" + if shift; then + case "$firstarg" in + *o*) + firstarg=`echo "$firstarg" | sed s/o//` + tar "$firstarg" "$@" && exit 0 + ;; + esac + case "$firstarg" in + *h*) + firstarg=`echo "$firstarg" | sed s/h//` + tar "$firstarg" "$@" && exit 0 + ;; + esac + fi + + echo 1>&2 "\ +WARNING: I can't seem to be able to run \`tar' with the given arguments. + You may want to install GNU tar or Free paxutils, or check the + command line arguments." + exit 1 + ;; + *) echo 1>&2 "\ -WARNING: \`$1' is needed, and you do not seem to have it handy on your - system. You might have modified some files without having the +WARNING: \`$1' is needed, and is $msg. + You might have modified some files without having the proper tools for further handling them. Check the \`README' file, - it often tells you about the needed prerequirements for installing + it often tells you about the needed prerequisites for installing this package. You may also peek at any GNU archive site, in case some other package would contain this missing \`$1' program." exit 1 @@ -188,3 +351,10 @@ WARNING: \`$1' is needed, and you do not seem to have it handy on your esac exit 0 + +# Local variables: +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-end: "$" +# End: diff --git a/SRC/plugins/Makefile.am b/SRC/plugins/Makefile.am index 9332427..8a6c654 100644 --- a/SRC/plugins/Makefile.am +++ b/SRC/plugins/Makefile.am @@ -1,2 +1,12 @@ SUBDIRS=@subdirs@ +CONFIGURE_DEPENDENCIES=list-of-dirs.m4 +list-of-dirs.m4: + @echo "dnl Created automatically on `date`" > $@ + for file in `ls | grep -v CVS | grep -v autom4te`; do \ + if test -d $$file; then \ + echo "if test \"\$$$${file}_BUILD\" = 1; then" >> $@ ; \ + echo " AC_CONFIG_SUBDIRS($$file)" >> $@ ; \ + echo "fi" >> $@ ; \ + fi \ + done diff --git a/SRC/plugins/Makefile.in b/SRC/plugins/Makefile.in index feccc95..efa76c2 100644 --- a/SRC/plugins/Makefile.in +++ b/SRC/plugins/Makefile.in @@ -38,18 +38,17 @@ DIST_COMMON = $(am__configure_deps) $(srcdir)/../config.guess \ $(srcdir)/../config.sub $(srcdir)/../install-sh \ $(srcdir)/../ltmain.sh $(srcdir)/../missing \ $(srcdir)/../mkinstalldirs $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(srcdir)/Makefile.plugins.in \ - $(top_srcdir)/configure + $(srcdir)/Makefile.in $(top_srcdir)/configure subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/../configure-common.ac \ - $(top_srcdir)/configure.ac + $(top_srcdir)/list-of-dirs.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ configure.lineno configure.status.lineno mkinstalldirs = $(SHELL) $(top_srcdir)/../mkinstalldirs -CONFIG_CLEAN_FILES = Makefile.plugins +CONFIG_CLEAN_FILES = SOURCES = DIST_SOURCES = RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ @@ -169,6 +168,7 @@ subdirs = @subdirs@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ SUBDIRS = @subdirs@ +CONFIGURE_DEPENDENCIES = list-of-dirs.m4 all: all-recursive .SUFFIXES: @@ -205,8 +205,6 @@ $(top_srcdir)/configure: $(am__configure_deps) cd $(srcdir) && $(AUTOCONF) $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) -Makefile.plugins: $(top_builddir)/config.status $(srcdir)/Makefile.plugins.in - cd $(top_builddir) && $(SHELL) ./config.status $@ mostlyclean-libtool: -rm -f *.lo @@ -341,7 +339,7 @@ distclean-tags: distdir: $(DISTFILES) $(am__remove_distdir) mkdir $(distdir) - $(mkdir_p) $(distdir)/. $(distdir)/.. + $(mkdir_p) $(distdir)/.. @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ list='$(DISTFILES)'; for file in $$list; do \ @@ -574,6 +572,16 @@ uninstall-info: uninstall-info-recursive mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \ tags tags-recursive uninstall uninstall-am uninstall-info-am + +list-of-dirs.m4: + @echo "dnl Created automatically on `date`" > $@ + for file in `ls | grep -v CVS | grep -v autom4te`; do \ + if test -d $$file; then \ + echo "if test \"\$$$${file}_BUILD\" = 1; then" >> $@ ; \ + echo " AC_CONFIG_SUBDIRS($$file)" >> $@ ; \ + echo "fi" >> $@ ; \ + fi \ + done # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/SRC/plugins/Makefile.plugins.in b/SRC/plugins/Makefile.plugins.in deleted file mode 100644 index 656f8fa..0000000 --- a/SRC/plugins/Makefile.plugins.in +++ /dev/null @@ -1,36 +0,0 @@ -CCFLAGS=-DHAVE_CONFIG_H -Wall -O0 -g -CCDYNAMICFLAGS=${CCFLAGS} -fPIC -ifeq ("${LDFLAGS}","") -LDFLAGS= -endif -LDDYNAMICFLAGS=${LDFLAGS} -shared -# Autoconf variables -prefix = @prefix@ -exec_prefix = @exec_prefix@ -DESTDIR=@plugins_dir@ -MANDIR=@mandir@ -INSTALL=@INSTALL@ - -%.o: %.c - ${CC} ${CCDYNAMICFLAGS} -c -o $@ $< - -%.so: %.o - ${CC} ${LDDYNAMICFLAGS} -o $@ $< - -prepare-install: - @if [ ! -d ${DESTDIR} ]; then \ - mkdir ${DESTDIR}; \ - fi - -clean: - -rm -f *.o *.so - -distclean: clean - -rm -f *~ - -# $Id$ - -## Local Variables: ## -## mode:makefile ## -## End: ## - diff --git a/SRC/plugins/configure b/SRC/plugins/configure index 5c1b85d..247e292 100755 --- a/SRC/plugins/configure +++ b/SRC/plugins/configure @@ -462,7 +462,10 @@ ac_includes_default="\ # include #endif" -ac_subdirs_all="$ac_subdirs_all random whois dns postgresql" +ac_subdirs_all="$ac_subdirs_all dns" +ac_subdirs_all="$ac_subdirs_all postgresql" +ac_subdirs_all="$ac_subdirs_all random" +ac_subdirs_all="$ac_subdirs_all whois" ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB STRIP ac_ct_STRIP CPP CXX CXXFLAGS ac_ct_CXX CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE subdirs plugins_dir LIBOBJS LTLIBOBJS' ac_subst_files='' @@ -1034,6 +1037,7 @@ Optional Features: --disable-libtool-lock avoid locking (might break parallel builds) --disable-dependency-tracking speeds up one-time build --enable-dependency-tracking do not reject slow dependency extractors + --enable-plugin=LIST Build only the following plugins Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] @@ -2839,7 +2843,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 2842 "configure"' > conftest.$ac_ext + echo '#line 2846 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -4294,7 +4298,7 @@ fi # Provide some information about the compiler. -echo "$as_me:4297:" \ +echo "$as_me:4301:" \ "checking for Fortran 77 compiler version" >&5 ac_compiler=`set X $ac_compile; echo $2` { (eval echo "$as_me:$LINENO: \"$ac_compiler --version &5\"") >&5 @@ -5326,11 +5330,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:5329: $lt_compile\"" >&5) + (eval echo "\"\$as_me:5333: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:5333: \$? = $ac_status" >&5 + echo "$as_me:5337: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -5559,11 +5563,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:5562: $lt_compile\"" >&5) + (eval echo "\"\$as_me:5566: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:5566: \$? = $ac_status" >&5 + echo "$as_me:5570: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -5619,11 +5623,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:5622: $lt_compile\"" >&5) + (eval echo "\"\$as_me:5626: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:5626: \$? = $ac_status" >&5 + echo "$as_me:5630: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -7795,7 +7799,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext <&5) + (eval echo "\"\$as_me:10077: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:10077: \$? = $ac_status" >&5 + echo "$as_me:10081: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -10130,11 +10134,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:10133: $lt_compile\"" >&5) + (eval echo "\"\$as_me:10137: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:10137: \$? = $ac_status" >&5 + echo "$as_me:10141: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -11487,7 +11491,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext <&5) + (eval echo "\"\$as_me:12419: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:12419: \$? = $ac_status" >&5 + echo "$as_me:12423: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -12472,11 +12476,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:12475: $lt_compile\"" >&5) + (eval echo "\"\$as_me:12479: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:12479: \$? = $ac_status" >&5 + echo "$as_me:12483: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -14505,11 +14509,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:14508: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14512: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:14512: \$? = $ac_status" >&5 + echo "$as_me:14516: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -14738,11 +14742,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:14741: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14745: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:14745: \$? = $ac_status" >&5 + echo "$as_me:14749: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -14798,11 +14802,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:14801: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14805: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:14805: \$? = $ac_status" >&5 + echo "$as_me:14809: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -16974,7 +16978,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext <&5 +echo "$as_me: error: You cannot disable plugin support" >&2;} + { (exit 1); exit 1; }; } +else + if test "$enableval" == "yes"; then + { { echo "$as_me:$LINENO: error: You must indicate a list of plugins with this option" >&5 +echo "$as_me: error: You must indicate a list of plugins with this option" >&2;} + { (exit 1); exit 1; }; } + else + plugins=$enableval + fi +fi +else + plugins="random whois dns postgresql" +fi; +for plugin in $plugins; do + if test ! -d $plugin ; then + { { echo "$as_me:$LINENO: error: No such plugin $plugin" >&5 +echo "$as_me: error: No such plugin $plugin" >&2;} + { (exit 1); exit 1; }; } + fi + eval ${plugin}_BUILD=1 +done +if test "$dns_BUILD" = 1; then + + +subdirs="$subdirs dns" + +fi +if test "$postgresql_BUILD" = 1; then -subdirs="$subdirs random whois dns postgresql" +subdirs="$subdirs postgresql" + +fi +if test "$random_BUILD" = 1; then + + +subdirs="$subdirs random" + +fi +if test "$whois_BUILD" = 1; then + + +subdirs="$subdirs whois" + +fi plugins_dir=`cat dir` - ac_config_files="$ac_config_files Makefile.plugins Makefile" + ac_config_files="$ac_config_files Makefile" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure # tests run on this system so they can be shared between configure @@ -19361,7 +19413,6 @@ for ac_config_target in $ac_config_targets do case "$ac_config_target" in # Handling of arguments. - "Makefile.plugins" ) CONFIG_FILES="$CONFIG_FILES Makefile.plugins" ;; "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;; "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 @@ -20169,4 +20220,5 @@ echo "$as_me: error: $ac_sub_configure failed for $ac_dir" >&2;} done fi - +echo "" +echo Plugins to build: $plugins diff --git a/SRC/plugins/configure.ac b/SRC/plugins/configure.ac index 5454766..965e7c5 100644 --- a/SRC/plugins/configure.ac +++ b/SRC/plugins/configure.ac @@ -2,10 +2,29 @@ dnl $Id$ m4_include(../configure-common.ac) AM_INIT_AUTOMAKE(foreign) -dnl TODO: allow to exclude or include plugins dnl TODO: writes a LDAP plugin -AC_CONFIG_SUBDIRS(random whois dns postgresql) +dnl TODO: write a XML-RPC plugin for Adamsnames' interface +AC_ARG_ENABLE(plugin, +[ --enable-plugin=LIST Build only the following plugins], +[if test "$enableval" == "no"; then + AC_MSG_ERROR([You cannot disable plugin support]) +else + if test "$enableval" == "yes"; then + AC_MSG_ERROR([You must indicate a list of plugins with this option]) + else + plugins=$enableval + fi +fi], +plugins="random whois dns postgresql") +for plugin in $plugins; do + if test ! -d $plugin ; then + AC_MSG_ERROR([No such plugin $plugin]) + fi + eval ${plugin}_BUILD=1 +done +m4_include(list-of-dirs.m4) plugins_dir=`cat dir` AC_SUBST(plugins_dir) -AC_OUTPUT(Makefile.plugins Makefile) - +AC_OUTPUT(Makefile) +echo "" +echo Plugins to build: $plugins diff --git a/SRC/plugins/random/random.c b/SRC/plugins/random/random.c index 24b1a91..e26aafc 100644 --- a/SRC/plugins/random/random.c +++ b/SRC/plugins/random/random.c @@ -15,7 +15,7 @@ init (const int argc, const char *argv[]) struct timeval tv; (void) gettimeofday (&tv, (struct timezone *) NULL); srand (tv.tv_usec); - return NULL; + return "7"; /* Not used, just to say we use the cooked interface */ } void start ()