@@ -181,9 +181,6 @@ don't. */

 /* Define to 1 if you have the <lzo1x.h> header file. */

 #define HAVE_LZO1X_H 1

-/* Define to 1 if you have the <lzoutil.h> header file. */

-#define HAVE_LZOUTIL_H 1

-

 /* Define to 1 if you have the `mlockall' function. */

 #cmakedefine HAVE_MLOCKALL

@@ -1170,15 +1170,6 @@ if test "${have_lzo}" = "yes"; then

 	saved_CFLAGS="${CFLAGS}"

 	CFLAGS="${CFLAGS} ${LZO_CFLAGS}"

 	AC_CHECK_HEADERS(

-		[lzo/lzoutil.h],

-		,

-		[AC_CHECK_HEADERS(

-			[lzoutil.h],

-			,

-			[AC_MSG_ERROR([lzoutil.h is missing])]

-		)]

-	)

-	AC_CHECK_HEADERS(

 		[lzo/lzo1x.h],

 		,

 		[AC_CHECK_HEADERS(

@@ -107,14 +107,14 @@ lzo_compress_init(struct compress_context *compctx)

     {

         msg(M_FATAL, "Cannot initialize LZO compression library (lzo_init() returns %d)", lzo_status);

     }

-    compctx->wu.lzo.wmem = (lzo_voidp) lzo_malloc(compctx->wu.lzo.wmem_size);

+    compctx->wu.lzo.wmem = (lzo_voidp) malloc(compctx->wu.lzo.wmem_size);

     check_malloc_return(compctx->wu.lzo.wmem);

 }

 static void

 lzo_compress_uninit(struct compress_context *compctx)

 {

-    lzo_free(compctx->wu.lzo.wmem);

+    free(compctx->wu.lzo.wmem);

     compctx->wu.lzo.wmem = NULL;

 }

@@ -40,16 +40,11 @@

 #if defined(HAVE_LZO_CONF_H)

 /* The lzo.h magic gets confused and still wants

  * to include lzo/lzoconf.h even if our include paths

- * are setup to include the paths without lzo/ include lzoconf.h to

- * avoid it being include by lzoutil.h */

+ * are setup to include the paths without lzo/

+ */

 #include <lzodefs.h>

 #include <lzoconf.h>

 #endif

-#if defined(HAVE_LZO_LZOUTIL_H)

-#include <lzo/lzoutil.h>

-#elif defined(HAVE_LZOUTIL_H)

-#include <lzoutil.h>

-#endif

 #if defined(HAVE_LZO_LZO1X_H)

 #include <lzo/lzo1x.h>

 #elif defined(HAVE_LZO1X_H)