Attachment #68198 for bug #105637




# // Checks for LZO library
# ************************************************************************/

AC_CHECK_HEADERS(lzo/lzoconf.h lzo/lzo1x.h,,AC_MSG_ERROR([LZO header file not found. Please check your installation or set the environment variable \`CPPFLAGS'.]))

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(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.]))


# /***********************************************************************




#endif

#define WITH_LZO
#include <lzo/lzoconf.h>
#if !defined(LZO_VERSION)
#  error "you need the LZO library"
#elif (LZO_VERSION < 0x1040)
#  error "please upgrade your LZO package"
#elif (LZO_VERSION >= 0x1080)
#else
#  include <lzo/lzoutil.h>
#endif

/* workaround a cpp bug under hpux 10.20 */

#  define USE_MALLOC
#  undef malloc
#  undef free
//#  define malloc        lzo_malloc
//#  define free          lzo_free
#else
#  error
#endif


#if defined(WITH_LZO)

#include <lzo/lzo1x.h>

#define USE_LZO1X_1
#if !defined(LZO_999_UNSUPPORTED)

#endif

#if defined(LZO_USE_ASM_1)
#define LZO_EXTERN_CDECL LZO_EXTERN
LZO_EXTERN_CDECL(int)
lzo1x_decompress_asm_fast
                        ( const lzo_byte *src, lzo_uint  src_len,

Return to bug 105637

Lines 65-76 Link Here

(-)lzop-1.01.orgi/configure.ac (-4 / +4 lines)
65	# // Checks for LZO library	65	# // Checks for LZO library
66	# ************************************************************************/	66	# ************************************************************************/
67		67
68	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'.]))	68	AC_CHECK_HEADERS(lzo/lzoconf.h lzo/lzo1x.h,,AC_MSG_ERROR([LZO header file not found. Please check your installation or set the environment variable \`CPPFLAGS'.]))
69		69
70	AC_CHECK_LIB(lzo,__lzo_init2,,AC_MSG_ERROR([LZO library not found. Please check your installation or set the environment variable \`LDFLAGS'.]))	70	AC_CHECK_LIB(lzo2,__lzo_init_v2,,AC_MSG_ERROR([LZO library not found. Please check your installation or set the environment variable \`LDFLAGS'.]))
71		71
72	AC_CHECK_LIB(lzo,lzo1x_decompress_asm_fast,AC_DEFINE(LZO_USE_ASM_1,1,[Use asm.]))	72	AC_CHECK_LIB(lzo2,lzo1x_decompress_asm_fast,AC_DEFINE(LZO_USE_ASM_1,1,[Use asm.]))
73	AC_CHECK_LIB(lzo,_lzo1x_decompress_asm_fast,AC_DEFINE(LZO_USE_ASM_2,1,[Use asm.]))	73	AC_CHECK_LIB(lzo2,_lzo1x_decompress_asm_fast,AC_DEFINE(LZO_USE_ASM_2,1,[Use asm.]))
74		74
75		75
76	# /***********************************************************************	76	# /***********************************************************************

Lines 34-46 Link Here

(-)lzop-1.01.orgi/src/conf.h (-5 / +7 lines)
34	#endif	34	#endif
35		35
36	#define WITH_LZO	36	#define WITH_LZO
37	#include <lzoconf.h>	37	#include <lzo/lzoconf.h>
38	#if !defined(LZO_VERSION)	38	#if !defined(LZO_VERSION)
39	# error "you need the LZO library"	39	# error "you need the LZO library"
40	#elif (LZO_VERSION < 0x1040)	40	#elif (LZO_VERSION < 0x1040)
41	# error "please upgrade your LZO package"	41	# error "please upgrade your LZO package"
42	#elif (LZO_VERSION >= 0x1080)	42	#elif (LZO_VERSION >= 0x1080)
43	# include <lzoutil.h>	43	#else
		44	# include <lzo/lzoutil.h>
44	#endif	45	#endif
45		46
46	/* workaround a cpp bug under hpux 10.20 */	47	/* workaround a cpp bug under hpux 10.20 */
Lines 73-80 Link Here
73	# define USE_MALLOC	74	# define USE_MALLOC
74	# undef malloc	75	# undef malloc
75	# undef free	76	# undef free
76	# define malloc lzo_malloc	77	//# define malloc lzo_malloc
77	# define free lzo_free	78	//# define free lzo_free
78	#else	79	#else
79	# error	80	# error
80	#endif	81	#endif
Lines 682-688 Link Here
682		683
683	#if defined(WITH_LZO)	684	#if defined(WITH_LZO)
684		685
685	#include <lzo1x.h>	686	#include <lzo/lzo1x.h>
686		687
687	#define USE_LZO1X_1	688	#define USE_LZO1X_1
688	#if !defined(LZO_999_UNSUPPORTED)	689	#if !defined(LZO_999_UNSUPPORTED)
Lines 693-698 Link Here
693	#endif	694	#endif
694		695
695	#if defined(LZO_USE_ASM_1)	696	#if defined(LZO_USE_ASM_1)
		697	#define LZO_EXTERN_CDECL LZO_EXTERN
696	LZO_EXTERN_CDECL(int)	698	LZO_EXTERN_CDECL(int)
697	lzo1x_decompress_asm_fast	699	lzo1x_decompress_asm_fast
698	( const lzo_byte *src, lzo_uint src_len,	700	( const lzo_byte *src, lzo_uint src_len,