[ViewVC] Diff of: cvs/rxvt-unicode/configure.ac

Comparing rxvt-unicode/configure.ac (file contents):
Revision 1.52 by ayin, Wed Jun 13 16:20:41 2007 UTC vs.
Revision 1.79 by ayin, Wed Oct 31 11:59:09 2007 UTC

…		…
46	CXX="$CC"	46	CXX="$CC"
47	LIBS="$LIBS -lsupc++"	47	LIBS="$LIBS -lsupc++"
48	LINKER="$CC"	48	LINKER="$CC"
49	AC_LINK_IFELSE(	49	AC_LINK_IFELSE(
50	[AC_LANG_PROGRAM([struct test { }; void f() try { throw new test; } catch (...) { throw; }],[])],	50	[AC_LANG_PROGRAM([struct test { }; void f() try { throw new test; } catch (...) { throw; }],[])],
51	[
52	AC_MSG_RESULT(ok)	51	[AC_MSG_RESULT(ok)],
53	CXXLIB="-lsupc++"
54	],
55	[	52	[
56	AC_MSG_RESULT([no, making everything bigger and slower])	53	AC_MSG_RESULT([no, making everything bigger and slower])
57	LIBS="$save_LIBS"	54	LIBS="$save_LIBS"
58	LINKER="$save_CXX"	55	LINKER="$save_CXX"
59	]	56	]
60	)	57	)
61	CXX="$save_CXX"	58	CXX="$save_CXX"
62	fi	59	fi
63	AC_SUBST(LINKER,[$LINKER])	60	AC_SUBST(LINKER,[$LINKER])
64	AC_SUBST(CXXLIB)
65		61
66	dnl# --------------------------------------------------------------------------	62	dnl# --------------------------------------------------------------------------
67	dnl# Supply default CXXFLAGS, if not specified by `CXXFLAGS=flags ./configure'	63	dnl# Supply default CXXFLAGS, if not specified by `CXXFLAGS=flags ./configure'
68	dnl#	64	dnl#
69	if test -z "$orig_CXXFLAGS"; then	65	if test -z "$orig_CXXFLAGS"; then
70	if test x$GCC = xyes && test "x$GXX" = xyes; then	66	if test x$GCC = xyes && test "x$GXX" = xyes; then
71	CXXFLAGS="-g -O3 -fno-threadsafe-statics -fno-enforce-eh-specs"	67	CXXFLAGS="-g -O3 -fno-threadsafe-statics -fno-enforce-eh-specs"
72	AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[])], [], [CXXFLAGS="-g -O3"])	68	AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[])], [], [CXXFLAGS="-g -O3"])
73	else	69	else
74	CXXFLAGS="-O"	70	CXXFLAGS="-O"
75	fi	71	fi
76	CFLAGS="$CXXFLAGS"	72	CFLAGS="$CXXFLAGS"
…		…
78		74
79	AC_DEFINE(_GNU_SOURCE, 1, Use all glibc features.)	75	AC_DEFINE(_GNU_SOURCE, 1, Use all glibc features.)
80		76
81	case $host in	77	case $host in
82	--solaris* )	78	--solaris* )
83	AC_DEFINE(_XOPEN_SOURCE_EXTENDED, 1, Needed to get declarations for msg_control and msg_controllen on Solaris)	79	AC_DEFINE(_XOPEN_SOURCE, 500, Needed to get declarations for msg_control and msg_controllen on Solaris)
84	AC_DEFINE(_XOPEN_SOURCE, 2, Needed to get declarations for msg_control and msg_controllen on Solaris)
85	AC_DEFINE(__EXTENSIONS__, 1, Needed to get declarations for msg_control and msg_controllen on Solaris)
86	;;	80	;;
87	esac	81	esac
88		82
89	dnl if test x$GXX = xyes; then	83	dnl if test x$GXX = xyes; then
90	dnl CXXFLAGS="$CXXFLAGS" dnl I once had -fno-exceptions, but I am using them now...	84	dnl CXXFLAGS="$CXXFLAGS" dnl I once had -fno-exceptions, but I am using them now...
…		…
101	dnl AC_ENABLE_STATIC(yes)dnl# libtool	95	dnl AC_ENABLE_STATIC(yes)dnl# libtool
102	dnl AC_PROG_LIBTOOL()dnl# libtool	96	dnl AC_PROG_LIBTOOL()dnl# libtool
103		97
104	support_frills=yes	98	support_frills=yes
105	support_inheritpixmap=yes	99	support_inheritpixmap=yes
106	support_tinting=yes
107	support_fading=yes	100	support_fading=yes
108	support_keepscrolling=yes	101	support_keepscrolling=yes
109	support_selectionscrolling=yes	102	support_selectionscrolling=yes
110	support_mousewheel=yes	103	support_mousewheel=yes
111	support_mouseslipwheel=yes	104	support_mouseslipwheel=yes
…		…
114	support_scroll_rxvt=yes	107	support_scroll_rxvt=yes
115	support_scroll_next=yes	108	support_scroll_next=yes
116	support_scroll_xterm=yes	109	support_scroll_xterm=yes
117	support_scroll_plain=yes	110	support_scroll_plain=yes
118	support_xim=yes	111	support_xim=yes
119	support_xpm=yes
120	support_afterimage=yes	112	support_afterimage=yes
121	support_afterstep=yes	113	support_afterstep=yes
122	support_xft=yes	114	support_xft=yes
123	support_unicode3=no	115	support_unicode3=no
124	support_combining=yes	116	support_combining=yes
…		…
144	NOTE: automatically enabled with --enable-shared],	136	NOTE: automatically enabled with --enable-shared],
145	[	137	[
146	if test x$enableval = xno; then	138	if test x$enableval = xno; then
147	support_frills=no	139	support_frills=no
148	support_inheritpixmap=no	140	support_inheritpixmap=no
149	support_tinting=no
150	support_fading=no	141	support_fading=no
151	support_keepscrolling=no	142	support_keepscrolling=no
152	support_selectionscrolling=no	143	support_selectionscrolling=no
153	support_lastlog=no	144	support_lastlog=no
154	support_mousewheel=no	145	support_mousewheel=no
…		…
160	support_scroll_xterm=no	151	support_scroll_xterm=no
161	support_scroll_plain=no	152	support_scroll_plain=no
162	support_utmp=no	153	support_utmp=no
163	support_wtmp=no	154	support_wtmp=no
164	support_xim=no	155	support_xim=no
165	support_xpm=no
166	support_afterimage=no	156	support_afterimage=no
167	support_afterstep=no	157	support_afterstep=no
168	support_xft=no	158	support_xft=no
169	support_unicode3=no	159	support_unicode3=no
170	support_combining=no	160	support_combining=no
…		…
175	codesets=	165	codesets=
176	fi	166	fi
177	if test x$enableval = xyes; then	167	if test x$enableval = xyes; then
178	support_frills=yes	168	support_frills=yes
179	support_inheritpixmap=yes	169	support_inheritpixmap=yes
180	support_tinting=yes
181	support_fading=yes	170	support_fading=yes
182	support_keepscrolling=yes	171	support_keepscrolling=yes
183	support_selectionscrolling=yes	172	support_selectionscrolling=yes
184	support_lastlog=yes	173	support_lastlog=yes
185	support_mousewheel=yes	174	support_mousewheel=yes
…		…
191	support_scroll_xterm=yes	180	support_scroll_xterm=yes
192	support_scroll_plain=yes	181	support_scroll_plain=yes
193	support_utmp=yes	182	support_utmp=yes
194	support_wtmp=yes	183	support_wtmp=yes
195	support_xim=yes	184	support_xim=yes
196	support_xpm=yes
197	support_afterimage=yes	185	support_afterimage=yes
198	support_afterstep=yes	186	support_afterstep=yes
199	support_xft=yes	187	support_xft=yes
200	support_unicode3=yes	188	support_unicode3=yes
201	support_combining=yes	189	support_combining=yes
…		…
205	support_perl=yes	193	support_perl=yes
206	codesets=all	194	codesets=all
207	fi	195	fi
208	])	196	])
209		197
		198	WARNINGS=no
		199	AC_ARG_ENABLE(warnings,
		200	[ --enable-warnings turn on g++ warnings],
		201	[if test x$enableval = xyes; then
		202	WARNINGS=yes
		203	fi])
		204	if test x$GXX = xyes; then
		205	if test $WARNINGS = yes; then
		206	save_CXXFLAGS="$CXXFLAGS"
		207	CXXFLAGS="$CXXFLAGS -Wall -Wno-sign-compare -Wno-reorder -Wno-non-virtual-dtor"
		208	AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[])], [], [CXXFLAGS="$save_CXXFLAGS"])
		209	else
		210	CXXFLAGS="$CXXFLAGS -w"
		211	fi
		212	fi
		213
210	AC_ARG_ENABLE(unicode3,	214	AC_ARG_ENABLE(unicode3,
211	[ --enable-unicode3 use 21 instead of 16 bits to represent unicode characters],	215	[ --enable-unicode3 use 21 instead of 16 bits to represent unicode characters],
212	[if test x$enableval = xyes -o x$enableval = xno; then	216	[if test x$enableval = xyes -o x$enableval = xno; then
213	support_unicode3=$enableval	217	support_unicode3=$enableval
214	fi])	218	fi])
…		…
227		231
228	AC_ARG_ENABLE(font-styles,	232	AC_ARG_ENABLE(font-styles,
229	[ --enable-font-styles enable bold and italic support],	233	[ --enable-font-styles enable bold and italic support],
230	[if test x$enableval = xyes -o x$enableval = xno; then	234	[if test x$enableval = xyes -o x$enableval = xno; then
231	support_styles=$enableval	235	support_styles=$enableval
232	fi])
233
234	AC_ARG_ENABLE(xpm-background,
235	[ --enable-xpm-background enable background pixmaps],
236	[if test x$enableval = xyes -o x$enableval = xno; then
237	support_xpm=$enableval
238	fi])	236	fi])
239		237
240	AC_ARG_ENABLE(afterimage,	238	AC_ARG_ENABLE(afterimage,
241	[ --enable-afterimage enable integration with libAfterImage for background images],	239	[ --enable-afterimage enable integration with libAfterImage for background images],
242	[if test x$enableval = xyes -o x$enableval = xno; then	240	[if test x$enableval = xyes -o x$enableval = xno; then
…		…
247	[ --with-afterimage-config=DIR use libAfterImage config script in DIR],	245	[ --with-afterimage-config=DIR use libAfterImage config script in DIR],
248	[if test "x$withval" != x; then	246	[if test "x$withval" != x; then
249	afterimage_config=$withval/afterimage-config	247	afterimage_config=$withval/afterimage-config
250	fi])	248	fi])
251		249
252	AC_ARG_ENABLE(afterstep,	250	dnl AC_ARG_ENABLE(afterstep,
253	[ --enable-afterstep enable integration with AfterStep window manager],	251	dnl [ --enable-afterstep enable integration with AfterStep window manager],
254	[if test x$enableval = xyes -o x$enableval = xno; then	252	dnl [if test x$enableval = xyes -o x$enableval = xno; then
255	support_afterstep=$enableval	253	dnl support_afterstep=$enableval
256	fi])	254	dnl fi])
257		255
258	AC_ARG_ENABLE(transparency,	256	AC_ARG_ENABLE(transparency,
259	[ --enable-transparency enable transparent backgrounds],	257	[ --enable-transparency enable transparent backgrounds],
260	[if test x$enableval = xyes -o x$enableval = xno; then	258	[if test x$enableval = xyes -o x$enableval = xno; then
261	support_inheritpixmap=$enableval	259	support_inheritpixmap=$enableval
262	fi])	260	fi])
263		261
264	AC_ARG_ENABLE(tinting,
265	[ --enable-tinting enable tinting of transparent bg],
266	[if test x$enableval = xyes -o x$enableval = xno; then
267	support_tinting=$enableval
268	fi])
269
270	AC_ARG_ENABLE(fading,	262	AC_ARG_ENABLE(fading,
271	[ --enable-fading enable colors fading when off focus],	263	[ --enable-fading enable colors fading when off focus],
272	[if test x$enableval = xyes -o x$enableval = xno; then	264	[if test x$enableval = xyes -o x$enableval = xno; then
273	support_fading=$enableval	265	support_fading=$enableval
274	fi])	266	fi])
…		…
302	[if test x$enableval = xyes -o x$enableval = xno; then	294	[if test x$enableval = xyes -o x$enableval = xno; then
303	support_scroll_plain=$enableval	295	support_scroll_plain=$enableval
304	fi])	296	fi])
305		297
306	AC_ARG_WITH(codesets,	298	AC_ARG_WITH(codesets,
307	[ --with-codesets=NAME,.. compile in additional codesets (jp,jp_ext,kr,zh,zh_ext,all)],	299	[ --with-codesets=CS,... compile in additional codesets (jp,jp_ext,kr,zh,zh_ext,all)],
308	[codesets="$withval"])	300	[codesets="$withval"])
309		301
310	AC_ARG_ENABLE(xim,	302	AC_ARG_ENABLE(xim,
311	[ --enable-xim XIM (X Input Method) protocol support],	303	[ --enable-xim XIM (X Input Method) protocol support],
312	[if test x$enableval = xyes -o x$enableval = xno; then	304	[if test x$enableval = xyes -o x$enableval = xno; then
…		…
337	support_8bitctrls=$enableval	329	support_8bitctrls=$enableval
338	fi])	330	fi])
339		331
340	RESFALLBACK=Rxvt	332	RESFALLBACK=Rxvt
341	AC_ARG_ENABLE(fallback,	333	AC_ARG_ENABLE(fallback,
342	[ --enable-fallback(=CLASS) fall back on CLASS resources in addition to URxvt ones (default: Rxvt)],	334	[ --enable-fallback@<:@=CLASS@:>@ fall back on CLASS resources in addition to URxvt ones (default: Rxvt)],
343	[	335	[
344	test x$enableval = xyes && enableval=Rxvt	336	test x$enableval = xyes && enableval=Rxvt
345	test x$enableval = xno && enableval=	337	test x$enableval = xno && enableval=
346	RESFALLBACK="$enableval"	338	RESFALLBACK="$enableval"
347	])	339	])
…		…
406	[if test x$enableval = xyes -o x$enableval = xno; then	398	[if test x$enableval = xyes -o x$enableval = xno; then
407	support_mousewheel=$enableval	399	support_mousewheel=$enableval
408	fi])	400	fi])
409		401
410	AC_ARG_ENABLE(slipwheeling,	402	AC_ARG_ENABLE(slipwheeling,
411	[ --enable-slipwheeling enable slip wheel scrolling (requires previous)],	403	[ --enable-slipwheeling enable slip wheel scrolling (requires --enable-mousewheel)],
412	[if test x$enableval = xyes -o x$enableval = xno; then	404	[if test x$enableval = xyes -o x$enableval = xno; then
413	support_mouseslipwheel=$enableval	405	support_mouseslipwheel=$enableval
414	fi])	406	fi])
415		407
416	AC_ARG_ENABLE(smart-resize,	408	AC_ARG_ENABLE(smart-resize,
…		…
443	AC_DEFINE_UNQUOTED(RXVT_TERMINFO, "$withval", Set TERMINFO value to the value given by configure) terminfo="$withval"	435	AC_DEFINE_UNQUOTED(RXVT_TERMINFO, "$withval", Set TERMINFO value to the value given by configure) terminfo="$withval"
444	fi])	436	fi])
445		437
446	dnl# --------------------------------------------------------------------------	438	dnl# --------------------------------------------------------------------------
447		439
448	AC_PATH_PROG(TIC, tic)	440	AC_PATH_PROG(TIC, tic, :)
449		441
450	dnl# need a neat way to detect SVR4 or its features	442	dnl# need a neat way to detect SVR4 or its features
451	dnl# in src/command.c we use these functions:	443	dnl# in src/command.c we use these functions:
452	dnl# grantpt(), unlockpt(), ptsname(), which are defined in <sys/ptms.h>	444	dnl# grantpt(), unlockpt(), ptsname(), which are defined in <sys/ptms.h>
453	dnl# - but are these also defined for other systems?	445	dnl# - but are these also defined for other systems?
…		…
460	dnl## #endif	452	dnl## #endif
461	dnl## ], [AC_MSG_RESULT(yes); AC_DEFINE(PERHAPS_SVR4)], AC_MSG_RESULT(perhaps not?))	453	dnl## ], [AC_MSG_RESULT(yes); AC_DEFINE(PERHAPS_SVR4)], AC_MSG_RESULT(perhaps not?))
462		454
463	AC_PATH_XTRA	455	AC_PATH_XTRA
464		456
465	dnl# the only reasonable way to find libXpm is do-it-yourself
466	dnl# only check if we want xpm-background
467
468	LIBAFTERIMAGE_CFLAGS=	457	AFTERIMAGE_CFLAGS=
469	AFTERIMAGE_LIBS=	458	AFTERIMAGE_LIBS=
470	have_afterimage=	459	AFTERIMAGE_VERSION=
471		460
472	if test x$support_afterimage = xyes; then	461	if test x$support_afterimage = xyes; then
473	support_afterimage=no	462	support_afterimage=no
474		463
475	if test "x$afterimage_config" = "x" ; then	464	if test "x$afterimage_config" = "x" ; then
476	AC_PATH_PROG(afterimage_config, afterimage-config, no)	465	AC_PATH_PROG(afterimage_config, afterimage-config, no)
477	fi	466	fi
478		467	if test "x$afterimage_config" != "xno" ; then
479	AC_MSG_CHECKING(for libAfterImage)	468	AC_MSG_CHECKING(for libAfterImage version >= 1.15)
480	if $afterimage_config --version >/dev/null 2>&1 ; then	469	xAFTERIMAGE_VERSION=`$afterimage_config --version`
		470	if test -n "$xAFTERIMAGE_VERSION" ; then
481	LIBAFTERIMAGE_CFLAGS=`$afterimage_config --cflags`	471	xAFTERIMAGE_CFLAGS=`$afterimage_config --cflags`
482	AFTERIMAGE_LIBS=`$afterimage_config --libs`	472	xAFTERIMAGE_LIBS=`$afterimage_config --libs`
483	if test "x$AFTERIMAGE_LIBS" != "x"; then	473	if test "x$xAFTERIMAGE_LIBS" != "x"; then
		474	libai_ver_major=`echo $xAFTERIMAGE_VERSION \| cut -f 1 -d .`
		475	libai_ver_minor=`echo $xAFTERIMAGE_VERSION \| cut -f 2 -d .`
		476	if test $libai_ver_major -gt 1 -o $ $libai_ver_major -eq 1 -a $libai_ver_minor -ge 15 $; then
484	support_afterimage=yes	477	support_afterimage=yes
		478	AFTERIMAGE_CFLAGS="$xAFTERIMAGE_CFLAGS"
		479	AFTERIMAGE_LIBS="$xAFTERIMAGE_LIBS"
		480	AFTERIMAGE_VERSION="$xAFTERIMAGE_VERSION"
		481	fi
		482	fi
485	fi	483	fi
486	fi
487
488	if test "x$support_afterimage" = "xyes"; then	484	if test "x$support_afterimage" = "xyes"; then
489	AC_MSG_RESULT($AFTERIMAGE_LIBS)	485	AC_MSG_RESULT($AFTERIMAGE_LIBS)
490	else	486	else
491	AC_MSG_RESULT(no)	487	AC_MSG_RESULT(no)
492	fi	488	fi
493	fi
494
495	if test x$support_afterimage != xyes -a x$support_xpm = xyes ; then
496	VT_FIND_LIBXPM
497	if test x$no_xpm = xyes; then
498	support_xpm=needsmanualspecification
499	fi	489	fi
500	fi	490	fi
501		491
502	dnl# --------------------------------------------------------------------------	492	dnl# --------------------------------------------------------------------------
503	dnl# CHECKING FOR HEADER FILES	493	dnl# CHECKING FOR HEADER FILES
…		…
531	#include <sys/ioctl.h>	521	#include <sys/ioctl.h>
532	#ifdef HAVE_TERMIOS_H	522	#ifdef HAVE_TERMIOS_H
533	#include <termios.h>	523	#include <termios.h>
534	#endif]], [[int a = ECHO;]])],[rxvt_cv_header_sysioctl=yes],[rxvt_cv_header_sysioctl=no])])	524	#endif]], [[int a = ECHO;]])],[rxvt_cv_header_sysioctl=yes],[rxvt_cv_header_sysioctl=no])])
535		525
536	dnl# ELF systems may want to store paths for dynamic libraries.
537	dnl# Lets see if the compiler can accept "-Rpath" or "-Wl,-Rpath"
538	dnl# At least one version of SunOS wants "-R path" but it's not checked yet.
539	if test -n "$GCC"; then
540	LDARG="-Wl,"
541	else
542	LDARG=""
543	fi
544	changequote(, )dnl
545	R_TRANSLATE='s/-L$[^ ]*$/-L\1 '$LDARG'-rpath '$LDARG'\1/g'
546	changequote([, ])dnl
547
548	ac_save_CFLAGS=$CFLAGS
549	ac_save_LIBS=$LIBS
550	CFLAGS="$CFLAGS $X_CFLAGS"
551	LIBS=`echo "$LIBS $X_LIBS $X_EXTRA_LIBS -lX11" \| sed "$R_TRANSLATE"`
552	AC_CACHE_CHECK([for -rpath dynamic library path recording], rxvt_cv_rpath,
553	[AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <X11/Xlib.h>
554	#include <stdlib.h>
555	main()
556	{
557	exit(0);
558	(void) XOpenDisplay("foobar");
559	}]])],[rxvt_cv_rpath=yes],[rxvt_cv_rpath=no],[dnl
560	AC_MSG_WARN(You may need to check the LIBS line)])])
561	if test x$rxvt_cv_rpath != xyes; then
562	changequote(, )dnl
563	R_TRANSLATE='s/-L$[^ ]*$/-L\1 '$LDARG'-R\1/g'
564	changequote([, ])dnl
565	LIBS=`echo "$ac_save_LIBS $X_LIBS $X_EXTRA_LIBS -lX11" \| sed "$R_TRANSLATE"`
566	AC_CACHE_CHECK([for -R dynamic library path recording], rxvt_cv_R,
567	[AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <X11/Xlib.h>
568	#include <stdlib.h>
569	main()
570	{
571	exit(0);
572	(void) XOpenDisplay("foobar");
573	}]])],[rxvt_cv_R=yes],[rxvt_cv_R=no],[rxvt_cv_R=no])])
574	if test x$rxvt_cv_R != xyes; then
575	LIBS="$ac_save_LIBS $X_LIBS $X_EXTRA_LIBS -lX11"
576	fi
577	fi
578
579	AC_CACHE_CHECK([for XPointer], rxvt_cv_xpointer,	526	AC_CACHE_CHECK([for XPointer], rxvt_cv_xpointer,
580	[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <X11/Xlib.h>]], [[XPointer dummy;]])],[rxvt_cv_xpointer=yes],[rxvt_cv_xpointer=no])])	527	[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <X11/Xlib.h>]], [[XPointer dummy;]])],[rxvt_cv_xpointer=yes],[rxvt_cv_xpointer=no])])
581	if test x$rxvt_cv_xpointer = xyes; then	528	if test x$rxvt_cv_xpointer = xyes; then
582	AC_DEFINE(HAVE_XPOINTER, 1, Define if you have XPointer typedef)	529	AC_DEFINE(HAVE_XPOINTER, 1, Define if you have XPointer typedef)
583	fi	530	fi
584	LIBS=$ac_save_LIBS
585	CFLAGS=$ac_save_CFLAGS
586		531
587	AC_CACHE_CHECK([for XLIB_ILLEGAL_ACCESS], rxvt_xlib_illegal_access,	532	AC_CACHE_CHECK([for XLIB_ILLEGAL_ACCESS], rxvt_xlib_illegal_access,
588	[AC_COMPILE_IFELSE(	533	[AC_COMPILE_IFELSE(
589	[AC_LANG_PROGRAM([	534	[AC_LANG_PROGRAM([
590	#define XLIB_ILLEGAL_ACCESS	535	#define XLIB_ILLEGAL_ACCESS
…		…
726		671
727	dnl# --------------------------------------------------------------------------	672	dnl# --------------------------------------------------------------------------
728	dnl# --------------------------------------------------------------------------	673	dnl# --------------------------------------------------------------------------
729		674
730	dnl# this is a really hack test for some basic Xlocale stuff	675	dnl# this is a really hack test for some basic Xlocale stuff
731	ac_save_LIBS=$LIBS	676	save_LIBS=$LIBS
732	ac_save_CFLAGS=$CFLAGS	677	save_CFLAGS=$CFLAGS
733	CFLAGS="$CFLAGS $X_CFLAGS"	678	CFLAGS="$CFLAGS $X_CFLAGS"
734	LIBS="$LIBS $X_LIBS $X_EXTRA_LIBS -lX11"	679	LIBS="$LIBS $X_LIBS $X_EXTRA_LIBS -lX11"
735	if test x$rxvt_cv_rpath = xyes -o x$rxvt_cv_R = xyes; then	680	if test x$support_xim = xyes; then
736	LIBS=`echo $LIBS \| sed "$R_TRANSLATE"`
737	fi
738	AC_CACHE_CHECK(for working Xlocale, rxvt_cv_func_xlocale,	681	AC_CACHE_CHECK(for working Xlocale, rxvt_cv_func_xlocale,
739	[AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <X11/Xlib.h>	682	[AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <X11/Xlib.h>
740	#include <stdlib.h>	683	#include <stdlib.h>
741	main() {	684	main() {
742	char *p;	685	char *p;
743	if ((p = XSetLocaleModifiers("@im=none")) != NULL && *p)	686	if ((p = XSetLocaleModifiers("@im=none")) != NULL && *p)
744	exit (XSupportsLocale() ? 0 : 1);	687	exit (XSupportsLocale() ? 0 : 1);
745	else	688	else
746	exit (1);}]])],[dnl	689	exit (1);}]])],[dnl
747	rxvt_cv_func_xlocale=yes],[rxvt_cv_func_xlocale=no],[dnl	690	rxvt_cv_func_xlocale=yes],[rxvt_cv_func_xlocale=no],[dnl
748	AC_MSG_WARN(Define NO_XLOCALE in config.h manually)])])	691	:])])
749	if test x$rxvt_cv_func_xlocale = xyes; then	692	if test x$rxvt_cv_func_xlocale = xyes; then
750	AC_DEFINE(HAVE_XLOCALE, 1, Define if Xlocale support works)	693	AC_DEFINE(USE_XIM, 1, Define if you want to have XIM (X Input Method) protocol support - required for multibyte characters input)
		694	AC_CACHE_CHECK(for broken XIM callback, rxvt_broken_ximcb,
		695	[AC_COMPILE_IFELSE([
		696	#include <X11/Xlib.h>
		697
		698	void im_destroy_cb (XIC unused1, XPointer client_data, XPointer unused3);
		699
		700	void f() {
		701	XIMCallback cb;
		702	cb.callback = im_destroy_cb;
		703	}
		704	],rxvt_broken_ximcb=yes,rxvt_broken_ximcb=no)])
		705
		706	if test x$rxvt_broken_ximcb = xyes; then
		707	AC_DEFINE(XIMCB_PROTO_BROKEN, 1, Define if your XIMCallback specifies XIC as first type.)
		708	fi
		709	fi
751	fi	710	fi
752		711
753	AC_CACHE_CHECK(for working X setlocale, rxvt_cv_func_xsetlocale,	712	AC_CACHE_CHECK(for working X setlocale, rxvt_cv_func_xsetlocale,
754	[AC_LINK_IFELSE([AC_LANG_PROGRAM([[#define X_LOCALE 1	713	[AC_LINK_IFELSE([AC_LANG_PROGRAM([[#define X_LOCALE 1
755	#include <X11/Xlocale.h>]], [[setlocale(LC_CTYPE, "");]])],[rxvt_cv_func_xsetlocale=yes],[rxvt_cv_func_xsetlocale=no])])	714	#include <X11/Xlocale.h>]], [[setlocale(LC_CTYPE, "");]])],[rxvt_cv_func_xsetlocale=yes],[rxvt_cv_func_xsetlocale=no])])
756	if test x$rxvt_cv_func_xsetlocale = xyes; then	715	if test x$rxvt_cv_func_xsetlocale = xyes; then
757	AC_DEFINE(HAVE_XSETLOCALE, 1, Define if setlocale (defined to Xsetlocale) works)	716	AC_DEFINE(HAVE_XSETLOCALE, 1, Define if setlocale (defined to Xsetlocale) works)
758	fi	717	fi
759	LIBS=$ac_save_LIBS	718	LIBS=$save_LIBS
760	CFLAGS=$ac_save_CFLAGS	719	CFLAGS=$save_CFLAGS
761		720
762	AC_CACHE_CHECK(for working plain setlocale, rxvt_cv_func_setlocale,	721	AC_CACHE_CHECK(for working plain setlocale, rxvt_cv_func_setlocale,
763	[AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <clocale>]], [[setlocale(LC_CTYPE, "");]])],[rxvt_cv_func_setlocale=yes],[rxvt_cv_func_setlocale=no])])	722	[AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <clocale>]], [[setlocale(LC_CTYPE, "");]])],[rxvt_cv_func_setlocale=yes],[rxvt_cv_func_setlocale=no])])
764	if test x$rxvt_cv_func_setlocale = xyes; then	723	if test x$rxvt_cv_func_setlocale = xyes; then
765	AC_DEFINE(HAVE_SETLOCALE, 1, Define if plain old setlocale works)	724	AC_DEFINE(HAVE_SETLOCALE, 1, Define if plain old setlocale works)
…		…
770	if test x$rxvt_cv_func_nl_langinfo = xyes; then	729	if test x$rxvt_cv_func_nl_langinfo = xyes; then
771	AC_DEFINE(HAVE_NL_LANGINFO, 1, Define if nl_langinfo(CODESET) works)	730	AC_DEFINE(HAVE_NL_LANGINFO, 1, Define if nl_langinfo(CODESET) works)
772	fi	731	fi
773		732
774	SCM_RIGHTS_CHECK	733	SCM_RIGHTS_CHECK
775
776	AC_CACHE_CHECK(for broken XIM callback, rxvt_broken_ximcb,
777	[AC_COMPILE_IFELSE([
778	#include <X11/Xlib.h>
779
780	void im_destroy_cb (XIC unused1, XPointer client_data, XPointer unused3);
781
782	void f() {
783	XIMCallback cb;
784	cb.callback = im_destroy_cb;
785	}
786	],rxvt_broken_ximcb=yes,rxvt_broken_ximcb=no)])
787
788	if test x$rxvt_broken_ximcb = xyes; then
789	AC_DEFINE(XIMCB_PROTO_BROKEN, 1, Define if your XIMCallback specifies XIC as first type.)
790	fi
791		734
792	PTY_CHECK	735	PTY_CHECK
793		736
794	TTY_GROUP_CHECK	737	TTY_GROUP_CHECK
795		738
…		…
826	AC_DEFINE(EIGHT_BIT_CONTROLS, 1, Define if you want 8 bit control sequences)	769	AC_DEFINE(EIGHT_BIT_CONTROLS, 1, Define if you want 8 bit control sequences)
827	fi	770	fi
828	if test x$support_fading = xyes; then	771	if test x$support_fading = xyes; then
829	AC_DEFINE(OFF_FOCUS_FADING, 1, Define if you want faded colors when focus is lost)	772	AC_DEFINE(OFF_FOCUS_FADING, 1, Define if you want faded colors when focus is lost)
830	fi	773	fi
831	if test x$support_tinting = xyes; then
832	AC_DEFINE(TINTING, 1, Define if you want your background to be tinted)
833	fi
834	if test x$support_inheritpixmap = xyes; then	774	if test x$support_inheritpixmap = xyes; then
835	AC_DEFINE(TRANSPARENT, 1, Define if you want your background to use the parent window background)	775	AC_DEFINE(ENABLE_TRANSPARENCY, 1, Define if you want your background to use the parent window background)
836	fi	776	fi
837	if test x$support_keepscrolling = xno; then	777	if test x$support_keepscrolling = xno; then
838	AC_DEFINE(NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING, 1, Define for continual scrolling when you keep the scrollbar button pressed)	778	AC_DEFINE(NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING, 1, Define for continual scrolling when you keep the scrollbar button pressed)
839	fi	779	fi
840	if test x$support_selectionscrolling = xyes; then	780	if test x$support_selectionscrolling = xyes; then
…		…
847	AC_DEFINE(MOUSE_WHEEL, 1, Define to use wheel events (button4 and button5) to scroll)	787	AC_DEFINE(MOUSE_WHEEL, 1, Define to use wheel events (button4 and button5) to scroll)
848	fi	788	fi
849	if test x$support_mouseslipwheel = xyes; then	789	if test x$support_mouseslipwheel = xyes; then
850	AC_DEFINE(MOUSE_SLIP_WHEELING, 1, Define to have CTRL cause wheel events to accelerate scrolling. Release CTRL to halt scrolling)	790	AC_DEFINE(MOUSE_SLIP_WHEELING, 1, Define to have CTRL cause wheel events to accelerate scrolling. Release CTRL to halt scrolling)
851	fi	791	fi
852	if test x$support_xim = xyes -o x$multichar_set = xyes; then
853	if test x$rxvt_cv_func_xlocale = xyes; then
854	AC_DEFINE(USE_XIM, 1, Define if you want to have XIM (X Input Method) protocol support - required for multibyte characters input)
855	fi
856	fi
857	if test x$support_xpm = xyes -o x$support_afterimage = xyes ; then
858	AC_DEFINE(XPM_BACKGROUND, 1, Define if you want to have sexy-looking background pixmaps. Needs libXpm or libAfterImage)
859	fi
860
861	if test x$support_afterimage = xyes; then	792	if test x$support_afterimage = xyes; then
862	AC_DEFINE(HAVE_AFTERIMAGE, 1, Define if you want to use libAfterImage for image processing)	793	AC_DEFINE(HAVE_AFTERIMAGE, 1, Define if you want to use libAfterImage for image processing)
		794	AC_DEFINE(BG_IMAGE_FROM_FILE, 1, Define if you want to have sexy-looking background pixmaps. Needs libAfterImage)
863	fi	795	fi
864		796
865	if test x$support_afterstep = xyes; then	797	dnl if test x$support_afterstep = xyes; then
866	AC_DEFINE(AFTERSTEP_INTEGRATION, 1, Define if you want to integrate with AfterStep window manager)	798	dnl AC_DEFINE(AFTERSTEP_INTEGRATION, 1, Define if you want to integrate with AfterStep window manager)
867	fi	799	dnl fi
868		800
869	if test x$support_scroll_rxvt = xyes; then	801	if test x$support_scroll_rxvt = xyes; then
870	AC_DEFINE(RXVT_SCROLLBAR, 1, Support Rxvt original style scrollbars)	802	AC_DEFINE(RXVT_SCROLLBAR, 1, Support Rxvt original style scrollbars)
871	scrolltypes="rxvt"	803	scrolltypes="rxvt"
872	fi	804	fi
…		…
951	AC_SUBST(PERLPRIVLIBEXP)	883	AC_SUBST(PERLPRIVLIBEXP)
952	AC_SUBST(PERL)	884	AC_SUBST(PERL)
953	AC_SUBST(IF_PERL)	885	AC_SUBST(IF_PERL)
954	AC_SUBST(PERL_O)	886	AC_SUBST(PERL_O)
955		887
956	if test x$support_perl = xyes; then
957	support_frills=yes
958	fi
959
960	AC_SUBST(CFLAGS)	888	AC_SUBST(CFLAGS)
961	AC_SUBST(CPPFLAGS)	889	AC_SUBST(CPPFLAGS)
962	AC_SUBST(LDFLAGS)	890	AC_SUBST(LDFLAGS)
963	AC_SUBST(X_CFLAGS)	891	AC_SUBST(X_CFLAGS)
964		892
965	dnl# Attack the libs	893	dnl# Attack the libs
966	if test x$rxvt_cv_rpath = xyes -o x$rxvt_cv_R = xyes; then
967	LIBS=`echo $LIBS \| sed "$R_TRANSLATE"`
968	X_LIBS=`echo $X_LIBS \| sed "$R_TRANSLATE"`
969	X_EXTRA_LIBS=`echo $X_EXTRA_LIBS \| sed "$R_TRANSLATE"`
970	XPM_LIBS=`echo $XPM_LIBS \| sed "$R_TRANSLATE"`
971	fi
972	AC_SUBST(LIBS)	894	AC_SUBST(LIBS)
973	AC_SUBST(X_LIBS)	895	AC_SUBST(X_LIBS)
974	AC_SUBST(X_EXTRA_LIBS)	896	AC_SUBST(X_EXTRA_LIBS)
975		897
976	AC_SUBST(LIBAFTERIMAGE_CFLAGS)	898	AC_SUBST(AFTERIMAGE_CFLAGS)
977	AC_SUBST(AFTERIMAGE_LIBS)	899	AC_SUBST(AFTERIMAGE_LIBS)
978		900
979	AC_ARG_PROGRAM	901	AC_ARG_PROGRAM
980		902
981	dnl# test for "sun" or "__sun__" before include sys_ioctl	903	dnl# test for "sun" or "__sun__" before include sys_ioctl
…		…
1017	Install path: ${prefix}/bin	939	Install path: ${prefix}/bin
1018	Compiler: $CXX	940	Compiler: $CXX
1019	Compiler flags: $CXXFLAGS	941	Compiler flags: $CXXFLAGS
1020	Linker: $LINKER"	942	Linker: $LINKER"
1021		943
1022	if test x$support_xpm = xyes; then
1023	echo " Xpm library: $XPM_LIBS"
1024	fi
1025
1026	if test x$support_afterimage = xyes; then
1027	echo " AfterImage support: yes"
1028	fi
1029
1030	if test x$support_afterstep = xyes; then
1031	echo " AfterStep integration: yes"
1032	fi
1033
1034	if test x$term != x; then	944	if test x$term != x; then
1035	echo " set TERM to: $term"	945	echo " set TERM to: $term"
1036	fi	946	fi
1037	if test x$terminfo != x; then	947	if test x$terminfo != x; then
1038	echo " set TERMINFO to: $terminfo"	948	echo " set TERMINFO to: $terminfo"
…		…
1042	if test x$RESFALLBACK != x; then	952	if test x$RESFALLBACK != x; then
1043	echo " resource class fallback: $RESFALLBACK"	953	echo " resource class fallback: $RESFALLBACK"
1044	fi	954	fi
1045	echo	955	echo
1046	echo " embedded perl: $support_perl"	956	echo " embedded perl: $support_perl"
		957	echo " libafterimage: $support_afterimage"
		958	dnl echo " AfterStep integration: $support_afterstep"
1047	echo	959	echo
1048	if test x$support_xpm = xneedsmanualspecification; then
1049	echo ".----------------------------------------------------------------."
1050	echo ". WARNING: --enable-xpm-background was specified however the ."
1051	echo ". XPM includes files and libraries could not be found. ."
1052	echo ". XPM backgrounds are now being DISABLED! If you want ."
1053	echo ". to use them you should rerun configure with the ."
1054	echo ". appropriate --with-xpm-includes=/path/to/xpm/includes ."
1055	echo ". and --with-xpm-library=/path/to/xpm/library lines. ."
1056	echo ".----------------------------------------------------------------."
1057	fi
1058	if test x$support_xim = xyes -a x$rxvt_cv_func_xlocale = xno; then	960	if test x$support_xim = xyes -a x$rxvt_cv_func_xlocale = xno; then
1059	echo ".----------------------------------------------------------------."	961	echo ".----------------------------------------------------------------."
1060	echo ". WARNING: --enable-xim was specified however the locale support ."	962	echo ". WARNING: --enable-xim was specified however the locale support ."
1061	echo ". functions could not be found. ."	963	echo ". functions could not be found. ."
1062	echo ". XIM is now being DISABLED! ."	964	echo ". XIM is now being DISABLED! ."

Diff Legend

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines

Comparing rxvt-unicode/configure.ac (file contents): Revision 1.52 by ayin, Wed Jun 13 16:20:41 2007 UTC vs. Revision 1.79 by ayin, Wed Oct 31 11:59:09 2007 UTC

Diff Legend

Comparing rxvt-unicode/configure.ac (file contents):
Revision 1.52 by ayin, Wed Jun 13 16:20:41 2007 UTC vs.
Revision 1.79 by ayin, Wed Oct 31 11:59:09 2007 UTC