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

Comparing rxvt-unicode/configure.ac (file contents):
Revision 1.52 by ayin, Wed Jun 13 16:20:41 2007 UTC vs.
Revision 1.69 by root, Wed Aug 1 18:38:15 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
…		…
78		74
79	AC_DEFINE(_GNU_SOURCE, 1, Use all glibc features.)	75	AC_DEFINE(_GNU_SOURCE, 1, Use all glibc features.)
80		76
81	case $host in	77	case $host in
82	--solaris* )	78	--solaris* )
83	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)
84	AC_DEFINE(_XOPEN_SOURCE, 2, Needed to get declarations for msg_control and msg_controllen on Solaris)
85	AC_DEFINE(__EXTENSIONS__, 1, Needed to get declarations for msg_control and msg_controllen on Solaris)
86	;;	80	;;
87	esac	81	esac
88		82
89	dnl if test x$GXX = xyes; then	83	dnl if test x$GXX = xyes; then
90	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...
…		…
247	[ --with-afterimage-config=DIR use libAfterImage config script in DIR],	241	[ --with-afterimage-config=DIR use libAfterImage config script in DIR],
248	[if test "x$withval" != x; then	242	[if test "x$withval" != x; then
249	afterimage_config=$withval/afterimage-config	243	afterimage_config=$withval/afterimage-config
250	fi])	244	fi])
251		245
252	AC_ARG_ENABLE(afterstep,	246	dnl AC_ARG_ENABLE(afterstep,
253	[ --enable-afterstep enable integration with AfterStep window manager],	247	dnl [ --enable-afterstep enable integration with AfterStep window manager],
254	[if test x$enableval = xyes -o x$enableval = xno; then	248	dnl [if test x$enableval = xyes -o x$enableval = xno; then
255	support_afterstep=$enableval	249	dnl support_afterstep=$enableval
256	fi])	250	dnl fi])
257		251
258	AC_ARG_ENABLE(transparency,	252	AC_ARG_ENABLE(transparency,
259	[ --enable-transparency enable transparent backgrounds],	253	[ --enable-transparency enable transparent backgrounds],
260	[if test x$enableval = xyes -o x$enableval = xno; then	254	[if test x$enableval = xyes -o x$enableval = xno; then
261	support_inheritpixmap=$enableval	255	support_inheritpixmap=$enableval
…		…
463	AC_PATH_XTRA	457	AC_PATH_XTRA
464		458
465	dnl# the only reasonable way to find libXpm is do-it-yourself	459	dnl# the only reasonable way to find libXpm is do-it-yourself
466	dnl# only check if we want xpm-background	460	dnl# only check if we want xpm-background
467		461
468	LIBAFTERIMAGE_CFLAGS=	462	AFTERIMAGE_CFLAGS=
469	AFTERIMAGE_LIBS=	463	AFTERIMAGE_LIBS=
470	have_afterimage=	464	AFTERIMAGE_VERSION=
471		465
472	if test x$support_afterimage = xyes; then	466	if test x$support_afterimage = xyes; then
473	support_afterimage=no	467	support_afterimage=no
474		468
475	if test "x$afterimage_config" = "x" ; then	469	if test "x$afterimage_config" = "x" ; then
476	AC_PATH_PROG(afterimage_config, afterimage-config, no)	470	AC_PATH_PROG(afterimage_config, afterimage-config, no)
477	fi	471	fi
478		472	if test "x$afterimage_config" != "xno" ; then
479	AC_MSG_CHECKING(for libAfterImage)	473	AC_MSG_CHECKING(for libAfterImage version >= 1.15)
480	if $afterimage_config --version >/dev/null 2>&1 ; then	474	xAFTERIMAGE_VERSION=`$afterimage_config --version`
		475	if test -n "$xAFTERIMAGE_VERSION" ; then
481	LIBAFTERIMAGE_CFLAGS=`$afterimage_config --cflags`	476	xAFTERIMAGE_CFLAGS=`$afterimage_config --cflags`
482	AFTERIMAGE_LIBS=`$afterimage_config --libs`	477	xAFTERIMAGE_LIBS=`$afterimage_config --libs`
483	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
484	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
485	fi	488	fi
486	fi
487
488	if test "x$support_afterimage" = "xyes"; then	489	if test "x$support_afterimage" = "xyes"; then
489	AC_MSG_RESULT($AFTERIMAGE_LIBS)	490	AC_MSG_RESULT($AFTERIMAGE_LIBS)
490	else	491	else
491	AC_MSG_RESULT(no)	492	AC_MSG_RESULT(no)
		493	fi
492	fi	494	fi
493	fi	495	fi
494		496
495	if test x$support_afterimage != xyes -a x$support_xpm = xyes ; then	497	if test x$support_afterimage != xyes -a x$support_xpm = xyes ; then
496	VT_FIND_LIBXPM	498	VT_FIND_LIBXPM
…		…
531	#include <sys/ioctl.h>	533	#include <sys/ioctl.h>
532	#ifdef HAVE_TERMIOS_H	534	#ifdef HAVE_TERMIOS_H
533	#include <termios.h>	535	#include <termios.h>
534	#endif]], [[int a = ECHO;]])],[rxvt_cv_header_sysioctl=yes],[rxvt_cv_header_sysioctl=no])])	536	#endif]], [[int a = ECHO;]])],[rxvt_cv_header_sysioctl=yes],[rxvt_cv_header_sysioctl=no])])
535		537
536	dnl# ELF systems may want to store paths for dynamic libraries.
537	dnl# Lets see if the compiler can accept "-Rpath" or "-Wl,-Rpath"
538	dnl# At least one version of SunOS wants "-R path" but it's not checked yet.
539	if test -n "$GCC"; then
540	LDARG="-Wl,"
541	else
542	LDARG=""
543	fi
544	changequote(, )dnl
545	R_TRANSLATE='s/-L$[^ ]*$/-L\1 '$LDARG'-rpath '$LDARG'\1/g'
546	changequote([, ])dnl
547
548	ac_save_CFLAGS=$CFLAGS
549	ac_save_LIBS=$LIBS
550	CFLAGS="$CFLAGS $X_CFLAGS"
551	LIBS=`echo "$LIBS $X_LIBS $X_EXTRA_LIBS -lX11" \| sed "$R_TRANSLATE"`
552	AC_CACHE_CHECK([for -rpath dynamic library path recording], rxvt_cv_rpath,
553	[AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <X11/Xlib.h>
554	#include <stdlib.h>
555	main()
556	{
557	exit(0);
558	(void) XOpenDisplay("foobar");
559	}]])],[rxvt_cv_rpath=yes],[rxvt_cv_rpath=no],[dnl
560	AC_MSG_WARN(You may need to check the LIBS line)])])
561	if test x$rxvt_cv_rpath != xyes; then
562	changequote(, )dnl
563	R_TRANSLATE='s/-L$[^ ]*$/-L\1 '$LDARG'-R\1/g'
564	changequote([, ])dnl
565	LIBS=`echo "$ac_save_LIBS $X_LIBS $X_EXTRA_LIBS -lX11" \| sed "$R_TRANSLATE"`
566	AC_CACHE_CHECK([for -R dynamic library path recording], rxvt_cv_R,
567	[AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <X11/Xlib.h>
568	#include <stdlib.h>
569	main()
570	{
571	exit(0);
572	(void) XOpenDisplay("foobar");
573	}]])],[rxvt_cv_R=yes],[rxvt_cv_R=no],[rxvt_cv_R=no])])
574	if test x$rxvt_cv_R != xyes; then
575	LIBS="$ac_save_LIBS $X_LIBS $X_EXTRA_LIBS -lX11"
576	fi
577	fi
578
579	AC_CACHE_CHECK([for XPointer], rxvt_cv_xpointer,	538	AC_CACHE_CHECK([for XPointer], rxvt_cv_xpointer,
580	[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <X11/Xlib.h>]], [[XPointer dummy;]])],[rxvt_cv_xpointer=yes],[rxvt_cv_xpointer=no])])	539	[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <X11/Xlib.h>]], [[XPointer dummy;]])],[rxvt_cv_xpointer=yes],[rxvt_cv_xpointer=no])])
581	if test x$rxvt_cv_xpointer = xyes; then	540	if test x$rxvt_cv_xpointer = xyes; then
582	AC_DEFINE(HAVE_XPOINTER, 1, Define if you have XPointer typedef)	541	AC_DEFINE(HAVE_XPOINTER, 1, Define if you have XPointer typedef)
583	fi	542	fi
584	LIBS=$ac_save_LIBS
585	CFLAGS=$ac_save_CFLAGS
586		543
587	AC_CACHE_CHECK([for XLIB_ILLEGAL_ACCESS], rxvt_xlib_illegal_access,	544	AC_CACHE_CHECK([for XLIB_ILLEGAL_ACCESS], rxvt_xlib_illegal_access,
588	[AC_COMPILE_IFELSE(	545	[AC_COMPILE_IFELSE(
589	[AC_LANG_PROGRAM([	546	[AC_LANG_PROGRAM([
590	#define XLIB_ILLEGAL_ACCESS	547	#define XLIB_ILLEGAL_ACCESS
…		…
730	dnl# this is a really hack test for some basic Xlocale stuff	687	dnl# this is a really hack test for some basic Xlocale stuff
731	ac_save_LIBS=$LIBS	688	ac_save_LIBS=$LIBS
732	ac_save_CFLAGS=$CFLAGS	689	ac_save_CFLAGS=$CFLAGS
733	CFLAGS="$CFLAGS $X_CFLAGS"	690	CFLAGS="$CFLAGS $X_CFLAGS"
734	LIBS="$LIBS $X_LIBS $X_EXTRA_LIBS -lX11"	691	LIBS="$LIBS $X_LIBS $X_EXTRA_LIBS -lX11"
735	if test x$rxvt_cv_rpath = xyes -o x$rxvt_cv_R = xyes; then
736	LIBS=`echo $LIBS \| sed "$R_TRANSLATE"`
737	fi
738	AC_CACHE_CHECK(for working Xlocale, rxvt_cv_func_xlocale,	692	AC_CACHE_CHECK(for working Xlocale, rxvt_cv_func_xlocale,
739	[AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <X11/Xlib.h>	693	[AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <X11/Xlib.h>
740	#include <stdlib.h>	694	#include <stdlib.h>
741	main() {	695	main() {
742	char *p;	696	char *p;
743	if ((p = XSetLocaleModifiers("@im=none")) != NULL && *p)	697	if ((p = XSetLocaleModifiers("@im=none")) != NULL && *p)
744	exit (XSupportsLocale() ? 0 : 1);	698	exit (XSupportsLocale() ? 0 : 1);
745	else	699	else
746	exit (1);}]])],[dnl	700	exit (1);}]])],[dnl
747	rxvt_cv_func_xlocale=yes],[rxvt_cv_func_xlocale=no],[dnl	701	rxvt_cv_func_xlocale=yes],[rxvt_cv_func_xlocale=no],[dnl
748	AC_MSG_WARN(Define NO_XLOCALE in config.h manually)])])	702	:])])
		703	if test x$support_xim = xyes; then
749	if test x$rxvt_cv_func_xlocale = xyes; then	704	if test x$rxvt_cv_func_xlocale = xyes; then
750	AC_DEFINE(HAVE_XLOCALE, 1, Define if Xlocale support works)	705	AC_DEFINE(USE_XIM, 1, Define if you want to have XIM (X Input Method) protocol support - required for multibyte characters input)
		706	fi
751	fi	707	fi
752		708
753	AC_CACHE_CHECK(for working X setlocale, rxvt_cv_func_xsetlocale,	709	AC_CACHE_CHECK(for working X setlocale, rxvt_cv_func_xsetlocale,
754	[AC_LINK_IFELSE([AC_LANG_PROGRAM([[#define X_LOCALE 1	710	[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])])	711	#include <X11/Xlocale.h>]], [[setlocale(LC_CTYPE, "");]])],[rxvt_cv_func_xsetlocale=yes],[rxvt_cv_func_xsetlocale=no])])
…		…
830	fi	786	fi
831	if test x$support_tinting = xyes; then	787	if test x$support_tinting = xyes; then
832	AC_DEFINE(TINTING, 1, Define if you want your background to be tinted)	788	AC_DEFINE(TINTING, 1, Define if you want your background to be tinted)
833	fi	789	fi
834	if test x$support_inheritpixmap = xyes; then	790	if test x$support_inheritpixmap = xyes; then
835	AC_DEFINE(TRANSPARENT, 1, Define if you want your background to use the parent window background)	791	AC_DEFINE(ENABLE_TRANSPARENCY, 1, Define if you want your background to use the parent window background)
836	fi	792	fi
837	if test x$support_keepscrolling = xno; then	793	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)	794	AC_DEFINE(NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING, 1, Define for continual scrolling when you keep the scrollbar button pressed)
839	fi	795	fi
840	if test x$support_selectionscrolling = xyes; then	796	if test x$support_selectionscrolling = xyes; then
841	AC_DEFINE(SELECTION_SCROLLING, 1, Define to allow scrolling when the selection moves to the top or bottom of the screen)	797	AC_DEFINE(SELECTION_SCROLLING, 1, Define to allow scrolling when the selection moves to the top or bottom of the screen)
842	fi	798	fi
843	if test x$support_frills = xyes; then
844	AC_DEFINE(ENABLE_FRILLS, 1, Define if you want handling for rarely used but handy features)
845	fi
846	if test x$support_mousewheel = xyes; then	799	if test x$support_mousewheel = xyes; then
847	AC_DEFINE(MOUSE_WHEEL, 1, Define to use wheel events (button4 and button5) to scroll)	800	AC_DEFINE(MOUSE_WHEEL, 1, Define to use wheel events (button4 and button5) to scroll)
848	fi	801	fi
849	if test x$support_mouseslipwheel = xyes; then	802	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)	803	AC_DEFINE(MOUSE_SLIP_WHEELING, 1, Define to have CTRL cause wheel events to accelerate scrolling. Release CTRL to halt scrolling)
851	fi	804	fi
852	if test x$support_xim = xyes -o x$multichar_set = xyes; then
853	if test x$rxvt_cv_func_xlocale = xyes; then
854	AC_DEFINE(USE_XIM, 1, Define if you want to have XIM (X Input Method) protocol support - required for multibyte characters input)
855	fi
856	fi
857	if test x$support_xpm = xyes -o x$support_afterimage = xyes ; then	805	if test x$support_xpm = xyes -o x$support_afterimage = xyes ; then
858	AC_DEFINE(XPM_BACKGROUND, 1, Define if you want to have sexy-looking background pixmaps. Needs libXpm or libAfterImage)	806	AC_DEFINE(XPM_BACKGROUND, 1, Define if you want to have sexy-looking background pixmaps. Needs libXpm or libAfterImage)
859	fi	807	fi
860		808
861	if test x$support_afterimage = xyes; then	809	if test x$support_afterimage = xyes; then
862	AC_DEFINE(HAVE_AFTERIMAGE, 1, Define if you want to use libAfterImage for image processing)	810	AC_DEFINE(HAVE_AFTERIMAGE, 1, Define if you want to use libAfterImage for image processing)
863	fi	811	fi
864		812
865	if test x$support_afterstep = xyes; then	813	dnl if test x$support_afterstep = xyes; then
866	AC_DEFINE(AFTERSTEP_INTEGRATION, 1, Define if you want to integrate with AfterStep window manager)	814	dnl AC_DEFINE(AFTERSTEP_INTEGRATION, 1, Define if you want to integrate with AfterStep window manager)
867	fi	815	dnl fi
868		816
869	if test x$support_scroll_rxvt = xyes; then	817	if test x$support_scroll_rxvt = xyes; then
870	AC_DEFINE(RXVT_SCROLLBAR, 1, Support Rxvt original style scrollbars)	818	AC_DEFINE(RXVT_SCROLLBAR, 1, Support Rxvt original style scrollbars)
871	scrolltypes="rxvt"	819	scrolltypes="rxvt"
872	fi	820	fi
…		…
955		903
956	if test x$support_perl = xyes; then	904	if test x$support_perl = xyes; then
957	support_frills=yes	905	support_frills=yes
958	fi	906	fi
959		907
		908	if test x$support_frills = xyes; then
		909	AC_DEFINE(ENABLE_FRILLS, 1, Define if you want handling for rarely used but handy features)
		910	fi
		911
960	AC_SUBST(CFLAGS)	912	AC_SUBST(CFLAGS)
961	AC_SUBST(CPPFLAGS)	913	AC_SUBST(CPPFLAGS)
962	AC_SUBST(LDFLAGS)	914	AC_SUBST(LDFLAGS)
963	AC_SUBST(X_CFLAGS)	915	AC_SUBST(X_CFLAGS)
964		916
965	dnl# Attack the libs	917	dnl# Attack the libs
966	if test x$rxvt_cv_rpath = xyes -o x$rxvt_cv_R = xyes; then
967	LIBS=`echo $LIBS \| sed "$R_TRANSLATE"`
968	X_LIBS=`echo $X_LIBS \| sed "$R_TRANSLATE"`
969	X_EXTRA_LIBS=`echo $X_EXTRA_LIBS \| sed "$R_TRANSLATE"`
970	XPM_LIBS=`echo $XPM_LIBS \| sed "$R_TRANSLATE"`
971	fi
972	AC_SUBST(LIBS)	918	AC_SUBST(LIBS)
973	AC_SUBST(X_LIBS)	919	AC_SUBST(X_LIBS)
974	AC_SUBST(X_EXTRA_LIBS)	920	AC_SUBST(X_EXTRA_LIBS)
975		921
976	AC_SUBST(LIBAFTERIMAGE_CFLAGS)	922	AC_SUBST(AFTERIMAGE_CFLAGS)
977	AC_SUBST(AFTERIMAGE_LIBS)	923	AC_SUBST(AFTERIMAGE_LIBS)
978		924
979	AC_ARG_PROGRAM	925	AC_ARG_PROGRAM
980		926
981	dnl# test for "sun" or "__sun__" before include sys_ioctl	927	dnl# test for "sun" or "__sun__" before include sys_ioctl
…		…
1025		971
1026	if test x$support_afterimage = xyes; then	972	if test x$support_afterimage = xyes; then
1027	echo " AfterImage support: yes"	973	echo " AfterImage support: yes"
1028	fi	974	fi
1029		975
1030	if test x$support_afterstep = xyes; then	976	dnl if test x$support_afterstep = xyes; then
1031	echo " AfterStep integration: yes"	977	dnl echo " AfterStep integration: yes"
1032	fi	978	dnl fi
1033		979
1034	if test x$term != x; then	980	if test x$term != x; then
1035	echo " set TERM to: $term"	981	echo " set TERM to: $term"
1036	fi	982	fi
1037	if test x$terminfo != x; then	983	if test x$terminfo != x; then
…		…
1042	if test x$RESFALLBACK != x; then	988	if test x$RESFALLBACK != x; then
1043	echo " resource class fallback: $RESFALLBACK"	989	echo " resource class fallback: $RESFALLBACK"
1044	fi	990	fi
1045	echo	991	echo
1046	echo " embedded perl: $support_perl"	992	echo " embedded perl: $support_perl"
		993	echo " libafterimage: $support_afterimage"
1047	echo	994	echo
1048	if test x$support_xpm = xneedsmanualspecification; then	995	if test x$support_xpm = xneedsmanualspecification; then
1049	echo ".----------------------------------------------------------------."	996	echo ".----------------------------------------------------------------."
1050	echo ". WARNING: --enable-xpm-background was specified however the ."	997	echo ". WARNING: --enable-xpm-background was specified however the ."
1051	echo ". XPM includes files and libraries could not be found. ."	998	echo ". XPM includes files and libraries could not be found. ."

Diff Legend

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

Comparing rxvt-unicode/configure.ac (file contents): Revision 1.52 by ayin, Wed Jun 13 16:20:41 2007 UTC vs. Revision 1.69 by root, Wed Aug 1 18:38:15 2007 UTC

Diff Legend

Comparing rxvt-unicode/configure.ac (file contents):
Revision 1.52 by ayin, Wed Jun 13 16:20:41 2007 UTC vs.
Revision 1.69 by root, Wed Aug 1 18:38:15 2007 UTC