[Vtun-Commit] CVS: The file 'vtun/configure.in' has been modified.

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

The following file was modified in vtun:

Name            Old version     New version       Comment
----            -----------     -----------       -------
configure.in    1.10.2.12.2.5   1.10.2.12.2.5.2.1=20

The accompanying log:

Check for Liblzo2 and use that when available (rfe1602625)


The diff of the modified file(s):

--- configure.in	16 Nov 2006 04:02:54 -0000	1.10.2.12.2.5
+++ configure.in	11 Dec 2006 01:41:46 -0000	1.10.2.12.2.5.2.1
@@ -2,7 +2,7 @@
 dnl VTun - Virtual Tunnel over TCP/IP network.
 dnl Copyright (C) 1998-2005  Maxim Krasnyansky <ma...@ya...>
 dnl
-dnl $Id$
+dnl configure.in,v 1.10.2.12.2.5 2006/11/16 04:02:54 mtbishop Exp
 dnl
 dnl Process this file with autoconf to produce a configure script.
 dnl
@@ -119,20 +119,40 @@
    )
 fi
=20
+dnl very servicable code borrowed heavily from openvpn.
 if test "$LZO" =3D "yes"; then
+   LZOCHK=3D""
    AC_MSG_RESULT()
    AC_CHECKING( for LZO Library and Header files ... )
+   AC_SEARCH_HEADERS(lzo_asm.h,
+	$LZO_HDR_DIR /usr/include/lzo "" /usr/local/include,
+	LZOCHK=3D"lzo2 lzo",
    AC_SEARCH_HEADERS(lzo1x.h,=20
 	$LZO_HDR_DIR /usr/include/lzo "" /usr/local/include,
-        AC_CHECK_LIB(lzo, lzo1x_decompress,
+		LZOCHK=3D"lzo",
+		AC_MSG_ERROR( LZO library not found. )
+		)
+	)
+
+   if test -n "$LZOCHK"; then
+      havelzo=3D0;
+      for I in $LZOCHK ; do
+         if test $havelzo =3D 0; then
+	    AC_CHECK_LIB($I, lzo1x_decompress,
 	    [
-	       LIBS=3D"$LIBS -llzo"
+	          LIBS=3D"$LIBS -l"$I
 	       AC_DEFINE(HAVE_LZO)
-	    ],
+	          havelzo=3D1
+	      ]
+	    )
+	 fi
+      done
+      if test $havelzo =3D 0; then
 	    AC_MSG_ERROR( LZO library not found. )
-	),
+      fi
+   else
         AC_MSG_ERROR( LZO headers not found. )
-   )
+   fi
 fi
=20
 if test "$SSL" =3D "yes"; then