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

Comparing rxvt-unicode/configure.ac (file contents):
Revision 1.55 by ayin, Mon Jun 25 23:11:23 2007 UTC vs.
Revision 1.81 by ayin, Mon Nov 5 00:55:45 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"
…		…
99	dnl AC_ENABLE_STATIC(yes)dnl# libtool	95	dnl AC_ENABLE_STATIC(yes)dnl# libtool
100	dnl AC_PROG_LIBTOOL()dnl# libtool	96	dnl AC_PROG_LIBTOOL()dnl# libtool
101		97
102	support_frills=yes	98	support_frills=yes
103	support_inheritpixmap=yes	99	support_inheritpixmap=yes
104	support_tinting=yes
105	support_fading=yes	100	support_fading=yes
106	support_keepscrolling=yes	101	support_keepscrolling=yes
107	support_selectionscrolling=yes	102	support_selectionscrolling=yes
108	support_mousewheel=yes	103	support_mousewheel=yes
109	support_mouseslipwheel=yes	104	support_mouseslipwheel=yes
…		…
112	support_scroll_rxvt=yes	107	support_scroll_rxvt=yes
113	support_scroll_next=yes	108	support_scroll_next=yes
114	support_scroll_xterm=yes	109	support_scroll_xterm=yes
115	support_scroll_plain=yes	110	support_scroll_plain=yes
116	support_xim=yes	111	support_xim=yes
117	support_xpm=yes
118	support_afterimage=yes	112	support_afterimage=yes
119	support_afterstep=yes	113	support_afterstep=yes
120	support_xft=yes	114	support_xft=yes
121	support_unicode3=no	115	support_unicode3=no
122	support_combining=yes	116	support_combining=yes
…		…
142	NOTE: automatically enabled with --enable-shared],	136	NOTE: automatically enabled with --enable-shared],
143	[	137	[
144	if test x$enableval = xno; then	138	if test x$enableval = xno; then
145	support_frills=no	139	support_frills=no
146	support_inheritpixmap=no	140	support_inheritpixmap=no
147	support_tinting=no
148	support_fading=no	141	support_fading=no
149	support_keepscrolling=no	142	support_keepscrolling=no
150	support_selectionscrolling=no	143	support_selectionscrolling=no
151	support_lastlog=no	144	support_lastlog=no
152	support_mousewheel=no	145	support_mousewheel=no
…		…
158	support_scroll_xterm=no	151	support_scroll_xterm=no
159	support_scroll_plain=no	152	support_scroll_plain=no
160	support_utmp=no	153	support_utmp=no
161	support_wtmp=no	154	support_wtmp=no
162	support_xim=no	155	support_xim=no
163	support_xpm=no
164	support_afterimage=no	156	support_afterimage=no
165	support_afterstep=no	157	support_afterstep=no
166	support_xft=no	158	support_xft=no
167	support_unicode3=no	159	support_unicode3=no
168	support_combining=no	160	support_combining=no
…		…
173	codesets=	165	codesets=
174	fi	166	fi
175	if test x$enableval = xyes; then	167	if test x$enableval = xyes; then
176	support_frills=yes	168	support_frills=yes
177	support_inheritpixmap=yes	169	support_inheritpixmap=yes
178	support_tinting=yes
179	support_fading=yes	170	support_fading=yes
180	support_keepscrolling=yes	171	support_keepscrolling=yes
181	support_selectionscrolling=yes	172	support_selectionscrolling=yes
182	support_lastlog=yes	173	support_lastlog=yes
183	support_mousewheel=yes	174	support_mousewheel=yes
…		…
189	support_scroll_xterm=yes	180	support_scroll_xterm=yes
190	support_scroll_plain=yes	181	support_scroll_plain=yes
191	support_utmp=yes	182	support_utmp=yes
192	support_wtmp=yes	183	support_wtmp=yes
193	support_xim=yes	184	support_xim=yes
194	support_xpm=yes
195	support_afterimage=yes	185	support_afterimage=yes
196	support_afterstep=yes	186	support_afterstep=yes
197	support_xft=yes	187	support_xft=yes
198	support_unicode3=yes	188	support_unicode3=yes
199	support_combining=yes	189	support_combining=yes
…		…
203	support_perl=yes	193	support_perl=yes
204	codesets=all	194	codesets=all
205	fi	195	fi
206	])	196	])
207		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
208	AC_ARG_ENABLE(unicode3,	214	AC_ARG_ENABLE(unicode3,
209	[ --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],
210	[if test x$enableval = xyes -o x$enableval = xno; then	216	[if test x$enableval = xyes -o x$enableval = xno; then
211	support_unicode3=$enableval	217	support_unicode3=$enableval
212	fi])	218	fi])
…		…
225		231
226	AC_ARG_ENABLE(font-styles,	232	AC_ARG_ENABLE(font-styles,
227	[ --enable-font-styles enable bold and italic support],	233	[ --enable-font-styles enable bold and italic support],
228	[if test x$enableval = xyes -o x$enableval = xno; then	234	[if test x$enableval = xyes -o x$enableval = xno; then
229	support_styles=$enableval	235	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])	236	fi])
237		237
238	AC_ARG_ENABLE(afterimage,	238	AC_ARG_ENABLE(afterimage,
239	[ --enable-afterimage enable integration with libAfterImage for background images],	239	[ --enable-afterimage enable integration with libAfterImage for background images],
240	[if test x$enableval = xyes -o x$enableval = xno; then	240	[if test x$enableval = xyes -o x$enableval = xno; then
…		…
245	[ --with-afterimage-config=DIR use libAfterImage config script in DIR],	245	[ --with-afterimage-config=DIR use libAfterImage config script in DIR],
246	[if test "x$withval" != x; then	246	[if test "x$withval" != x; then
247	afterimage_config=$withval/afterimage-config	247	afterimage_config=$withval/afterimage-config
248	fi])	248	fi])
249		249
250	AC_ARG_ENABLE(afterstep,	250	dnl AC_ARG_ENABLE(afterstep,
251	[ --enable-afterstep enable integration with AfterStep window manager],	251	dnl [ --enable-afterstep enable integration with AfterStep window manager],
252	[if test x$enableval = xyes -o x$enableval = xno; then	252	dnl [if test x$enableval = xyes -o x$enableval = xno; then
253	support_afterstep=$enableval	253	dnl support_afterstep=$enableval
254	fi])	254	dnl fi])
255		255
256	AC_ARG_ENABLE(transparency,	256	AC_ARG_ENABLE(transparency,
257	[ --enable-transparency enable transparent backgrounds],	257	[ --enable-transparency enable transparent backgrounds],
258	[if test x$enableval = xyes -o x$enableval = xno; then	258	[if test x$enableval = xyes -o x$enableval = xno; then
259	support_inheritpixmap=$enableval	259	support_inheritpixmap=$enableval
260	fi])	260	fi])
261		261
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,	262	AC_ARG_ENABLE(fading,
269	[ --enable-fading enable colors fading when off focus],	263	[ --enable-fading enable colors fading when off focus],
270	[if test x$enableval = xyes -o x$enableval = xno; then	264	[if test x$enableval = xyes -o x$enableval = xno; then
271	support_fading=$enableval	265	support_fading=$enableval
272	fi])	266	fi])
…		…
300	[if test x$enableval = xyes -o x$enableval = xno; then	294	[if test x$enableval = xyes -o x$enableval = xno; then
301	support_scroll_plain=$enableval	295	support_scroll_plain=$enableval
302	fi])	296	fi])
303		297
304	AC_ARG_WITH(codesets,	298	AC_ARG_WITH(codesets,
305	[ --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)],
306	[codesets="$withval"])	300	[codesets="$withval"])
307		301
308	AC_ARG_ENABLE(xim,	302	AC_ARG_ENABLE(xim,
309	[ --enable-xim XIM (X Input Method) protocol support],	303	[ --enable-xim XIM (X Input Method) protocol support],
310	[if test x$enableval = xyes -o x$enableval = xno; then	304	[if test x$enableval = xyes -o x$enableval = xno; then
…		…
335	support_8bitctrls=$enableval	329	support_8bitctrls=$enableval
336	fi])	330	fi])
337		331
338	RESFALLBACK=Rxvt	332	RESFALLBACK=Rxvt
339	AC_ARG_ENABLE(fallback,	333	AC_ARG_ENABLE(fallback,
340	[ --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)],
341	[	335	[
342	test x$enableval = xyes && enableval=Rxvt	336	test x$enableval = xyes && enableval=Rxvt
343	test x$enableval = xno && enableval=	337	test x$enableval = xno && enableval=
344	RESFALLBACK="$enableval"	338	RESFALLBACK="$enableval"
345	])	339	])
…		…
404	[if test x$enableval = xyes -o x$enableval = xno; then	398	[if test x$enableval = xyes -o x$enableval = xno; then
405	support_mousewheel=$enableval	399	support_mousewheel=$enableval
406	fi])	400	fi])
407		401
408	AC_ARG_ENABLE(slipwheeling,	402	AC_ARG_ENABLE(slipwheeling,
409	[ --enable-slipwheeling enable slip wheel scrolling (requires previous)],	403	[ --enable-slipwheeling enable slip wheel scrolling (requires --enable-mousewheel)],
410	[if test x$enableval = xyes -o x$enableval = xno; then	404	[if test x$enableval = xyes -o x$enableval = xno; then
411	support_mouseslipwheel=$enableval	405	support_mouseslipwheel=$enableval
412	fi])	406	fi])
413		407
414	AC_ARG_ENABLE(smart-resize,	408	AC_ARG_ENABLE(smart-resize,
…		…
441	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"
442	fi])	436	fi])
443		437
444	dnl# --------------------------------------------------------------------------	438	dnl# --------------------------------------------------------------------------
445		439
446	AC_PATH_PROG(TIC, tic)	440	AC_PATH_PROG(TIC, tic, :)
447		441
448	dnl# need a neat way to detect SVR4 or its features	442	dnl# need a neat way to detect SVR4 or its features
449	dnl# in src/command.c we use these functions:	443	dnl# in src/command.c we use these functions:
450	dnl# grantpt(), unlockpt(), ptsname(), which are defined in <sys/ptms.h>	444	dnl# grantpt(), unlockpt(), ptsname(), which are defined in <sys/ptms.h>
451	dnl# - but are these also defined for other systems?	445	dnl# - but are these also defined for other systems?
…		…
458	dnl## #endif	452	dnl## #endif
459	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?))
460		454
461	AC_PATH_XTRA	455	AC_PATH_XTRA
462		456
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=	457	AFTERIMAGE_CFLAGS=
467	AFTERIMAGE_LIBS=	458	AFTERIMAGE_LIBS=
468	have_afterimage=	459	AFTERIMAGE_VERSION=
469		460
470	if test x$support_afterimage = xyes; then	461	if test x$support_afterimage = xyes; then
471	support_afterimage=no	462	support_afterimage=no
472		463
473	if test "x$afterimage_config" = "x" ; then	464	if test "x$afterimage_config" = "x" ; then
474	AC_PATH_PROG(afterimage_config, afterimage-config, no)	465	AC_PATH_PROG(afterimage_config, afterimage-config, no)
475	fi	466	fi
476		467	if test "x$afterimage_config" != "xno" ; then
477	AC_MSG_CHECKING(for libAfterImage)	468	AC_MSG_CHECKING(for libAfterImage version >= 1.15)
478	if $afterimage_config --version >/dev/null 2>&1 ; then	469	xAFTERIMAGE_VERSION=`$afterimage_config --version`
		470	if test -n "$xAFTERIMAGE_VERSION" ; then
479	LIBAFTERIMAGE_CFLAGS=`$afterimage_config --cflags`	471	xAFTERIMAGE_CFLAGS=`$afterimage_config --cflags`
480	AFTERIMAGE_LIBS=`$afterimage_config --libs`	472	xAFTERIMAGE_LIBS=`$afterimage_config --libs`
481	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
482	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
483	fi	483	fi
484	fi
485
486	if test "x$support_afterimage" = "xyes"; then	484	if test "x$support_afterimage" = "xyes"; then
487	AC_MSG_RESULT($AFTERIMAGE_LIBS)	485	AC_MSG_RESULT($AFTERIMAGE_LIBS)
488	else	486	else
489	AC_MSG_RESULT(no)	487	AC_MSG_RESULT(no)
490	fi	488	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	489	fi
498	fi	490	fi
499		491
500	dnl# --------------------------------------------------------------------------	492	dnl# --------------------------------------------------------------------------
501	dnl# CHECKING FOR HEADER FILES	493	dnl# CHECKING FOR HEADER FILES
…		…
529	#include <sys/ioctl.h>	521	#include <sys/ioctl.h>
530	#ifdef HAVE_TERMIOS_H	522	#ifdef HAVE_TERMIOS_H
531	#include <termios.h>	523	#include <termios.h>
532	#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])])
533		525
534	dnl# ELF systems may want to store paths for dynamic libraries.
535	dnl# Lets see if the compiler can accept "-Rpath" or "-Wl,-Rpath"
536	dnl# At least one version of SunOS wants "-R path" but it's not checked yet.
537	if test -n "$GCC"; then
538	LDARG="-Wl,"
539	else
540	LDARG=""
541	fi
542	changequote(, )dnl
543	R_TRANSLATE='s/-L$[^ ]*$/-L\1 '$LDARG'-rpath '$LDARG'\1/g'
544	changequote([, ])dnl
545
546	ac_save_CFLAGS=$CFLAGS
547	ac_save_LIBS=$LIBS
548	CFLAGS="$CFLAGS $X_CFLAGS"
549	LIBS=`echo "$LIBS $X_LIBS $X_EXTRA_LIBS -lX11" \| sed "$R_TRANSLATE"`
550	AC_CACHE_CHECK([for -rpath dynamic library path recording], rxvt_cv_rpath,
551	[AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <X11/Xlib.h>
552	#include <stdlib.h>
553	main()
554	{
555	exit(0);
556	(void) XOpenDisplay("foobar");
557	}]])],[rxvt_cv_rpath=yes],[rxvt_cv_rpath=no],[dnl
558	AC_MSG_WARN(You may need to check the LIBS line)])])
559	if test x$rxvt_cv_rpath != xyes; then
560	changequote(, )dnl
561	R_TRANSLATE='s/-L$[^ ]*$/-L\1 '$LDARG'-R\1/g'
562	changequote([, ])dnl
563	LIBS=`echo "$ac_save_LIBS $X_LIBS $X_EXTRA_LIBS -lX11" \| sed "$R_TRANSLATE"`
564	AC_CACHE_CHECK([for -R dynamic library path recording], rxvt_cv_R,
565	[AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <X11/Xlib.h>
566	#include <stdlib.h>
567	main()
568	{
569	exit(0);
570	(void) XOpenDisplay("foobar");
571	}]])],[rxvt_cv_R=yes],[rxvt_cv_R=no],[rxvt_cv_R=no])])
572	if test x$rxvt_cv_R != xyes; then
573	LIBS="$ac_save_LIBS $X_LIBS $X_EXTRA_LIBS -lX11"
574	fi
575	fi
576
577	AC_CACHE_CHECK([for XPointer], rxvt_cv_xpointer,	526	AC_CACHE_CHECK([for XPointer], rxvt_cv_xpointer,
578	[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])])
579	if test x$rxvt_cv_xpointer = xyes; then	528	if test x$rxvt_cv_xpointer = xyes; then
580	AC_DEFINE(HAVE_XPOINTER, 1, Define if you have XPointer typedef)	529	AC_DEFINE(HAVE_XPOINTER, 1, Define if you have XPointer typedef)
581	fi	530	fi
582	LIBS=$ac_save_LIBS
583	CFLAGS=$ac_save_CFLAGS
584		531
585	AC_CACHE_CHECK([for XLIB_ILLEGAL_ACCESS], rxvt_xlib_illegal_access,	532	AC_CACHE_CHECK([for XLIB_ILLEGAL_ACCESS], rxvt_xlib_illegal_access,
586	[AC_COMPILE_IFELSE(	533	[AC_COMPILE_IFELSE(
587	[AC_LANG_PROGRAM([	534	[AC_LANG_PROGRAM([
588	#define XLIB_ILLEGAL_ACCESS	535	#define XLIB_ILLEGAL_ACCESS
…		…
695	dnl# CHECKING FOR LIBRARY FUNCTIONS	642	dnl# CHECKING FOR LIBRARY FUNCTIONS
696	dnl# --------------------------------------------------------------------------	643	dnl# --------------------------------------------------------------------------
697	AC_TYPE_SIGNAL	644	AC_TYPE_SIGNAL
698	dnl> AC_FUNC_VPRINTF	645	dnl> AC_FUNC_VPRINTF
699		646
700	AC_CHECK_FUNCS( \	647	AC_CHECK_FUNCS(unsetenv)
701	unsetenv \
702	setutent \
703	on_exit \
704	)
705		648
706	UTMP_CHECK	649	UTMP_CHECK
707		650
708	dnl# --------------------------------------------------------------------------	651	dnl# --------------------------------------------------------------------------
709		652
710	dnl# find ttys/ttytab
711	AC_CACHE_CHECK(where ttys/ttytab is located, rxvt_cv_path_ttytab,
712	[for ttys_file in dnl
713	/etc/ttys /etc/ttytab;
714	do
715	if test -f "$ttys_file" ; then
716	rxvt_cv_path_ttytab=$ttys_file
717	break
718	fi
719	done
720	])
721	if test x$rxvt_cv_path_ttytab != x; then
722	AC_DEFINE_UNQUOTED(TTYTAB_FILENAME, "$rxvt_cv_path_ttytab", Define location of ttys/ttytab)
723	fi
724
725	dnl# --------------------------------------------------------------------------	653	dnl# --------------------------------------------------------------------------
726	dnl# --------------------------------------------------------------------------	654	dnl# --------------------------------------------------------------------------
727		655
728	dnl# this is a really hack test for some basic Xlocale stuff	656	dnl# this is a really hack test for some basic Xlocale stuff
729	ac_save_LIBS=$LIBS	657	save_LIBS=$LIBS
730	ac_save_CFLAGS=$CFLAGS	658	save_CFLAGS=$CFLAGS
731	CFLAGS="$CFLAGS $X_CFLAGS"	659	CFLAGS="$CFLAGS $X_CFLAGS"
732	LIBS="$LIBS $X_LIBS $X_EXTRA_LIBS -lX11"	660	LIBS="$LIBS $X_LIBS $X_EXTRA_LIBS -lX11"
733	if test x$rxvt_cv_rpath = xyes -o x$rxvt_cv_R = xyes; then
734	LIBS=`echo $LIBS \| sed "$R_TRANSLATE"`
735	fi
736	AC_CACHE_CHECK(for working Xlocale, rxvt_cv_func_xlocale,
737	[AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <X11/Xlib.h>
738	#include <stdlib.h>
739	main() {
740	char *p;
741	if ((p = XSetLocaleModifiers("@im=none")) != NULL && *p)
742	exit (XSupportsLocale() ? 0 : 1);
743	else
744	exit (1);}]])],[dnl
745	rxvt_cv_func_xlocale=yes],[rxvt_cv_func_xlocale=no],[dnl
746	:])])
747	if test x$support_xim = xyes; then	661	if test x$support_xim = xyes; then
		662	AC_CACHE_CHECK(for working Xlocale, rxvt_cv_func_xlocale,
		663	[AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <X11/Xlib.h>
		664	#include <stdlib.h>
		665	main() {
		666	char *p;
		667	if ((p = XSetLocaleModifiers("@im=none")) != NULL && *p)
		668	exit (XSupportsLocale() ? 0 : 1);
		669	else
		670	exit (1);}]])],[dnl
		671	rxvt_cv_func_xlocale=yes],[rxvt_cv_func_xlocale=no],[dnl
		672	:])])
748	if test x$rxvt_cv_func_xlocale = xyes; then	673	if test x$rxvt_cv_func_xlocale = xyes; then
749	AC_DEFINE(USE_XIM, 1, Define if you want to have XIM (X Input Method) protocol support - required for multibyte characters input)	674	AC_DEFINE(USE_XIM, 1, Define if you want to have XIM (X Input Method) protocol support - required for multibyte characters input)
		675	AC_CACHE_CHECK(for broken XIM callback, rxvt_broken_ximcb,
		676	[AC_COMPILE_IFELSE([
		677	#include <X11/Xlib.h>
		678
		679	void im_destroy_cb (XIC unused1, XPointer client_data, XPointer unused3);
		680
		681	void f() {
		682	XIMCallback cb;
		683	cb.callback = im_destroy_cb;
		684	}
		685	],rxvt_broken_ximcb=yes,rxvt_broken_ximcb=no)])
		686
		687	if test x$rxvt_broken_ximcb = xyes; then
		688	AC_DEFINE(XIMCB_PROTO_BROKEN, 1, Define if your XIMCallback specifies XIC as first type.)
		689	fi
750	fi	690	fi
751	fi	691	fi
752		692
753	AC_CACHE_CHECK(for working X setlocale, rxvt_cv_func_xsetlocale,	693	AC_CACHE_CHECK(for working X setlocale, rxvt_cv_func_xsetlocale,
754	[AC_LINK_IFELSE([AC_LANG_PROGRAM([[#define X_LOCALE 1	694	[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])])	695	#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	696	if test x$rxvt_cv_func_xsetlocale = xyes; then
757	AC_DEFINE(HAVE_XSETLOCALE, 1, Define if setlocale (defined to Xsetlocale) works)	697	AC_DEFINE(HAVE_XSETLOCALE, 1, Define if setlocale (defined to Xsetlocale) works)
758	fi	698	fi
759	LIBS=$ac_save_LIBS	699	LIBS=$save_LIBS
760	CFLAGS=$ac_save_CFLAGS	700	CFLAGS=$save_CFLAGS
761		701
762	AC_CACHE_CHECK(for working plain setlocale, rxvt_cv_func_setlocale,	702	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])])	703	[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	704	if test x$rxvt_cv_func_setlocale = xyes; then
765	AC_DEFINE(HAVE_SETLOCALE, 1, Define if plain old setlocale works)	705	AC_DEFINE(HAVE_SETLOCALE, 1, Define if plain old setlocale works)
…		…
770	if test x$rxvt_cv_func_nl_langinfo = xyes; then	710	if test x$rxvt_cv_func_nl_langinfo = xyes; then
771	AC_DEFINE(HAVE_NL_LANGINFO, 1, Define if nl_langinfo(CODESET) works)	711	AC_DEFINE(HAVE_NL_LANGINFO, 1, Define if nl_langinfo(CODESET) works)
772	fi	712	fi
773		713
774	SCM_RIGHTS_CHECK	714	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		715
792	PTY_CHECK	716	PTY_CHECK
793		717
794	TTY_GROUP_CHECK	718	TTY_GROUP_CHECK
795		719
…		…
826	AC_DEFINE(EIGHT_BIT_CONTROLS, 1, Define if you want 8 bit control sequences)	750	AC_DEFINE(EIGHT_BIT_CONTROLS, 1, Define if you want 8 bit control sequences)
827	fi	751	fi
828	if test x$support_fading = xyes; then	752	if test x$support_fading = xyes; then
829	AC_DEFINE(OFF_FOCUS_FADING, 1, Define if you want faded colors when focus is lost)	753	AC_DEFINE(OFF_FOCUS_FADING, 1, Define if you want faded colors when focus is lost)
830	fi	754	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	755	if test x$support_inheritpixmap = xyes; then
835	AC_DEFINE(TRANSPARENT, 1, Define if you want your background to use the parent window background)	756	AC_DEFINE(ENABLE_TRANSPARENCY, 1, Define if you want your background to use the parent window background)
836	fi	757	fi
837	if test x$support_keepscrolling = xno; then	758	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)	759	AC_DEFINE(NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING, 1, Define for continual scrolling when you keep the scrollbar button pressed)
839	fi	760	fi
840	if test x$support_selectionscrolling = xyes; then	761	if test x$support_selectionscrolling = xyes; then
…		…
847	AC_DEFINE(MOUSE_WHEEL, 1, Define to use wheel events (button4 and button5) to scroll)	768	AC_DEFINE(MOUSE_WHEEL, 1, Define to use wheel events (button4 and button5) to scroll)
848	fi	769	fi
849	if test x$support_mouseslipwheel = xyes; then	770	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)	771	AC_DEFINE(MOUSE_SLIP_WHEELING, 1, Define to have CTRL cause wheel events to accelerate scrolling. Release CTRL to halt scrolling)
851	fi	772	fi
852	if test x$support_xpm = xyes -o x$support_afterimage = xyes ; then
853	AC_DEFINE(XPM_BACKGROUND, 1, Define if you want to have sexy-looking background pixmaps. Needs libXpm or libAfterImage)
854	fi
855
856	if test x$support_afterimage = xyes; then	773	if test x$support_afterimage = xyes; then
857	AC_DEFINE(HAVE_AFTERIMAGE, 1, Define if you want to use libAfterImage for image processing)	774	AC_DEFINE(HAVE_AFTERIMAGE, 1, Define if you want to use libAfterImage for image processing)
		775	AC_DEFINE(BG_IMAGE_FROM_FILE, 1, Define if you want to have sexy-looking background pixmaps. Needs libAfterImage)
858	fi	776	fi
859		777
860	if test x$support_afterstep = xyes; then	778	dnl if test x$support_afterstep = xyes; then
861	AC_DEFINE(AFTERSTEP_INTEGRATION, 1, Define if you want to integrate with AfterStep window manager)	779	dnl AC_DEFINE(AFTERSTEP_INTEGRATION, 1, Define if you want to integrate with AfterStep window manager)
862	fi	780	dnl fi
863		781
864	if test x$support_scroll_rxvt = xyes; then	782	if test x$support_scroll_rxvt = xyes; then
865	AC_DEFINE(RXVT_SCROLLBAR, 1, Support Rxvt original style scrollbars)	783	AC_DEFINE(RXVT_SCROLLBAR, 1, Support Rxvt original style scrollbars)
866	scrolltypes="rxvt"	784	scrolltypes="rxvt"
867	fi	785	fi
…		…
946	AC_SUBST(PERLPRIVLIBEXP)	864	AC_SUBST(PERLPRIVLIBEXP)
947	AC_SUBST(PERL)	865	AC_SUBST(PERL)
948	AC_SUBST(IF_PERL)	866	AC_SUBST(IF_PERL)
949	AC_SUBST(PERL_O)	867	AC_SUBST(PERL_O)
950		868
951	if test x$support_perl = xyes; then
952	support_frills=yes
953	fi
954
955	AC_SUBST(CFLAGS)	869	AC_SUBST(CFLAGS)
956	AC_SUBST(CPPFLAGS)	870	AC_SUBST(CPPFLAGS)
957	AC_SUBST(LDFLAGS)	871	AC_SUBST(LDFLAGS)
958	AC_SUBST(X_CFLAGS)	872	AC_SUBST(X_CFLAGS)
959		873
960	dnl# Attack the libs	874	dnl# Attack the libs
961	if test x$rxvt_cv_rpath = xyes -o x$rxvt_cv_R = xyes; then
962	LIBS=`echo $LIBS \| sed "$R_TRANSLATE"`
963	X_LIBS=`echo $X_LIBS \| sed "$R_TRANSLATE"`
964	X_EXTRA_LIBS=`echo $X_EXTRA_LIBS \| sed "$R_TRANSLATE"`
965	XPM_LIBS=`echo $XPM_LIBS \| sed "$R_TRANSLATE"`
966	fi
967	AC_SUBST(LIBS)	875	AC_SUBST(LIBS)
968	AC_SUBST(X_LIBS)	876	AC_SUBST(X_LIBS)
969	AC_SUBST(X_EXTRA_LIBS)	877	AC_SUBST(X_EXTRA_LIBS)
970		878
971	AC_SUBST(LIBAFTERIMAGE_CFLAGS)	879	AC_SUBST(AFTERIMAGE_CFLAGS)
972	AC_SUBST(AFTERIMAGE_LIBS)	880	AC_SUBST(AFTERIMAGE_LIBS)
973		881
974	AC_ARG_PROGRAM	882	AC_ARG_PROGRAM
975		883
976	dnl# test for "sun" or "__sun__" before include sys_ioctl	884	dnl# test for "sun" or "__sun__" before include sys_ioctl
…		…
1012	Install path: ${prefix}/bin	920	Install path: ${prefix}/bin
1013	Compiler: $CXX	921	Compiler: $CXX
1014	Compiler flags: $CXXFLAGS	922	Compiler flags: $CXXFLAGS
1015	Linker: $LINKER"	923	Linker: $LINKER"
1016		924
1017	if test x$support_xpm = xyes; then
1018	echo " Xpm library: $XPM_LIBS"
1019	fi
1020
1021	if test x$support_afterimage = xyes; then
1022	echo " AfterImage support: yes"
1023	fi
1024
1025	if test x$support_afterstep = xyes; then
1026	echo " AfterStep integration: yes"
1027	fi
1028
1029	if test x$term != x; then	925	if test x$term != x; then
1030	echo " set TERM to: $term"	926	echo " set TERM to: $term"
1031	fi	927	fi
1032	if test x$terminfo != x; then	928	if test x$terminfo != x; then
1033	echo " set TERMINFO to: $terminfo"	929	echo " set TERMINFO to: $terminfo"
…		…
1037	if test x$RESFALLBACK != x; then	933	if test x$RESFALLBACK != x; then
1038	echo " resource class fallback: $RESFALLBACK"	934	echo " resource class fallback: $RESFALLBACK"
1039	fi	935	fi
1040	echo	936	echo
1041	echo " embedded perl: $support_perl"	937	echo " embedded perl: $support_perl"
		938	echo " libafterimage: $support_afterimage"
		939	dnl echo " AfterStep integration: $support_afterstep"
1042	echo	940	echo
1043	if test x$support_xpm = xneedsmanualspecification; then
1044	echo ".----------------------------------------------------------------."
1045	echo ". WARNING: --enable-xpm-background was specified however the ."
1046	echo ". XPM includes files and libraries could not be found. ."
1047	echo ". XPM backgrounds are now being DISABLED! If you want ."
1048	echo ". to use them you should rerun configure with the ."
1049	echo ". appropriate --with-xpm-includes=/path/to/xpm/includes ."
1050	echo ". and --with-xpm-library=/path/to/xpm/library lines. ."
1051	echo ".----------------------------------------------------------------."
1052	fi
1053	if test x$support_xim = xyes -a x$rxvt_cv_func_xlocale = xno; then	941	if test x$support_xim = xyes -a x$rxvt_cv_func_xlocale = xno; then
1054	echo ".----------------------------------------------------------------."	942	echo ".----------------------------------------------------------------."
1055	echo ". WARNING: --enable-xim was specified however the locale support ."	943	echo ". WARNING: --enable-xim was specified however the locale support ."
1056	echo ". functions could not be found. ."	944	echo ". functions could not be found. ."
1057	echo ". XIM is now being DISABLED! ."	945	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.55 by ayin, Mon Jun 25 23:11:23 2007 UTC vs. Revision 1.81 by ayin, Mon Nov 5 00:55:45 2007 UTC

Diff Legend

Comparing rxvt-unicode/configure.ac (file contents):
Revision 1.55 by ayin, Mon Jun 25 23:11:23 2007 UTC vs.
Revision 1.81 by ayin, Mon Nov 5 00:55:45 2007 UTC