diff --git a/SRC/Makefile.in b/SRC/Makefile.in index eda0fe8..d5a28ce 100644 --- a/SRC/Makefile.in +++ b/SRC/Makefile.in @@ -1,6 +1,6 @@ -# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am +# Makefile.in generated automatically by automake 1.4-p4 from Makefile.am -# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -110,7 +110,7 @@ NROFF = nroff DIST_COMMON = README ./stamp-h.in AUTHORS COPYING ChangeLog INSTALL \ Makefile.am Makefile.in NEWS TODO acinclude.m4 aclocal.m4 config.guess \ config.h.in config.sub configure configure.ac echoping.1.in install-sh \ -missing mkinstalldirs +ltmain.sh missing mkinstalldirs DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) @@ -135,7 +135,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) $(ACLOCAL_M4): configure.ac acinclude.m4 cd $(srcdir) && $(ACLOCAL) -config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +config.status: $(srcdir)/configure.ac $(CONFIG_STATUS_DEPENDENCIES) $(SHELL) ./config.status --recheck $(srcdir)/configure: $(srcdir)/configure.ac $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) cd $(srcdir) && $(AUTOCONF) @@ -290,7 +290,7 @@ maintainer-clean-recursive: dot_seen=no; \ rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \ rev="$$subdir $$rev"; \ - test "$$subdir" != "." || dot_seen=yes; \ + test "$$subdir" = "." && dot_seen=yes; \ done; \ test "$$dot_seen" = "no" && rev=". $$rev"; \ target=`echo $@ | sed s/-recursive//`; \ @@ -332,7 +332,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) $(LI awk ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ test -z "$(ETAGS_ARGS)config.h.in$$unique$(LISP)$$tags" \ - || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags config.h.in $$unique $(LISP)) + || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags config.h.in $$unique $(LISP) -o $$here/TAGS) mostlyclean-tags: diff --git a/SRC/aclocal.m4 b/SRC/aclocal.m4 index 91a9773..e8a1ff9 100644 --- a/SRC/aclocal.m4 +++ b/SRC/aclocal.m4 @@ -1,6 +1,6 @@ -dnl aclocal.m4 generated automatically by aclocal 1.4-p6 +dnl aclocal.m4 generated automatically by aclocal 1.4-p4 -dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. +dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -1111,9 +1111,8 @@ AC_LIB_PROG_LD_GNU dnl Usage: dnl AM_INIT_AUTOMAKE(package,version, [no-define]) -AC_DEFUN([AM_INIT_AUTOMAKE], -[AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl -AC_REQUIRE([AC_PROG_INSTALL]) +AC_DEFUN(AM_INIT_AUTOMAKE, +[AC_REQUIRE([AC_PROG_INSTALL]) PACKAGE=[$1] AC_SUBST(PACKAGE) VERSION=[$2] @@ -1129,47 +1128,18 @@ AC_REQUIRE([AM_SANITY_CHECK]) AC_REQUIRE([AC_ARG_PROGRAM]) dnl FIXME This is truly gross. missing_dir=`cd $ac_aux_dir && pwd` -AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}, $missing_dir) +AM_MISSING_PROG(ACLOCAL, aclocal, $missing_dir) AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir) -AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}, $missing_dir) +AM_MISSING_PROG(AUTOMAKE, automake, $missing_dir) AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir) AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir) AC_REQUIRE([AC_PROG_MAKE_SET])]) -# Copyright 2002 Free Software Foundation, Inc. - -# 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 -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA - -# AM_AUTOMAKE_VERSION(VERSION) -# ---------------------------- -# Automake X.Y traces this macro to ensure aclocal.m4 has been -# generated from the m4 files accompanying Automake X.Y. -AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.4"]) - -# AM_SET_CURRENT_AUTOMAKE_VERSION -# ------------------------------- -# Call AM_AUTOMAKE_VERSION so it can be traced. -# This function is AC_REQUIREd by AC_INIT_AUTOMAKE. -AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], - [AM_AUTOMAKE_VERSION([1.4-p6])]) - # # Check to make sure that the build environment is sane. # -AC_DEFUN([AM_SANITY_CHECK], +AC_DEFUN(AM_SANITY_CHECK, [AC_MSG_CHECKING([whether build environment is sane]) # Just in case sleep 1 @@ -1210,7 +1180,7 @@ AC_MSG_RESULT(yes)]) dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY) dnl The program must properly implement --version. -AC_DEFUN([AM_MISSING_PROG], +AC_DEFUN(AM_MISSING_PROG, [AC_MSG_CHECKING(for working $2) # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. @@ -1226,7 +1196,7 @@ AC_SUBST($1)]) # Like AC_CONFIG_HEADER, but automatically create stamp file. -AC_DEFUN([AM_CONFIG_HEADER], +AC_DEFUN(AM_CONFIG_HEADER, [AC_PREREQ([2.12]) AC_CONFIG_HEADER([$1]) dnl When config.status generates a header, we must update the stamp-h file. diff --git a/SRC/configure b/SRC/configure index d114c24..422b870 100755 --- a/SRC/configure +++ b/SRC/configure @@ -2100,7 +2100,6 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu -am__api_version="1.4" # Find a good install program. We prefer a C program (faster), # so one script is as good as another. But avoid the broken or # incompatible versions: @@ -2290,17 +2289,17 @@ _ACEOF missing_dir=`cd $ac_aux_dir && pwd` -echo "$as_me:$LINENO: checking for working aclocal-${am__api_version}" >&5 -echo $ECHO_N "checking for working aclocal-${am__api_version}... $ECHO_C" >&6 +echo "$as_me:$LINENO: checking for working aclocal" >&5 +echo $ECHO_N "checking for working aclocal... $ECHO_C" >&6 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. -if (aclocal-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then - ACLOCAL=aclocal-${am__api_version} +if (aclocal --version) < /dev/null > /dev/null 2>&1; then + ACLOCAL=aclocal echo "$as_me:$LINENO: result: found" >&5 echo "${ECHO_T}found" >&6 else - ACLOCAL="$missing_dir/missing aclocal-${am__api_version}" + ACLOCAL="$missing_dir/missing aclocal" echo "$as_me:$LINENO: result: missing" >&5 echo "${ECHO_T}missing" >&6 fi @@ -2320,17 +2319,17 @@ else echo "${ECHO_T}missing" >&6 fi -echo "$as_me:$LINENO: checking for working automake-${am__api_version}" >&5 -echo $ECHO_N "checking for working automake-${am__api_version}... $ECHO_C" >&6 +echo "$as_me:$LINENO: checking for working automake" >&5 +echo $ECHO_N "checking for working automake... $ECHO_C" >&6 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. -if (automake-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then - AUTOMAKE=automake-${am__api_version} +if (automake --version) < /dev/null > /dev/null 2>&1; then + AUTOMAKE=automake echo "$as_me:$LINENO: result: found" >&5 echo "${ECHO_T}found" >&6 else - AUTOMAKE="$missing_dir/missing automake-${am__api_version}" + AUTOMAKE="$missing_dir/missing automake" echo "$as_me:$LINENO: result: missing" >&5 echo "${ECHO_T}missing" >&6 fi diff --git a/SRC/plugins/configure-plugins.ac b/SRC/plugins/configure-plugins.ac new file mode 100644 index 0000000..2f29681 --- /dev/null +++ b/SRC/plugins/configure-plugins.ac @@ -0,0 +1,31 @@ +LIBIDN=1 +AC_ARG_WITH(libidn, + [--with-libidn[=DIR] Internationalized Domain Names support (needs GNU libidn)],dnl + [if test "$withval" != "no"; then + if test "$withval" != "yes"; then + IDNROOT=$withval + LDFLAGS="${LDFLAGS} -L$IDNROOT/lib" + CPPFLAGS="${CPPFLAGS} -I$IDNROOT/include" + fi + else + LIBIDN=0 + fi], +) +if test "$LIBIDN" = "1"; then +AC_DEFINE(LIBIDN,,[Internationalized Domain Names support]) +fi + +AC_ARG_WITH(popt, + [--with-popt[=DIR] popt command-line parsing library],dnl + [if test "$withval" != "no"; then + if test "$withval" != "yes"; then + POPTROOT=$withval + LDFLAGS="${LDFLAGS} -L$POPTROOT/lib" + CPPFLAGS="${CPPFLAGS} -I$POPTROOT/include" + fi + else + AC_MSG_ERROR([The popt command-line parsing library is mandatory for this plugin]) + fi], +) + +dnl $Id$ diff --git a/SRC/plugins/dns/configure b/SRC/plugins/dns/configure index 4c40ef7..bf40a1e 100755 --- a/SRC/plugins/dns/configure +++ b/SRC/plugins/dns/configure @@ -799,6 +799,7 @@ if test -n "$ac_init_help"; then Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) +--with-libidn=DIR Internationalized Domain Names support (needs GNU libidn) --with-popt=DIR popt command-line parsing library Some influential environment variables: @@ -2279,6 +2280,29 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' +LIBIDN=1 + +# Check whether --with-libidn or --without-libidn was given. +if test "${with_libidn+set}" = set; then + withval="$with_libidn" + if test "$withval" != "no"; then + if test "$withval" != "yes"; then + IDNROOT=$withval + LDFLAGS="${LDFLAGS} -L$IDNROOT/lib" + CPPFLAGS="${CPPFLAGS} -I$IDNROOT/include" + fi + else + LIBIDN=0 + fi +fi; +if test "$LIBIDN" = "1"; then + +cat >>confdefs.h <<\_ACEOF +#define LIBIDN +_ACEOF + +fi + # Check whether --with-popt or --without-popt was given. if test "${with_popt+set}" = set; then @@ -2296,6 +2320,8 @@ echo "$as_me: error: The popt command-line parsing library is mandatory for this fi fi; + + DNS_BUILD=1 diff --git a/SRC/plugins/dns/configure.ac b/SRC/plugins/dns/configure.ac index 2f250ba..3a10bde 100644 --- a/SRC/plugins/dns/configure.ac +++ b/SRC/plugins/dns/configure.ac @@ -7,18 +7,7 @@ dnl Checks for programs. AC_PROG_CC AC_PROG_INSTALL -AC_ARG_WITH(popt, - [--with-popt[=DIR] popt command-line parsing library],dnl - [if test "$withval" != "no"; then - if test "$withval" != "yes"; then - POPTROOT=$withval - LDFLAGS="${LDFLAGS} -L$POPTROOT/lib" - CPPFLAGS="${CPPFLAGS} -I$POPTROOT/include" - fi - else - AC_MSG_ERROR([The popt command-line parsing library is mandatory for this plugin]) - fi], -) +m4_include([../configure-plugins.ac]) DNS_BUILD=1 AC_CHECK_FUNCS(poptGetContext,, diff --git a/SRC/plugins/whois/configure b/SRC/plugins/whois/configure index 713d52c..65df222 100755 --- a/SRC/plugins/whois/configure +++ b/SRC/plugins/whois/configure @@ -799,6 +799,7 @@ if test -n "$ac_init_help"; then Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) +--with-libidn=DIR Internationalized Domain Names support (needs GNU libidn) --with-popt=DIR popt command-line parsing library Some influential environment variables: @@ -2279,6 +2280,30 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' +LIBIDN=1 + +# Check whether --with-libidn or --without-libidn was given. +if test "${with_libidn+set}" = set; then + withval="$with_libidn" + if test "$withval" != "no"; then + if test "$withval" != "yes"; then + IDNROOT=$withval + LDFLAGS="${LDFLAGS} -L$IDNROOT/lib" + CPPFLAGS="${CPPFLAGS} -I$IDNROOT/include" + fi + else + LIBIDN=0 + fi +fi; +if test "$LIBIDN" = "1"; then + +cat >>confdefs.h <<\_ACEOF +#define LIBIDN +_ACEOF + +fi + + # Check whether --with-popt or --without-popt was given. if test "${with_popt+set}" = set; then diff --git a/SRC/plugins/whois/configure.ac b/SRC/plugins/whois/configure.ac index 512bcb4..21eeac6 100644 --- a/SRC/plugins/whois/configure.ac +++ b/SRC/plugins/whois/configure.ac @@ -7,18 +7,7 @@ dnl Checks for programs. AC_PROG_CC AC_PROG_INSTALL -AC_ARG_WITH(popt, - [--with-popt[=DIR] popt command-line parsing library],dnl - [if test "$withval" != "no"; then - if test "$withval" != "yes"; then - POPTROOT=$withval - LDFLAGS="${LDFLAGS} -L$POPTROOT/lib" - CPPFLAGS="${CPPFLAGS} -I$POPTROOT/include" - fi - else - AC_MSG_ERROR([The popt command-line parsing library is mandatory for this plugin]) - fi], -) +m4_include([../configure-plugins.ac]) WHOIS_BUILD=1 AC_CHECK_FUNCS(poptGetContext,,