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

Comparing rxvt-unicode/configure.ac (file contents):
Revision 1.48 by ayin, Mon Jun 11 17:36:47 2007 UTC vs.
Revision 1.80 by ayin, Mon Nov 5 00:19:14 2007 UTC

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

Diff Legend

Comparing rxvt-unicode/configure.ac (file contents):
Revision 1.48 by ayin, Mon Jun 11 17:36:47 2007 UTC vs.
Revision 1.80 by ayin, Mon Nov 5 00:19:14 2007 UTC