Attachment #72803 for bug #112377

View | Details | Raw Unified | Return to bug 112377
Collapse All | Expand All

Lines 3102-3117 Link Here

(-)dxpc-3.8.2.orig/configure (-57 / +106 lines)
3102	fi	3597	fi
3103		3598
3104		3599
3105	echo "$as_me:$LINENO: checking for lzo_version in -llzo" >&5	3600	echo "$as_me:$LINENO: checking for lzo_version in -llzo2" >&5
3106	echo $ECHO_N "checking for lzo_version in -llzo... $ECHO_C" >&6	3601	echo $ECHO_N "checking for lzo_version in -llzo2... $ECHO_C" >&6
3107	if test "${ac_cv_lib_lzo_lzo_version+set}" = set; then	3602	if test "${ac_cv_lib_lzo2_lzo_version+set}" = set; then
3108	echo $ECHO_N "(cached) $ECHO_C" >&6	3603	echo $ECHO_N "(cached) $ECHO_C" >&6
3109	else	3604	else
3110	ac_check_lib_save_LIBS=$LIBS	3605	ac_check_lib_save_LIBS=$LIBS
3111	LIBS="-llzo $LIBS"	3606	LIBS="-llzo2 $LIBS"
3112	cat >conftest.$ac_ext <<_ACEOF	3607	cat >conftest.$ac_ext <<_ACEOF
3113	#line $LINENO "configure"	3608	/* confdefs.h. */
3114	#include "confdefs.h"	3609	_ACEOF
		3610	cat confdefs.h >>conftest.$ac_ext
		3611	cat >>conftest.$ac_ext <<_ACEOF
		3612	/* end confdefs.h. */
3115		3613
3116	/* Override any gcc2 internal prototype to avoid an error. */	3614	/* Override any gcc2 internal prototype to avoid an error. */
3117	#ifdef __cplusplus	3615	#ifdef __cplusplus
Lines 3130-3158 Link Here
3130	_ACEOF	3628	_ACEOF
3131	rm -f conftest.$ac_objext conftest$ac_exeext	3629	rm -f conftest.$ac_objext conftest$ac_exeext
3132	if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5	3630	if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
3133	(eval $ac_link) 2>&5	3631	(eval $ac_link) 2>conftest.er1
3134	ac_status=$?	3632	ac_status=$?
		3633	grep -v '^ *+' conftest.er1 >conftest.err
		3634	rm -f conftest.er1
		3635	cat conftest.err >&5
3135	echo "$as_me:$LINENO: \$? = $ac_status" >&5	3636	echo "$as_me:$LINENO: \$? = $ac_status" >&5
3136	(exit $ac_status); } &&	3637	(exit $ac_status); } &&
3137	{ ac_try='test -s conftest$ac_exeext'	3638	{ ac_try='test -z "$ac_cxx_werror_flag"
		3639	\|\| test ! -s conftest.err'
		3640	{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
		3641	(eval $ac_try) 2>&5
		3642	ac_status=$?
		3643	echo "$as_me:$LINENO: \$? = $ac_status" >&5
		3644	(exit $ac_status); }; } &&
		3645	{ ac_try='test -s conftest$ac_exeext'
3138	{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5	3646	{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
3139	(eval $ac_try) 2>&5	3647	(eval $ac_try) 2>&5
3140	ac_status=$?	3648	ac_status=$?
3141	echo "$as_me:$LINENO: \$? = $ac_status" >&5	3649	echo "$as_me:$LINENO: \$? = $ac_status" >&5
3142	(exit $ac_status); }; }; then	3650	(exit $ac_status); }; }; then
3143	ac_cv_lib_lzo_lzo_version=yes	3651	ac_cv_lib_lzo2_lzo_version=yes
3144	else	3652	else
3145	echo "$as_me: failed program was:" >&5	3653	echo "$as_me: failed program was:" >&5
3146	cat conftest.$ac_ext >&5	3654	sed 's/^/\| /' conftest.$ac_ext >&5
3147	ac_cv_lib_lzo_lzo_version=no	3655
		3656	ac_cv_lib_lzo2_lzo_version=no
3148	fi	3657	fi
3149	rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext	3658	rm -f conftest.err conftest.$ac_objext \
		3659	conftest$ac_exeext conftest.$ac_ext
3150	LIBS=$ac_check_lib_save_LIBS	3660	LIBS=$ac_check_lib_save_LIBS
3151	fi	3661	fi
3152	echo "$as_me:$LINENO: result: $ac_cv_lib_lzo_lzo_version" >&5	3662	echo "$as_me:$LINENO: result: $ac_cv_lib_lzo2_lzo_version" >&5
3153	echo "${ECHO_T}$ac_cv_lib_lzo_lzo_version" >&6	3663	echo "${ECHO_T}$ac_cv_lib_lzo2_lzo_version" >&6
3154	if test $ac_cv_lib_lzo_lzo_version = yes; then	3664	if test $ac_cv_lib_lzo2_lzo_version = yes; then
3155	LIBS="$LIBS -llzo"	3665	LIBS="$LIBS -llzo2"
3156	else	3666	else
3157	{ { echo "$as_me:$LINENO: error: lzo library required: you may need to use the --with-lzo-lib	3667	{ { echo "$as_me:$LINENO: error: lzo library required: you may need to use the --with-lzo-lib
3158	option to specify path to LZO if it is installed in a non-standard	3668	option to specify path to LZO if it is installed in a non-standard
Lines 3482-3512 Link Here
3482	if test $ac_cv_header_lzoconf_h = yes; then	4069	if test $ac_cv_header_lzoconf_h = yes; then
3483	:	4070	:
3484	else	4071	else
3485	if test "${ac_cv_header__usr_local_include_lzoconf_h+set}" = set; then	4072	if test "${ac_cv_header__usr_include_lzo_lzoconf_h+set}" = set; then
3486	echo "$as_me:$LINENO: checking for /usr/local/include/lzoconf.h" >&5	4073	echo "$as_me:$LINENO: checking for /usr/include/lzo/lzoconf.h" >&5
3487	echo $ECHO_N "checking for /usr/local/include/lzoconf.h... $ECHO_C" >&6	4074	echo $ECHO_N "checking for /usr/include/lzo/lzoconf.h... $ECHO_C" >&6
3488	if test "${ac_cv_header__usr_local_include_lzoconf_h+set}" = set; then	4075	if test "${ac_cv_header__usr_include_lzo_lzoconf_h+set}" = set; then
3489	echo $ECHO_N "(cached) $ECHO_C" >&6	4076	echo $ECHO_N "(cached) $ECHO_C" >&6
3490	fi	4077	fi
3491	echo "$as_me:$LINENO: result: $ac_cv_header__usr_local_include_lzoconf_h" >&5	4078	echo "$as_me:$LINENO: result: $ac_cv_header__usr_include_lzo_lzoconf_h" >&5
3492	echo "${ECHO_T}$ac_cv_header__usr_local_include_lzoconf_h" >&6	4079	echo "${ECHO_T}$ac_cv_header__usr_include_lzo_lzoconf_h" >&6
3493	else	4080	else
3494	# Is the header compilable?	4081	# Is the header compilable?
3495	echo "$as_me:$LINENO: checking /usr/local/include/lzoconf.h usability" >&5	4082	echo "$as_me:$LINENO: checking /usr/include/lzo/lzoconf.h usability" >&5
3496	echo $ECHO_N "checking /usr/local/include/lzoconf.h usability... $ECHO_C" >&6	4083	echo $ECHO_N "checking /usr/include/lzo/lzoconf.h usability... $ECHO_C" >&6
3497	cat >conftest.$ac_ext <<_ACEOF	4084	cat >conftest.$ac_ext <<_ACEOF
3498	#line $LINENO "configure"	4085	/* confdefs.h. */
3499	#include "confdefs.h"	4086	_ACEOF
		4087	cat confdefs.h >>conftest.$ac_ext
		4088	cat >>conftest.$ac_ext <<_ACEOF
		4089	/* end confdefs.h. */
3500	$ac_includes_default	4090	$ac_includes_default
3501	#include </usr/local/include/lzoconf.h>	4091	#include </usr/include/lzo/lzoconf.h>
3502	_ACEOF	4092	_ACEOF
3503	rm -f conftest.$ac_objext	4093	rm -f conftest.$ac_objext
3504	if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5	4094	if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
3505	(eval $ac_compile) 2>&5	4095	(eval $ac_compile) 2>conftest.er1
3506	ac_status=$?	4096	ac_status=$?
		4097	grep -v '^ *+' conftest.er1 >conftest.err
		4098	rm -f conftest.er1
		4099	cat conftest.err >&5
3507	echo "$as_me:$LINENO: \$? = $ac_status" >&5	4100	echo "$as_me:$LINENO: \$? = $ac_status" >&5
3508	(exit $ac_status); } &&	4101	(exit $ac_status); } &&
3509	{ ac_try='test -s conftest.$ac_objext'	4102	{ ac_try='test -z "$ac_cxx_werror_flag"
		4103	\|\| test ! -s conftest.err'
		4104	{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
		4105	(eval $ac_try) 2>&5
		4106	ac_status=$?
		4107	echo "$as_me:$LINENO: \$? = $ac_status" >&5
		4108	(exit $ac_status); }; } &&
		4109	{ ac_try='test -s conftest.$ac_objext'
3510	{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5	4110	{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
3511	(eval $ac_try) 2>&5	4111	(eval $ac_try) 2>&5
3512	ac_status=$?	4112	ac_status=$?
Lines 3515-3534 Link Here
3515	ac_header_compiler=yes	4115	ac_header_compiler=yes
3516	else	4116	else
3517	echo "$as_me: failed program was:" >&5	4117	echo "$as_me: failed program was:" >&5
3518	cat conftest.$ac_ext >&5	4118	sed 's/^/\| /' conftest.$ac_ext >&5
		4119
3519	ac_header_compiler=no	4120	ac_header_compiler=no
3520	fi	4121	fi
3521	rm -f conftest.$ac_objext conftest.$ac_ext	4122	rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
3522	echo "$as_me:$LINENO: result: $ac_header_compiler" >&5	4123	echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
3523	echo "${ECHO_T}$ac_header_compiler" >&6	4124	echo "${ECHO_T}$ac_header_compiler" >&6
3524		4125
3525	# Is the header present?	4126	# Is the header present?
3526	echo "$as_me:$LINENO: checking /usr/local/include/lzoconf.h presence" >&5	4127	echo "$as_me:$LINENO: checking /usr/include/lzo/lzoconf.h presence" >&5
3527	echo $ECHO_N "checking /usr/local/include/lzoconf.h presence... $ECHO_C" >&6	4128	echo $ECHO_N "checking /usr/include/lzo/lzoconf.h presence... $ECHO_C" >&6
3528	cat >conftest.$ac_ext <<_ACEOF	4129	cat >conftest.$ac_ext <<_ACEOF
3529	#line $LINENO "configure"	4130	/* confdefs.h. */
3530	#include "confdefs.h"	4131	_ACEOF
3531	#include </usr/local/include/lzoconf.h>	4132	cat confdefs.h >>conftest.$ac_ext
		4133	cat >>conftest.$ac_ext <<_ACEOF
		4134	/* end confdefs.h. */
		4135	#include </usr/include/lzo/lzoconf.h>
3532	_ACEOF	4136	_ACEOF
3533	if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5	4137	if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
3534	(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1	4138	(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
Lines 3558-3590 Link Here
3558	echo "${ECHO_T}$ac_header_preproc" >&6	4164	echo "${ECHO_T}$ac_header_preproc" >&6
3559		4165
3560	# So? What about this header?	4166	# So? What about this header?
3561	case $ac_header_compiler:$ac_header_preproc in	4167	case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
3562	yes:no )	4168	yes:no: )
3563	{ echo "$as_me:$LINENO: WARNING: /usr/local/include/lzoconf.h: accepted by the compiler, rejected by the preprocessor!" >&5	4169	{ echo "$as_me:$LINENO: WARNING: /usr/include/lzo/lzoconf.h: accepted by the compiler, rejected by the preprocessor!" >&5
3564	echo "$as_me: WARNING: /usr/local/include/lzoconf.h: accepted by the compiler, rejected by the preprocessor!" >&2;}	4170	echo "$as_me: WARNING: /usr/include/lzo/lzoconf.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
3565	{ echo "$as_me:$LINENO: WARNING: /usr/local/include/lzoconf.h: proceeding with the preprocessor's result" >&5	4171	{ echo "$as_me:$LINENO: WARNING: /usr/include/lzo/lzoconf.h: proceeding with the compiler's result" >&5
3566	echo "$as_me: WARNING: /usr/local/include/lzoconf.h: proceeding with the preprocessor's result" >&2;};;	4172	echo "$as_me: WARNING: /usr/include/lzo/lzoconf.h: proceeding with the compiler's result" >&2;}
3567	no:yes )	4173	ac_header_preproc=yes
3568	{ echo "$as_me:$LINENO: WARNING: /usr/local/include/lzoconf.h: present but cannot be compiled" >&5	4174	;;
3569	echo "$as_me: WARNING: /usr/local/include/lzoconf.h: present but cannot be compiled" >&2;}	4175	no:yes:* )
3570	{ echo "$as_me:$LINENO: WARNING: /usr/local/include/lzoconf.h: check for missing prerequisite headers?" >&5	4176	{ echo "$as_me:$LINENO: WARNING: /usr/include/lzo/lzoconf.h: present but cannot be compiled" >&5
3571	echo "$as_me: WARNING: /usr/local/include/lzoconf.h: check for missing prerequisite headers?" >&2;}	4177	echo "$as_me: WARNING: /usr/include/lzo/lzoconf.h: present but cannot be compiled" >&2;}
3572	{ echo "$as_me:$LINENO: WARNING: /usr/local/include/lzoconf.h: proceeding with the preprocessor's result" >&5	4178	{ echo "$as_me:$LINENO: WARNING: /usr/include/lzo/lzoconf.h: check for missing prerequisite headers?" >&5
3573	echo "$as_me: WARNING: /usr/local/include/lzoconf.h: proceeding with the preprocessor's result" >&2;};;	4179	echo "$as_me: WARNING: /usr/include/lzo/lzoconf.h: check for missing prerequisite headers?" >&2;}
		4180	{ echo "$as_me:$LINENO: WARNING: /usr/include/lzo/lzoconf.h: see the Autoconf documentation" >&5
		4181	echo "$as_me: WARNING: /usr/include/lzo/lzoconf.h: see the Autoconf documentation" >&2;}
		4182	{ echo "$as_me:$LINENO: WARNING: /usr/include/lzo/lzoconf.h: section \"Present But Cannot Be Compiled\"" >&5
		4183	echo "$as_me: WARNING: /usr/include/lzo/lzoconf.h: section \"Present But Cannot Be Compiled\"" >&2;}
		4184	{ echo "$as_me:$LINENO: WARNING: /usr/include/lzo/lzoconf.h: proceeding with the preprocessor's result" >&5
		4185	echo "$as_me: WARNING: /usr/include/lzo/lzoconf.h: proceeding with the preprocessor's result" >&2;}
		4186	{ echo "$as_me:$LINENO: WARNING: /usr/include/lzo/lzoconf.h: in the future, the compiler will take precedence" >&5
		4187	echo "$as_me: WARNING: /usr/include/lzo/lzoconf.h: in the future, the compiler will take precedence" >&2;}
		4188	(
		4189	cat <<\_ASBOX
		4190	## ------------------------------------------ ##
		4191	## Report this to the AC_PACKAGE_NAME lists. ##
		4192	## ------------------------------------------ ##
		4193	_ASBOX
		4194	) \|
		4195	sed "s/^/$as_me: WARNING: /" >&2
		4196	;;
3574	esac	4197	esac
3575	echo "$as_me:$LINENO: checking for /usr/local/include/lzoconf.h" >&5	4198	echo "$as_me:$LINENO: checking for /usr/include/lzo/lzoconf.h" >&5
3576	echo $ECHO_N "checking for /usr/local/include/lzoconf.h... $ECHO_C" >&6	4199	echo $ECHO_N "checking for /usr/include/lzo/lzoconf.h... $ECHO_C" >&6
3577	if test "${ac_cv_header__usr_local_include_lzoconf_h+set}" = set; then	4200	if test "${ac_cv_header__usr_include_lzo_lzoconf_h+set}" = set; then
3578	echo $ECHO_N "(cached) $ECHO_C" >&6	4201	echo $ECHO_N "(cached) $ECHO_C" >&6
3579	else	4202	else
3580	ac_cv_header__usr_local_include_lzoconf_h=$ac_header_preproc	4203	ac_cv_header__usr_include_lzo_lzoconf_h=$ac_header_preproc
3581	fi	4204	fi
3582	echo "$as_me:$LINENO: result: $ac_cv_header__usr_local_include_lzoconf_h" >&5	4205	echo "$as_me:$LINENO: result: $ac_cv_header__usr_include_lzo_lzoconf_h" >&5
3583	echo "${ECHO_T}$ac_cv_header__usr_local_include_lzoconf_h" >&6	4206	echo "${ECHO_T}$ac_cv_header__usr_include_lzo_lzoconf_h" >&6
3584		4207
3585	fi	4208	fi
3586	if test $ac_cv_header__usr_local_include_lzoconf_h = yes; then	4209	if test $ac_cv_header__usr_include_lzo_lzoconf_h = yes; then
3587	CXXFLAGS="$CXXFLAGS -I/usr/local/include"	4210	CXXFLAGS="$CXXFLAGS -I/usr/include/lzo"
3588	else	4211	else
3589	{ { echo "$as_me:$LINENO: error: lzoconf.h required (part of LZO library)" >&5	4212	{ { echo "$as_me:$LINENO: error: lzoconf.h required (part of LZO library)" >&5
3590	echo "$as_me: error: lzoconf.h required (part of LZO library)" >&2;}	4213	echo "$as_me: error: lzoconf.h required (part of LZO library)" >&2;}




dnl Checks for header files.
AC_PATH_XTRA

AC_CHECK_LIB(lzo2, lzo_version, 
             [LIBS="$LIBS -llzo2"],
             AC_MSG_ERROR(
[lzo library required: you may need to use the --with-lzo-lib 
option to specify path to LZO if it is installed in a non-standard

# The LZO installer likes to put headers in /usr/local/include, even on
# systems where that is not searched. Try to be nice and detect this case...
AC_CHECK_HEADER(lzoconf.h, ,
 [AC_CHECK_HEADER(/usr/include/lzo/lzoconf.h,
		   [CXXFLAGS="$CXXFLAGS -I/usr/include/lzo"],
		   AC_MSG_ERROR([lzoconf.h required (part of LZO library)]))])

AC_DEFUN(dxpc_ACCEPT_LENGTH_T,




install: install.bin install.man

install.bin:	$(TARGET)
	$(srcdir)/mkinstalldirs $(DESTDIR)$(bindir)
	$(INSTALL) $(TARGET) $(DESTDIR)$(bindir)/$(TARGET)

install.man:
	$(srcdir)/mkinstalldirs $(DESTDIR)$(man1dir)
	$(INSTALL_DATA) $(TARGET).man $(DESTDIR)$(man1dir)/$(TARGET).1

clean:
	-rm -f *~ *.o $(TARGET) pure_* quant_* *.bak core gmon.out

Return to bug 112377

Lines 21-28 Link Here

(-)dxpc-3.8.2.orig/configure.in (-4 / +4 lines)
21	dnl Checks for header files.	21	dnl Checks for header files.
22	AC_PATH_XTRA	22	AC_PATH_XTRA
23		23
24	AC_CHECK_LIB(lzo, lzo_version,	24	AC_CHECK_LIB(lzo2, lzo_version,
25	[LIBS="$LIBS -llzo"],	25	[LIBS="$LIBS -llzo2"],
26	AC_MSG_ERROR(	26	AC_MSG_ERROR(
27	[lzo library required: you may need to use the --with-lzo-lib	27	[lzo library required: you may need to use the --with-lzo-lib
28	option to specify path to LZO if it is installed in a non-standard	28	option to specify path to LZO if it is installed in a non-standard
Lines 31-38 Link Here
31	# The LZO installer likes to put headers in /usr/local/include, even on	31	# The LZO installer likes to put headers in /usr/local/include, even on
32	# systems where that is not searched. Try to be nice and detect this case...	32	# systems where that is not searched. Try to be nice and detect this case...
33	AC_CHECK_HEADER(lzoconf.h, ,	33	AC_CHECK_HEADER(lzoconf.h, ,
34	[AC_CHECK_HEADER(/usr/local/include/lzoconf.h,	34	[AC_CHECK_HEADER(/usr/include/lzo/lzoconf.h,
35	[CXXFLAGS="$CXXFLAGS -I/usr/local/include"],	35	[CXXFLAGS="$CXXFLAGS -I/usr/include/lzo"],
36	AC_MSG_ERROR([lzoconf.h required (part of LZO library)]))])	36	AC_MSG_ERROR([lzoconf.h required (part of LZO library)]))])
37		37
38	AC_DEFUN(dxpc_ACCEPT_LENGTH_T,	38	AC_DEFUN(dxpc_ACCEPT_LENGTH_T,

Lines 53-64 Link Here

(-)dxpc-3.8.2/Makefile.in.orig (-4 / +4 lines)
53	install: install.bin install.man	53	install: install.bin install.man
54		54
55	install.bin: $(TARGET)	55	install.bin: $(TARGET)
56	$(srcdir)/mkinstalldirs $(bindir)	56	$(srcdir)/mkinstalldirs $(DESTDIR)$(bindir)
57	$(INSTALL) $(TARGET) $(bindir)/$(TARGET)	57	$(INSTALL) $(TARGET) $(DESTDIR)$(bindir)/$(TARGET)
58		58
59	install.man:	59	install.man:
60	$(srcdir)/mkinstalldirs $(man1dir)	60	$(srcdir)/mkinstalldirs $(DESTDIR)$(man1dir)
61	$(INSTALL_DATA) $(TARGET).man $(man1dir)/$(TARGET).1	61	$(INSTALL_DATA) $(TARGET).man $(DESTDIR)$(man1dir)/$(TARGET).1
62		62
63	clean:	63	clean:
64	-rm -f ~ .o $(TARGET) pure_* quant_* *.bak core gmon.out	64	-rm -f ~ .o $(TARGET) pure_* quant_* *.bak core gmon.out