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

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

Diff Legend

Comparing rxvt-unicode/configure.ac (file contents):
Revision 1.60 by ayin, Tue Jun 26 21:59:13 2007 UTC vs.
Revision 1.83 by root, Sun Nov 18 01:02:09 2007 UTC