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

Comparing rxvt-unicode/configure.ac (file contents):
Revision 1.146 by sf-exg, Fri Jun 29 19:36:11 2012 UTC vs.
Revision 1.154 by sf-exg, Tue Jun 16 12:00:07 2015 UTC

…		…
293	[ --disable-delete-key disable handling of the delete key],	293	[ --disable-delete-key disable handling of the delete key],
294	[if test x$enableval = xno; then	294	[if test x$enableval = xno; then
295	AC_DEFINE(NO_DELETE_KEY, 1, Define if you don't want support for the (non-keypad) delete key)	295	AC_DEFINE(NO_DELETE_KEY, 1, Define if you don't want support for the (non-keypad) delete key)
296	fi])	296	fi])
297		297
		298	support_resources=yes
298	AC_ARG_ENABLE(resources,	299	AC_ARG_ENABLE(resources,
299	[ --disable-resources disable all resource checking],	300	[ --disable-resources disable all resource checking],
300	[if test x$enableval = xno; then	301	[if test x$enableval = xno; then
301	AC_DEFINE(NO_RESOURCES, 1, Define if you don't want any resources read)	302	support_resources=no
302	fi])	303	fi])
303		304
304	AC_ARG_ENABLE(8bitctrls,	305	AC_ARG_ENABLE(8bitctrls,
305	[ --enable-8bitctrls enable 8 bit control sequences (not recommended)],	306	[ --enable-8bitctrls enable 8 bit control sequences (not recommended)],
306	[if test x$enableval = xyes -o x$enableval = xno; then	307	[if test x$enableval = xyes -o x$enableval = xno; then
…		…
410	[ --with-terminfo=PATH set the path to the terminfo tree to PATH],	411	[ --with-terminfo=PATH set the path to the terminfo tree to PATH],
411	[if test x$withval != x; then	412	[if test x$withval != x; then
412	AC_DEFINE_UNQUOTED(RXVT_TERMINFO, "$withval", Set TERMINFO value to the value given by configure) terminfo="$withval"	413	AC_DEFINE_UNQUOTED(RXVT_TERMINFO, "$withval", Set TERMINFO value to the value given by configure) terminfo="$withval"
413	fi])	414	fi])
414		415
		416	if test x$support_resources = xno; then
		417	if test x$support_frills = xyes \|\| test x$support_perl = xyes; then
		418	AC_MSG_ERROR([--disable-resources requires --disable-frills --disable-perl])
		419	fi
		420
		421	AC_DEFINE(NO_RESOURCES, 1, Define if you don't want any resources read)
		422	fi
		423
415	dnl# --------------------------------------------------------------------------	424	dnl# --------------------------------------------------------------------------
416		425
417	LIBEV_M4_AVOID_LIBRT=1	426	LIBEV_M4_AVOID_LIBRT=1
418	m4_include([libev/libev.m4])	427	m4_include([libev/libev.m4])
419		428
…		…
421		430
422	AC_PATH_PROG(TIC, tic, :)	431	AC_PATH_PROG(TIC, tic, :)
423		432
424	AC_PATH_XTRA	433	AC_PATH_XTRA
425		434
		435	AC_PATH_TOOL(PKG_CONFIG, pkg-config, no)
		436
426	image_lib=none	437	image_lib=none
427		438
428	PIXBUF_CFLAGS=	439	PIXBUF_CFLAGS=
429	PIXBUF_LIBS=	440	PIXBUF_LIBS=
430		441
431	if test x$support_pixbuf = xyes; then	442	if test x$support_pixbuf = xyes; then
432	support_pixbuf=no	443	RXVT_CHECK_MODULES([PIXBUF], [gdk-pixbuf-2.0], [
433	AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
434	AC_MSG_CHECKING(for gdk-pixbuf)
435	if test $PKG_CONFIG != no && $PKG_CONFIG --exists gdk-pixbuf-2.0; then
436	PIXBUF_CFLAGS="`$PKG_CONFIG gdk-pixbuf-2.0 --cflags`"
437	PIXBUF_LIBS="`$PKG_CONFIG gdk-pixbuf-2.0 --libs`"
438	support_pixbuf=yes
439	fi
440
441	if test x$support_pixbuf = xyes; then
442	AC_MSG_RESULT(ok)
443	image_lib=gdk-pixbuf	444	image_lib=gdk-pixbuf
444	AC_DEFINE(HAVE_PIXBUF, 1, Define if you want to use gdk-pixbuf for image processing)	445	AC_DEFINE(HAVE_PIXBUF, 1, Define if you want to use gdk-pixbuf for image processing)
445	else	446	], [:])
446	AC_MSG_RESULT(no)
447	fi
448	fi	447	fi
449		448
450	AC_SUBST(PIXBUF_CFLAGS)	449	AC_SUBST(PIXBUF_CFLAGS)
451	AC_SUBST(PIXBUF_LIBS)	450	AC_SUBST(PIXBUF_LIBS)
452		451
453	STARTUP_NOTIFICATION_CFLAGS=	452	STARTUP_NOTIFICATION_CFLAGS=
454	STARTUP_NOTIFICATION_LIBS=	453	STARTUP_NOTIFICATION_LIBS=
455		454
456	if test x$support_startup_notification = xyes; then	455	if test x$support_startup_notification = xyes; then
457	support_startup_notification=no	456	RXVT_CHECK_MODULES([STARTUP_NOTIFICATION], [libstartup-notification-1.0], [
458	AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
459	AC_MSG_CHECKING(for libstartup-notification)
460	if test $PKG_CONFIG != no && $PKG_CONFIG --exists libstartup-notification-1.0; then
461	STARTUP_NOTIFICATION_CFLAGS="`$PKG_CONFIG libstartup-notification-1.0 --cflags`"
462	STARTUP_NOTIFICATION_LIBS="`$PKG_CONFIG libstartup-notification-1.0 --libs`"
463	support_startup_notification=yes
464	fi
465
466	if test x$support_startup_notification = xyes; then
467	AC_MSG_RESULT(ok)
468	AC_DEFINE(HAVE_STARTUP_NOTIFICATION, 1, Define if freedesktop startup notifications should be supported)	457	AC_DEFINE(HAVE_STARTUP_NOTIFICATION, 1, Define if freedesktop startup notifications should be supported)
469	else	458	], [:])
470	AC_MSG_RESULT(no)
471	fi
472	fi	459	fi
473		460
474	AC_SUBST(STARTUP_NOTIFICATION_CFLAGS)	461	AC_SUBST(STARTUP_NOTIFICATION_CFLAGS)
475	AC_SUBST(STARTUP_NOTIFICATION_LIBS)	462	AC_SUBST(STARTUP_NOTIFICATION_LIBS)
		463
		464	if test x$support_frills = xyes; then
		465	RXVT_CHECK_MODULES([XMU], [xmu], [
		466	X_LIBS="$XMU_LIBS $X_LIBS"
		467	CPPFLAGS="$CPPFLAGS $XMU_CFLAGS"
		468	AC_DEFINE(HAVE_XMU, 1, Define to enable Xmu support)
		469	], [:])
		470	fi
476		471
477	dnl# --------------------------------------------------------------------------	472	dnl# --------------------------------------------------------------------------
478	dnl# CHECKING FOR HEADER FILES	473	dnl# CHECKING FOR HEADER FILES
479	dnl# --------------------------------------------------------------------------	474	dnl# --------------------------------------------------------------------------
480	AC_CHECK_HEADERS( \	475	AC_CHECK_HEADERS( \
…		…
525	dnl# --------------------------------------------------------------------------	520	dnl# --------------------------------------------------------------------------
526	dnl# --------------------------------------------------------------------------	521	dnl# --------------------------------------------------------------------------
527		522
528	dnl# this is a really hack test for some basic Xlocale stuff	523	dnl# this is a really hack test for some basic Xlocale stuff
529	save_LIBS=$LIBS	524	save_LIBS=$LIBS
530	save_CFLAGS=$CFLAGS	525	save_CXXFLAGS=$CXXFLAGS
531	CFLAGS="$CFLAGS $X_CFLAGS"	526	CXXFLAGS="$CXXFLAGS $X_CFLAGS"
532	LIBS="$LIBS $X_LIBS $X_EXTRA_LIBS -lX11"	527	LIBS="$LIBS $X_LIBS $X_EXTRA_LIBS -lX11"
533	if test x$support_xim = xyes; then	528	if test x$support_xim = xyes; then
534	AC_CACHE_CHECK(for working Xlocale, rxvt_cv_func_xlocale,	529	AC_CACHE_CHECK(for working Xlocale, rxvt_cv_func_xlocale,
535	[AC_RUN_IFELSE([AC_LANG_SOURCE([[	530	[AC_RUN_IFELSE([AC_LANG_SOURCE([[
536	#include <X11/Xlib.h>	531	#include <X11/Xlib.h>
…		…
568	#include <X11/Xlocale.h>]], [[setlocale(LC_CTYPE, "");]])],[rxvt_cv_func_xsetlocale=yes],[rxvt_cv_func_xsetlocale=no])])	563	#include <X11/Xlocale.h>]], [[setlocale(LC_CTYPE, "");]])],[rxvt_cv_func_xsetlocale=yes],[rxvt_cv_func_xsetlocale=no])])
569	if test x$rxvt_cv_func_xsetlocale = xyes; then	564	if test x$rxvt_cv_func_xsetlocale = xyes; then
570	AC_DEFINE(HAVE_XSETLOCALE, 1, Define if setlocale (defined to Xsetlocale) works)	565	AC_DEFINE(HAVE_XSETLOCALE, 1, Define if setlocale (defined to Xsetlocale) works)
571	fi	566	fi
572	LIBS=$save_LIBS	567	LIBS=$save_LIBS
573	CFLAGS=$save_CFLAGS	568	CXXFLAGS=$save_CXXFLAGS
574		569
575	AC_CACHE_CHECK(for working nl_langinfo, rxvt_cv_func_nl_langinfo,	570	AC_CACHE_CHECK(for working nl_langinfo, rxvt_cv_func_nl_langinfo,
576	[AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <langinfo.h>]], [[nl_langinfo(CODESET);]])],[rxvt_cv_func_nl_langinfo=yes],[rxvt_cv_func_nl_langinfo=no])])	571	[AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <langinfo.h>]], [[nl_langinfo(CODESET);]])],[rxvt_cv_func_nl_langinfo=yes],[rxvt_cv_func_nl_langinfo=no])])
577	if test x$rxvt_cv_func_nl_langinfo = xyes; then	572	if test x$rxvt_cv_func_nl_langinfo = xyes; then
578	AC_DEFINE(HAVE_NL_LANGINFO, 1, Define if nl_langinfo(CODESET) works)	573	AC_DEFINE(HAVE_NL_LANGINFO, 1, Define if nl_langinfo(CODESET) works)
…		…
591	if test x$support_inheritpixmap = xyes \|\| test x$support_pixbuf = xyes; then	586	if test x$support_inheritpixmap = xyes \|\| test x$support_pixbuf = xyes; then
592	support_image=yes	587	support_image=yes
593	fi	588	fi
594	if test x$support_xft = xyes \|\| test x$support_image = xyes; then	589	if test x$support_xft = xyes \|\| test x$support_image = xyes; then
595	rxvt_have_xrender=no	590	rxvt_have_xrender=no
596	AC_PATH_PROG(PKG_CONFIG, pkg-config, no)	591	RXVT_CHECK_MODULES([XRENDER], [xrender], [
597	if test $PKG_CONFIG != no && $PKG_CONFIG --exists xrender; then	592	X_LIBS="$XRENDER_LIBS $X_LIBS"
598	X_LIBS="`$PKG_CONFIG xrender --libs` $X_LIBS"	593	CPPFLAGS="$CPPFLAGS $XRENDER_CFLAGS"
599	CPPFLAGS="$CPPFLAGS `$PKG_CONFIG xrender --cflags`"
600	rxvt_have_xrender=yes	594	rxvt_have_xrender=yes
601		595
602	save_LIBS="$LIBS"	596	save_LIBS="$LIBS"
603	LIBS="$LIBS $X_LIBS"	597	LIBS="$LIBS $X_LIBS"
604	AC_CHECK_HEADER(X11/extensions/Xrender.h,,[rxvt_have_xrender=no])	598	AC_CHECK_HEADER(X11/extensions/Xrender.h,,[rxvt_have_xrender=no])
605	AC_CHECK_FUNC(XRenderFindStandardFormat,,[rxvt_have_xrender=no])	599	AC_CHECK_FUNC(XRenderFindStandardFormat,,[rxvt_have_xrender=no])
606	LIBS="$save_LIBS"	600	LIBS="$save_LIBS"
607	fi	601	], [:])
608	fi	602	fi
609		603
610	if test x$support_xft = xyes && test x$rxvt_have_xrender = xyes; then	604	if test x$support_xft = xyes && test x$rxvt_have_xrender = xyes; then
611	AC_PATH_PROG(PKG_CONFIG, pkg-config, no)	605	RXVT_CHECK_MODULES([XFT], [fontconfig xft], [
612	if test $PKG_CONFIG != no && $PKG_CONFIG --exists xft; then	606	X_LIBS="$XFT_LIBS $X_LIBS"
613	X_LIBS="`$PKG_CONFIG xft --libs` $X_LIBS"	607	CPPFLAGS="$CPPFLAGS $XFT_CFLAGS"
614	CPPFLAGS="$CPPFLAGS `$PKG_CONFIG xft --cflags`"	608	], [
615	else
616	AC_PATH_PROG(XFT_CONFIG, xft-config, no)	609	AC_PATH_PROG(XFT_CONFIG, xft-config, no)
617	if test $XFT_CONFIG != no; then	610	if test $XFT_CONFIG != no; then
618	X_LIBS="`$XFT_CONFIG --libs` $X_LIBS"	611	X_LIBS="`$XFT_CONFIG --libs` $X_LIBS"
619	CPPFLAGS="$CPPFLAGS `$XFT_CONFIG --cflags`"	612	CPPFLAGS="$CPPFLAGS `$XFT_CONFIG --cflags`"
620	fi	613	fi
621	fi	614	])
622
623	if test $PKG_CONFIG != no && $PKG_CONFIG --exists fontconfig; then
624	X_LIBS="`$PKG_CONFIG fontconfig --libs` $X_LIBS"
625	CPPFLAGS="$CPPFLAGS `$PKG_CONFIG fontconfig --cflags`"
626	fi
627		615
628	save_LIBS="$LIBS"	616	save_LIBS="$LIBS"
629	LIBS="$LIBS $X_LIBS"	617	LIBS="$LIBS $X_LIBS"
630	AC_CHECK_HEADERS(X11/Xft/Xft.h,,[support_xft=no])
631	AC_CHECK_LIB(Xft,XftDrawString32,:,[support_xft=no])
632	AC_CHECK_HEADERS(fontconfig/fontconfig.h,,[support_xft=no])	618	AC_CHECK_HEADERS(X11/Xft/Xft.h fontconfig/fontconfig.h,,[support_xft=no])
633	AC_CHECK_LIB(fontconfig,FcPatternGet,:,[support_xft=no])	619	AC_CHECK_FUNCS(XftDrawString32 FcPatternGet,,[support_xft=no])
634	LIBS="$save_LIBS"	620	LIBS="$save_LIBS"
635		621
636	if test x$support_xft = xyes; then	622	if test x$support_xft = xyes; then
637	AC_DEFINE(XFT, 1, Define to enable xft support)	623	AC_DEFINE(XFT, 1, Define to enable xft support)
638	fi	624	fi
639	fi	625	fi
640		626
641	if test x$support_image = xyes && test x$rxvt_have_xrender = xyes; then	627	if test x$support_image = xyes && test x$rxvt_have_xrender = xyes; then
		628	AC_MSG_CHECKING(for Render >= 0.11)
		629	AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
		630	#include <X11/extensions/Xrender.h>
		631	#if RENDER_MAJOR == 0 && RENDER_MINOR <= 10
		632	error
		633	#endif
		634	]])],[],[support_image=no])
		635	if test x$support_image = xyes; then
		636	AC_MSG_RESULT(ok)
642	LIBS="$LIBS -lm"	637	LIBS="$LIBS -lm"
643	AC_DEFINE(XRENDER, 1, Define to enable xrender support)	638	AC_DEFINE(XRENDER, 1, Define to enable xrender support)
644		639
645	if test x$support_inheritpixmap = xyes; then	640	if test x$support_inheritpixmap = xyes; then
646	AC_DEFINE(ENABLE_TRANSPARENCY, 1, Define if you want your background to use the parent window background)	641	AC_DEFINE(ENABLE_TRANSPARENCY, 1, Define if you want your background to use the parent window background)
647	fi	642	fi
648		643	else
649	if test x$support_pixbuf = xyes; then	644	AC_MSG_RESULT(no)
650	AC_DEFINE(BG_IMAGE_FROM_FILE, 1, Define if you want to have sexy-looking background pixmaps.)
651	fi	645	fi
652	fi	646	fi
653		647
654	if test x$support_styles = xyes; then	648	if test x$support_styles = xyes; then
655	AC_DEFINE(ENABLE_STYLES, 1, Define if you want bold and italic support)	649	AC_DEFINE(ENABLE_STYLES, 1, Define if you want bold and italic support)

Diff Legend

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

Comparing rxvt-unicode/configure.ac (file contents): Revision 1.146 by sf-exg, Fri Jun 29 19:36:11 2012 UTC vs. Revision 1.154 by sf-exg, Tue Jun 16 12:00:07 2015 UTC

Diff Legend

Comparing rxvt-unicode/configure.ac (file contents):
Revision 1.146 by sf-exg, Fri Jun 29 19:36:11 2012 UTC vs.
Revision 1.154 by sf-exg, Tue Jun 16 12:00:07 2015 UTC