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

Comparing rxvt-unicode/configure.ac (file contents):
Revision 1.59 by ayin, Tue Jun 26 20:53:07 2007 UTC vs.
Revision 1.86 by ayin, Tue Dec 4 01:20:49 2007 UTC

…		…
17	changequote([, ])dnl	17	changequote([, ])dnl
18	AC_SUBST(VERSION)dnl	18	AC_SUBST(VERSION)dnl
19	AC_SUBST(DATE)dnl	19	AC_SUBST(DATE)dnl
20	AC_SUBST(LSMDATE)dnl	20	AC_SUBST(LSMDATE)dnl
21	AC_SUBST(LIBVERSION)dnl	21	AC_SUBST(LIBVERSION)dnl
		22
22	echo ""	23	echo ""
23	echo "configuring for rxvt $VERSION"	24	echo "configuring for rxvt $VERSION"
24	echo ""	25	echo ""
25		26
26	orig_CXXFLAGS="$CXXFLAGS"	27	orig_CXXFLAGS="$CXXFLAGS"
…		…
46	CXX="$CC"	47	CXX="$CC"
47	LIBS="$LIBS -lsupc++"	48	LIBS="$LIBS -lsupc++"
48	LINKER="$CC"	49	LINKER="$CC"
49	AC_LINK_IFELSE(	50	AC_LINK_IFELSE(
50	[AC_LANG_PROGRAM([struct test { }; void f() try { throw new test; } catch (...) { throw; }],[])],	51	[AC_LANG_PROGRAM([struct test { }; void f() try { throw new test; } catch (...) { throw; }],[])],
51	[
52	AC_MSG_RESULT(ok)	52	[AC_MSG_RESULT(ok)],
53	CXXLIB="-lsupc++"
54	],
55	[	53	[
56	AC_MSG_RESULT([no, making everything bigger and slower])	54	AC_MSG_RESULT([no, making everything bigger and slower])
57	LIBS="$save_LIBS"	55	LIBS="$save_LIBS"
58	LINKER="$save_CXX"	56	LINKER="$save_CXX"
59	]	57	]
60	)	58	)
61	CXX="$save_CXX"	59	CXX="$save_CXX"
62	fi	60	fi
63	AC_SUBST(LINKER,[$LINKER])	61	AC_SUBST(LINKER,[$LINKER])
64	AC_SUBST(CXXLIB)
65		62
66	dnl# --------------------------------------------------------------------------	63	dnl# --------------------------------------------------------------------------
67	dnl# Supply default CXXFLAGS, if not specified by `CXXFLAGS=flags ./configure'	64	dnl# Supply default CXXFLAGS, if not specified by `CXXFLAGS=flags ./configure'
68	dnl#	65	dnl#
69	if test -z "$orig_CXXFLAGS"; then	66	if test -z "$orig_CXXFLAGS"; then
70	if test x$GCC = xyes && test "x$GXX" = xyes; then	67	if test x$GCC = xyes && test "x$GXX" = xyes; then
71	CXXFLAGS="-g -O3 -fno-threadsafe-statics -fno-enforce-eh-specs"	68	CXXFLAGS="-g -O3 -fno-rtti -fvisibility-inlines-hidden -fno-threadsafe-statics -fno-enforce-eh-specs"
72	AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[])], [], [CXXFLAGS="-g -O3"])	69	AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[])], [], [CXXFLAGS="-g -O3"])
73	else	70	else
74	CXXFLAGS="-O"	71	CXXFLAGS="-O"
75	fi	72	fi
76	CFLAGS="$CXXFLAGS"	73	CFLAGS="$CXXFLAGS"
…		…
99	dnl AC_ENABLE_STATIC(yes)dnl# libtool	96	dnl AC_ENABLE_STATIC(yes)dnl# libtool
100	dnl AC_PROG_LIBTOOL()dnl# libtool	97	dnl AC_PROG_LIBTOOL()dnl# libtool
101		98
102	support_frills=yes	99	support_frills=yes
103	support_inheritpixmap=yes	100	support_inheritpixmap=yes
104	support_tinting=yes
105	support_fading=yes	101	support_fading=yes
106	support_keepscrolling=yes	102	support_keepscrolling=yes
107	support_selectionscrolling=yes	103	support_selectionscrolling=yes
108	support_mousewheel=yes	104	support_mousewheel=yes
109	support_mouseslipwheel=yes	105	support_mouseslipwheel=yes
…		…
112	support_scroll_rxvt=yes	108	support_scroll_rxvt=yes
113	support_scroll_next=yes	109	support_scroll_next=yes
114	support_scroll_xterm=yes	110	support_scroll_xterm=yes
115	support_scroll_plain=yes	111	support_scroll_plain=yes
116	support_xim=yes	112	support_xim=yes
117	support_xpm=yes
118	support_afterimage=yes	113	support_afterimage=yes
119	support_afterstep=yes	114	support_afterstep=yes
120	support_xft=yes	115	support_xft=yes
121	support_unicode3=no	116	support_unicode3=no
122	support_combining=yes	117	support_combining=yes
…		…
142	NOTE: automatically enabled with --enable-shared],	137	NOTE: automatically enabled with --enable-shared],
143	[	138	[
144	if test x$enableval = xno; then	139	if test x$enableval = xno; then
145	support_frills=no	140	support_frills=no
146	support_inheritpixmap=no	141	support_inheritpixmap=no
147	support_tinting=no
148	support_fading=no	142	support_fading=no
149	support_keepscrolling=no	143	support_keepscrolling=no
150	support_selectionscrolling=no	144	support_selectionscrolling=no
151	support_lastlog=no	145	support_lastlog=no
152	support_mousewheel=no	146	support_mousewheel=no
…		…
158	support_scroll_xterm=no	152	support_scroll_xterm=no
159	support_scroll_plain=no	153	support_scroll_plain=no
160	support_utmp=no	154	support_utmp=no
161	support_wtmp=no	155	support_wtmp=no
162	support_xim=no	156	support_xim=no
163	support_xpm=no
164	support_afterimage=no	157	support_afterimage=no
165	support_afterstep=no	158	support_afterstep=no
166	support_xft=no	159	support_xft=no
167	support_unicode3=no	160	support_unicode3=no
168	support_combining=no	161	support_combining=no
…		…
173	codesets=	166	codesets=
174	fi	167	fi
175	if test x$enableval = xyes; then	168	if test x$enableval = xyes; then
176	support_frills=yes	169	support_frills=yes
177	support_inheritpixmap=yes	170	support_inheritpixmap=yes
178	support_tinting=yes
179	support_fading=yes	171	support_fading=yes
180	support_keepscrolling=yes	172	support_keepscrolling=yes
181	support_selectionscrolling=yes	173	support_selectionscrolling=yes
182	support_lastlog=yes	174	support_lastlog=yes
183	support_mousewheel=yes	175	support_mousewheel=yes
…		…
189	support_scroll_xterm=yes	181	support_scroll_xterm=yes
190	support_scroll_plain=yes	182	support_scroll_plain=yes
191	support_utmp=yes	183	support_utmp=yes
192	support_wtmp=yes	184	support_wtmp=yes
193	support_xim=yes	185	support_xim=yes
194	support_xpm=yes
195	support_afterimage=yes	186	support_afterimage=yes
196	support_afterstep=yes	187	support_afterstep=yes
197	support_xft=yes	188	support_xft=yes
198	support_unicode3=yes	189	support_unicode3=yes
199	support_combining=yes	190	support_combining=yes
…		…
203	support_perl=yes	194	support_perl=yes
204	codesets=all	195	codesets=all
205	fi	196	fi
206	])	197	])
207		198
		199	WARNINGS=no
		200	AC_ARG_ENABLE(warnings,
		201	[ --enable-warnings turn on g++ warnings],
		202	[if test x$enableval = xyes; then
		203	WARNINGS=yes
		204	fi])
		205	if test x$GXX = xyes; then
		206	if test $WARNINGS = yes; then
		207	save_CXXFLAGS="$CXXFLAGS"
		208	CXXFLAGS="$CXXFLAGS -Wall -Wno-sign-compare -Wno-reorder -Wno-non-virtual-dtor"
		209	AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[])], [], [CXXFLAGS="$save_CXXFLAGS"])
		210	else
		211	CXXFLAGS="$CXXFLAGS -w"
		212	fi
		213	fi
		214
208	AC_ARG_ENABLE(unicode3,	215	AC_ARG_ENABLE(unicode3,
209	[ --enable-unicode3 use 21 instead of 16 bits to represent unicode characters],	216	[ --enable-unicode3 use 21 instead of 16 bits to represent unicode characters],
210	[if test x$enableval = xyes -o x$enableval = xno; then	217	[if test x$enableval = xyes -o x$enableval = xno; then
211	support_unicode3=$enableval	218	support_unicode3=$enableval
212	fi])	219	fi])
…		…
225		232
226	AC_ARG_ENABLE(font-styles,	233	AC_ARG_ENABLE(font-styles,
227	[ --enable-font-styles enable bold and italic support],	234	[ --enable-font-styles enable bold and italic support],
228	[if test x$enableval = xyes -o x$enableval = xno; then	235	[if test x$enableval = xyes -o x$enableval = xno; then
229	support_styles=$enableval	236	support_styles=$enableval
230	fi])
231
232	AC_ARG_ENABLE(xpm-background,
233	[ --enable-xpm-background enable background pixmaps],
234	[if test x$enableval = xyes -o x$enableval = xno; then
235	support_xpm=$enableval
236	fi])	237	fi])
237		238
238	AC_ARG_ENABLE(afterimage,	239	AC_ARG_ENABLE(afterimage,
239	[ --enable-afterimage enable integration with libAfterImage for background images],	240	[ --enable-afterimage enable integration with libAfterImage for background images],
240	[if test x$enableval = xyes -o x$enableval = xno; then	241	[if test x$enableval = xyes -o x$enableval = xno; then
…		…
245	[ --with-afterimage-config=DIR use libAfterImage config script in DIR],	246	[ --with-afterimage-config=DIR use libAfterImage config script in DIR],
246	[if test "x$withval" != x; then	247	[if test "x$withval" != x; then
247	afterimage_config=$withval/afterimage-config	248	afterimage_config=$withval/afterimage-config
248	fi])	249	fi])
249		250
250	AC_ARG_ENABLE(afterstep,	251	dnl AC_ARG_ENABLE(afterstep,
251	[ --enable-afterstep enable integration with AfterStep window manager],	252	dnl [ --enable-afterstep enable integration with AfterStep window manager],
252	[if test x$enableval = xyes -o x$enableval = xno; then	253	dnl [if test x$enableval = xyes -o x$enableval = xno; then
253	support_afterstep=$enableval	254	dnl support_afterstep=$enableval
254	fi])	255	dnl fi])
255		256
256	AC_ARG_ENABLE(transparency,	257	AC_ARG_ENABLE(transparency,
257	[ --enable-transparency enable transparent backgrounds],	258	[ --enable-transparency enable transparent backgrounds],
258	[if test x$enableval = xyes -o x$enableval = xno; then	259	[if test x$enableval = xyes -o x$enableval = xno; then
259	support_inheritpixmap=$enableval	260	support_inheritpixmap=$enableval
260	fi])	261	fi])
261		262
262	AC_ARG_ENABLE(tinting,
263	[ --enable-tinting enable tinting of transparent bg],
264	[if test x$enableval = xyes -o x$enableval = xno; then
265	support_tinting=$enableval
266	fi])
267
268	AC_ARG_ENABLE(fading,	263	AC_ARG_ENABLE(fading,
269	[ --enable-fading enable colors fading when off focus],	264	[ --enable-fading enable colors fading when off focus],
270	[if test x$enableval = xyes -o x$enableval = xno; then	265	[if test x$enableval = xyes -o x$enableval = xno; then
271	support_fading=$enableval	266	support_fading=$enableval
272	fi])	267	fi])
…		…
287	[ --enable-xterm-scroll enable Xterm style scrollbar],	282	[ --enable-xterm-scroll enable Xterm style scrollbar],
288	[if test x$enableval = xyes -o x$enableval = xno; then	283	[if test x$enableval = xyes -o x$enableval = xno; then
289	support_scroll_xterm=$enableval	284	support_scroll_xterm=$enableval
290	fi])	285	fi])
291		286
		287	AC_ARG_ENABLE(plain-scroll,
		288	[ --enable-plain-scroll enable plain style scrollbar],
		289	[if test x$enableval = xyes -o x$enableval = xno; then
		290	support_scroll_plain=$enableval
		291	fi])
		292
292	AC_ARG_ENABLE(perl,	293	AC_ARG_ENABLE(perl,
293	[ --enable-perl enable embedded perl interpreter],	294	[ --enable-perl enable embedded perl interpreter],
294	[if test x$enableval = xyes -o x$enableval = xno; then	295	[if test x$enableval = xyes -o x$enableval = xno; then
295	support_perl=$enableval	296	support_perl=$enableval
296	fi])	297	fi])
297		298
298	AC_ARG_ENABLE(plain-scroll,
299	[ --enable-plain-scroll enable plain style scrollbar],
300	[if test x$enableval = xyes -o x$enableval = xno; then
301	support_scroll_plain=$enableval
302	fi])
303
304	AC_ARG_WITH(codesets,	299	AC_ARG_WITH(codesets,
305	[ --with-codesets=NAME,.. compile in additional codesets (jp,jp_ext,kr,zh,zh_ext,all)],	300	[ --with-codesets=CS,... compile in additional codesets (jp,jp_ext,kr,zh,zh_ext,all)],
306	[codesets="$withval"])	301	[codesets="$withval"])
307		302
308	AC_ARG_ENABLE(xim,	303	AC_ARG_ENABLE(xim,
309	[ --enable-xim XIM (X Input Method) protocol support],	304	[ --enable-xim XIM (X Input Method) protocol support],
310	[if test x$enableval = xyes -o x$enableval = xno; then	305	[if test x$enableval = xyes -o x$enableval = xno; then
…		…
335	support_8bitctrls=$enableval	330	support_8bitctrls=$enableval
336	fi])	331	fi])
337		332
338	RESFALLBACK=Rxvt	333	RESFALLBACK=Rxvt
339	AC_ARG_ENABLE(fallback,	334	AC_ARG_ENABLE(fallback,
340	[ --enable-fallback(=CLASS) fall back on CLASS resources in addition to URxvt ones (default: Rxvt)],	335	[ --enable-fallback@<:@=CLASS@:>@ fall back on CLASS resources in addition to URxvt ones (default: Rxvt)],
341	[	336	[
342	test x$enableval = xyes && enableval=Rxvt	337	test x$enableval = xyes && enableval=Rxvt
343	test x$enableval = xno && enableval=	338	test x$enableval = xno && enableval=
344	RESFALLBACK="$enableval"	339	RESFALLBACK="$enableval"
345	])	340	])
…		…
404	[if test x$enableval = xyes -o x$enableval = xno; then	399	[if test x$enableval = xyes -o x$enableval = xno; then
405	support_mousewheel=$enableval	400	support_mousewheel=$enableval
406	fi])	401	fi])
407		402
408	AC_ARG_ENABLE(slipwheeling,	403	AC_ARG_ENABLE(slipwheeling,
409	[ --enable-slipwheeling enable slip wheel scrolling (requires previous)],	404	[ --enable-slipwheeling enable slip wheel scrolling (requires --enable-mousewheel)],
410	[if test x$enableval = xyes -o x$enableval = xno; then	405	[if test x$enableval = xyes -o x$enableval = xno; then
411	support_mouseslipwheel=$enableval	406	support_mouseslipwheel=$enableval
412	fi])	407	fi])
413		408
414	AC_ARG_ENABLE(smart-resize,	409	AC_ARG_ENABLE(smart-resize,
…		…
441	AC_DEFINE_UNQUOTED(RXVT_TERMINFO, "$withval", Set TERMINFO value to the value given by configure) terminfo="$withval"	436	AC_DEFINE_UNQUOTED(RXVT_TERMINFO, "$withval", Set TERMINFO value to the value given by configure) terminfo="$withval"
442	fi])	437	fi])
443		438
444	dnl# --------------------------------------------------------------------------	439	dnl# --------------------------------------------------------------------------
445		440
		441	LIBEV_M4_AVOID_LIBRT=1
		442	m4_include([libev/libev.m4])
		443
		444	dnl# --------------------------------------------------------------------------
		445
446	AC_PATH_PROG(TIC, tic)	446	AC_PATH_PROG(TIC, tic, :)
447		447
448	dnl# need a neat way to detect SVR4 or its features	448	dnl# need a neat way to detect SVR4 or its features
449	dnl# in src/command.c we use these functions:	449	dnl# in src/command.c we use these functions:
450	dnl# grantpt(), unlockpt(), ptsname(), which are defined in <sys/ptms.h>	450	dnl# grantpt(), unlockpt(), ptsname(), which are defined in <sys/ptms.h>
451	dnl# - but are these also defined for other systems?	451	dnl# - but are these also defined for other systems?
…		…
458	dnl## #endif	458	dnl## #endif
459	dnl## ], [AC_MSG_RESULT(yes); AC_DEFINE(PERHAPS_SVR4)], AC_MSG_RESULT(perhaps not?))	459	dnl## ], [AC_MSG_RESULT(yes); AC_DEFINE(PERHAPS_SVR4)], AC_MSG_RESULT(perhaps not?))
460		460
461	AC_PATH_XTRA	461	AC_PATH_XTRA
462		462
463	dnl# the only reasonable way to find libXpm is do-it-yourself
464	dnl# only check if we want xpm-background
465
466	LIBAFTERIMAGE_CFLAGS=	463	AFTERIMAGE_CFLAGS=
467	AFTERIMAGE_LIBS=	464	AFTERIMAGE_LIBS=
468	have_afterimage=	465	AFTERIMAGE_VERSION=
469		466
470	if test x$support_afterimage = xyes; then	467	if test x$support_afterimage = xyes; then
471	support_afterimage=no	468	support_afterimage=no
472		469
473	if test "x$afterimage_config" = "x" ; then	470	if test "x$afterimage_config" = "x" ; then
474	AC_PATH_PROG(afterimage_config, afterimage-config, no)	471	AC_PATH_PROG(afterimage_config, afterimage-config, no)
475	fi	472	fi
476		473	if test "x$afterimage_config" != "xno" ; then
477	AC_MSG_CHECKING(for libAfterImage)	474	AC_MSG_CHECKING(for libAfterImage version >= 1.15)
478	if $afterimage_config --version >/dev/null 2>&1 ; then	475	xAFTERIMAGE_VERSION=`$afterimage_config --version`
		476	if test -n "$xAFTERIMAGE_VERSION" ; then
479	LIBAFTERIMAGE_CFLAGS=`$afterimage_config --cflags`	477	xAFTERIMAGE_CFLAGS=`$afterimage_config --cflags`
480	AFTERIMAGE_LIBS=`$afterimage_config --libs`	478	xAFTERIMAGE_LIBS=`$afterimage_config --libs`
481	if test "x$AFTERIMAGE_LIBS" != "x"; then	479	if test "x$xAFTERIMAGE_LIBS" != "x"; then
		480	libai_ver_major=`echo $xAFTERIMAGE_VERSION \| cut -f 1 -d .`
		481	libai_ver_minor=`echo $xAFTERIMAGE_VERSION \| cut -f 2 -d .`
		482	if test $libai_ver_major -gt 1 -o $ $libai_ver_major -eq 1 -a $libai_ver_minor -ge 15 $; then
482	support_afterimage=yes	483	support_afterimage=yes
		484	AFTERIMAGE_CFLAGS="$xAFTERIMAGE_CFLAGS"
		485	AFTERIMAGE_LIBS="$xAFTERIMAGE_LIBS"
		486	AFTERIMAGE_VERSION="$xAFTERIMAGE_VERSION"
		487	fi
		488	fi
483	fi	489	fi
484	fi
485
486	if test "x$support_afterimage" = "xyes"; then	490	if test "x$support_afterimage" = "xyes"; then
487	AC_MSG_RESULT($AFTERIMAGE_LIBS)	491	AC_MSG_RESULT($AFTERIMAGE_LIBS)
488	else	492	else
489	AC_MSG_RESULT(no)	493	AC_MSG_RESULT(no)
490	fi	494	fi
491	fi
492
493	if test x$support_afterimage != xyes -a x$support_xpm = xyes ; then
494	VT_FIND_LIBXPM
495	if test x$no_xpm = xyes; then
496	support_xpm=needsmanualspecification
497	fi	495	fi
498	fi	496	fi
499		497
500	dnl# --------------------------------------------------------------------------	498	dnl# --------------------------------------------------------------------------
501	dnl# CHECKING FOR HEADER FILES	499	dnl# CHECKING FOR HEADER FILES
…		…
534	AC_CACHE_CHECK([for XPointer], rxvt_cv_xpointer,	532	AC_CACHE_CHECK([for XPointer], rxvt_cv_xpointer,
535	[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <X11/Xlib.h>]], [[XPointer dummy;]])],[rxvt_cv_xpointer=yes],[rxvt_cv_xpointer=no])])	533	[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <X11/Xlib.h>]], [[XPointer dummy;]])],[rxvt_cv_xpointer=yes],[rxvt_cv_xpointer=no])])
536	if test x$rxvt_cv_xpointer = xyes; then	534	if test x$rxvt_cv_xpointer = xyes; then
537	AC_DEFINE(HAVE_XPOINTER, 1, Define if you have XPointer typedef)	535	AC_DEFINE(HAVE_XPOINTER, 1, Define if you have XPointer typedef)
538	fi	536	fi
539	LIBS=$ac_save_LIBS
540	CFLAGS=$ac_save_CFLAGS
541		537
542	AC_CACHE_CHECK([for XLIB_ILLEGAL_ACCESS], rxvt_xlib_illegal_access,	538	AC_CACHE_CHECK([for XLIB_ILLEGAL_ACCESS], rxvt_xlib_illegal_access,
543	[AC_COMPILE_IFELSE(	539	[AC_COMPILE_IFELSE(
544	[AC_LANG_PROGRAM([	540	[AC_LANG_PROGRAM([
545	#define XLIB_ILLEGAL_ACCESS	541	#define XLIB_ILLEGAL_ACCESS
…		…
652	dnl# CHECKING FOR LIBRARY FUNCTIONS	648	dnl# CHECKING FOR LIBRARY FUNCTIONS
653	dnl# --------------------------------------------------------------------------	649	dnl# --------------------------------------------------------------------------
654	AC_TYPE_SIGNAL	650	AC_TYPE_SIGNAL
655	dnl> AC_FUNC_VPRINTF	651	dnl> AC_FUNC_VPRINTF
656		652
657	AC_CHECK_FUNCS( \	653	AC_CHECK_FUNCS(unsetenv)
658	unsetenv \
659	setutent \
660	on_exit \
661	)
662		654
663	UTMP_CHECK	655	UTMP_CHECK
664		656
665	dnl# --------------------------------------------------------------------------	657	dnl# --------------------------------------------------------------------------
666		658
667	dnl# find ttys/ttytab
668	AC_CACHE_CHECK(where ttys/ttytab is located, rxvt_cv_path_ttytab,
669	[for ttys_file in dnl
670	/etc/ttys /etc/ttytab;
671	do
672	if test -f "$ttys_file" ; then
673	rxvt_cv_path_ttytab=$ttys_file
674	break
675	fi
676	done
677	])
678	if test x$rxvt_cv_path_ttytab != x; then
679	AC_DEFINE_UNQUOTED(TTYTAB_FILENAME, "$rxvt_cv_path_ttytab", Define location of ttys/ttytab)
680	fi
681
682	dnl# --------------------------------------------------------------------------	659	dnl# --------------------------------------------------------------------------
683	dnl# --------------------------------------------------------------------------	660	dnl# --------------------------------------------------------------------------
684		661
685	dnl# this is a really hack test for some basic Xlocale stuff	662	dnl# this is a really hack test for some basic Xlocale stuff
686	ac_save_LIBS=$LIBS	663	save_LIBS=$LIBS
687	ac_save_CFLAGS=$CFLAGS	664	save_CFLAGS=$CFLAGS
688	CFLAGS="$CFLAGS $X_CFLAGS"	665	CFLAGS="$CFLAGS $X_CFLAGS"
689	LIBS="$LIBS $X_LIBS $X_EXTRA_LIBS -lX11"	666	LIBS="$LIBS $X_LIBS $X_EXTRA_LIBS -lX11"
690	AC_CACHE_CHECK(for working Xlocale, rxvt_cv_func_xlocale,
691	[AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <X11/Xlib.h>
692	#include <stdlib.h>
693	main() {
694	char *p;
695	if ((p = XSetLocaleModifiers("@im=none")) != NULL && *p)
696	exit (XSupportsLocale() ? 0 : 1);
697	else
698	exit (1);}]])],[dnl
699	rxvt_cv_func_xlocale=yes],[rxvt_cv_func_xlocale=no],[dnl
700	:])])
701	if test x$support_xim = xyes; then	667	if test x$support_xim = xyes; then
		668	AC_CACHE_CHECK(for working Xlocale, rxvt_cv_func_xlocale,
		669	[AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <X11/Xlib.h>
		670	#include <stdlib.h>
		671	main() {
		672	char *p;
		673	if ((p = XSetLocaleModifiers("@im=none")) != NULL && *p)
		674	exit (XSupportsLocale() ? 0 : 1);
		675	else
		676	exit (1);}]])],[dnl
		677	rxvt_cv_func_xlocale=yes],[rxvt_cv_func_xlocale=no],[dnl
		678	:])])
702	if test x$rxvt_cv_func_xlocale = xyes; then	679	if test x$rxvt_cv_func_xlocale = xyes; then
703	AC_DEFINE(USE_XIM, 1, Define if you want to have XIM (X Input Method) protocol support - required for multibyte characters input)	680	AC_DEFINE(USE_XIM, 1, Define if you want to have XIM (X Input Method) protocol support - required for multibyte characters input)
		681	AC_CACHE_CHECK(for broken XIM callback, rxvt_broken_ximcb,
		682	[AC_COMPILE_IFELSE([
		683	#include <X11/Xlib.h>
		684
		685	void im_destroy_cb (XIC unused1, XPointer client_data, XPointer unused3);
		686
		687	void f() {
		688	XIMCallback cb;
		689	cb.callback = im_destroy_cb;
		690	}
		691	],rxvt_broken_ximcb=yes,rxvt_broken_ximcb=no)])
		692
		693	if test x$rxvt_broken_ximcb = xyes; then
		694	AC_DEFINE(XIMCB_PROTO_BROKEN, 1, Define if your XIMCallback specifies XIC as first type.)
		695	fi
704	fi	696	fi
705	fi	697	fi
706		698
707	AC_CACHE_CHECK(for working X setlocale, rxvt_cv_func_xsetlocale,	699	AC_CACHE_CHECK(for working X setlocale, rxvt_cv_func_xsetlocale,
708	[AC_LINK_IFELSE([AC_LANG_PROGRAM([[#define X_LOCALE 1	700	[AC_LINK_IFELSE([AC_LANG_PROGRAM([[#define X_LOCALE 1
709	#include <X11/Xlocale.h>]], [[setlocale(LC_CTYPE, "");]])],[rxvt_cv_func_xsetlocale=yes],[rxvt_cv_func_xsetlocale=no])])	701	#include <X11/Xlocale.h>]], [[setlocale(LC_CTYPE, "");]])],[rxvt_cv_func_xsetlocale=yes],[rxvt_cv_func_xsetlocale=no])])
710	if test x$rxvt_cv_func_xsetlocale = xyes; then	702	if test x$rxvt_cv_func_xsetlocale = xyes; then
711	AC_DEFINE(HAVE_XSETLOCALE, 1, Define if setlocale (defined to Xsetlocale) works)	703	AC_DEFINE(HAVE_XSETLOCALE, 1, Define if setlocale (defined to Xsetlocale) works)
712	fi	704	fi
713	LIBS=$ac_save_LIBS	705	LIBS=$save_LIBS
714	CFLAGS=$ac_save_CFLAGS	706	CFLAGS=$save_CFLAGS
715		707
716	AC_CACHE_CHECK(for working plain setlocale, rxvt_cv_func_setlocale,	708	AC_CACHE_CHECK(for working plain setlocale, rxvt_cv_func_setlocale,
717	[AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <clocale>]], [[setlocale(LC_CTYPE, "");]])],[rxvt_cv_func_setlocale=yes],[rxvt_cv_func_setlocale=no])])	709	[AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <clocale>]], [[setlocale(LC_CTYPE, "");]])],[rxvt_cv_func_setlocale=yes],[rxvt_cv_func_setlocale=no])])
718	if test x$rxvt_cv_func_setlocale = xyes; then	710	if test x$rxvt_cv_func_setlocale = xyes; then
719	AC_DEFINE(HAVE_SETLOCALE, 1, Define if plain old setlocale works)	711	AC_DEFINE(HAVE_SETLOCALE, 1, Define if plain old setlocale works)
…		…
725	AC_DEFINE(HAVE_NL_LANGINFO, 1, Define if nl_langinfo(CODESET) works)	717	AC_DEFINE(HAVE_NL_LANGINFO, 1, Define if nl_langinfo(CODESET) works)
726	fi	718	fi
727		719
728	SCM_RIGHTS_CHECK	720	SCM_RIGHTS_CHECK
729		721
730	AC_CACHE_CHECK(for broken XIM callback, rxvt_broken_ximcb,
731	[AC_COMPILE_IFELSE([
732	#include <X11/Xlib.h>
733
734	void im_destroy_cb (XIC unused1, XPointer client_data, XPointer unused3);
735
736	void f() {
737	XIMCallback cb;
738	cb.callback = im_destroy_cb;
739	}
740	],rxvt_broken_ximcb=yes,rxvt_broken_ximcb=no)])
741
742	if test x$rxvt_broken_ximcb = xyes; then
743	AC_DEFINE(XIMCB_PROTO_BROKEN, 1, Define if your XIMCallback specifies XIC as first type.)
744	fi
745
746	PTY_CHECK	722	PTY_CHECK
747		723
748	TTY_GROUP_CHECK	724	TTY_GROUP_CHECK
749		725
750	dnl# --------------------------------------------------------------------------	726	dnl# --------------------------------------------------------------------------
751	dnl# now add and remove other stuff	727	dnl# now add and remove other stuff
752	dnl# --------------------------------------------------------------------------	728	dnl# --------------------------------------------------------------------------
753	if test x$support_xft = xyes; then	729	if test x$support_xft = xyes; then
754	AC_PATH_PROG(PKG_CONFIG, pkg-config, no)	730	AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
755	if test $PKG_CONFIG != no && $PKG_CONFIG --exists xft; then	731	if test $PKG_CONFIG != no && $PKG_CONFIG --exists xft; then
756	LIBS="$LIBS `$PKG_CONFIG xft --libs`"	732	X_LIBS="`$PKG_CONFIG xft --libs` $X_LIBS"
757	CPPFLAGS="$CPPFLAGS `$PKG_CONFIG xft --cflags`"	733	CPPFLAGS="$CPPFLAGS `$PKG_CONFIG xft --cflags`"
758	else	734	else
759	AC_PATH_PROG(XFT_CONFIG, xft-config, no)	735	AC_PATH_PROG(XFT_CONFIG, xft-config, no)
760	if test $XFT_CONFIG != no; then	736	if test $XFT_CONFIG != no; then
761	LIBS="$LIBS `$XFT_CONFIG --libs`"	737	X_LIBS="`$XFT_CONFIG --libs` $X_LIBS"
762	CPPFLAGS="$CPPFLAGS `$XFT_CONFIG --cflags`"	738	CPPFLAGS="$CPPFLAGS `$XFT_CONFIG --cflags`"
763	fi	739	fi
764	fi	740	fi
765		741
		742	save_LIBS="$LIBS"
		743	LIBS="$LIBS $X_LIBS"
766	AC_CHECK_HEADERS(X11/Xft/Xft.h,,[support_xft=no])	744	AC_CHECK_HEADERS(X11/Xft/Xft.h,,[support_xft=no])
767	AC_CHECK_LIB(Xft,XftDrawString32,,[support_xft=no])	745	AC_CHECK_LIB(Xft,XftDrawString32,:,[support_xft=no])
		746	LIBS="$save_LIBS"
768		747
769	if test x$support_xft = xyes; then	748	if test x$support_xft = xyes; then
770	AC_DEFINE(XFT, 1, Define to enable xft support)	749	AC_DEFINE(XFT, 1, Define to enable xft support)
771	fi	750	fi
772	fi	751	fi
…		…
780	AC_DEFINE(EIGHT_BIT_CONTROLS, 1, Define if you want 8 bit control sequences)	759	AC_DEFINE(EIGHT_BIT_CONTROLS, 1, Define if you want 8 bit control sequences)
781	fi	760	fi
782	if test x$support_fading = xyes; then	761	if test x$support_fading = xyes; then
783	AC_DEFINE(OFF_FOCUS_FADING, 1, Define if you want faded colors when focus is lost)	762	AC_DEFINE(OFF_FOCUS_FADING, 1, Define if you want faded colors when focus is lost)
784	fi	763	fi
785	if test x$support_tinting = xyes; then
786	AC_DEFINE(TINTING, 1, Define if you want your background to be tinted)
787	fi
788	if test x$support_inheritpixmap = xyes; then	764	if test x$support_inheritpixmap = xyes; then
789	AC_DEFINE(ENABLE_TRANSPARENCY, 1, Define if you want your background to use the parent window background)	765	AC_DEFINE(ENABLE_TRANSPARENCY, 1, Define if you want your background to use the parent window background)
790	fi	766	fi
791	if test x$support_keepscrolling = xno; then	767	if test x$support_keepscrolling = xno; then
792	AC_DEFINE(NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING, 1, Define for continual scrolling when you keep the scrollbar button pressed)	768	AC_DEFINE(NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING, 1, Define for continual scrolling when you keep the scrollbar button pressed)
793	fi	769	fi
794	if test x$support_selectionscrolling = xyes; then	770	if test x$support_selectionscrolling = xyes; then
795	AC_DEFINE(SELECTION_SCROLLING, 1, Define to allow scrolling when the selection moves to the top or bottom of the screen)	771	AC_DEFINE(SELECTION_SCROLLING, 1, Define to allow scrolling when the selection moves to the top or bottom of the screen)
796	fi	772	fi
		773	if test x$support_frills = xyes; then
		774	AC_DEFINE(ENABLE_FRILLS, 1, Define if you want handling for rarely used but handy features)
		775	fi
797	if test x$support_mousewheel = xyes; then	776	if test x$support_mousewheel = xyes; then
798	AC_DEFINE(MOUSE_WHEEL, 1, Define to use wheel events (button4 and button5) to scroll)	777	AC_DEFINE(MOUSE_WHEEL, 1, Define to use wheel events (button4 and button5) to scroll)
799	fi	778	fi
800	if test x$support_mouseslipwheel = xyes; then	779	if test x$support_mouseslipwheel = xyes; then
801	AC_DEFINE(MOUSE_SLIP_WHEELING, 1, Define to have CTRL cause wheel events to accelerate scrolling. Release CTRL to halt scrolling)	780	AC_DEFINE(MOUSE_SLIP_WHEELING, 1, Define to have CTRL cause wheel events to accelerate scrolling. Release CTRL to halt scrolling)
802	fi	781	fi
803	if test x$support_xpm = xyes -o x$support_afterimage = xyes ; then
804	AC_DEFINE(XPM_BACKGROUND, 1, Define if you want to have sexy-looking background pixmaps. Needs libXpm or libAfterImage)
805	fi
806
807	if test x$support_afterimage = xyes; then	782	if test x$support_afterimage = xyes; then
808	AC_DEFINE(HAVE_AFTERIMAGE, 1, Define if you want to use libAfterImage for image processing)	783	AC_DEFINE(HAVE_AFTERIMAGE, 1, Define if you want to use libAfterImage for image processing)
		784	AC_DEFINE(BG_IMAGE_FROM_FILE, 1, Define if you want to have sexy-looking background pixmaps. Needs libAfterImage)
809	fi	785	fi
810		786
811	if test x$support_afterstep = xyes; then	787	dnl if test x$support_afterstep = xyes; then
812	AC_DEFINE(AFTERSTEP_INTEGRATION, 1, Define if you want to integrate with AfterStep window manager)	788	dnl AC_DEFINE(AFTERSTEP_INTEGRATION, 1, Define if you want to integrate with AfterStep window manager)
813	fi	789	dnl fi
814		790
815	if test x$support_scroll_rxvt = xyes; then	791	if test x$support_scroll_rxvt = xyes; then
816	AC_DEFINE(RXVT_SCROLLBAR, 1, Support Rxvt original style scrollbars)	792	AC_DEFINE(RXVT_SCROLLBAR, 1, Support Rxvt original style scrollbars)
817	scrolltypes="rxvt"	793	scrolltypes="rxvt"
818	fi	794	fi
…		…
897	AC_SUBST(PERLPRIVLIBEXP)	873	AC_SUBST(PERLPRIVLIBEXP)
898	AC_SUBST(PERL)	874	AC_SUBST(PERL)
899	AC_SUBST(IF_PERL)	875	AC_SUBST(IF_PERL)
900	AC_SUBST(PERL_O)	876	AC_SUBST(PERL_O)
901		877
902	if test x$support_perl = xyes; then
903	support_frills=yes
904	fi
905
906	if test x$support_frills = xyes; then
907	AC_DEFINE(ENABLE_FRILLS, 1, Define if you want handling for rarely used but handy features)
908	fi
909
910	AC_SUBST(CFLAGS)	878	AC_SUBST(CFLAGS)
911	AC_SUBST(CPPFLAGS)	879	AC_SUBST(CPPFLAGS)
912	AC_SUBST(LDFLAGS)	880	AC_SUBST(LDFLAGS)
913	AC_SUBST(X_CFLAGS)	881	AC_SUBST(X_CFLAGS)
914		882
915	dnl# Attack the libs	883	dnl# Attack the libs
916	AC_SUBST(LIBS)	884	AC_SUBST(LIBS)
917	AC_SUBST(X_LIBS)	885	AC_SUBST(X_LIBS)
918	AC_SUBST(X_EXTRA_LIBS)	886	AC_SUBST(X_EXTRA_LIBS)
919		887
920	AC_SUBST(LIBAFTERIMAGE_CFLAGS)	888	AC_SUBST(AFTERIMAGE_CFLAGS)
921	AC_SUBST(AFTERIMAGE_LIBS)	889	AC_SUBST(AFTERIMAGE_LIBS)
922		890
923	AC_ARG_PROGRAM	891	AC_ARG_PROGRAM
924		892
925	dnl# test for "sun" or "__sun__" before include sys_ioctl	893	dnl# test for "sun" or "__sun__" before include sys_ioctl
…		…
961	Install path: ${prefix}/bin	929	Install path: ${prefix}/bin
962	Compiler: $CXX	930	Compiler: $CXX
963	Compiler flags: $CXXFLAGS	931	Compiler flags: $CXXFLAGS
964	Linker: $LINKER"	932	Linker: $LINKER"
965		933
966	if test x$support_xpm = xyes; then
967	echo " Xpm library: $XPM_LIBS"
968	fi
969
970	if test x$support_afterimage = xyes; then
971	echo " AfterImage support: yes"
972	fi
973
974	if test x$support_afterstep = xyes; then
975	echo " AfterStep integration: yes"
976	fi
977
978	if test x$term != x; then	934	if test x$term != x; then
979	echo " set TERM to: $term"	935	echo " set TERM to: $term"
980	fi	936	fi
981	if test x$terminfo != x; then	937	if test x$terminfo != x; then
982	echo " set TERMINFO to: $terminfo"	938	echo " set TERMINFO to: $terminfo"
…		…
986	if test x$RESFALLBACK != x; then	942	if test x$RESFALLBACK != x; then
987	echo " resource class fallback: $RESFALLBACK"	943	echo " resource class fallback: $RESFALLBACK"
988	fi	944	fi
989	echo	945	echo
990	echo " embedded perl: $support_perl"	946	echo " embedded perl: $support_perl"
		947	echo " libafterimage: $support_afterimage"
		948	dnl echo " AfterStep integration: $support_afterstep"
991	echo	949	echo
992	if test x$support_xpm = xneedsmanualspecification; then
993	echo ".----------------------------------------------------------------."
994	echo ". WARNING: --enable-xpm-background was specified however the ."
995	echo ". XPM includes files and libraries could not be found. ."
996	echo ". XPM backgrounds are now being DISABLED! If you want ."
997	echo ". to use them you should rerun configure with the ."
998	echo ". appropriate --with-xpm-includes=/path/to/xpm/includes ."
999	echo ". and --with-xpm-library=/path/to/xpm/library lines. ."
1000	echo ".----------------------------------------------------------------."
1001	fi
1002	if test x$support_xim = xyes -a x$rxvt_cv_func_xlocale = xno; then	950	if test x$support_xim = xyes -a x$rxvt_cv_func_xlocale = xno; then
1003	echo ".----------------------------------------------------------------."	951	echo ".----------------------------------------------------------------."
1004	echo ". WARNING: --enable-xim was specified however the locale support ."	952	echo ". WARNING: --enable-xim was specified however the locale support ."
1005	echo ". functions could not be found. ."	953	echo ". functions could not be found. ."
1006	echo ". XIM is now being DISABLED! ."	954	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.59 by ayin, Tue Jun 26 20:53:07 2007 UTC vs. Revision 1.86 by ayin, Tue Dec 4 01:20:49 2007 UTC

Diff Legend

Comparing rxvt-unicode/configure.ac (file contents):
Revision 1.59 by ayin, Tue Jun 26 20:53:07 2007 UTC vs.
Revision 1.86 by ayin, Tue Dec 4 01:20:49 2007 UTC