--- src/conf.h.orig	2007-05-31 07:44:50.000000000 +0200
+++ src/conf.h	2007-05-31 07:45:30.000000000 +0200
@@ -71,10 +71,7 @@
 #undef USE_MALLOC
 #if defined(WITH_LZO)
 #  define USE_MALLOC
-#  undef malloc
-#  undef free
-#  define malloc        lzo_malloc
-#  define free          lzo_free
+#include <stdlib.h>
 #else
 #  error
 #endif
--- configure.ac.orig	2007-05-31 07:25:34.000000000 +0200
+++ configure.ac	2007-05-31 07:28:38.000000000 +0200
@@ -67,10 +67,10 @@
 
 AC_CHECK_HEADERS(lzoconf.h lzo1x.h,,AC_MSG_ERROR([LZO header file not found. Please check your installation or set the environment variable \`CPPFLAGS'.]))
 
-AC_CHECK_LIB(lzo,__lzo_init2,,AC_MSG_ERROR([LZO library not found. Please check your installation or set the environment variable \`LDFLAGS'.]))
+AC_CHECK_LIB(lzo2,__lzo_init_v2,,AC_MSG_ERROR([LZO library not found. Please check your installation or set the environment variable \`LDFLAGS'.]))
 
-AC_CHECK_LIB(lzo,lzo1x_decompress_asm_fast,AC_DEFINE(LZO_USE_ASM_1,1,[Use asm.]))
-AC_CHECK_LIB(lzo,_lzo1x_decompress_asm_fast,AC_DEFINE(LZO_USE_ASM_2,1,[Use asm.]))
+AC_CHECK_LIB(lzo2,lzo1x_decompress_asm_fast,AC_DEFINE(LZO_USE_ASM_1,1,[Use asm.]))
+AC_CHECK_LIB(lzo2,_lzo1x_decompress_asm_fast,AC_DEFINE(LZO_USE_ASM_2,1,[Use asm.]))
 
 
 # /***********************************************************************
@@ -92,7 +92,6 @@
 AC_CHECK_TYPE(ptrdiff_t,long)
 AC_TYPE_SIZE_T
 AC_TYPE_SIGNAL
-AC_STRUCT_ST_MTIM_NSEC
 
 AC_CHECK_SIZEOF(short)
 AC_CHECK_SIZEOF(int)