diff options
author | cube <cube> | 2005-01-01 06:26:41 +0000 |
---|---|---|
committer | cube <cube> | 2005-01-01 06:26:41 +0000 |
commit | 0f24ca3c5609904b47a98bc945f92bb3d6939316 (patch) | |
tree | 582dc3304f080260da2c4d7aab38b3cd76a162c7 /net/poptop | |
parent | a3ef94166cdb27885250433c1147fb4cf9a8a967 (diff) | |
download | pkgsrc-0f24ca3c5609904b47a98bc945f92bb3d6939316.tar.gz |
Update poptop to version 1.2.1.
pkgsrc changes and patches:
o As pppd binary location is configurable at run-time, it is no longer
necessary to use ./configure tricks to use another pppd.
o Add a rc.d script.
o Disable bcrelay build unconditonally, until it is made portable.
o Move configuration file over to PKG_SYSCONFDIR.
Changes:
1.2.1: released 2004-06-23
[* Nothing relevant *]
1.2.0-b4: released 2004-05-25
- fix for options file check when no options file wanted [Cameron]
- fix for SIGTERM handling [Guraj]
- minor manual page edits [Wilson]
- fix printing of connection speed [Dubiec]
- fix segfault if built --with-bcrelay but no option used [Cameron]
- add --logwtmp option to track users online [Cameron/Guraj]
- remove vpnwho.pl from package (due to --logwtmp) [Cameron]
- include README.portslave in distribution [Cameron]
1.2.0-b3: released 2004-04-25 (ANZAC day)
- add hint for EIO to suggest pppd option syntax [Cameron]
- add routing checklists to pptpd.conf man page [Cameron]
- fix broken --stimeout option [Cameron]
- rework all manual pages, cross check against programs [Cameron]
- add --ppp option for portslave support [Cameron]
- fix unanticipated exit() when --noipparam option used [Cameron]
- fix segfault on pptpctrl called with no arguments [Cameron]
{closes: Bug#140709}
- include vpnwho.pl in package [!3runo]
- note that speed is ineffective on Linux [Cameron]
- rework comments in sample configuration files [Cameron]
- update references to web sites [Cameron]
- minor edits to manual pages [Cameron]
- improve script comments [Cameron]
1.2.0-b2: released 2004-04-22 to test team (Peter & Bruno)
- fix build without bcrelay [Cameron]
- adopt bcrelay version from main package [Cameron]
- when built without bcrelay, the bcrelay will exit [Cameron]
1.1.4-b4:
- terminate call on any CALL_CLR_RQST [!3runo]
- unblock SIGCHLD [Stamfest]
{closes: Bug#248123}
- report pppd path in debug mode [Cameron]
- report cause of failed execvp() [Cameron]
- explain pppd launch failure [Cameron]
- pass ipparam to pppd [Ammirata]
- add bcrelay [Bolhuis]
- fix loss of first GRE packet [fghdgh]
- fix inheritance of console file descriptors [fghdgh]
- fix pidfile option [Mandzgaladze]
- fix two buffer overflows [Otero]
- fix potential buffer overflow [Vroede]
- enhance callid [Latypov] {does not close Bug#171831}
Diffstat (limited to 'net/poptop')
-rw-r--r-- | net/poptop/MESSAGE | 4 | ||||
-rw-r--r-- | net/poptop/Makefile | 20 | ||||
-rw-r--r-- | net/poptop/distinfo | 15 | ||||
-rw-r--r-- | net/poptop/files/pptpd.sh | 17 | ||||
-rw-r--r-- | net/poptop/patches/patch-aa | 36 | ||||
-rw-r--r-- | net/poptop/patches/patch-ab | 1322 | ||||
-rw-r--r-- | net/poptop/patches/patch-ad | 13 | ||||
-rw-r--r-- | net/poptop/patches/patch-ae | 53 | ||||
-rw-r--r-- | net/poptop/patches/patch-af | 13 | ||||
-rw-r--r-- | net/poptop/patches/patch-ag | 13 | ||||
-rw-r--r-- | net/poptop/patches/patch-ah | 13 |
11 files changed, 493 insertions, 1026 deletions
diff --git a/net/poptop/MESSAGE b/net/poptop/MESSAGE index 712352c685b..a726df4be5b 100644 --- a/net/poptop/MESSAGE +++ b/net/poptop/MESSAGE @@ -1,7 +1,7 @@ =========================================================================== -$NetBSD: MESSAGE,v 1.3 2003/09/07 14:40:32 hubertf Exp $ +$NetBSD: MESSAGE,v 1.4 2005/01/01 06:26:41 cube Exp $ -If you have trouble getting this to operate properly and run +If you have trouble getting this to operate properly and run on NetBSD 1.6.x or earlier, try removing the "gre" network interface from your kernel! diff --git a/net/poptop/Makefile b/net/poptop/Makefile index 6f4ff494e95..05c6b2a68a3 100644 --- a/net/poptop/Makefile +++ b/net/poptop/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.9 2004/04/25 08:10:20 snj Exp $ +# $NetBSD: Makefile,v 1.10 2005/01/01 06:26:41 cube Exp $ # -DISTNAME= pptpd-1.1.3-20030409 -PKGNAME= poptop-1.1.3.20030409 +DISTNAME= pptpd-1.2.1 +PKGNAME= ${DISTNAME:S/pptpd/poptop/} CATEGORIES= net MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=poptop/} @@ -10,17 +10,19 @@ MAINTAINER= cube@NetBSD.org HOMEPAGE= http://www.poptop.org/ COMMENT= PPTP server with support for Microsoft VPN clients -WRKSRC= ${WRKDIR}/poptop USE_BUILDLINK3= YES GNU_CONFIGURE= YES +USE_GNU_TOOLS+= make +USE_PKGINSTALL= YES CONFIGURE_ARGS+= --with-libwrap -.include "../../mk/bsd.prefs.mk" +SUBST_CLASSES+= sysconf +SUBST_STAGE.sysconf= post-patch +SUBST_FILES.sysconf= defaults.h pptpd.8 pptpd.conf.5 +SUBST_SED.sysconf= -e s,@@PKGSYSCONFDIR@@,${PKG_SYSCONFDIR}, -.if defined(POPTOP_USE_MPPE) -DEPENDS+= ppp-mppe-2.3.9:../../net/ppp-mppe -CONFIGURE_ARGS+= --with-pppd=${PREFIX}/sbin/pppd -.endif +RCD_SCRIPTS= pptpd +.include "../../security/tcp_wrappers/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/poptop/distinfo b/net/poptop/distinfo index 8ee8c2cc7ed..4369b175fbb 100644 --- a/net/poptop/distinfo +++ b/net/poptop/distinfo @@ -1,7 +1,12 @@ -$NetBSD: distinfo,v 1.4 2003/09/17 19:37:08 cube Exp $ +$NetBSD: distinfo,v 1.5 2005/01/01 06:26:41 cube Exp $ -SHA1 (pptpd-1.1.3-20030409.tar.gz) = b4b7e2c5dc17b962fafb2aebff780fdcfa666551 -Size (pptpd-1.1.3-20030409.tar.gz) = 148934 bytes -SHA1 (patch-aa) = 11bf3a2c6fb445c90c01389f98b3a339a052b53a -SHA1 (patch-ab) = 878af32d56324ca4001488b3b05eae917011c2a3 +SHA1 (pptpd-1.2.1.tar.gz) = ffbeff5d8a8c0725125ec0682b0871e927aefba4 +Size (pptpd-1.2.1.tar.gz) = 180974 bytes +SHA1 (patch-aa) = 40e5873fc582040112e97477e3709e729245d4c9 +SHA1 (patch-ab) = 43741ecf4f1f52113814ccd0f70a9ab173c0667f SHA1 (patch-ac) = 9414c9d086913d8a322629d87f3ed79ecbd4059f +SHA1 (patch-ad) = 451e6811622114c4e99df3b9ff31238bfa6623ed +SHA1 (patch-ae) = 7072ce9eacbdc52632c2eb8341dc4519d6d79d78 +SHA1 (patch-af) = f087f8b16566701ab51dbb967a126c710f785213 +SHA1 (patch-ag) = 7810baae4607113684a00bcdf13140242f8744b9 +SHA1 (patch-ah) = 54506391dfc52ce71550aec6225d96b069560581 diff --git a/net/poptop/files/pptpd.sh b/net/poptop/files/pptpd.sh new file mode 100644 index 00000000000..9fcae2929fd --- /dev/null +++ b/net/poptop/files/pptpd.sh @@ -0,0 +1,17 @@ +#!@RCD_SCRIPTS_SHELL@ +# +# $NetBSD: pptpd.sh,v 1.1 2005/01/01 06:26:41 cube Exp $ +# + +# PROVIDE: pptpd +# REQUIRE: DAEMON + +. /etc/rc.subr + +name="pptpd" +rcvar=$name +command="@PREFIX@/sbin/pptpd" +required_files="@PKG_SYSCONFDIR@/pptpd.conf" + +load_rc_config $name +run_rc_command "$1" diff --git a/net/poptop/patches/patch-aa b/net/poptop/patches/patch-aa index 5752cf4edb9..851b0d90484 100644 --- a/net/poptop/patches/patch-aa +++ b/net/poptop/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.2 2001/12/23 17:18:12 kim Exp $ +$NetBSD: patch-aa,v 1.3 2005/01/01 06:26:41 cube Exp $ ---- configure.in.orig Sun Sep 24 21:29:23 2000 -+++ configure.in Sun Dec 23 12:09:28 2001 -@@ -112,7 +112,7 @@ +--- configure.in.orig 2004-06-23 09:38:43.000000000 +0200 ++++ configure.in +@@ -112,7 +112,7 @@ fi if test "$ac_cv_header_libintl_h" = yes; then if test "$ac_cv_lib_c_gettext" = no; then if test "$ac_cv_lib_intl_gettext" = yes; then @@ -11,31 +11,3 @@ $NetBSD: patch-aa,v 1.2 2001/12/23 17:18:12 kim Exp $ else echo "Have libintl.h but no usable gettext!" 1>&2 exit 1 -@@ -144,15 +144,18 @@ - [ AC_DEFINE(PNS_MODE) - PNS_MODE = yes ]) - --if test "$BSDUSER_PPP" = "yes"; then -- AC_DEFINE(PPP_BINARY, "/usr/sbin/ppp") --else -- if test "$SLIRP" = "yes"; then -- AC_DEFINE(PPP_BINARY, "/bin/slirp") -- else -- AC_DEFINE(PPP_BINARY, "/usr/sbin/pppd") -- fi --fi -+AC_ARG_WITH(pppd, -+ [ --with-pppd=[ARG] Path to pppd binary.], -+ [ AC_DEFINE_UNQUOTED(PPP_BINARY,"$withval")], -+ [ if test "$BSDUSER_PPP" = "yes"; then -+ AC_DEFINE(PPP_BINARY, "/usr/sbin/ppp") -+ else -+ if test "$SLIRP" = "yes"; then -+ AC_DEFINE(PPP_BINARY, "/bin/slirp") -+ else -+ AC_DEFINE(PPP_BINARY, "/usr/sbin/pppd") -+ fi -+ fi]) - - if test "$SLIRP" = "yes"; then - if test "$PPPD_IP_ALLOC" = "yes"; then diff --git a/net/poptop/patches/patch-ab b/net/poptop/patches/patch-ab index b2faa95a643..01a6e84b032 100644 --- a/net/poptop/patches/patch-ab +++ b/net/poptop/patches/patch-ab @@ -1,942 +1,327 @@ -$NetBSD: patch-ab,v 1.3 2003/09/17 19:37:12 cube Exp $ +$NetBSD: patch-ab,v 1.4 2005/01/01 06:26:41 cube Exp $ ---- configure.orig 2003-02-06 17:39:46.000000000 +0100 +--- configure.orig 2004-06-23 09:39:15.000000000 +0200 +++ configure -@@ -21,6 +21,8 @@ - --with-pppd-ip-alloc Let pppd allocate IP addresses " - ac_help="$ac_help - --with-pns-mode Option is NOT FUNCTIONAL YET " -+ac_help="$ac_help -+ --with-pppd=[ARG] Path to pppd binary." - - # Initialize some variables set by options. - # The variables have the same names as the options, with -@@ -566,7 +568,7 @@ - # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" - # ./install, which can be erroneously created by make from ./install.sh. - echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 --echo "configure:570: checking for a BSD compatible install" >&5 -+echo "configure:572: checking for a BSD compatible install" >&5 - if test -z "$INSTALL"; then - if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -619,7 +621,7 @@ - test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' - - echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6 --echo "configure:623: checking whether build environment is sane" >&5 -+echo "configure:625: checking whether build environment is sane" >&5 - # Just in case - sleep 1 - echo timestamp > conftestfile -@@ -676,7 +678,7 @@ - test "$program_transform_name" = "" && program_transform_name="s,x,x," - - echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 --echo "configure:680: checking whether ${MAKE-make} sets \${MAKE}" >&5 -+echo "configure:682: checking whether ${MAKE-make} sets \${MAKE}" >&5 - set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -722,7 +724,7 @@ - - missing_dir=`cd $ac_aux_dir && pwd` - echo $ac_n "checking for working aclocal""... $ac_c" 1>&6 --echo "configure:726: checking for working aclocal" >&5 -+echo "configure:728: checking for working aclocal" >&5 - # 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. -@@ -735,7 +737,7 @@ - fi - - echo $ac_n "checking for working autoconf""... $ac_c" 1>&6 --echo "configure:739: checking for working autoconf" >&5 -+echo "configure:741: checking for working autoconf" >&5 - # 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. -@@ -748,7 +750,7 @@ - fi - - echo $ac_n "checking for working automake""... $ac_c" 1>&6 --echo "configure:752: checking for working automake" >&5 -+echo "configure:754: checking for working automake" >&5 - # 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. -@@ -761,7 +763,7 @@ - fi - - echo $ac_n "checking for working autoheader""... $ac_c" 1>&6 --echo "configure:765: checking for working autoheader" >&5 -+echo "configure:767: checking for working autoheader" >&5 - # 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. -@@ -774,7 +776,7 @@ - fi - - echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6 --echo "configure:778: checking for working makeinfo" >&5 -+echo "configure:780: checking for working makeinfo" >&5 - # 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. -@@ -790,7 +792,7 @@ - # Extract the first word of "gcc", so it can be a program name with args. - set dummy gcc; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:794: checking for $ac_word" >&5 -+echo "configure:796: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -820,7 +822,7 @@ - # Extract the first word of "cc", so it can be a program name with args. - set dummy cc; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:824: checking for $ac_word" >&5 -+echo "configure:826: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -871,7 +873,7 @@ - # Extract the first word of "cl", so it can be a program name with args. - set dummy cl; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:875: checking for $ac_word" >&5 -+echo "configure:877: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -903,7 +905,7 @@ - fi - - echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 --echo "configure:907: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 -+echo "configure:909: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 - - ac_ext=c - # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -@@ -914,12 +916,12 @@ - - cat > conftest.$ac_ext << EOF - --#line 918 "configure" -+#line 920 "configure" - #include "confdefs.h" - - main(){return(0);} - EOF --if { (eval echo configure:923: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:925: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - ac_cv_prog_cc_works=yes - # If we can't run a trivial program, we are probably using a cross compiler. - if (./conftest; exit) 2>/dev/null; then -@@ -945,12 +947,12 @@ - { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } - fi - echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 --echo "configure:949: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 -+echo "configure:951: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 - echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 - cross_compiling=$ac_cv_prog_cc_cross - - echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 --echo "configure:954: checking whether we are using GNU C" >&5 -+echo "configure:956: checking whether we are using GNU C" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -959,7 +961,7 @@ - yes; - #endif - EOF --if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:963: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then -+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:965: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then - ac_cv_prog_gcc=yes - else - ac_cv_prog_gcc=no -@@ -978,7 +980,7 @@ - ac_save_CFLAGS="$CFLAGS" - CFLAGS= - echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 --echo "configure:982: checking whether ${CC-cc} accepts -g" >&5 -+echo "configure:984: checking whether ${CC-cc} accepts -g" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -1012,7 +1014,7 @@ - # Extract the first word of "ranlib", so it can be a program name with args. - set dummy ranlib; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:1016: checking for $ac_word" >&5 -+echo "configure:1018: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -1051,7 +1053,7 @@ - # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" - # ./install, which can be erroneously created by make from ./install.sh. - echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 --echo "configure:1055: checking for a BSD compatible install" >&5 -+echo "configure:1057: checking for a BSD compatible install" >&5 - if test -z "$INSTALL"; then - if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -1104,7 +1106,7 @@ - test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' - - echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 --echo "configure:1108: checking whether ln -s works" >&5 -+echo "configure:1110: checking whether ln -s works" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -1125,7 +1127,7 @@ - fi - - echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 --echo "configure:1129: checking whether ${MAKE-make} sets \${MAKE}" >&5 -+echo "configure:1131: checking whether ${MAKE-make} sets \${MAKE}" >&5 - set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -1153,12 +1155,12 @@ - - - echo $ac_n "checking for working const""... $ac_c" 1>&6 --echo "configure:1157: checking for working const" >&5 -+echo "configure:1159: checking for working const" >&5 - if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 1162 "configure" -+#line 1164 "configure" - #include "confdefs.h" - - int main() { -@@ -1207,7 +1209,7 @@ - - ; return 0; } - EOF --if { (eval echo configure:1211: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:1213: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_c_const=yes - else -@@ -1228,21 +1230,21 @@ - fi - - echo $ac_n "checking for inline""... $ac_c" 1>&6 --echo "configure:1232: checking for inline" >&5 -+echo "configure:1234: checking for inline" >&5 - if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - ac_cv_c_inline=no - for ac_kw in inline __inline__ __inline; do - cat > conftest.$ac_ext <<EOF --#line 1239 "configure" -+#line 1241 "configure" - #include "confdefs.h" - - int main() { - } $ac_kw foo() { - ; return 0; } - EOF --if { (eval echo configure:1246: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:1248: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_c_inline=$ac_kw; break - else -@@ -1269,12 +1271,12 @@ - - - echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6 --echo "configure:1273: checking for Cygwin environment" >&5 -+echo "configure:1275: checking for Cygwin environment" >&5 - if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 1278 "configure" -+#line 1280 "configure" - #include "confdefs.h" - - int main() { -@@ -1285,7 +1287,7 @@ - return __CYGWIN__; - ; return 0; } - EOF --if { (eval echo configure:1289: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:1291: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_cygwin=yes - else -@@ -1302,19 +1304,19 @@ - CYGWIN= - test "$ac_cv_cygwin" = yes && CYGWIN=yes - echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6 --echo "configure:1306: checking for mingw32 environment" >&5 -+echo "configure:1308: checking for mingw32 environment" >&5 - if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 1311 "configure" -+#line 1313 "configure" - #include "confdefs.h" - - int main() { - return __MINGW32__; - ; return 0; } - EOF --if { (eval echo configure:1318: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:1320: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_mingw32=yes - else -@@ -1333,7 +1335,7 @@ - - - echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 --echo "configure:1337: checking for executable suffix" >&5 -+echo "configure:1339: checking for executable suffix" >&5 - if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -1343,7 +1345,7 @@ - rm -f conftest* - echo 'int main () { return 0; }' > conftest.$ac_ext - ac_cv_exeext= -- if { (eval echo configure:1347: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then -+ if { (eval echo configure:1349: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then - for file in conftest.*; do - case $file in - *.c | *.o | *.obj) ;; -@@ -1364,13 +1366,13 @@ - ac_exeext=$EXEEXT - - echo $ac_n "checking for object suffix""... $ac_c" 1>&6 --echo "configure:1368: checking for object suffix" >&5 -+echo "configure:1370: checking for object suffix" >&5 - if eval "test \"`echo '$''{'ac_cv_objext'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - rm -f conftest* - echo 'int i = 1;' > conftest.$ac_ext --if { (eval echo configure:1374: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:1376: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - for ac_file in conftest.*; do - case $ac_file in - *.c) ;; -@@ -1390,7 +1392,7 @@ - # Pull the hash mark out of the macro call to avoid m4 problems. - ac_msg="whether #! works in shell scripts" - echo $ac_n "checking $ac_msg""... $ac_c" 1>&6 --echo "configure:1394: checking $ac_msg" >&5 -+echo "configure:1396: checking $ac_msg" >&5 - if eval "test \"`echo '$''{'ac_cv_sys_interpreter'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -1414,12 +1416,12 @@ - for ac_func in setsid daemon setproctitle getservbyname strlcpy fork memmove strerror - do - echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:1418: checking for $ac_func" >&5 -+echo "configure:1420: checking for $ac_func" >&5 - if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 1423 "configure" -+#line 1425 "configure" - #include "confdefs.h" - /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func(); below. */ -@@ -1442,7 +1444,7 @@ - - ; return 0; } - EOF --if { (eval echo configure:1446: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:1448: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" - else -@@ -1468,7 +1470,7 @@ - - - echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 --echo "configure:1472: checking how to run the C preprocessor" >&5 -+echo "configure:1474: checking how to run the C preprocessor" >&5 - # On Suns, sometimes $CPP names a directory. - if test -n "$CPP" && test -d "$CPP"; then - CPP= -@@ -1483,13 +1485,13 @@ - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. - cat > conftest.$ac_ext <<EOF --#line 1487 "configure" -+#line 1489 "configure" - #include "confdefs.h" - #include <assert.h> - Syntax Error - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:1493: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:1495: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - : -@@ -1500,13 +1502,13 @@ - rm -rf conftest* - CPP="${CC-cc} -E -traditional-cpp" - cat > conftest.$ac_ext <<EOF --#line 1504 "configure" -+#line 1506 "configure" - #include "confdefs.h" - #include <assert.h> - Syntax Error - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:1510: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:1512: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - : -@@ -1517,13 +1519,13 @@ - rm -rf conftest* - CPP="${CC-cc} -nologo -E" - cat > conftest.$ac_ext <<EOF --#line 1521 "configure" -+#line 1523 "configure" - #include "confdefs.h" - #include <assert.h> - Syntax Error - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:1527: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:1529: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - : -@@ -1551,17 +1553,17 @@ - do - ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:1555: checking for $ac_hdr" >&5 -+echo "configure:1557: checking for $ac_hdr" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 1560 "configure" -+#line 1562 "configure" - #include "confdefs.h" - #include <$ac_hdr> - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:1565: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:1567: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - rm -rf conftest* -@@ -1591,17 +1593,17 @@ - do - ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:1595: checking for $ac_hdr" >&5 -+echo "configure:1597: checking for $ac_hdr" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 1600 "configure" -+#line 1602 "configure" - #include "confdefs.h" - #include <$ac_hdr> - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:1605: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:1607: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - rm -rf conftest* -@@ -1631,17 +1633,17 @@ - do - ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:1635: checking for $ac_hdr" >&5 -+echo "configure:1637: checking for $ac_hdr" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 1640 "configure" -+#line 1642 "configure" - #include "confdefs.h" - #include <$ac_hdr> - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:1645: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:1647: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - rm -rf conftest* -@@ -1671,17 +1673,17 @@ - do - ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:1675: checking for $ac_hdr" >&5 -+echo "configure:1677: checking for $ac_hdr" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 1680 "configure" -+#line 1682 "configure" - #include "confdefs.h" - #include <$ac_hdr> - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:1685: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:1687: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - rm -rf conftest* -@@ -1711,17 +1713,17 @@ - do - ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:1715: checking for $ac_hdr" >&5 -+echo "configure:1717: checking for $ac_hdr" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 1720 "configure" -+#line 1722 "configure" - #include "confdefs.h" - #include <$ac_hdr> - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:1725: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:1727: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - rm -rf conftest* -@@ -1749,12 +1751,12 @@ - - - echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 --echo "configure:1753: checking for ANSI C header files" >&5 -+echo "configure:1755: checking for ANSI C header files" >&5 - if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 1758 "configure" -+#line 1760 "configure" - #include "confdefs.h" - #include <stdlib.h> - #include <stdarg.h> -@@ -1762,7 +1764,7 @@ - #include <float.h> - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:1766: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:1768: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - rm -rf conftest* -@@ -1779,7 +1781,7 @@ - if test $ac_cv_header_stdc = yes; then - # SunOS 4.x string.h does not declare mem*, contrary to ANSI. - cat > conftest.$ac_ext <<EOF --#line 1783 "configure" -+#line 1785 "configure" - #include "confdefs.h" - #include <string.h> - EOF -@@ -1797,7 +1799,7 @@ - if test $ac_cv_header_stdc = yes; then - # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. - cat > conftest.$ac_ext <<EOF --#line 1801 "configure" -+#line 1803 "configure" - #include "confdefs.h" - #include <stdlib.h> - EOF -@@ -1818,7 +1820,7 @@ - : - else - cat > conftest.$ac_ext <<EOF --#line 1822 "configure" -+#line 1824 "configure" - #include "confdefs.h" - #include <ctype.h> - #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') -@@ -1829,7 +1831,7 @@ - exit (0); } - - EOF --if { (eval echo configure:1833: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:1835: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - : - else -@@ -1853,12 +1855,12 @@ - fi - - echo $ac_n "checking for size_t""... $ac_c" 1>&6 --echo "configure:1857: checking for size_t" >&5 -+echo "configure:1859: checking for size_t" >&5 - if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 1862 "configure" -+#line 1864 "configure" - #include "confdefs.h" - #include <sys/types.h> - #if STDC_HEADERS -@@ -1886,12 +1888,12 @@ - fi - - echo $ac_n "checking for ssize_t""... $ac_c" 1>&6 --echo "configure:1890: checking for ssize_t" >&5 -+echo "configure:1892: checking for ssize_t" >&5 - if eval "test \"`echo '$''{'ac_cv_type_ssize_t'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 1895 "configure" -+#line 1897 "configure" - #include "confdefs.h" - #include <sys/types.h> - #if STDC_HEADERS -@@ -1919,12 +1921,12 @@ - fi - - echo $ac_n "checking for u_int8_t""... $ac_c" 1>&6 --echo "configure:1923: checking for u_int8_t" >&5 -+echo "configure:1925: checking for u_int8_t" >&5 - if eval "test \"`echo '$''{'ac_cv_type_u_int8_t'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 1928 "configure" -+#line 1930 "configure" - #include "confdefs.h" - #include <sys/types.h> - #if STDC_HEADERS -@@ -1952,12 +1954,12 @@ - fi - - echo $ac_n "checking for u_int16_t""... $ac_c" 1>&6 --echo "configure:1956: checking for u_int16_t" >&5 -+echo "configure:1958: checking for u_int16_t" >&5 - if eval "test \"`echo '$''{'ac_cv_type_u_int16_t'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 1961 "configure" -+#line 1963 "configure" - #include "confdefs.h" - #include <sys/types.h> - #if STDC_HEADERS -@@ -1985,12 +1987,12 @@ - fi - - echo $ac_n "checking for u_int32_t""... $ac_c" 1>&6 --echo "configure:1989: checking for u_int32_t" >&5 -+echo "configure:1991: checking for u_int32_t" >&5 - if eval "test \"`echo '$''{'ac_cv_type_u_int32_t'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 1994 "configure" -+#line 1996 "configure" - #include "confdefs.h" - #include <sys/types.h> - #if STDC_HEADERS -@@ -2019,13 +2021,13 @@ - - - echo $ac_n "checking for socklen_t""... $ac_c" 1>&6 --echo "configure:2023: checking for socklen_t" >&5 -+echo "configure:2025: checking for socklen_t" >&5 - if eval "test \"`echo '$''{'ac_cv_type_socklen_t'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - - cat > conftest.$ac_ext <<EOF --#line 2029 "configure" -+#line 2031 "configure" - #include "confdefs.h" - #include <sys/types.h> - #include <sys/socket.h> -@@ -2061,17 +2063,17 @@ - - XYZZY_LIBS="$LIBS" - echo $ac_n "checking for libwrap alone""... $ac_c" 1>&6 --echo "configure:2065: checking for libwrap alone" >&5 -+echo "configure:2067: checking for libwrap alone" >&5 - LIBS="$XYZZY_LIBS -lwrap" - cat > conftest.$ac_ext <<EOF --#line 2068 "configure" -+#line 2070 "configure" - #include "confdefs.h" - int allow_severity, deny_severity; - int main() { - hosts_access(); - ; return 0; } - EOF --if { (eval echo configure:2075: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:2077: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - echo "$ac_t""yes" 1>&6 - cat >> confdefs.h <<\EOF -@@ -2087,16 +2089,16 @@ - echo "$ac_t""no" 1>&6 - LIBS="$XYZZY_LIBS -lwrap -lnsl" - echo $ac_n "checking for libwrap with libnsl""... $ac_c" 1>&6 --echo "configure:2091: checking for libwrap with libnsl" >&5 -+echo "configure:2093: checking for libwrap with libnsl" >&5 - cat > conftest.$ac_ext <<EOF --#line 2093 "configure" -+#line 2095 "configure" - #include "confdefs.h" - int allow_severity, deny_severity; - int main() { - hosts_access(); - ; return 0; } - EOF --if { (eval echo configure:2100: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:2102: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - echo "$ac_t""yes" 1>&6 - cat >> confdefs.h <<\EOF -@@ -2122,7 +2124,7 @@ - - XYZZY_LIBS="$LIBS" - echo $ac_n "checking for accept in -lc""... $ac_c" 1>&6 --echo "configure:2126: checking for accept in -lc" >&5 -+echo "configure:2128: checking for accept in -lc" >&5 - ac_lib_var=`echo c'_'accept | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -2130,7 +2132,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-lc $LIBS" - cat > conftest.$ac_ext <<EOF --#line 2134 "configure" -+#line 2136 "configure" - #include "confdefs.h" - /* Override any gcc2 internal prototype to avoid an error. */ - /* We use char because int might match the return type of a gcc2 -@@ -2141,7 +2143,7 @@ - accept() - ; return 0; } - EOF --if { (eval echo configure:2145: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:2147: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -2169,7 +2171,7 @@ - fi - - echo $ac_n "checking for gethostbyname in -lc""... $ac_c" 1>&6 --echo "configure:2173: checking for gethostbyname in -lc" >&5 -+echo "configure:2175: checking for gethostbyname in -lc" >&5 - ac_lib_var=`echo c'_'gethostbyname | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -2177,7 +2179,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-lc $LIBS" - cat > conftest.$ac_ext <<EOF --#line 2181 "configure" -+#line 2183 "configure" - #include "confdefs.h" - /* Override any gcc2 internal prototype to avoid an error. */ - /* We use char because int might match the return type of a gcc2 -@@ -2188,7 +2190,7 @@ - gethostbyname() - ; return 0; } - EOF --if { (eval echo configure:2192: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:2194: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -2216,7 +2218,7 @@ - fi - - echo $ac_n "checking for openpty in -lc""... $ac_c" 1>&6 --echo "configure:2220: checking for openpty in -lc" >&5 -+echo "configure:2222: checking for openpty in -lc" >&5 - ac_lib_var=`echo c'_'openpty | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -2224,7 +2226,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-lc $LIBS" - cat > conftest.$ac_ext <<EOF --#line 2228 "configure" -+#line 2230 "configure" - #include "confdefs.h" - /* Override any gcc2 internal prototype to avoid an error. */ - /* We use char because int might match the return type of a gcc2 -@@ -2235,7 +2237,7 @@ - openpty() - ; return 0; } - EOF --if { (eval echo configure:2239: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:2241: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -2263,7 +2265,7 @@ - fi - - echo $ac_n "checking for gettext in -lc""... $ac_c" 1>&6 --echo "configure:2267: checking for gettext in -lc" >&5 -+echo "configure:2269: checking for gettext in -lc" >&5 - ac_lib_var=`echo c'_'gettext | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -2271,7 +2273,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-lc $LIBS" - cat > conftest.$ac_ext <<EOF --#line 2275 "configure" -+#line 2277 "configure" - #include "confdefs.h" - /* Override any gcc2 internal prototype to avoid an error. */ - /* We use char because int might match the return type of a gcc2 -@@ -2282,7 +2284,7 @@ - gettext() - ; return 0; } - EOF --if { (eval echo configure:2286: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:2288: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -2310,7 +2312,7 @@ - fi - - echo $ac_n "checking for accept in -lsocket""... $ac_c" 1>&6 --echo "configure:2314: checking for accept in -lsocket" >&5 -+echo "configure:2316: checking for accept in -lsocket" >&5 - ac_lib_var=`echo socket'_'accept | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -2318,7 +2320,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-lsocket $LIBS" - cat > conftest.$ac_ext <<EOF --#line 2322 "configure" -+#line 2324 "configure" - #include "confdefs.h" - /* Override any gcc2 internal prototype to avoid an error. */ - /* We use char because int might match the return type of a gcc2 -@@ -2329,7 +2331,7 @@ - accept() - ; return 0; } - EOF --if { (eval echo configure:2333: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:2335: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -2357,7 +2359,7 @@ - fi - - echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 --echo "configure:2361: checking for gethostbyname in -lnsl" >&5 -+echo "configure:2363: checking for gethostbyname in -lnsl" >&5 - ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -2365,7 +2367,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-lnsl $LIBS" - cat > conftest.$ac_ext <<EOF --#line 2369 "configure" -+#line 2371 "configure" - #include "confdefs.h" - /* Override any gcc2 internal prototype to avoid an error. */ - /* We use char because int might match the return type of a gcc2 -@@ -2376,7 +2378,7 @@ - gethostbyname() - ; return 0; } - EOF --if { (eval echo configure:2380: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:2382: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -2404,7 +2406,7 @@ - fi - - echo $ac_n "checking for openpty in -lutil""... $ac_c" 1>&6 --echo "configure:2408: checking for openpty in -lutil" >&5 -+echo "configure:2410: checking for openpty in -lutil" >&5 - ac_lib_var=`echo util'_'openpty | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -2412,7 +2414,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-lutil $LIBS" - cat > conftest.$ac_ext <<EOF --#line 2416 "configure" -+#line 2418 "configure" - #include "confdefs.h" - /* Override any gcc2 internal prototype to avoid an error. */ - /* We use char because int might match the return type of a gcc2 -@@ -2423,7 +2425,7 @@ - openpty() - ; return 0; } - EOF --if { (eval echo configure:2427: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:2429: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -2451,7 +2453,7 @@ +@@ -958,7 +958,7 @@ esac + else + echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 + fi +- cd "$ac_popdir" ++ cd $ac_popdir + done fi - echo $ac_n "checking for gettext in -lintl""... $ac_c" 1>&6 --echo "configure:2455: checking for gettext in -lintl" >&5 -+echo "configure:2457: checking for gettext in -lintl" >&5 - ac_lib_var=`echo intl'_'gettext | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -2459,7 +2461,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-lintl $LIBS" - cat > conftest.$ac_ext <<EOF --#line 2463 "configure" -+#line 2465 "configure" - #include "confdefs.h" - /* Override any gcc2 internal prototype to avoid an error. */ - /* We use char because int might match the return type of a gcc2 -@@ -2470,7 +2472,7 @@ - gettext() - ; return 0; } - EOF --if { (eval echo configure:2474: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:2476: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -2534,7 +2536,7 @@ +@@ -2301,7 +2301,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" ++ || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -2359,7 +2360,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" ++ || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -2475,7 +2477,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" ++ || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -2529,7 +2532,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" ++ || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -2574,7 +2578,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" ++ || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -2618,7 +2623,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" ++ || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -3107,7 +3113,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" ++ || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -3167,7 +3174,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" ++ || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -3309,7 +3317,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" ++ || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -3625,7 +3634,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" ++ || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -3795,7 +3805,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" ++ || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -3862,7 +3873,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" ++ || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -4011,7 +4023,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" ++ || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -4160,7 +4173,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" ++ || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -4309,7 +4323,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" ++ || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -4458,7 +4473,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" ++ || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -4606,7 +4622,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" ++ || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -4671,7 +4688,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" ++ || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -4736,7 +4754,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" ++ || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -4801,7 +4820,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" ++ || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -4866,7 +4886,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" ++ || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -4971,7 +4992,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" ++ || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -5024,7 +5046,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" ++ || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -5101,7 +5124,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" ++ || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -5174,7 +5198,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" ++ || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -5247,7 +5272,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" ++ || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -5320,7 +5346,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" ++ || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -5393,7 +5420,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" ++ || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -5466,7 +5494,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" ++ || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -5539,7 +5568,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" ++ || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -5612,7 +5642,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" ++ || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -5683,7 +5714,7 @@ fi if test "$ac_cv_header_libintl_h" = yes; then if test "$ac_cv_lib_c_gettext" = no; then if test "$ac_cv_lib_intl_gettext" = yes; then @@ -945,47 +330,28 @@ $NetBSD: patch-ab,v 1.3 2003/09/17 19:37:12 cube Exp $ else echo "Have libintl.h but no usable gettext!" 1>&2 exit 1 -@@ -2590,25 +2592,35 @@ - fi - - --if test "$BSDUSER_PPP" = "yes"; then -- cat >> confdefs.h <<\EOF --#define PPP_BINARY "/usr/sbin/ppp" -+# Check whether --with-pppd or --without-pppd was given. -+if test "${with_pppd+set}" = set; then -+ withval="$with_pppd" -+ cat >> confdefs.h <<EOF -+#define PPP_BINARY "$withval" - EOF - - else -- if test "$SLIRP" = "yes"; then -- cat >> confdefs.h <<\EOF -+ if test "$BSDUSER_PPP" = "yes"; then -+ cat >> confdefs.h <<\EOF -+#define PPP_BINARY "/usr/sbin/ppp" -+EOF -+ -+ else -+ if test "$SLIRP" = "yes"; then -+ cat >> confdefs.h <<\EOF - #define PPP_BINARY "/bin/slirp" - EOF - -- else -- cat >> confdefs.h <<\EOF -+ else -+ cat >> confdefs.h <<\EOF - #define PPP_BINARY "/usr/sbin/pppd" - EOF - +@@ -6712,6 +6743,11 @@ esac + *) ac_INSTALL=$ac_top_builddir$INSTALL ;; + esac + ++ if test x"$ac_file" != x-; then ++ { echo "$as_me:$LINENO: creating $ac_file" >&5 ++echo "$as_me: creating $ac_file" >&6;} ++ rm -f "$ac_file" ++ fi + # Let's still pretend it is `configure' which instantiates (i.e., don't + # use $as_me), people would be surprised to read: + # /* config.h. Generated by config.status. */ +@@ -6750,12 +6786,6 @@ echo "$as_me: error: cannot find input f + fi;; + esac + done` || { (exit 1); exit 1; } +- +- if test x"$ac_file" != x-; then +- { echo "$as_me:$LINENO: creating $ac_file" >&5 +-echo "$as_me: creating $ac_file" >&6;} +- rm -f "$ac_file" - fi -+ fi -+ fi - fi - -+ - if test "$SLIRP" = "yes"; then - if test "$PPPD_IP_ALLOC" = "yes"; then - true + _ACEOF + cat >>$CONFIG_STATUS <<_ACEOF + sed "$ac_vpsub diff --git a/net/poptop/patches/patch-ad b/net/poptop/patches/patch-ad new file mode 100644 index 00000000000..33e226b59dd --- /dev/null +++ b/net/poptop/patches/patch-ad @@ -0,0 +1,13 @@ +$NetBSD: patch-ad,v 1.1 2005/01/01 06:26:41 cube Exp $ + +--- Makefile.am.orig 2004-06-23 11:48:50.000000000 +0200 ++++ Makefile.am +@@ -32,7 +32,7 @@ debian/po/POTFILES.in debian/po/fr.po de + debian/po/templates.pot + + EXTRA_PROGRAMS = +-sbin_PROGRAMS = pptpd pptpctrl bcrelay ++sbin_PROGRAMS = pptpd pptpctrl + + # Header files are only used to determine what to put in a distribution, not + # for dependencies, so just attribute them all to pptpd. diff --git a/net/poptop/patches/patch-ae b/net/poptop/patches/patch-ae new file mode 100644 index 00000000000..e82ca1db203 --- /dev/null +++ b/net/poptop/patches/patch-ae @@ -0,0 +1,53 @@ +$NetBSD: patch-ae,v 1.1 2005/01/01 06:26:41 cube Exp $ + +--- Makefile.in.orig 2004-12-30 19:56:10.000000000 +0100 ++++ Makefile.in +@@ -14,7 +14,7 @@ + + @SET_MAKE@ + +-SOURCES = $(bcrelay_SOURCES) $(pptpctrl_SOURCES) $(pptpd_SOURCES) ++SOURCES = $(pptpctrl_SOURCES) $(pptpd_SOURCES) + + srcdir = @srcdir@ + top_srcdir = @top_srcdir@ +@@ -37,7 +37,7 @@ NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : + EXTRA_PROGRAMS = +-sbin_PROGRAMS = pptpd$(EXEEXT) pptpctrl$(EXEEXT) bcrelay$(EXEEXT) ++sbin_PROGRAMS = pptpd$(EXEEXT) pptpctrl$(EXEEXT) + subdir = . + DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ + $(srcdir)/Makefile.in $(srcdir)/config.h.in \ +@@ -55,9 +55,6 @@ CONFIG_CLEAN_FILES = + am__installdirs = "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(man5dir)" "$(DESTDIR)$(man8dir)" + sbinPROGRAMS_INSTALL = $(INSTALL_PROGRAM) + PROGRAMS = $(sbin_PROGRAMS) +-am_bcrelay_OBJECTS = bcrelay.$(OBJEXT) +-bcrelay_OBJECTS = $(am_bcrelay_OBJECTS) +-bcrelay_LDADD = $(LDADD) + am_pptpctrl_OBJECTS = pptpctrl.$(OBJEXT) ctrlpacket.$(OBJEXT) \ + inststr.$(OBJEXT) compat.$(OBJEXT) pptpgre.$(OBJEXT) \ + ppphdlc.$(OBJEXT) +@@ -76,8 +73,8 @@ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUD + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) + CCLD = $(CC) + LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +-SOURCES = $(bcrelay_SOURCES) $(pptpctrl_SOURCES) $(pptpd_SOURCES) +-DIST_SOURCES = $(bcrelay_SOURCES) $(pptpctrl_SOURCES) $(pptpd_SOURCES) ++SOURCES = $(pptpctrl_SOURCES) $(pptpd_SOURCES) ++DIST_SOURCES = $(pptpctrl_SOURCES) $(pptpd_SOURCES) + man5dir = $(mandir)/man5 + man8dir = $(mandir)/man8 + NROFF = nroff +@@ -285,9 +282,6 @@ uninstall-sbinPROGRAMS: + + clean-sbinPROGRAMS: + -test -z "$(sbin_PROGRAMS)" || rm -f $(sbin_PROGRAMS) +-bcrelay$(EXEEXT): $(bcrelay_OBJECTS) $(bcrelay_DEPENDENCIES) +- @rm -f bcrelay$(EXEEXT) +- $(LINK) $(bcrelay_LDFLAGS) $(bcrelay_OBJECTS) $(bcrelay_LDADD) $(LIBS) + pptpctrl$(EXEEXT): $(pptpctrl_OBJECTS) $(pptpctrl_DEPENDENCIES) + @rm -f pptpctrl$(EXEEXT) + $(LINK) $(pptpctrl_LDFLAGS) $(pptpctrl_OBJECTS) $(pptpctrl_LDADD) $(LIBS) diff --git a/net/poptop/patches/patch-af b/net/poptop/patches/patch-af new file mode 100644 index 00000000000..a7aa2173f28 --- /dev/null +++ b/net/poptop/patches/patch-af @@ -0,0 +1,13 @@ +$NetBSD: patch-af,v 1.1 2005/01/01 06:26:41 cube Exp $ + +--- pptpd.8.orig 2004-05-24 11:39:03.000000000 +0200 ++++ pptpd.8 +@@ -29,7 +29,7 @@ network interface should be relayed to t + specifies the configuration file for + .B pptpd + (default +-.IR /etc/pptpd.conf ) ++.IR @@PKGSYSCONFDIR@@/pptpd.conf ) + + .TP + .BR -d | --debug diff --git a/net/poptop/patches/patch-ag b/net/poptop/patches/patch-ag new file mode 100644 index 00000000000..6e67caeafca --- /dev/null +++ b/net/poptop/patches/patch-ag @@ -0,0 +1,13 @@ +$NetBSD: patch-ag,v 1.1 2005/01/01 06:26:41 cube Exp $ + +--- defaults.h.orig 2004-04-28 13:36:07.000000000 +0200 ++++ defaults.h +@@ -45,7 +45,7 @@ + #if EMBED + #define PPTPD_CONFIG_FILE_DEFAULT "/etc/config/pptpd.conf" + #else +-#define PPTPD_CONFIG_FILE_DEFAULT "/etc/pptpd.conf" ++#define PPTPD_CONFIG_FILE_DEFAULT "@@PKGSYSCONFDIR@@/pptpd.conf" + #endif + #define PIDFILE_DEFAULT "/var/run/pptpd.pid" + diff --git a/net/poptop/patches/patch-ah b/net/poptop/patches/patch-ah new file mode 100644 index 00000000000..acf9850cb2d --- /dev/null +++ b/net/poptop/patches/patch-ah @@ -0,0 +1,13 @@ +$NetBSD: patch-ah,v 1.1 2005/01/01 06:26:41 cube Exp $ + +--- pptpd.conf.5.orig 2004-05-24 11:31:24.000000000 +0200 ++++ pptpd.conf.5 +@@ -5,7 +5,7 @@ + .SH DESCRIPTION + .BR pptpd (8) + reads options from this file, usually +-.IR /etc/pptpd.conf . ++.IR @@PKGSYSCONFDIR@@/pptpd.conf . + Most options can be overridden by the command line. The local and + remote IP addresses for clients must come from the configuration file + or from |