[Vtun-Commit] CVS: 41 files have been modified in vtun.

[Bishop <mtb...@us...>]

The following files were modified in vtun:

Name            Old version     New version     Comment
----            -----------     -----------     -------
ChangeLog       1.14            1.15=20=20=20=20=20=20=20=20=20=20=20=20
Credits         1.10            1.11=20=20=20=20=20=20=20=20=20=20=20=20
FAQ             1.6             1.7=20=20=20=20=20=20=20=20=20=20=20=20=20
Makefile.in     1.10            1.11=20=20=20=20=20=20=20=20=20=20=20=20
README          1.4             1.5=20=20=20=20=20=20=20=20=20=20=20=20=20
README.LZO      1.1             1.2=20=20=20=20=20=20=20=20=20=20=20=20=20
TODO            1.3             1.4=20=20=20=20=20=20=20=20=20=20=20=20=20
aclocal.m4      1.4             1.5=20=20=20=20=20=20=20=20=20=20=20=20=20
auth.c          1.8             1.9=20=20=20=20=20=20=20=20=20=20=20=20=20
auth.h          1.2             1.3=20=20=20=20=20=20=20=20=20=20=20=20=20
cfg_file.l      1.3             1.4=20=20=20=20=20=20=20=20=20=20=20=20=20
cfg_file.y      1.7             1.8=20=20=20=20=20=20=20=20=20=20=20=20=20
cfg_kwords.h    1.5             1.6=20=20=20=20=20=20=20=20=20=20=20=20=20
client.c        1.10            1.11=20=20=20=20=20=20=20=20=20=20=20=20
compat.h        1.2             1.3=20=20=20=20=20=20=20=20=20=20=20=20=20
config.h.in     1.4             1.5=20=20=20=20=20=20=20=20=20=20=20=20=20
configure       1.11            1.12=20=20=20=20=20=20=20=20=20=20=20=20
configure.in    1.18            1.19=20=20=20=20=20=20=20=20=20=20=20=20
driver.h        1.3             1.4=20=20=20=20=20=20=20=20=20=20=20=20=20
lfd_encrypt.c   1.10            1.11=20=20=20=20=20=20=20=20=20=20=20=20
lfd_lzo.c       1.4             1.5=20=20=20=20=20=20=20=20=20=20=20=20=20
lfd_shaper.c    1.6             1.7=20=20=20=20=20=20=20=20=20=20=20=20=20
lfd_zlib.c      1.4             1.5=20=20=20=20=20=20=20=20=20=20=20=20=20
lib.c           1.8             1.9=20=20=20=20=20=20=20=20=20=20=20=20=20
lib.h           1.6             1.7=20=20=20=20=20=20=20=20=20=20=20=20=20
linkfd.c        1.12            1.13=20=20=20=20=20=20=20=20=20=20=20=20
linkfd.h        1.3             1.4=20=20=20=20=20=20=20=20=20=20=20=20=20
llist.c         1.2             1.3=20=20=20=20=20=20=20=20=20=20=20=20=20
llist.h         1.2             1.3=20=20=20=20=20=20=20=20=20=20=20=20=20
lock.c          1.5             1.6=20=20=20=20=20=20=20=20=20=20=20=20=20
lock.h          1.2             1.3=20=20=20=20=20=20=20=20=20=20=20=20=20
main.c          1.8             1.9=20=20=20=20=20=20=20=20=20=20=20=20=20
netlib.c        1.10            1.11=20=20=20=20=20=20=20=20=20=20=20=20
netlib.h        1.4             1.5=20=20=20=20=20=20=20=20=20=20=20=20=20
server.c        1.8             1.9=20=20=20=20=20=20=20=20=20=20=20=20=20
tunnel.c        1.13            1.14=20=20=20=20=20=20=20=20=20=20=20=20
vtun.h          1.11            1.12=20=20=20=20=20=20=20=20=20=20=20=20
vtun_socks.h    1.2             1.3=20=20=20=20=20=20=20=20=20=20=20=20=20
vtund.8         1.5             1.6=20=20=20=20=20=20=20=20=20=20=20=20=20
vtund.conf      1.3             1.4=20=20=20=20=20=20=20=20=20=20=20=20=20
vtund.conf.5    1.3             1.4=20=20=20=20=20=20=20=20=20=20=20=20=20

The accompanying log:

Merging 3.0 devel back into HEAD


The diff of the modified file(s):

--- ChangeLog	19 Jan 2002 07:43:08 -0000	1.14
+++ ChangeLog	11 Dec 2006 07:55:06 -0000	1.15
@@ -1,3 +1,60 @@
+
+3.0.0:
+	Configure looks for liblzo2 when available. (bc)
+=09
+3.0.0-pre2:
+	obsoleted linux/tap_dev (mjt)
+	fixed Bug#1062819 - multi killold parsing bug (dpf)=09
+	changed rpm macros to support '--with socks' syntax (bc)
+	changed rpm macros to support '--without lzo' syntax (bc)
+	reworked rpm macro matrix for various distros (bc)
+	started on UNSUPPORTED rpmbuild option (bc)
+	Fixed Bug#1176343 SIGINT kills foreground server process (bc)
+	Added RFE#936523 Bind VTun Server to Specific Interface (bc)
+	Completely Rewrote the Bind To Specific Interface (alan grow)
+=09
+3.0.0-pre1:
+	Implementation of Nickolai 'kolya' Zeldovich's mlockall() patch	(bc)
+	Some cleanup with respect to SSL on Apple (dpf)
+	Added upper time bound to packet-based resync to reduce resync
+	delay (dpf)
+	Added xinetd prototype file for vtund (bc)
+	added missing --with-blowfish-headers=3DDIR option (Daniel Macks)
+=09
+3.0.0-pre0:
+	Added multiple cipher support. (dpf)
+	Added multiple cipher modes support. (dpf)
+	Added support for different sized keys. (dpf)
+	Re-sync ciphers when using non-ECB modes over a UDP
+	connection. (dpf)
+	Fixed Bug#908824 (persist=3Dkeep not re-applying routes) (dpf)
+
+ver 2.6:
+	No changes;  just renumber.
+=09
+ver 2.5.3:
+	$DESTDIR in makefile for packaging glee (PLD)
+	Tighter code in generic/pty_dev.c where available (PLD)
+	Various spec file improvements from (PLD)
+=09
+ver 2.5.2:
+	Configure fixes, to ensure vtun will build under Mac OS/X (Kurt Werle)
+	exclude <rand.h> #inclusion under OS/X
+
+ver 2.5.1:
+	Cleanups, reformat code, Automake improvements (Greg)
+
+	Improvement of Special SuSE init files (Willems Luc)
+	Spec file improvements and testing under SuSE (Willems Luc)
+	PLD build patch from Arkadiusz Miskiewicz
+
+	re-execute up-commands on re-up under persist-keep (David Kimdon, Leo Ber=
golth)
+	prevent reentering syslog in signal handlers (Leo Bergolth)
+	fd leak in tunnel.c (David Kimdon, Leo Bergolth)
+	fix configure wrt openSSL and SASL to pick correct MD5.h (Leo Bergolth)
+	prevent closing non-existant stat file (Edan Ayal)
+	minor packaging improvements (Bishop Clark)
+
 ver 2.5:
 	 New config option to keep tun device always open
 	 iproute support
--- Credits	22 Jan 2002 09:14:49 -0000	1.10
+++ Credits	11 Dec 2006 07:55:06 -0000	1.11
@@ -3,7 +3,7 @@
 A lot of thanks to the following people for their suggestions and=20
 contributions:
=20
-Gayaneh Krasnyanskaya(my wife:))) <ga...@ya...>=20
+Gayaneh Krasnyanskaya(Max's Wife) <ga...@ya...>=20
 	Initial Web site creation. And a lot of other help :)))=20=20
=20
 Alex Korenkov <al...@uz...>=20
@@ -13,8 +13,10 @@
 	Testing, bug reports, suggestions.
=20
 Dag Wieers <da...@mi...>
-	RPM packager specification file. RedHat startup script.=20
-	Several bug reports. SOCKS support suggestions.
+	Initial RPM packager specification file.=20
+	RedHat startup script.=20
+	Several bug reports.=20
+	SOCKS support suggestions.
=20
 Ted Rolle <te...@ac...>=20
 	Spelling fixes.
@@ -47,7 +49,9 @@
 	Solaris patches.  Suggestions.
=20
 Hurricane Floyd <fl...@hu...>=20
-	I had several vacations.
+	Max had several vacations.
+	Bishop had no power or water, and was able
+	   to experience the Third World.
 	:)))))))))))))))))))
=20
 James B. MacLean <mac...@Tr...>=20
@@ -119,3 +123,17 @@
=20
 Willems Luc <wil...@pa...>
 	Initial SuSE packaging.  Testing.
+
+Nickolai Zeldovich <nic...@cs...>
+	mlockall() support to prevent VM collapse.
+
+Dale Fountain <dpf...@fo...>
+	Added multiple cipher support.
+	Added multiple cipher modes support.
+	Added support for different sized keys.
+	Re-sync ciphers when using non-ECB modes over a UDP connection.
+	Fixed Bug#908824 (persist=3Dkeep not re-applying routes)
+
+Alan Grow <agrow-at-thegotonerd.com>
+	Added a Listening Address/Interface (rfe936523)
+	Cleaned up the code around that portion of the config.
--- FAQ	28 Apr 2002 21:41:00 -0000	1.6
+++ FAQ	11 Dec 2006 07:55:06 -0000	1.7
@@ -13,7 +13,7 @@
=20
 1.3 Whom do I contact for support ?
 Please send your suggestions, questions and problem descriptions to
-VTun mailing list vtu...@li...
+VTun mailing list vt...@of...
=20
 1.4 Is VTun Y2K compliant?
 YES.
@@ -137,6 +137,9 @@
 ...
 home$ vtund home_tunnel_config localhost
=20
+1.24 Is it possible to establish a vtun link from a client behind NAT or a=
 firewall?
+Yes it is, but you need to use TCP protocol.
+
 2. Error Messages
 2.1 Why do I see no vtund log and error messages ?
 On several Unices, FreeBSD for example, syslog doesn't log message=20
@@ -172,7 +175,7 @@
 LZO support.
=20
 2.8 Why do I get "expecting WORD at line xxx" error message ?
-This usually means that you are using password that contain only
+This usually means that you are using a password that contain only
 numerical characters.
 VTun passwords must be alpha characters or a mixture of alpha and
 numerical characters.
--- Makefile.in	29 Apr 2002 14:03:15 -0000	1.10
+++ Makefile.in	11 Dec 2006 07:55:06 -0000	1.11
@@ -15,7 +15,7 @@
 #   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 #   GNU General Public License for more details.
 #
-#   Makefile.in,v 1.7 2001/09/20 06:26:41 talby Exp
+#   Makefile.in,v 1.6.2.4.2.1 2006/11/16 04:03:44 mtbishop Exp
 #=20=20
 CC =3D @CC@
 CFLAGS =3D @CFLAGS@ @CPPFLAGS@
@@ -27,9 +27,9 @@
 LEX =3D @LEX@
 LEXFLAGS =3D -t=20
=20
-DESTDIR =3D
-
 INSTALL =3D @INSTALL@
+INSTALL_OWNER =3D -o root -g 0
+
 prefix =3D @prefix@
 exec_prefix =3D @exec_prefix@
=20
@@ -77,22 +77,24 @@
 	rm -f `cat vtun.drivers`=09
=20
 install_man:=20
-	$(INSTALL) -d -m 755 $(DESTDIR)$(MAN_DIR)/man8
-	$(INSTALL) -m 644 vtund.8 $(DESTDIR)$(MAN_DIR)/man8
-	$(INSTALL) -d -m 755 $(DESTDIR)$(MAN_DIR)/man5
-	$(INSTALL) -m 644 vtund.conf.5 $(DESTDIR)$(MAN_DIR)/man5
+	$(INSTALL) -d -m 755 $(INSTALL_OWNER) $(DESTDIR)$(MAN_DIR)/man8
+	$(INSTALL) -m 644 $(INSTALL_OWNER) vtund.8 $(DESTDIR)$(MAN_DIR)/man8
+	$(INSTALL) -d -m 755 $(INSTALL_OWNER) $(DESTDIR)$(MAN_DIR)/man5
+	$(INSTALL) -m 644 $(INSTALL_OWNER) vtund.conf.5 $(DESTDIR)$(MAN_DIR)/man5
+	rm -f $(DESTDIR)$(MAN_DIR)/man8/vtun.8=20
+	ln -s vtund.8 $(DESTDIR)$(MAN_DIR)/man8/vtun.8=20
=20
 install_config:=20
-	$(INSTALL) -d -m 755 $(DESTDIR)$(ETC_DIR)
+	$(INSTALL) -d -m 755 $(INSTALL_OWNER) $(DESTDIR)$(ETC_DIR)
 	if [ ! -f $(ETC_DIR)/vtund.conf ]; then \
-	  $(INSTALL) -m 600 vtund.conf $(DESTDIR)$(ETC_DIR); \
+	  $(INSTALL) -m 600 $(INSTALL_OWNER) vtund.conf $(DESTDIR)$(ETC_DIR); \
 	fi
=20
 install: vtund install_config install_man
-	$(INSTALL) -d -m 755 $(DESTDIR)$(VAR_DIR)/run
-	$(INSTALL) -d -m 755 $(DESTDIR)$(STAT_DIR)
-	$(INSTALL) -d -m 755 $(DESTDIR)$(LOCK_DIR)
-	$(INSTALL) -d -m 755 $(DESTDIR)$(SBIN_DIR)
-	$(INSTALL) -m 755 vtund $(DESTDIR)$(SBIN_DIR)
+	$(INSTALL) -d -m 755 $(INSTALL_OWNER) $(DESTDIR)$(VAR_DIR)/run
+	$(INSTALL) -d -m 755 $(INSTALL_OWNER) $(DESTDIR)$(STAT_DIR)
+	$(INSTALL) -d -m 755 $(INSTALL_OWNER) $(DESTDIR)$(LOCK_DIR)
+	$(INSTALL) -d -m 755 $(INSTALL_OWNER) $(DESTDIR)$(SBIN_DIR)
+	$(INSTALL) -m 755 $(INSTALL_OWNER) vtund $(DESTDIR)$(SBIN_DIR)
=20
 # DO NOT DELETE THIS LINE -- make depend depends on it.
--- README	28 Apr 2002 21:41:00 -0000	1.4
+++ README	11 Dec 2006 07:55:06 -0000	1.5
@@ -1,11 +1,11 @@
 VTun - Virtual Tunnel over TCP/IP network.
-Copyright (C) 1998-2000 Maxim Krasnyansky <ma...@ya...>
+Copyright (C) 1998-2004 Maxim Krasnyansky <ma...@ya...>
=20
 This product includes software developed by the OpenSSL Project
 for use in the OpenSSL Toolkit. (http://www.openssl.org/).
-Copyright (c) 1998-2000 The OpenSSL Project.  All rights reserved.
+Copyright (c) 1998-2004 The OpenSSL Project.  All rights reserved.
=20
-Compilation and Installation.
+Compilation and Installation:
=20
 In order to compile VTun you need several software packages.
 Required packages:=20
@@ -16,8 +16,8 @@
   - OpenSSL encryption library 	http://www.openssl.org=20
=20
 Optional packages:
-  - Zlib compression library
-  - LZO compression library 	http://wildsau.idv.uni-linz.ac.at/mfx/lzo.html
+  - Zlib compression library	http://www.gzip.org/zlib/
+  - LZO compression library 	http://www.oberhumer.com/opensource/lzo/
   - SOCKS library:
 	 Socks5 by NEC (recommended)	http://www.socks.nec.com=20
 	 Dante Socks4/5 	http://www.inet.no/dante=20
@@ -30,9 +30,9 @@
   --disable-shaper  	compile without Traffic shaping support
   --enable-socks 	compile with SOCKS support
=20
-Configure automatically searches for all required library and header files=
.=20
-However you might need to specify location of the files which could not be=
=20
-found in default location:
+Configure automatically searches for all required library and header
+files.  However you might need to specify location of the files which
+could not be found in default location:
   SSL(Crypto) library:
   --with-ssl-lib=3D/path/to/library (libcrypto.a)=20
   --with-ssl-headers=3D/path/to/headers (md5.h blowfish.h)
@@ -47,15 +47,16 @@
 To compile and install run:
   make install
=20
-Read manual page for 'vtund' and example of the config file for the=20
-configuration and other details.
+Read manual page for 'vtund' and the config file example for
+configuration and other suggestions.
=20
-VTun has the mailing lists vtu...@li... and
-vtu...@li...
-To receive information about the mailing lists and how to subscribe
-please visit http://vtun.sourceforge.net/mlist.html
+VTun has the mailing list vtu...@li...
+To receive information about mailing list and how to subscribe to it,
+send an e-mail to vtu...@li... with the
+word 'help' in the Subject.
=20
 If you have any suggestions, ideas, wishes send them to=20
 vtu...@li...
=20=20
-Maxim Krasnyansky <ma...@ya...>=20
+Vtun (c) Maxim Krasnyansky
+Maintained loosely by Bishop Clark <bi...@pl...>
--- TODO	28 Apr 2002 21:41:00 -0000	1.3
+++ TODO	11 Dec 2006 07:55:06 -0000	1.4
@@ -1,6 +1,7 @@
 See TODO list for 3.X development branch.
=20
 Comments, suggestion, wishes and if possible patches are always welcome.
-Send them to vtu...@li...
+Send them to vtu...@li... .
+
+Bishop Clark <bi...@pl...>
=20
-Maxim Krasnyansky <ma...@ya...>.
--- auth.c	16 Dec 2002 21:58:07 -0000	1.8
+++ auth.c	11 Dec 2006 07:55:06 -0000	1.9
@@ -17,7 +17,7 @@
  */
=20
 /*
- * auth.c,v 1.3 2001/09/20 06:26:41 talby Exp
+ * auth.c,v 1.2.2.7.2.3 2006/11/16 04:02:33 mtbishop Exp
  */
=20
 /*
@@ -61,14 +61,9 @@
 /* Encryption and Decryption of the challenge key */
 #ifdef HAVE_SSL
=20
-#ifndef __APPLE_CC__
 #include <openssl/md5.h>
 #include <openssl/blowfish.h>
 #include <openssl/rand.h>
-#else /* YAY - We're MAC OS */
-#include <sys/md5.h>
-#include <crypto/blowfish.h>
-#endif  /* __APPLE_CC__ */
=20
 void gen_chal(char *buf)
 {
@@ -178,7 +173,7 @@
 		*(ptr++) =3D 'K';
=20
 	if (host->flags & VTUN_ENCRYPT)
-		*(ptr++) =3D 'E';
+	ptr +=3D sprintf(ptr,"E%d", host->cipher);
=20
 	strcat(ptr, ">");
=20
@@ -220,27 +215,28 @@
 				host->flags |=3D VTUN_KEEP_ALIVE;
 				break;
 			case 'C':
-				if ((s =3D strtol(ptr, &p, 10)) =3D=3D ERANGE
-				    || ptr =3D=3D p)
+		if((s =3D strtol(ptr,&p,10)) =3D=3D ERANGE || ptr =3D=3D p)=20
 					return 0;
 				host->flags |=3D VTUN_ZLIB;
 				host->zlevel =3D s;
 				ptr =3D p;
 				break;
 			case 'L':
-				if ((s =3D strtol(ptr, &p, 10)) =3D=3D ERANGE
-				    || ptr =3D=3D p)
+		if((s =3D strtol(ptr,&p,10)) =3D=3D ERANGE || ptr =3D=3D p)=20
 					return 0;
 				host->flags |=3D VTUN_LZO;
 				host->zlevel =3D s;
 				ptr =3D p;
 				break;
 			case 'E':
+		if((s =3D strtol(ptr,&p,10)) =3D=3D ERANGE || ptr =3D=3D p)=20
+		   return 0;
 				host->flags |=3D VTUN_ENCRYPT;
+		host->cipher =3D s;=20
+		ptr =3D p;
 				break;
 			case 'S':
-				if ((s =3D strtol(ptr, &p, 10)) =3D=3D ERANGE
-				    || ptr =3D=3D p)
+		if((s =3D strtol(ptr,&p,10)) =3D=3D ERANGE || ptr =3D=3D p)=20
 					return 0;
 				if (s) {
 					host->flags |=3D VTUN_SHAPE;
@@ -330,8 +326,7 @@
 				host =3D strdup(str2);
=20
 				gen_chal(chal_req);
-				print_p(fd, "OK CHAL: %s\n",
-					cl2cs(chal_req));
+		   print_p(fd,"OK CHAL: %s\n", cl2cs(chal_req));
=20
 				stage =3D ST_CHAL;
 				continue;
@@ -347,8 +342,7 @@
=20
 				decrypt_chal(chal_res, h->passwd);
=20
-				if (!memcmp
-				    (chal_req, chal_res, VTUN_CHAL_SIZE)) {
+		   if( !memcmp(chal_req, chal_res, VTUN_CHAL_SIZE) ){
 					/* Auth successeful. */
=20
 					/* Lock host */
@@ -357,8 +351,7 @@
 						h =3D NULL;
 						break;
 					}
-					print_p(fd, "OK FLAGS: %s\n",
-						bf2cf(h));
+		      print_p(fd,"OK FLAGS: %s\n", bf2cf(h));=20
 				} else
 					h =3D NULL;
 			}
--- auth.h	22 Jan 2002 09:52:59 -0000	1.2
+++ auth.h	11 Dec 2006 07:55:06 -0000	1.3
@@ -17,7 +17,7 @@
  */
=20
 /*
- * auth.h,v 1.1.1.2 2000/03/28 17:19:39 maxk Exp
+ * auth.h,v 1.1.1.2.6.1 2006/11/16 04:02:36 mtbishop Exp
  */
=20
 #define VTUN_CHAL_SIZE	 16
--- cfg_file.l	29 Apr 2002 08:38:34 -0000	1.3
+++ cfg_file.l	11 Dec 2006 07:55:06 -0000	1.4
@@ -18,7 +18,7 @@
  */
=20
 /*
- * cfg_file.l,v 1.2 2001/09/20 06:26:41 talby Exp
+ * cfg_file.l,v 1.1.1.2.2.1.2.2 2006/11/16 04:02:39 mtbishop Exp
  */=20
=20
 #include "config.h"
@@ -187,7 +187,7 @@
 int find_keyword(struct kword *kw, char *str)
 {
     while( kw->str ){
-	if( !strncmp(str,kw->str,5) )
+	if( !strncmp(str,kw->str,20) )
 	   return kw->type;
 	kw++;
     }
--- cfg_file.y	25 Aug 2002 04:19:03 -0000	1.7
+++ cfg_file.y	11 Dec 2006 07:55:06 -0000	1.8
@@ -18,7 +18,7 @@
  */
=20
 /*
- * cfg_file.y,v 1.3 2002/01/05 01:23:39 noop Exp
+ * cfg_file.y,v 1.1.1.2.2.13.2.4 2006/11/16 04:02:42 mtbishop Exp
  */=20
=20
 #include "config.h"
@@ -69,13 +69,13 @@
    int  num;
    struct { int num1; int num2; } dnum;
 }
-%expect 36
+%expect 20
=20
-%token K_OPTIONS K_DEFAULT K_PORT K_PERSIST K_TIMEOUT
+%token K_OPTIONS K_DEFAULT K_PORT K_BINDADDR K_PERSIST K_TIMEOUT
 %token K_PASSWD K_PROG K_PPP K_SPEED K_IFCFG K_FWALL K_ROUTE K_DEVICE=20
 %token K_MULTI K_SRCADDR K_IFACE K_ADDR
 %token K_TYPE K_PROT K_COMPRESS K_ENCRYPT K_KALIVE K_STAT
-%token K_LINKUP K_LINKDOWN K_IFUP K_IFDOWN K_SYSLOG K_IPROUTE
+%token K_UP K_DOWN K_SYSLOG K_IPROUTE
=20
 %token <str> K_HOST K_ERROR
 %token <str> WORD PATH STRING
@@ -111,10 +111,9 @@
 		  /* Copy local address */
 		  copy_addr(parse_host, &default_host);
=20
-		  llist_copy(&default_host.linkup,&parse_host->linkup,cp_cmd,NULL);
-		  llist_copy(&default_host.linkdown,&parse_host->linkdown,cp_cmd,NULL);
-		  llist_copy(&default_host.ifup,&parse_host->ifup,cp_cmd,NULL);
-		  llist_copy(&default_host.ifdown,&parse_host->ifdown,cp_cmd,NULL);
+		  llist_copy(&default_host.up,&parse_host->up,cp_cmd,NULL);
+		  llist_copy(&default_host.down,&parse_host->down,cp_cmd,NULL);
+
 		}=20=20=20=20
     '{' host_options '}'
 		{
@@ -143,8 +142,15 @@
 /* Don't override command line options */
 option:  '\n'
   | K_PORT NUM 		{=20
-			  if(vtun.svr_port =3D=3D -1)
-			     vtun.svr_port =3D $2;
+			  if(vtun.bind_addr.port =3D=3D -1)
+			     vtun.bind_addr.port =3D $2;
+			}=20
+
+  | K_BINDADDR '{' bindaddr_option '}'
+
+  | K_IFACE STRING	{=20
+			  if(vtun.svr_addr =3D=3D -1)
+			    vtun.svr_addr =3D strdup($2);
 			}=20
=20
   | K_TYPE NUM 		{=20
@@ -190,6 +196,28 @@
 			}
   ;
=20
+bindaddr_option:=20
+  K_ADDR WORD		{
+			  vtun.bind_addr.name =3D strdup($2);
+			  vtun.bind_addr.type =3D VTUN_ADDR_NAME;
+			}
+
+  | K_IFACE WORD	{
+			  vtun.bind_addr.name =3D strdup($2);
+			  vtun.bind_addr.type =3D VTUN_ADDR_IFACE;
+			}
+
+  | K_IFACE STRING	{
+			  vtun.bind_addr.name =3D strdup($2);
+			  vtun.bind_addr.type =3D VTUN_ADDR_IFACE;
+			}
+
+  | K_ERROR		{
+			  cfg_error("Unknown option '%s'",$1);
+			  YYABORT;
+			}
+  ;
+
 syslog_opt:
   NUM 			{
                           vtun.syslog =3D $1;
@@ -257,9 +285,10 @@
 			compress
=20
   | K_ENCRYPT NUM 	{=20=20
-			  if( $2 )
+			  if( $2 ){
 			     parse_host->flags |=3D VTUN_ENCRYPT;
-			  else
+			     parse_host->cipher =3D $2;
+			  } else
 			     parse_host->flags &=3D ~VTUN_ENCRYPT;
 			}
=20
@@ -294,27 +323,16 @@
=20
   | K_SRCADDR 		'{' srcaddr_options '}'
=20
-  | K_LINKUP 	        {=20
-			  parse_cmds =3D &parse_host->linkup;=20
-    			  llist_free(parse_cmds, free_cmd, NULL);=20=20=20
- 			} '{' command_options '}'=20
-
-  | K_LINKDOWN 	        {=20
-			  parse_cmds =3D &parse_host->linkdown;=20
-   			  llist_free(parse_cmds, free_cmd, NULL);=20=20=20
-			} '{' command_options '}'=20
-
-  | K_IFUP 	        {=20
-			  parse_cmds =3D &parse_host->ifup;=20
+  | K_UP 	        {=20
+			  parse_cmds =3D &parse_host->up;=20
    			  llist_free(parse_cmds, free_cmd, NULL);=20=20=20
 			} '{' command_options '}'=20
=20
-  | K_IFDOWN 	        {=20
-			  parse_cmds =3D &parse_host->ifdown;=20
+  | K_DOWN 	        {=20
+			  parse_cmds =3D &parse_host->down;=20
     			  llist_free(parse_cmds, free_cmd, NULL);=20=20=20
  			} '{' command_options '}'=20
=20
-
   | K_ERROR		{
 			  cfg_error("Unknown option '%s'",$1);
 			  YYABORT;
@@ -547,10 +565,8 @@
    free(h->host);=20=20=20
    free(h->passwd);=20=20=20
=20=20=20=20
-   llist_free(&h->linkup, free_cmd, NULL);=20=20=20
-   llist_free(&h->linkdown, free_cmd, NULL);
-   llist_free(&h->ifup, free_cmd, NULL);=20=20=20
-   llist_free(&h->ifdown, free_cmd, NULL);
+   llist_free(&h->up, free_cmd, NULL);=20=20=20
+   llist_free(&h->down, free_cmd, NULL);
=20
    free_addr(h);
=20=20
--- cfg_kwords.h	29 Apr 2002 08:38:34 -0000	1.5
+++ cfg_kwords.h	11 Dec 2006 07:55:06 -0000	1.6
@@ -17,7 +17,7 @@
  */
=20
 /*
- * cfg_kwords.h,v 1.3 2002/01/05 01:23:39 noop Exp
+ * cfg_kwords.h,v 1.1.1.1.2.3.2.8 2006/11/16 04:02:45 mtbishop Exp
  */
=20
 extern int lineno;
@@ -30,21 +30,19 @@
 struct kword cfg_keyword[] =3D {
 	{"options", K_OPTIONS},
 	{"default", K_DEFAULT},
-	{ "linkup", K_LINKUP },
-	{ "linkdown", K_LINKDOWN },
-	{ "ifup", K_IFUP },
-	{ "ifdown", K_IFDOWN },
-	{ "up",	K_LINKUP },
-	{ "down", K_LINKDOWN },
+   { "up",	 K_UP },
+   { "down",	 K_DOWN },
 	{"port", K_PORT},
 	{"srcaddr", K_SRCADDR},
 	{"addr", K_ADDR},
 	{"iface", K_IFACE},
+   { "bindaddr", K_BINDADDR },
 	{"persist", K_PERSIST},
 	{"multi", K_MULTI},
 	{"iface", K_IFACE},
 	{"timeout", K_TIMEOUT},
 	{"passwd", K_PASSWD},
+   { "password", K_PASSWD },=20
 	{"program", K_PROG},
 	{"speed", K_SPEED},
 	{"compress", K_COMPRESS},
@@ -84,5 +82,21 @@
 	{"inetd", VTUN_INETD},
 	{"stand", VTUN_STAND_ALONE},
 	{"keep", VTUN_PERSIST_KEEPIF},
+   { "blowfish128ecb", VTUN_ENC_BF128ECB },
+   { "blowfish128cbc", VTUN_ENC_BF128CBC },
+   { "blowfish128cfb", VTUN_ENC_BF128CFB },
+   { "blowfish128ofb", VTUN_ENC_BF128OFB },
+   { "blowfish256ecb", VTUN_ENC_BF256ECB },
+   { "blowfish256cbc", VTUN_ENC_BF256CBC },
+   { "blowfish256cfb", VTUN_ENC_BF256CFB },
+   { "blowfish256ofb", VTUN_ENC_BF256OFB },
+   { "aes128ecb",      VTUN_ENC_AES128ECB },
+   { "aes128cbc",      VTUN_ENC_AES128CBC },
+   { "aes128cfb",      VTUN_ENC_AES128CFB },
+   { "aes128ofb",      VTUN_ENC_AES128OFB },
+   { "aes256ecb",      VTUN_ENC_AES256ECB },
+   { "aes256cbc",      VTUN_ENC_AES256CBC },
+   { "aes256cfb",      VTUN_ENC_AES256CFB },
+   { "aes256ofb",      VTUN_ENC_AES256OFB },
 	{NULL, 0}
 };
--- client.c	29 Apr 2002 17:58:14 -0000	1.10
+++ client.c	11 Dec 2006 07:55:06 -0000	1.11
@@ -17,7 +17,7 @@
  */
=20
 /*
- * client.c,v 1.7 2002/01/05 01:23:39 noop Exp
+ * client.c,v 1.5.2.8.2.1 2006/11/16 04:02:48 mtbishop Exp
  */
=20
 #include "config.h"
@@ -73,8 +73,7 @@
 	sigaction(SIGTERM, &sa, NULL);
 	sigaction(SIGINT, &sa, NULL);
=20
-	client_term =3D 0;
-	reconnect =3D 0;
+     client_term =3D 0; reconnect =3D 0;
 	while ((!client_term) || (client_term =3D=3D VTUN_SIG_HUP)) {
 		if (reconnect && (client_term !=3D VTUN_SIG_HUP)) {
 			if (vtun.persist || host->persist) {
@@ -126,29 +125,24 @@
=20
 		io_init();
=20
-		set_title("%s connecting to %s", host->host,
-			  vtun.svr_name);
+	set_title("%s connecting to %s", host->host, vtun.svr_name);
 		vtun_syslog(LOG_INFO, "Connecting to %s", vtun.svr_name);
=20
-		if (connect_t
-		    (s, (struct sockaddr *) &svr_addr, host->timeout)) {
-			vtun_syslog(LOG_INFO, "Connect to %s failed. %s(%d)",
-				    vtun.svr_name, strerror(errno), errno);
+        if( connect_t(s,(struct sockaddr *) &svr_addr, host->timeout) ){
+	   vtun_syslog(LOG_INFO,"Connect to %s failed. %s(%d)", vtun.svr_name,
+					strerror(errno), errno);
 		} else {
 			if (auth_client(s, host)) {
-				vtun_syslog(LOG_INFO, "Session %s[%s] opened",
-					    host->host, vtun.svr_name);
+	      vtun_syslog(LOG_INFO,"Session %s[%s] opened",host->host,vtun.svr_na=
me);
=20
 				host->rmt_fd =3D s;
=20
 				/* Start the tunnel */
 				client_term =3D tunnel(host);
=20
-				vtun_syslog(LOG_INFO, "Session %s[%s] closed",
-					    host->host, vtun.svr_name);
+	      vtun_syslog(LOG_INFO,"Session %s[%s] closed",host->host,vtun.svr_na=
me);
 			} else {
-			  vtun_syslog(LOG_INFO, "Connection denied by %s",
-				      vtun.svr_name);
+	      vtun_syslog(LOG_INFO,"Connection denied by %s",vtun.svr_name);
 			}
 		}
 		close(s);
--- compat.h	22 Jan 2002 09:52:59 -0000	1.2
+++ compat.h	11 Dec 2006 07:55:06 -0000	1.3
@@ -17,7 +17,7 @@
  */
=20
 /*
- * compat.h,v 1.1.1.2 2000/03/28 17:19:39 maxk Exp
+ * compat.h,v 1.1.1.2.6.1 2006/11/16 04:02:51 mtbishop Exp
  */
 #ifndef _VTUN_COMPAT_H
 #define _VTUN_COMPAT_H
--- config.h.in	20 Sep 2001 06:26:41 -0000	1.4
+++ config.h.in	11 Dec 2006 07:55:06 -0000	1.5
@@ -62,6 +62,12 @@
 /* Define if you have OpenSSL */
 #undef HAVE_SSL
=20
+#undef HAVE_SSL_BLOWFISH
+
+#undef HAVE_SSL_AES
+
+#undef HAVE_SSL_EVP
+
 #undef HAVE_SHAPER
=20
 /* Release version and date */
--- configure	25 Aug 2002 07:03:01 -0000	1.11
+++ configure	11 Dec 2006 07:55:06 -0000	1.12
@@ -1,48 +1,325 @@
 #! /bin/sh
-
 # Guess values for system-dependent variables and create Makefiles.
-# Generated automatically using autoconf version 2.13=20
-# Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
+# Generated by GNU Autoconf 2.59.
 #
+# Copyright (C) 2003 Free Software Foundation, Inc.
 # This configure script is free software; the Free Software Foundation
 # gives unlimited permission to copy, distribute and modify it.
+## --------------------- ##
+## M4sh Initialization.  ##
+## --------------------- ##
=20
-# Defaults:
-ac_help=3D
+# Be Bourne compatible
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+  emulate sh
+  NULLCMD=3D:
+  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '${1+"$@"}'=3D'"$@"'
+elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
+  set -o posix
+fi
+DUALCASE=3D1; export DUALCASE # for MKS sh
+
+# Support unset when possible.
+if ( (MAIL=3D60; unset MAIL) || exit) >/dev/null 2>&1; then
+  as_unset=3Dunset
+else
+  as_unset=3Dfalse
+fi
+
+
+# Work around bugs in pre-3.0 UWIN ksh.
+$as_unset ENV MAIL MAILPATH
+PS1=3D'$ '
+PS2=3D'> '
+PS4=3D'+ '
+
+# NLS nuisances.
+for as_var in \
+  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
+  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
+  LC_TELEPHONE LC_TIME
+do
+  if (set +x; test -z "`(eval $as_var=3DC; export $as_var) 2>&1`"); then
+    eval $as_var=3DC; export $as_var
+  else
+    $as_unset $as_var
+  fi
+done
+
+# Required to use basename.
+if expr a : '\(a\)' >/dev/null 2>&1; then
+  as_expr=3Dexpr
+else
+  as_expr=3Dfalse
+fi
+
+if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" =3D "X/"; then
+  as_basename=3Dbasename
+else
+  as_basename=3Dfalse
+fi
+
+
+# Name of the executable.
+as_me=3D`$as_basename "$0" ||
+$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
+	 X"$0" : 'X\(//\)$' \| \
+	 X"$0" : 'X\(/\)$' \| \
+	 .     : '\(.\)' 2>/dev/null ||
+echo X/"$0" |
+    sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
+  	  /^X\/\(\/\/\)$/{ s//\1/; q; }
+  	  /^X\/\(\/\).*/{ s//\1/; q; }
+  	  s/.*/./; q'`
+
+
+# PATH needs CR, and LINENO needs CR and PATH.
+# Avoid depending upon Character Ranges.
+as_cr_letters=3D'abcdefghijklmnopqrstuvwxyz'
+as_cr_LETTERS=3D'ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+as_cr_Letters=3D$as_cr_letters$as_cr_LETTERS
+as_cr_digits=3D'0123456789'
+as_cr_alnum=3D$as_cr_Letters$as_cr_digits
+
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" !=3D set; then
+  echo "#! /bin/sh" >conf$$.sh
+  echo  "exit 0"   >>conf$$.sh
+  chmod +x conf$$.sh
+  if (PATH=3D"/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
+    PATH_SEPARATOR=3D';'
+  else
+    PATH_SEPARATOR=3D:
+  fi
+  rm -f conf$$.sh
+fi
+
+
+  as_lineno_1=3D$LINENO
+  as_lineno_2=3D$LINENO
+  as_lineno_3=3D`(expr $as_lineno_1 + 1) 2>/dev/null`
+  test "x$as_lineno_1" !=3D "x$as_lineno_2" &&
+  test "x$as_lineno_3"  =3D "x$as_lineno_2"  || {
+  # Find who we are.  Look in the path if we contain no path at all
+  # relative or not.
+  case $0 in
+    *[\\/]* ) as_myself=3D$0 ;;
+    *) as_save_IFS=3D$IFS; IFS=3D$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=3D$as_save_IFS
+  test -z "$as_dir" && as_dir=3D.
+  test -r "$as_dir/$0" && as_myself=3D$as_dir/$0 && break
+done
+
+       ;;
+  esac
+  # We did not find ourselves, most probably we were run as `sh COMMAND'
+  # in which case we are not to be found in the path.
+  if test "x$as_myself" =3D x; then
+    as_myself=3D$0
+  fi
+  if test ! -f "$as_myself"; then
+    { echo "$as_me: error: cannot find myself; rerun with an absolute path=
" >&2
+   { (exit 1); exit 1; }; }
+  fi
+  case $CONFIG_SHELL in
+  '')
+    as_save_IFS=3D$IFS; IFS=3D$PATH_SEPARATOR
+for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
+do
+  IFS=3D$as_save_IFS
+  test -z "$as_dir" && as_dir=3D.
+  for as_base in sh bash ksh sh5; do
+	 case $as_dir in
+	 /*)
+	   if ("$as_dir/$as_base" -c '
+  as_lineno_1=3D$LINENO
+  as_lineno_2=3D$LINENO
+  as_lineno_3=3D`(expr $as_lineno_1 + 1) 2>/dev/null`
+  test "x$as_lineno_1" !=3D "x$as_lineno_2" &&
+  test "x$as_lineno_3"  =3D "x$as_lineno_2" ') 2>/dev/null; then
+	     $as_unset BASH_ENV || test "${BASH_ENV+set}" !=3D set || { BASH_ENV=
=3D; export BASH_ENV; }
+	     $as_unset ENV || test "${ENV+set}" !=3D set || { ENV=3D; export ENV;=
 }
+	     CONFIG_SHELL=3D$as_dir/$as_base
+	     export CONFIG_SHELL
+	     exec "$CONFIG_SHELL" "$0" ${1+"$@"}
+	   fi;;
+	 esac
+       done
+done
+;;
+  esac
+
+  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
+  # uniformly replaced by the line number.  The first 'sed' inserts a
+  # line-number line before each line; the second 'sed' does the real
+  # work.  The second script uses 'N' to pair each line-number line
+  # with the numbered line, and appends trailing '-' during
+  # substitution so that $LINENO is not a special case at line end.
+  # (Raja R Harinath suggested sed '=3D', and Paul Eggert wrote the
+  # second 'sed' script.  Blame Lee E. McMahon for sed's syntax.  :-)
+  sed '=3D' <$as_myself |
+    sed '
+      N
+      s,$,-,
+      : loop
+      s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\=
1\3,
+      t loop
+      s,-$,,
+      s,^['$as_cr_digits']*\n,,
+    ' >$as_me.lineno &&
+  chmod +x $as_me.lineno ||
+    { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX=
 shell" >&2
+   { (exit 1); exit 1; }; }
+
+  # Don't try to exec as it changes $[0], causing all sort of problems
+  # (the dirname of $[0] is not the place where we might find the
+  # original and so on.  Autoconf is especially sensible to this).
+  . ./$as_me.lineno
+  # Exit status is that of the last command.
+  exit
+}
+
+
+case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
+  *c*,-n*) ECHO_N=3D ECHO_C=3D'
+' ECHO_T=3D'	' ;;
+  *c*,*  ) ECHO_N=3D-n ECHO_C=3D ECHO_T=3D ;;
+  *)       ECHO_N=3D ECHO_C=3D'\c' ECHO_T=3D ;;
+esac
+
+if expr a : '\(a\)' >/dev/null 2>&1; then
+  as_expr=3Dexpr
+else
+  as_expr=3Dfalse
+fi
+
+rm -f conf$$ conf$$.exe conf$$.file
+echo >conf$$.file
+if ln -s conf$$.file conf$$ 2>/dev/null; then
+  # We could just check for DJGPP; but this test a) works b) is more gener=
ic
+  # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
+  if test -f conf$$.exe; then
+    # Don't use ln at all; we don't have any links
+    as_ln_s=3D'cp -p'
+  else
+    as_ln_s=3D'ln -s'
+  fi
+elif ln conf$$.file conf$$ 2>/dev/null; then
+  as_ln_s=3Dln
+else
+  as_ln_s=3D'cp -p'
+fi
+rm -f conf$$ conf$$.exe conf$$.file
+
+if mkdir -p . 2>/dev/null; then
+  as_mkdir_p=3D:
+else
+  test -d ./-p && rmdir ./-p
+  as_mkdir_p=3Dfalse
+fi
+
+as_executable_p=3D"test -f"
+
+# Sed expression to map a string onto a valid CPP name.
+as_tr_cpp=3D"eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnu=
m]%_%g'"
+
+# Sed expression to map a string onto a valid variable name.
+as_tr_sh=3D"eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
+
+
+# IFS
+# We need space, tab and new line, in precisely that order.
+as_nl=3D'
+'
+IFS=3D" 	$as_nl"
+
+# CDPATH.
+$as_unset CDPATH
+
+
+# Name of the host.
+# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
+# so uname gets run too.
+ac_hostname=3D`(hostname || uname -n) 2>/dev/null | sed 1q`
+
+exec 6>&1
+
+#
+# Initializations.
+#
 ac_default_prefix=3D/usr/local
-# Any additions from configure.in:
-ac_help=3D"$ac_help
---disable-shaper    	   Don not compile shaper module"
-ac_help=3D"$ac_help
---disable-ssl     	   Don not compile encryption module"
-ac_help=3D"$ac_help
---disable-zlib     	   Don not compile ZLIB compression module"
-ac_help=3D"$ac_help
---disable-lzo     	   Don not compile LZO compression module"
-ac_help=3D"$ac_help
---enable-socks     	   Compile with SOCKS support"
-ac_help=3D"$ac_help
---with-ssl-headers=3DDIR  Crypto Include files location"
-ac_help=3D"$ac_help
---with-ssl-headers=3DDIR  Crypto Include files location"
-ac_help=3D"$ac_help
---with-ssl-lib=3DDIR      Crypto Library location"
-ac_help=3D"$ac_help
---with-lzo-headers=3DDIR     LZO Include files location"
-ac_help=3D"$ac_help
---with-lzo-lib=3DDIR         LZO Library location"
-ac_help=3D"$ac_help
---with-socks-lib=3DDIR         SOCKS Library location"
+ac_config_libobj_dir=3D.
+cross_compiling=3Dno
+subdirs=3D
+MFLAGS=3D
+MAKEFLAGS=3D
+SHELL=3D${CONFIG_SHELL-/bin/sh}
+
+# Maximum number of lines to put in a shell here document.
+# This variable seems obsolete.  It should probably be removed, and
+# only ac_max_sed_lines should be used.
+: ${ac_max_here_lines=3D38}
+
+# Identity of this package.
+PACKAGE_NAME=3D
+PACKAGE_TARNAME=3D
+PACKAGE_VERSION=3D
+PACKAGE_STRING=3D
+PACKAGE_BUGREPORT=3D
+
+ac_unique_file=3D"lib.c"
+# Factoring default headers for most tests.
+ac_includes_default=3D"\
+#include <stdio.h>
+#if HAVE_SYS_TYPES_H
+# include <sys/types.h>
+#endif
+#if HAVE_SYS_STAT_H
+# include <sys/stat.h>
+#endif
+#if STDC_HEADERS
+# include <stdlib.h>
+# include <stddef.h>
+#else
+# if HAVE_STDLIB_H
+#  include <stdlib.h>
+# endif
+#endif
+#if HAVE_STRING_H
+# if !STDC_HEADERS && HAVE_MEMORY_H
+#  include <memory.h>
+# endif
+# include <string.h>
+#endif
+#if HAVE_STRINGS_H
+# include <strings.h>
+#endif
+#if HAVE_INTTYPES_H
+# include <inttypes.h>
+#else
+# if HAVE_STDINT_H
+#  include <stdint.h>
+# endif
+#endif
+#if HAVE_UNISTD_H
+# include <unistd.h>
+#endif"
+
+ac_subst_vars=3D'SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE=
_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transf=
orm_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir locals=
tatedir libdir includedir oldincludedir infodir mandir build_alias host_ali=
as target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor=
 build_os host host_cpu host_vendor host_os target target_cpu target_vendor=
 target_os YACC LEX CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT LEXLI=
B LEX_OUTPUT_ROOT INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CPP EGREP LIB=
OBJS LTLIBOBJS'
+ac_subst_files=3D''
=20
 # Initialize some variables set by options.
+ac_init_help=3D
+ac_init_version=3Dfalse
 # The variables have the same names as the options, with
 # dashes changed to underlines.
-build=3DNONE
-cache_file=3D./config.cache
+cache_file=3D/dev/null
 exec_prefix=3DNONE
-host=3DNONE
 no_create=3D
-nonopt=3DNONE
 no_recursion=3D
 prefix=3DNONE
 program_prefix=3DNONE
@@ -51,10 +328,15 @@
 silent=3D
 site=3D
 srcdir=3D
-target=3DNONE
 verbose=3D
 x_includes=3DNONE
 x_libraries=3DNONE
+
+# Installation directory options.
+# These are left unexpanded so users can "make install exec_prefix=3D/foo"
+# and all the variables that are supposed to be based on exec_prefix
+# by default will actually change.
+# Use braces instead of parens because sh, perl, etc. also accept them.
 bindir=3D'${exec_prefix}/bin'
 sbindir=3D'${exec_prefix}/sbin'
 libexecdir=3D'${exec_prefix}/libexec'
@@ -68,17 +350,9 @@
 infodir=3D'${prefix}/info'
 mandir=3D'${prefix}/man'
=20
-# Initialize some other variables.
-subdirs=3D
-MFLAGS=3D MAKEFLAGS=3D
-SHELL=3D${CONFIG_SHELL-/bin/sh}
-# Maximum number of lines to put in a shell here document.
-ac_max_here_lines=3D12
-
 ac_prev=3D
 for ac_option
 do
-
   # If the previous option needs an argument, assign it.
   if test -n "$ac_prev"; then
     eval "$ac_prev=3D\$ac_option"
@@ -86,59 +360,59 @@
     continue
   fi
=20
-  case "$ac_option" in
-  -*=3D*) ac_optarg=3D`echo "$ac_option" | sed 's/[-_a-zA-Z0-9]*=3D//'` ;;
-  *) ac_optarg=3D ;;
-  esac
+  ac_optarg=3D`expr "x$ac_option" : 'x[^=3D]*=3D\(.*\)'`
=20
   # Accept the important Cygnus configure options, so we can diagnose typo=
s.
=20
-  case "$ac_option" in
+  case $ac_option in
=20
   -bindir | --bindir | --bindi | --bind | --bin | --bi)
     ac_prev=3Dbindir ;;
   -bindir=3D* | --bindir=3D* | --bindi=3D* | --bind=3D* | --bin=3D* | --bi=
=3D*)
-    bindir=3D"$ac_optarg" ;;
+    bindir=3D$ac_optarg ;;
=20
   -build | --build | --buil | --bui | --bu)
-    ac_prev=3Dbuild ;;
+    ac_prev=3Dbuild_alias ;;
   -build=3D* | --build=3D* | --buil=3D* | --bui=3D* | --bu=3D*)
-    build=3D"$ac_optarg" ;;
+    build_alias=3D$ac_optarg ;;
=20
   -cache-file | --cache-file | --cache-fil | --cache-fi \
   | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
     ac_prev=3Dcache_file ;;
   -cache-file=3D* | --cache-file=3D* | --cache-fil=3D* | --cache-fi=3D* \
   | --cache-f=3D* | --cache-=3D* | --cache=3D* | --cach=3D* | --cac=3D* | =
--ca=3D* | --c=3D*)
-    cache_file=3D"$ac_optarg" ;;
+    cache_file=3D$ac_optarg ;;
+
+  --config-cache | -C)
+    cache_file=3Dconfig.cache ;;
=20
   -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
     ac_prev=3Ddatadir ;;
   -datadir=3D* | --datadir=3D* | --datadi=3D* | --datad=3D* | --data=3D* |=
 --dat=3D* \
   | --da=3D*)
-    datadir=3D"$ac_optarg" ;;
+    datadir=3D$ac_optarg ;;
=20
   -disable-* | --disable-*)
-    ac_feature=3D`echo $ac_option|sed -e 's/-*disable-//'`
+    ac_feature=3D`expr "x$ac_option" : 'x-*disable-\(.*\)'`
     # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_feature| sed 's/[-a-zA-Z0-9_]//g'`"; then
-      { echo "configure: error: $ac_feature: invalid feature name" 1>&2; e=
xit 1; }
-    fi
+    expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
+      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
+   { (exit 1); exit 1; }; }
     ac_feature=3D`echo $ac_feature| sed 's/-/_/g'`
-    eval "enable_${ac_feature}=3Dno" ;;
+    eval "enable_$ac_feature=3Dno" ;;
=20
   -enable-* | --enable-*)
-    ac_feature=3D`echo $ac_option|sed -e 's/-*enable-//' -e 's/=3D.*//'`
+    ac_feature=3D`expr "x$ac_option" : 'x-*enable-\([^=3D]*\)'`
     # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_feature| sed 's/[-_a-zA-Z0-9]//g'`"; then
-      { echo "configure: error: $ac_feature: invalid feature name" 1>&2; e=
xit 1; }
-    fi
+    expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
+      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
+   { (exit 1); exit 1; }; }
     ac_feature=3D`echo $ac_feature| sed 's/-/_/g'`
-    case "$ac_option" in
-      *=3D*) ;;
+    case $ac_option in
+      *=3D*) ac_optarg=3D`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
       *) ac_optarg=3Dyes ;;
     esac
-    eval "enable_${ac_feature}=3D'$ac_optarg'" ;;
+    eval "enable_$ac_feature=3D'$ac_optarg'" ;;
=20
   -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
   | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
@@ -147,95 +421,47 @@
   -exec-prefix=3D* | --exec_prefix=3D* | --exec-prefix=3D* | --exec-prefi=
=3D* \
   | --exec-pref=3D* | --exec-pre=3D* | --exec-pr=3D* | --exec-p=3D* | --ex=
ec-=3D* \
   | --exec=3D* | --exe=3D* | --ex=3D*)
-    exec_prefix=3D"$ac_optarg" ;;
+    exec_prefix=3D$ac_optarg ;;
=20
   -gas | --gas | --ga | --g)
     # Obsolete; use --with-gas.
     with_gas=3Dyes ;;
=20
-  -help | --help | --hel | --he)
-    # Omit some internal or obsolete options to make the list less imposin=
g.
-    # This message is too long to be a string in the A/UX 3.1 sh.
-    cat << EOF
-Usage: configure [options] [host]
-Options: [defaults in brackets after descriptions]
-Configuration:
-  --cache-file=3DFILE       cache test results in FILE
-  --help                  print this message
-  --no-create             do not create output files
-  --quiet, --silent       do not print \`checking...' messages
-  --version               print the version of autoconf that created confi=
gure
-Directory and file names:
-  --prefix=3DPREFIX         install architecture-independent files in PREF=
IX
-                          [$ac_default_prefix]
-  --exec-prefix=3DEPREFIX   install architecture-dependent files in EPREFIX
-                          [same as prefix]
-  --bindir=3DDIR            user executables in DIR [EPREFIX/bin]
-  --sbindir=3DDIR           system admin executables in DIR [EPREFIX/sbin]
-  --libexecdir=3DDIR        program executables in DIR [EPREFIX/libexec]
-  --datadir=3DDIR           read-only architecture-independent data in DIR
-                          [PREFIX/share]
-  --sysconfdir=3DDIR        read-only single-machine data in DIR [PREFIX/e=
tc]
-  --sharedstatedir=3DDIR    modifiable architecture-independent data in DIR
-                          [PREFIX/com]
-  --localstatedir=3DDIR     modifiable single-machine data in DIR [PREFIX/=
var]
-  --libdir=3DDIR            object code libraries in DIR [EPREFIX/lib]
-  --includedir=3DDIR        C header files in DIR [PREFIX/include]
-  --oldincludedir=3DDIR     C header files for non-gcc in DIR [/usr/includ=
e]
-  --infodir=3DDIR           info documentation in DIR [PREFIX/info]
-  --mandir=3DDIR            man documentation in DIR [PREFIX/man]
-  --srcdir=3DDIR            find the sources in DIR [configure dir or ..]
-  --program-prefix=3DPREFIX prepend PREFIX to installed program names
-  --program-suffix=3DSUFFIX append SUFFIX to installed program names
-  --program-transform-name=3DPROGRAM
-                          run sed PROGRAM on installed program names
-EOF
-    cat << EOF
-Host type:
-  --build=3DBUILD           configure for building on BUILD [BUILD=3DHOST]
-  --host=3DHOST             configure for HOST [guessed]
-  --target=3DTARGET         configure for TARGET [TARGET=3DHOST]
-Features and packages:
-  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=
=3Dno)
-  --enable-FEATURE[=3DARG]  include FEATURE [ARG=3Dyes]
-  --with-PACKAGE[=3DARG]    use PACKAGE [ARG=3Dyes]
-  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=3Dno)
-  --x-includes=3DDIR        X include files are in DIR
-  --x-libraries=3DDIR       X library files are in DIR
-EOF
-    if test -n "$ac_help"; then
-      echo "--enable and --with options recognized:$ac_help"
-    fi
-    exit 0 ;;
+  -help | --help | --hel | --he | -h)
+    ac_init_help=3Dlong ;;
+  -help=3Dr* | --help=3Dr* | --hel=3Dr* | --he=3Dr* | -hr*)
+    ac_init_help=3Drecursive ;;
+  -help=3Ds* | --help=3Ds* | --hel=3Ds* | --he=3Ds* | -hs*)
+    ac_init_help=3Dshort ;;
=20
   -host | --host | --hos | --ho)
-    ac_prev=3Dhost ;;
+    ac_prev=3Dhost_alias ;;
   -host=3D* | --host=3D* | --hos=3D* | --ho=3D*)
-    host=3D"$ac_optarg" ;;
+    host_alias=3D$ac_optarg ;;
=20
   -includedir | --includedir | --includedi | --included | --include \
   | --includ | --inclu | --incl | --inc)
     ac_prev=3Dincludedir ;;
   -includedir=3D* | --includedir=3D* | --includedi=3D* | --included=3D* | =
--include=3D* \
   | --includ=3D* | --inclu=3D* | --incl=3D* | --inc=3D*)
-    includedir=3D"$ac_optarg" ;;
+    includedir=3D$ac_optarg ;;
=20
   -infodir | --infodir | --infodi | --infod | --info | --inf)
     ac_prev=3Dinfodir ;;
   -infodir=3D* | --infodir=3D* | --infodi=3D* | --infod=3D* | --info=3D* |=
 --inf=3D*)
-    infodir=3D"$ac_optarg" ;;
+    infodir=3D$ac_optarg ;;
=20
   -libdir | --libdir | --libdi | --libd)
     ac_prev=3Dlibdir ;;
   -libdir=3D* | --libdir=3D* | --libdi=3D* | --libd=3D*)
-    libdir=3D"$ac_optarg" ;;
+    libdir=3D$ac_optarg ;;
=20
   -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
   | --libexe | --libex | --libe)
     ac_prev=3Dlibexecdir ;;
   -libexecdir=3D* | --libexecdir=3D* | --libexecdi=3D* | --libexecd=3D* | =
--libexec=3D* \
   | --libexe=3D* | --libex=3D* | --libe=3D*)
-    libexecdir=3D"$ac_optarg" ;;
+    libexecdir=3D$ac_optarg ;;
=20
   -localstatedir | --localstatedir | --localstatedi | --localstated \
   | --localstate | --localstat | --localsta | --localst \
@@ -244,19 +470,19 @@
   -localstatedir=3D* | --localstatedir=3D* | --localstatedi=3D* | --locals=
tated=3D* \
   | --localstate=3D* | --localstat=3D* | --localsta=3D* | --localst=3D* \
   | --locals=3D* | --local=3D* | --loca=3D* | --loc=3D* | --lo=3D*)
-    localstatedir=3D"$ac_optarg" ;;
+    localstatedir=3D$ac_optarg ;;
=20
   -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
     ac_prev=3Dmandir ;;
   -mandir=3D* | --mandir=3D* | --mandi=3D* | --mand=3D* | --man=3D* | --ma=
=3D* | --m=3D*)
-    mandir=3D"$ac_optarg" ;;
+    mandir=3D$ac_optarg ;;
=20
   -nfp | --nfp | --nf)
     # Obsolete; use --without-fp.
     with_fp=3Dno ;;
=20
   -no-create | --no-create | --no-creat | --no-crea | --no-cre \
-  | --no-cr | --no-c)
+  | --no-cr | --no-c | -n)
     no_create=3Dyes ;;
=20
   -no-recursion | --no-recursion | --no-recursio | --no-recursi \
@@ -270,26 +496,26 @@
   -oldincludedir=3D* | --oldincludedir=3D* | --oldincludedi=3D* | --oldinc=
luded=3D* \
   | --oldinclude=3D* | --oldinclud=3D* | --oldinclu=3D* | --oldincl=3D* | =
--oldinc=3D* \
   | --oldin=3D* | --oldi=3D* | --old=3D* | --ol=3D* | --o=3D*)
-    oldincludedir=3D"$ac_optarg" ;;
+    oldincludedir=3D$ac_optarg ;;
=20
   -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
     ac_prev=3Dprefix ;;
   -prefix=3D* | --prefix=3D* | --prefi=3D* | --pref=3D* | --pre=3D* | --pr=
=3D* | --p=3D*)
-    prefix=3D"$ac_optarg" ;;
+    prefix=3D$ac_optarg ;;
=20
   -program-prefix | --program-prefix | --program-prefi | --program-pref \
   | --program-pre | --program-pr | --program-p)
     ac_prev=3Dprogram_prefix ;;
   -program-prefix=3D* | --program-prefix=3D* | --program-prefi=3D* \
   | --program-pref=3D* | --program-pre=3D* | --program-pr=3D* | --program-=
p=3D*)
-    program_prefix=3D"$ac_optarg" ;;
+    program_prefix=3D$ac_optarg ;;
=20
   -program-suffix | --program-suffix | --program-suffi | --program-suff \
   | --program-suf | --program-su | --program-s)
     ac_prev=3Dprogram_suffix ;;
   -program-suffix=3D* | --program-suffix=3D* | --program-suffi=3D* \
   | --program-suff=3D* | --program-suf=3D* | --program-su=3D* | --program-=
s=3D*)
-    program_suffix=3D"$ac_optarg" ;;
+    program_suffix=3D$ac_optarg ;;
=20
   -program-transform-name | --program-transform-name \
   | --program-transform-nam | --program-transform-na \
@@ -306,7 +532,7 @@
   | --program-transfo=3D* | --program-transf=3D* \
   | --program-trans=3D* | --program-tran=3D* \
   | --progr-tra=3D* | --program-tr=3D* | --program-t=3D*)
-    program_transform_name=3D"$ac_optarg" ;;
+    program_transform_name=3D$ac_optarg ;;
=20
   -q | -quiet | --quiet | --quie | --qui | --qu | --q \
   | -silent | --silent | --silen | --sile | --sil)
@@ -316,7 +542,7 @@
     ac_prev=3Dsbindir ;;
   -sbindir=3D* | --sbindir=3D* | --sbindi=3D* | --sbind=3D* | --sbin=3D* \
   | --sbi=3D* | --sb=3D*)
-    sbindir=3D"$ac_optarg" ;;
+    sbindir=3D$ac_optarg ;;
=20
   -sharedstatedir | --sharedstatedir | --sharedstatedi \
   | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
@@ -327,58 +553,57 @@
   | --sharedstated=3D* | --sharedstate=3D* | --sharedstat=3D* | --sharedst=
a=3D* \
   | --sharedst=3D* | --shareds=3D* | --shared=3D* | --share=3D* | --shar=
=3D* \
   | --sha=3D* | --sh=3D*)
-    sharedstatedir=3D"$ac_optarg" ;;
+    sharedstatedir=3D$ac_optarg ;;
=20
   -site | --site | --sit)
     ac_prev=3Dsite ;;
   -site=3D* | --site=3D* | --sit=3D*)
-    site=3D"$ac_optarg" ;;
+    site=3D$ac_optarg ;;
=20
   -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
     ac_prev=3Dsrcdir ;;
   -srcdir=3D* | --srcdir=3D* | --srcdi=3D* | --srcd=3D* | --src=3D* | --sr=
=3D*)
-    srcdir=3D"$ac_optarg" ;;
+    srcdir=3D$ac_optarg ;;
=20
   -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
   | --syscon | --sysco | --sysc | --sys | --sy)
     ac_prev=3Dsysconfdir ;;
   -sysconfdir=3D* | --sysconfdir=3D* | --sysconfdi=3D* | --sysconfd=3D* | =
--sysconf=3D* \
   | --syscon=3D* | --sysco=3D* | --sysc=3D* | --sys=3D* | --sy=3D*)
-    sysconfdir=3D"$ac_optarg" ;;
+    sysconfdir=3D$ac_optarg ;;
=20
   -target | --target | --targe | --targ | --tar | --ta | --t)
-    ac_prev=3Dtarget ;;
+    ac_prev=3Dtarget_alias ;;
   -target=3D* | --target=3D* | --targe=3D* | --targ=3D* | --tar=3D* | --ta=
=3D* | --t=3D*)
-    target=3D"$ac_optarg" ;;
+    target_alias=3D$ac_optarg ;;
=20
   -v | -verbose | --verbose | --verbos | --verbo | --verb)
     verbose=3Dyes ;;
=20
-  -version | --version | --versio | --versi | --vers)
-    echo "configure generated by autoconf version 2.13"
-    exit 0 ;;
+  -version | --version | --versio | --versi | --vers | -V)
+    ac_init_version=3D: ;;
=20
   -with-* | --with-*)
-    ac_package=3D`echo $ac_option|sed -e 's/-*with-//' -e 's/=3D.*//'`
+    ac_package=3D`expr "x$ac_option" : 'x-*with-\([^=3D]*\)'`
     # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_package| sed 's/[-_a-zA-Z0-9]//g'`"; then
-      { echo "configure: error: $ac_package: invalid package name" 1>&2; e=
xit 1; }
-    fi
+    expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
+      { echo "$as_me: error: invalid package name: $ac_package" >&2
+   { (exit 1); exit 1; }; }
     ac_package=3D`echo $ac_package| sed 's/-/_/g'`
-    case "$ac_option" in
-      *=3D*) ;;
+    case $ac_option in
+      *=3D*) ac_optarg=3D`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
       *) ac_optarg=3Dyes ;;
     esac
-    eval "with_${ac_package}=3D'$ac_optarg'" ;;
+    eval "with_$ac_package=3D'$ac_optarg'" ;;
=20
   -without-* | --without-*)
-    ac_package=3D`echo $ac_option|sed -e 's/-*without-//'`
+    ac_package=3D`expr "x$ac_option" : 'x-*without-\(.*\)'`
     # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_package| sed 's/[-a-zA-Z0-9_]//g'`"; then
-      { echo "configure: error: $ac_package: invalid package name" 1>&2; e=
xit 1; }
-    fi
+    expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
+      { echo "$as_me: error: invalid package name: $ac_package" >&2
+   { (exit 1); exit 1; }; }
     ac_package=3D`echo $ac_package| sed 's/-/_/g'`
-    eval "with_${ac_package}=3Dno" ;;
+    eval "with_$ac_package=3Dno" ;;
=20
   --x)
     # Obsolete; use --with-x.
@@ -389,99 +614,110 @@
     ac_prev=3Dx_includes ;;
   -x-includes=3D* | --x-includes=3D* | --x-include=3D* | --x-includ=3D* | =
--x-inclu=3D* \
   | --x-incl=3D* | --x-inc=3D* | --x-in=3D* | --x-i=3D*)
-    x_includes=3D"$ac_optarg" ;;
+    x_includes=3D$ac_optarg ;;
=20
   -x-libraries | --x-libraries | --x-librarie | --x-librari \
   | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
     ac_prev=3Dx_libraries ;;
   -x-libraries=3D* | --x-libraries=3D* | --x-librarie=3D* | --x-librari=3D=
* \
   | --x-librar=3D* | --x-libra=3D* | --x-libr=3D* | --x-lib=3D* | --x-li=
=3D* | --x-l=3D*)
-    x_libraries=3D"$ac_optarg" ;;
+    x_libraries=3D$ac_optarg ;;
=20
-  -*) { echo "configure: error: $ac_option: invalid option; use --help to =
show usage" 1>&2; exit 1; }
+  -*) { echo "$as_me: error: unrecognized option: $ac_option
+Try \`$0 --help' for more information." >&2
+   { (exit 1); exit 1; }; }
     ;;
=20
+  *=3D*)
+    ac_envvar=3D`expr "x$ac_option" : 'x\([^=3D]*\)=3D'`
+    # Reject names that are not valid shell variable names.
+    expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
+      { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
+   { (exit 1); exit 1; }; }
+    ac_optarg=3D`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`
+    eval "$ac_envvar=3D'$ac_optarg'"
+    export $ac_envvar ;;
+
   *)
-    if test -n "`echo $ac_option| sed 's/[-a-z0-9.]//g'`"; then
-      echo "configure: warning: $ac_option: invalid host type" 1>&2
-    fi
-    if test "x$nonopt" !=3D xNONE; then
-      { echo "configure: error: can only configure for one host and one ta=
rget at a time" 1>&2; exit 1; }
-    fi
-    nonopt=3D"$ac_option"
+    # FIXME: should be removed in autoconf 3.0.
+    echo "$as_me: WARNING: you should use --build, --host, --target" >&2
+    expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
+      echo "$as_me: WARNING: invalid host type: $ac_option" >&2
+    : ${build_alias=3D$ac_option} ${host_alias=3D$ac_option} ${target_alia=
s=3D$ac_option}
     ;;
=20
   esac
 done
=20
 if test -n "$ac_prev"; then
-  { echo "configure: error: missing argument to --`echo $ac_prev | sed 's/=
_/-/g'`" 1>&2; exit 1; }
-fi
-
-trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit =
1' 1 2 15
-
-# File descriptor usage:
-# 0 standard input
-# 1 file creation
-# 2 errors and warnings
-# 3 some systems may open it to /dev/tty
-# 4 used on the Kubota Titan
-# 6 checking for... messages and results
-# 5 compiler messages saved in config.log
-if test "$silent" =3D yes; then
-  exec 6>/dev/null
-else
-  exec 6>&1
+  ac_option=3D--`echo $ac_prev | sed 's/_/-/g'`
+  { echo "$as_me: error: missing argument to $ac_option" >&2
+   { (exit 1); exit 1; }; }
 fi
-exec 5>./config.log
=20
-echo "\
-This file contains any messages produced by compilers while
-running configure, to aid debugging if configure makes a mistake.
-" 1>&5
+# Be sure to have absolute paths.
+for ac_var in exec_prefix prefix
+do
+  eval ac_val=3D$`echo $ac_var`
+  case $ac_val in
+    [\\/$]* | ?:[\\/]* | NONE | '' ) ;;
+    *)  { echo "$as_me: error: expected an absolute directory name for --$=
ac_var: $ac_val" >&2
+   { (exit 1); exit 1; }; };;
+  esac
+done
=20
-# Strip out --no-create and --no-recursion so they do not pile up.
-# Also quote any args containing shell metacharacters.
-ac_configure_args=3D
-for ac_arg
+# Be sure to have absolute paths.
+for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \
+	      localstatedir libdir includedir oldincludedir infodir mandir
 do
-  case "$ac_arg" in
-  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
-  | --no-cr | --no-c) ;;
-  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
-  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) ;;
-  *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?]*)
-  ac_configure_args=3D"$ac_configure_args '$ac_arg'" ;;
-  *) ac_configure_args=3D"$ac_configure_args $ac_arg" ;;
+  eval ac_val=3D$`echo $ac_var`
+  case $ac_val in
+    [\\/$]* | ?:[\\/]* ) ;;
+    *)  { echo "$as_me: error: expected an absolute directory name for --$=
ac_var: $ac_val" >&2
+   { (exit 1); exit 1; }; };;
   esac
 done
=20
-# NLS nuisances.
-# Only set these to C if already set.  These must not be set unconditional=
ly
-# because not all systems understand e.g. LANG=3DC (notably SCO).
-# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `s=
et'!
-# Non-C LC_CTYPE values break the ctype check.
-if test "${LANG+set}"   =3D set; then LANG=3DC;   export LANG;   fi
-if test "${LC_ALL+set}" =3D set; then LC_ALL=3DC; export LC_ALL; fi
-if test "${LC_MESSAGES+set}" =3D set; then LC_MESSAGES=3DC; export LC_MESS=
AGES; fi
-if test "${LC_CTYPE+set}"    =3D set; then LC_CTYPE=3DC;    export LC_CTYP=
E;    fi
+# There might be people who depend on the old broken behavior: `$host'
+# used to hold the argument of --host etc.
+# FIXME: To remove some day.
+build=3D$build_alias
+host=3D$host_alias
+target=3D$target_alias
=20
-# confdefs.h avoids OS command line length limits that DEFS can exceed.
-rm -rf conftest* confdefs.h
-# AIX cpp loses on an empty file, so make sure it contains at least a newl=
ine.
-echo > confdefs.h
+# FIXME: To remove some day.
+if test "x$host_alias" !=3D x; then
+  if test "x$build_alias" =3D x; then
+    cross_compiling=3Dmaybe
+    echo "$as_me: WARNING: If you wanted to set the --build type, don't us=
e --host.
+    If a cross compiler is detected then cross compile mode will be used."=
 >&2
+  elif test "x$build_alias" !=3D "x$host_alias"; then
+    cross_compiling=3Dyes
+  fi
+fi
+
+ac_tool_prefix=3D
+test -n "$host_alias" && ac_tool_prefix=3D$host_alias-
+
+test "$silent" =3D yes && exec 6>/dev/null
=20
-# A filename unique to this package, relative to the directory that
-# configure is in, which we can look for to find out if srcdir is correct.
-ac_unique_file=3Dlib.c
=20
 # Find the source files, if location was not specified.
 if test -z "$srcdir"; then
   ac_srcdir_defaulted=3Dyes
   # Try the directory containing this script, then its parent.
-  ac_prog=3D$0
-  ac_confdir=3D`echo $ac_prog|sed 's%/[^/][^/]*$%%'`
-  test "x$ac_confdir" =3D "x$ac_prog" && ac_confdir=3D.
+  ac_confdir=3D`(dirname "$0") 2>/dev/null ||
+$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$0" : 'X\(//\)[^/]' \| \
+	 X"$0" : 'X\(//\)$' \| \
+	 X"$0" : 'X\(/\)' \| \
+	 .     : '\(.\)' 2>/dev/null ||
+echo X"$0" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+  	  /^X\(\/\/\)$/{ s//\1/; q; }
+  	  /^X\(\/\).*/{ s//\1/; q; }
+  	  s/.*/./; q'`
   srcdir=3D$ac_confdir
   if test ! -r $srcdir/$ac_unique_file; then
     srcdir=3D..
@@ -491,13 +727,478 @@
 fi
 if test ! -r $srcdir/$ac_unique_file; then
   if test "$ac_srcdir_defaulted" =3D yes; then
-    { echo "configure: error: can not find sources in $ac_confdir or .." 1=
>&2; exit 1; }
+    { echo "$as_me: error: cannot find sources ($ac_unique_file) in $ac_co=
nfdir or .." >&2
+   { (exit 1); exit 1; }; }
   else
-    { echo "configure: error: can not find sources in $srcdir" 1>&2; exit =
1; }
+    { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdi=
r" >&2
+   { (exit 1); exit 1; }; }
   fi
 fi
-srcdir=3D`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'`
+(cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null ||
+  { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does no=
t work" >&2
+   { (exit 1); exit 1; }; }
+srcdir=3D`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'`
+ac_env_build_alias_set=3D${build_alias+set}
+ac_env_build_alias_value=3D$build_alias
+ac_cv_env_build_alias_set=3D${build_alias+set}
+ac_cv_env_build_alias_value=3D$build_alias
+ac_env_host_alias_set=3D${host_alias+set}
+ac_env_host_alias_value=3D$host_alias
+ac_cv_env_host_alias_set=3D${host_alias+set}
+ac_cv_env_host_alias_value=3D$host_alias
+ac_env_target_alias_set=3D${target_alias+set}
+ac_env_target_alias_value=3D$target_alias
+ac_cv_env_target_alias_set=3D${target_alias+set}
+ac_cv_env_target_alias_value=3D$target_alias
+ac_env_CC_set=3D${CC+set}
+ac_env_CC_value=3D$CC
+ac_cv_env_CC_set=3D${CC+set}
+ac_cv_env_CC_value=3D$CC
+ac_env_CFLAGS_set=3D${CFLAGS+set}
+ac_env_CFLAGS_value=3D$CFLAGS
+ac_cv_env_CFLAGS_set=3D${CFLAGS+set}
+ac_cv_env_CFLAGS_value=3D$CFLAGS
+ac_env_LDFLAGS_set=3D${LDFLAGS+set}
+ac_env_LDFLAGS_value=3D$LDFLAGS
+ac_cv_env_LDFLAGS_set=3D${LDFLAGS+set}
+ac_cv_env_LDFLAGS_value=3D$LDFLAGS
+ac_env_CPPFLAGS_set=3D${CPPFLAGS+set}
+ac_env_CPPFLAGS_value=3D$CPPFLAGS
+ac_cv_env_CPPFLAGS_set=3D${CPPFLAGS+set}
+ac_cv_env_CPPFLAGS_value=3D$CPPFLAGS
+ac_env_CPP_set=3D${CPP+set}
+ac_env_CPP_value=3D$CPP
+ac_cv_env_CPP_set=3D${CPP+set}
+ac_cv_env_CPP_value=3D$CPP
+
+#
+# Report the --help message.
+#
+if test "$ac_init_help" =3D "long"; then
+  # Omit some internal or obsolete options to make the list less imposing.
+  # This message is too long to be a string in the A/UX 3.1 sh.
+  cat <<_ACEOF
+\`configure' configures this package to adapt to many kinds of systems.
+
+Usage: $0 [OPTION]... [VAR=3DVALUE]...
+
+To assign environment variables (e.g., CC, CFLAGS...), specify them as
+VAR=3DVALUE.  See below for descriptions of some of the useful variables.
+
+Defaults for the options are specified in brackets.
+
+Configuration:
+  -h, --help              display this help and ...
 
[truncated message content]