Commit 9b576d93d9358a4be724569c8e8382b965fea98d - joy2key

Import Debian changes 1.6.1-3 joy2key (1.6.1-3) unstable; urgency=low * Fix configure.ac so the configure script will correctly handle the case of X libraries living in the standard library search path, and regenerate configure with autoconf (Closes: #365146) John Wright authored 18 years ago Ricardo Mones committed 5 years ago

6 changed file(s) with 274 addition(s) and 25 deletion(s). Raw diff Collapse all Expand all

+41

-10

config.guess less more

2	2	# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
3	3	# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
4	4
5		timestamp='2005-08-03'
	5	timestamp='2006-02-23'
6	6
7	7	# This file is free software; you can redistribute it and/or modify it
8	8	# under the terms of the GNU General Public License as published by

105	105	trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
106	106	trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
107	107	: ${TMPDIR=/tmp} ;
108		{ tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } \|\|
	108	{ tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } \|\|
109	109	{ test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } \|\|
110	110	{ tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } \|\|
111	111	{ echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;

205	205	:ekkoBSD::*)
206	206	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
207	207	exit ;;
	208	:SolidBSD::*)
	209	echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
	210	exit ;;
208	211	macppc:MirBSD::)
209	212	echo powerppc-unknown-mirbsd${UNAME_RELEASE}
210	213	exit ;;

763	766	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
764	767	exit ;;
765	768	:FreeBSD::*)
766		echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}\|sed -e 's/[-(].*//'`
	769	case ${UNAME_MACHINE} in
	770	pc98)
	771	echo i386-unknown-freebsd`echo ${UNAME_RELEASE}\|sed -e 's/[-(].*//'` ;;
	772	*)
	773	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}\|sed -e 's/[-(].*//'` ;;
	774	esac
767	775	exit ;;
768	776	i:CYGWIN:*)
769	777	echo ${UNAME_MACHINE}-pc-cygwin
770	778	exit ;;
771	779	i:MINGW:*)
	780	echo ${UNAME_MACHINE}-pc-mingw32
	781	exit ;;
	782	i:MSYS_NT-::)
772	783	echo ${UNAME_MACHINE}-pc-mingw32
773	784	exit ;;
774	785	i:windows32:*)

778	789	i:PW:*)
779	790	echo ${UNAME_MACHINE}-pc-pw32
780	791	exit ;;
781		x86:Interix:[34])
782		echo i586-pc-interix${UNAME_RELEASE}\|sed -e 's/\..*//'
	792	x86:Interix:[345])
	793	echo i586-pc-interix${UNAME_RELEASE}
	794	exit ;;
	795	EM64T:Interix:[345])
	796	echo x86_64-unknown-interix${UNAME_RELEASE}
783	797	exit ;;
784	798	[345]86:Windows_95:* \| [345]86:Windows_98:* \| [345]86:Windows_NT:*)
785	799	echo i${UNAME_MACHINE}-pc-mks

850	864	#endif
851	865	#endif
852	866	EOF
853		eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null \| grep ^CPU=`
	867	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null \| sed -n '
	868	/^CPU/{
	869	s: ::g
	870	p
	871	}'`"
854	872	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
855	873	;;
856	874	mips64:Linux::)

869	887	#endif
870	888	#endif
871	889	EOF
872		eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null \| grep ^CPU=`
	890	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null \| sed -n '
	891	/^CPU/{
	892	s: ::g
	893	p
	894	}'`"
873	895	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
874	896	;;
875	897	or32:Linux::)

917	939	exit ;;
918	940	sparc:Linux:: \| sparc64:Linux::)
919	941	echo ${UNAME_MACHINE}-unknown-linux-gnu
	942	exit ;;
	943	vax:Linux::)
	944	echo ${UNAME_MACHINE}-dec-linux-gnu
920	945	exit ;;
921	946	x86_64:Linux::)
922	947	echo x86_64-unknown-linux-gnu

963	988	LIBC=gnulibc1
964	989	# endif
965	990	#else
966		#ifdef __INTEL_COMPILER
	991	#if defined(__INTEL_COMPILER) \|\| defined(__PGI) \|\| defined(__sun)
967	992	LIBC=gnu
968	993	#else
969	994	LIBC=gnuaout

973	998	LIBC=dietlibc
974	999	#endif
975	1000	EOF
976		eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null \| grep ^LIBC=`
	1001	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null \| sed -n '
	1002	/^LIBC/{
	1003	s: ::g
	1004	p
	1005	}'`"
977	1006	test x"${LIBC}" != x && {
978	1007	echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
979	1008	exit

1184	1213	:Darwin::*)
1185	1214	UNAME_PROCESSOR=`uname -p` \|\| UNAME_PROCESSOR=unknown
1186	1215	case $UNAME_PROCESSOR in
1187		*86) UNAME_PROCESSOR=i686 ;;
1188	1216	unknown) UNAME_PROCESSOR=powerpc ;;
1189	1217	esac
1190	1218	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}

1262	1290	exit ;;
1263	1291	i86:skyos::*)
1264	1292	echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` \| sed -e 's/ .*$//'
	1293	exit ;;
	1294	i86:rdos::*)
	1295	echo ${UNAME_MACHINE}-pc-rdos
1265	1296	exit ;;
1266	1297	esac
1267	1298

+155

-0

config.log less more

	0	This file contains any messages produced by compilers while
	1	running configure, to aid debugging if configure makes a mistake.
	2
	3	It was created by configure, which was
	4	generated by GNU Autoconf 2.59. Invocation command line was
	5
	6	$ ./configure --host=ia64-linux-gnu --build=ia64-linux-gnu --prefix=/usr --mandir=${prefix}/share/man --infodir=${prefix}/share/info
	7
	8	## --------- ##
	9	## Platform. ##
	10	## --------- ##
	11
	12	hostname = krebs
	13	uname -m = ia64
	14	uname -r = 2.6.16-1-mckinley
	15	uname -s = Linux
	16	uname -v = #2 SMP Tue Mar 28 23:07:04 UTC 2006
	17
	18	/usr/bin/uname -p = unknown
	19	/bin/uname -X = unknown
	20
	21	/bin/arch = ia64
	22	/usr/bin/arch -k = unknown
	23	/usr/convex/getsysinfo = unknown
	24	hostinfo = unknown
	25	/bin/machine = unknown
	26	/usr/bin/oslevel = unknown
	27	/bin/universe = unknown
	28
	29	PATH: /usr/sbin
	30	PATH: /usr/bin
	31	PATH: /sbin
	32	PATH: /bin
	33	PATH: /usr/bin/X11
	34
	35
	36	## ----------- ##
	37	## Core tests. ##
	38	## ----------- ##
	39
	40	configure:1311: checking for a BSD-compatible install
	41	configure:1366: result: /usr/bin/install -c
	42	configure:1377: checking whether build environment is sane
	43
	44	## ---------------- ##
	45	## Cache variables. ##
	46	## ---------------- ##
	47
	48	ac_cv_env_CC_set=
	49	ac_cv_env_CC_value=
	50	ac_cv_env_CFLAGS_set=set
	51	ac_cv_env_CFLAGS_value='-Wall -g -O2'
	52	ac_cv_env_CPPFLAGS_set=
	53	ac_cv_env_CPPFLAGS_value=
	54	ac_cv_env_CPP_set=
	55	ac_cv_env_CPP_value=
	56	ac_cv_env_LDFLAGS_set=
	57	ac_cv_env_LDFLAGS_value=
	58	ac_cv_env_build_alias_set=set
	59	ac_cv_env_build_alias_value=ia64-linux-gnu
	60	ac_cv_env_host_alias_set=set
	61	ac_cv_env_host_alias_value=ia64-linux-gnu
	62	ac_cv_env_target_alias_set=
	63	ac_cv_env_target_alias_value=
	64	ac_cv_path_install='/usr/bin/install -c'
	65
	66	## ----------------- ##
	67	## Output variables. ##
	68	## ----------------- ##
	69
	70	ACLOCAL=''
	71	AMDEPBACKSLASH=''
	72	AMDEP_FALSE=''
	73	AMDEP_TRUE=''
	74	AMTAR=''
	75	AUTOCONF=''
	76	AUTOHEADER=''
	77	AUTOMAKE=''
	78	AWK=''
	79	CC=''
	80	CCDEPMODE=''
	81	CFLAGS='-Wall -g -O2'
	82	CPP=''
	83	CPPFLAGS=''
	84	CYGPATH_W=''
	85	DEFS=''
	86	DEPDIR=''
	87	ECHO_C=''
	88	ECHO_N='-n'
	89	ECHO_T=''
	90	EGREP=''
	91	EXEEXT=''
	92	INSTALL_DATA='${INSTALL} -m 644'
	93	INSTALL_PROGRAM='${INSTALL}'
	94	INSTALL_SCRIPT='${INSTALL}'
	95	INSTALL_STRIP_PROGRAM=''
	96	LDFLAGS=''
	97	LIBOBJS=''
	98	LIBS=''
	99	LTLIBOBJS=''
	100	MAKEINFO=''
	101	OBJEXT=''
	102	PACKAGE=''
	103	PACKAGE_BUGREPORT=''
	104	PACKAGE_NAME=''
	105	PACKAGE_STRING=''
	106	PACKAGE_TARNAME=''
	107	PACKAGE_VERSION=''
	108	PATH_SEPARATOR=':'
	109	SET_MAKE=''
	110	SHELL='/bin/sh'
	111	STRIP=''
	112	VERSION=''
	113	X_Stuff=''
	114	ac_ct_CC=''
	115	ac_ct_STRIP=''
	116	am__fastdepCC_FALSE=''
	117	am__fastdepCC_TRUE=''
	118	am__include=''
	119	am__leading_dot=''
	120	am__quote=''
	121	bindir='${exec_prefix}/bin'
	122	build_alias='ia64-linux-gnu'
	123	datadir='${prefix}/share'
	124	exec_prefix='NONE'
	125	host_alias='ia64-linux-gnu'
	126	includedir='${prefix}/include'
	127	infodir='${prefix}/share/info'
	128	install_sh=''
	129	libdir='${exec_prefix}/lib'
	130	libexecdir='${exec_prefix}/libexec'
	131	localstatedir='${prefix}/var'
	132	mandir='${prefix}/share/man'
	133	mkdir_p=''
	134	oldincludedir='/usr/include'
	135	prefix='/usr'
	136	program_transform_name='s,x,x,'
	137	sbindir='${exec_prefix}/sbin'
	138	sharedstatedir='${prefix}/com'
	139	sysconfdir='${prefix}/etc'
	140	target_alias=''
	141	x_headers=''
	142
	143	## ----------- ##
	144	## confdefs.h. ##
	145	## ----------- ##
	146
	147	#define PACKAGE_BUGREPORT ""
	148	#define PACKAGE_NAME ""
	149	#define PACKAGE_STRING ""
	150	#define PACKAGE_TARNAME ""
	151	#define PACKAGE_VERSION ""
	152
	153	configure: caught signal 2
	154	configure: exit 1

+38

-9

config.sub less more

2	2	# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
3	3	# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
4	4
5		timestamp='2005-07-08'
	5	timestamp='2006-02-23'
6	6
7	7	# This file is (in principle) common to ALL GNU software.
8	8	# The presence of a machine in this file suggests that SOME GNU software

118	118	# Here we must recognize all the valid KERNEL-OS combinations.
119	119	maybe_os=`echo $1 \| sed 's/^$.$-$[^-]-[^-]*$$/\2/'`
120	120	case $maybe_os in
121		nto-qnx* \| linux-gnu* \| linux-dietlibc \| linux-uclibc* \| uclinux-uclibc* \| uclinux-gnu* \| \
122		kfreebsd-gnu \| knetbsd-gnu \| netbsd-gnu \| storm-chaos* \| os2-emx* \| rtmk-nova*)
	121	nto-qnx* \| linux-gnu* \| linux-dietlibc \| linux-newlib* \| linux-uclibc* \| \
	122	uclinux-uclibc* \| uclinux-gnu* \| kfreebsd-gnu \| knetbsd-gnu \| netbsd-gnu \| \
	123	storm-chaos* \| os2-emx* \| rtmk-nova*)
123	124	os=-$maybe_os
124	125	basic_machine=`echo $1 \| sed 's/^$.$-$[^-]-[^-]*$$/\1/'`
125	126	;;

170	171	-hiux*)
171	172	os=-hiuxwe2
172	173	;;
	174	-sco6)
	175	os=-sco5v6
	176	basic_machine=`echo $1 \| sed -e 's/86-.*/86-pc/'`
	177	;;
173	178	-sco5)
174	179	os=-sco3.2v5
175	180	basic_machine=`echo $1 \| sed -e 's/86-.*/86-pc/'`

183	188	basic_machine=`echo $1 \| sed -e 's/86-.*/86-pc/'`
184	189	;;
185	190	-sco3.2v[4-9]*)
	191	# Don't forget version if it is 3.2v4 or newer.
	192	basic_machine=`echo $1 \| sed -e 's/86-.*/86-pc/'`
	193	;;
	194	-sco5v6*)
186	195	# Don't forget version if it is 3.2v4 or newer.
187	196	basic_machine=`echo $1 \| sed -e 's/86-.*/86-pc/'`
188	197	;;

238	247	\| h8300 \| h8500 \| hppa \| hppa1.[01] \| hppa2.0 \| hppa2.0[nw] \| hppa64 \
239	248	\| i370 \| i860 \| i960 \| ia64 \
240	249	\| ip2k \| iq2000 \
241		\| m32r \| m32rle \| m68000 \| m68k \| m88k \| maxq \| mcore \
	250	\| m32r \| m32rle \| m68000 \| m68k \| m88k \| maxq \| mb \| microblaze \| mcore \
242	251	\| mips \| mipsbe \| mipseb \| mipsel \| mipsle \
243	252	\| mips16 \
244	253	\| mips64 \| mips64el \

256	265	\| mipsisa64sr71k \| mipsisa64sr71kel \
257	266	\| mipstx39 \| mipstx39el \
258	267	\| mn10200 \| mn10300 \
259		\| ms1 \
	268	\| mt \
260	269	\| msp430 \
	270	\| nios \| nios2 \
261	271	\| ns16k \| ns32k \
262	272	\| or32 \
263	273	\| pdp10 \| pdp11 \| pj \| pjl \

284	294	os=-none
285	295	;;
286	296	m88110 \| m680[12346]0 \| m683?2 \| m68360 \| m5200 \| v70 \| w65 \| z8k)
	297	;;
	298	ms1)
	299	basic_machine=mt-unknown
287	300	;;
288	301
289	302	# We use `pc' rather than `unknown'

335	348	\| mipsisa64sr71k-* \| mipsisa64sr71kel-* \
336	349	\| mipstx39-* \| mipstx39el-* \
337	350	\| mmix-* \
338		\| ms1-* \
	351	\| mt-* \
339	352	\| msp430-* \
	353	\| nios-* \| nios2-* \
340	354	\| none-* \| np1-* \| ns16k-* \| ns32k-* \
341	355	\| orion-* \
342	356	\| pdp10-* \| pdp11-* \| pj-* \| pjl-* \| pn-* \| power-* \

695	709	basic_machine=i386-pc
696	710	os=-msdos
697	711	;;
	712	ms1-*)
	713	basic_machine=`echo $basic_machine \| sed -e 's/ms1-/mt-/'`
	714	;;
698	715	mvs)
699	716	basic_machine=i370-ibm
700	717	os=-mvs

802	819	pc532 \| pc532-*)
803	820	basic_machine=ns32k-pc532
804	821	;;
	822	pc98)
	823	basic_machine=i386-pc
	824	;;
	825	pc98-*)
	826	basic_machine=i386-`echo $basic_machine \| sed 's/^[^-]*-//'`
	827	;;
805	828	pentium \| p5 \| k5 \| k6 \| nexgen \| viac3)
806	829	basic_machine=i586-pc
807	830	;;

857	880	pw32)
858	881	basic_machine=i586-unknown
859	882	os=-pw32
	883	;;
	884	rdos)
	885	basic_machine=i386-pc
	886	os=-rdos
860	887	;;
861	888	rom68k)
862	889	basic_machine=m68k-rom68k

1173	1200	\| -aos* \
1174	1201	\| -nindy* \| -vxsim* \| -vxworks* \| -ebmon* \| -hms* \| -mvs* \
1175	1202	\| -clix* \| -riscos* \| -uniplus* \| -iris* \| -rtu* \| -xenix* \
1176		\| -hiux* \| -386bsd* \| -knetbsd* \| -mirbsd* \| -netbsd* \| -openbsd* \
	1203	\| -hiux* \| -386bsd* \| -knetbsd* \| -mirbsd* \| -netbsd* \
	1204	\| -openbsd* \| -solidbsd* \
1177	1205	\| -ekkobsd* \| -kfreebsd* \| -freebsd* \| -riscix* \| -lynxos* \
1178	1206	\| -bosx* \| -nextstep* \| -cxux* \| -aout* \| -elf* \| -oabi* \
1179	1207	\| -ptx* \| -coff* \| -ecoff* \| -winnt* \| -domain* \| -vsta* \
1180	1208	\| -udi* \| -eabi* \| -lites* \| -ieee* \| -go32* \| -aux* \
1181	1209	\| -chorusos* \| -chorusrdb* \
1182	1210	\| -cygwin* \| -pe* \| -psos* \| -moss* \| -proelf* \| -rtems* \
1183		\| -mingw32* \| -linux-gnu* \| -linux-uclibc* \| -uxpv* \| -beos* \| -mpeix* \| -udk* \
	1211	\| -mingw32* \| -linux-gnu* \| -linux-newlib* \| -linux-uclibc* \
	1212	\| -uxpv* \| -beos* \| -mpeix* \| -udk* \
1184	1213	\| -interix* \| -uwin* \| -mks* \| -rhapsody* \| -darwin* \| -opened* \
1185	1214	\| -openstep* \| -oskit* \| -conix* \| -pw32* \| -nonstopux* \
1186	1215	\| -storm-chaos* \| -tops10* \| -tenex* \| -tops20* \| -its* \
1187	1216	\| -os2* \| -vos* \| -palmos* \| -uclinux* \| -nucleus* \
1188	1217	\| -morphos* \| -superux* \| -rtmk* \| -rtmk-nova* \| -windiss* \
1189	1218	\| -powermax* \| -dnix* \| -nx6 \| -nx7 \| -sei* \| -dragonfly* \
1190		\| -skyos* \| -haiku*)
	1219	\| -skyos* \| -haiku* \| -rdos*)
1191	1220	# Remember, each alternative MUST END IN *, to match a version number.
1192	1221	;;
1193	1222	-qnx*)

+20

-4

configure less more

3621	3621	# Check whether --enable-X or --disable-X was given.
3622	3622	if test "${enable_X+set}" = set; then
3623	3623	enableval="$enable_X"
3624		if test $enableval != no; then cat >>confdefs.h <<\_ACEOF
	3624	if test $enableval != no; then
	3625	if test x$x_libraries != x; then
	3626	cat >>confdefs.h <<\_ACEOF
3625	3627	#define ENABLE_X 1
3626	3628	_ACEOF
3627		export xstuff="-L$x_libraries -lX11"; fi
3628		else
3629		cat >>confdefs.h <<\_ACEOF
	3629	export xstuff="-L$x_libraries -lX11"
	3630	else
	3631	cat >>confdefs.h <<\_ACEOF
3630	3632	#define ENABLE_X 1
3631	3633	_ACEOF
	3634	export xstuff="-lX11"
	3635	fi
	3636	fi
	3637	else
	3638	if test x$x_libraries != x; then
	3639	cat >>confdefs.h <<\_ACEOF
	3640	#define ENABLE_X 1
	3641	_ACEOF
3632	3642	export X_Stuff="-L$x_libraries -lX11"
	3643	else
	3644	cat >>confdefs.h <<\_ACEOF
	3645	#define ENABLE_X 1
	3646	_ACEOF
	3647	export X_Stuff="-lX11"
	3648	fi
3633	3649	fi;
3634	3650
3635	3651

+12

-2

configure.ac less more

19	19	AC_DEFINE(ENABLE_CONSOLE))
20	20
21	21	AC_ARG_ENABLE(X, [ --disable-X do not compile in X features],
22		if test $enableval != no; then AC_DEFINE(ENABLE_X) export xstuff="-L$x_libraries -lX11"; fi,
23		AC_DEFINE(ENABLE_X) export X_Stuff="-L$x_libraries -lX11")
	22	[ if test $enableval != no; then
	23	if test x$x_libraries != x; then
	24	AC_DEFINE(ENABLE_X) export xstuff="-L$x_libraries -lX11"
	25	else
	26	AC_DEFINE(ENABLE_X) export xstuff="-lX11"
	27	fi
	28	fi ],
	29	[ if test x$x_libraries != x; then
	30	AC_DEFINE(ENABLE_X) export X_Stuff="-L$x_libraries -lX11"
	31	else
	32	AC_DEFINE(ENABLE_X) export X_Stuff="-lX11"
	33	fi ])
24	34
25	35	AC_SUBST(X_Stuff)
26	36	AC_SUBST(x_headers)

-0

debian/changelog less more

	0	joy2key (1.6.1-3) unstable; urgency=low
	1
	2	* Fix configure.ac so the configure script will correctly handle the case of
	3	X libraries living in the standard library search path, and regenerate
	4	configure with autoconf (Closes: #365146)
	5
	6	-- John Wright <john@movingsucks.org> Sat, 6 May 2006 02:56:08 -0600
	7
0	8	joy2key (1.6.1-2) unstable; urgency=low
1	9
2	10	* Remove dh_make generated joy2key.doc-base.EX I accidentally left behind