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

Comparing rxvt-unicode/configure.ac (file contents):
Revision 1.49 by ayin, Wed Jun 13 11:19:41 2007 UTC vs.
Revision 1.64 by ayin, Thu Jul 26 17:41:46 2007 UTC

…		…
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...
…		…
439	AC_DEFINE_UNQUOTED(RXVT_TERMINFO, "$withval", Set TERMINFO value to the value given by configure) terminfo="$withval"	437	AC_DEFINE_UNQUOTED(RXVT_TERMINFO, "$withval", Set TERMINFO value to the value given by configure) terminfo="$withval"
440	fi])	438	fi])
441		439
442	dnl# --------------------------------------------------------------------------	440	dnl# --------------------------------------------------------------------------
443		441
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)	442	AC_PATH_PROG(TIC, tic)
451		443
452	dnl# need a neat way to detect SVR4 or its features	444	dnl# need a neat way to detect SVR4 or its features
453	dnl# in src/command.c we use these functions:	445	dnl# in src/command.c we use these functions:
454	dnl# grantpt(), unlockpt(), ptsname(), which are defined in <sys/ptms.h>	446	dnl# grantpt(), unlockpt(), ptsname(), which are defined in <sys/ptms.h>
…		…
468	dnl# only check if we want xpm-background	460	dnl# only check if we want xpm-background
469		461
470	LIBAFTERIMAGE_CFLAGS=	462	LIBAFTERIMAGE_CFLAGS=
471	AFTERIMAGE_LIBS=	463	AFTERIMAGE_LIBS=
472	have_afterimage=	464	have_afterimage=
		465	AFTERIMAGE_VERSION=
473		466
474	if test x$support_afterimage = xyes; then	467	if test x$support_afterimage = xyes; then
475	support_afterimage=no	468	support_afterimage=no
476		469
477	if test "x$afterimage_config" = "x" ; then	470	if test "x$afterimage_config" = "x" ; then
478	AC_PATH_PROG(afterimage_config, afterimage-config, no)	471	AC_PATH_PROG(afterimage_config, afterimage-config, no)
479	fi	472	fi
480		473	AC_PROG_AWK
481	AC_MSG_CHECKING(for libAfterImage)	474	AC_MSG_CHECKING(for libAfterImage version >= 1.15 )
482	if $afterimage_config --version >/dev/null 2>&1 ; then	475	AFTERIMAGE_VERSION=`$afterimage_config --version`
		476	if test -n $AFTERIMAGE_VERSION ; then
483	LIBAFTERIMAGE_CFLAGS=`$afterimage_config --cflags`	477	LIBAFTERIMAGE_CFLAGS=`$afterimage_config --cflags`
484	AFTERIMAGE_LIBS=`$afterimage_config --libs`	478	AFTERIMAGE_LIBS=`$afterimage_config --libs`
485	if test "x$AFTERIMAGE_LIBS" != "x"; then	479	if test "x$AFTERIMAGE_LIBS" != "x"; then
		480	libai_ver_major=`echo $AFTERIMAGE_VERSION \| $AWK -F . '{print $1}'`
		481	libai_ver_minor=`echo $AFTERIMAGE_VERSION \| $AWK -F . '{print $2}'`
		482	if test $libai_ver_major -gt 1 -o $ $libai_ver_major -eq 1 -a $libai_ver_minor -ge 15 $; then
486	support_afterimage=yes	483	support_afterimage=yes;
		484	fi
487	fi	485	fi
488	fi	486	fi
489		487
490	if test "x$support_afterimage" = "xyes"; then	488	if test "x$support_afterimage" = "xyes"; then
491	AC_MSG_RESULT($AFTERIMAGE_LIBS)	489	AC_MSG_RESULT($AFTERIMAGE_LIBS)
…		…
533	#include <sys/ioctl.h>	531	#include <sys/ioctl.h>
534	#ifdef HAVE_TERMIOS_H	532	#ifdef HAVE_TERMIOS_H
535	#include <termios.h>	533	#include <termios.h>
536	#endif]], [[int a = ECHO;]])],[rxvt_cv_header_sysioctl=yes],[rxvt_cv_header_sysioctl=no])])	534	#endif]], [[int a = ECHO;]])],[rxvt_cv_header_sysioctl=yes],[rxvt_cv_header_sysioctl=no])])
537		535
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,	536	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])])	537	[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	538	if test x$rxvt_cv_xpointer = xyes; then
584	AC_DEFINE(HAVE_XPOINTER, 1, Define if you have XPointer typedef)	539	AC_DEFINE(HAVE_XPOINTER, 1, Define if you have XPointer typedef)
585	fi	540	fi
586	LIBS=$ac_save_LIBS
587	CFLAGS=$ac_save_CFLAGS
588		541
589	AC_CACHE_CHECK([for XLIB_ILLEGAL_ACCESS], rxvt_xlib_illegal_access,	542	AC_CACHE_CHECK([for XLIB_ILLEGAL_ACCESS], rxvt_xlib_illegal_access,
590	[AC_COMPILE_IFELSE(	543	[AC_COMPILE_IFELSE(
591	[AC_LANG_PROGRAM([	544	[AC_LANG_PROGRAM([
592	#define XLIB_ILLEGAL_ACCESS	545	#define XLIB_ILLEGAL_ACCESS
…		…
732	dnl# this is a really hack test for some basic Xlocale stuff	685	dnl# this is a really hack test for some basic Xlocale stuff
733	ac_save_LIBS=$LIBS	686	ac_save_LIBS=$LIBS
734	ac_save_CFLAGS=$CFLAGS	687	ac_save_CFLAGS=$CFLAGS
735	CFLAGS="$CFLAGS $X_CFLAGS"	688	CFLAGS="$CFLAGS $X_CFLAGS"
736	LIBS="$LIBS $X_LIBS $X_EXTRA_LIBS -lX11"	689	LIBS="$LIBS $X_LIBS $X_EXTRA_LIBS -lX11"
737	if test x$rxvt_cv_rpath = xyes -o x$rxvt_cv_R = xyes; then
738	LIBS=`echo $LIBS \| sed "$R_TRANSLATE"`
739	fi
740	AC_CACHE_CHECK(for working Xlocale, rxvt_cv_func_xlocale,	690	AC_CACHE_CHECK(for working Xlocale, rxvt_cv_func_xlocale,
741	[AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <X11/Xlib.h>	691	[AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <X11/Xlib.h>
742	#include <stdlib.h>	692	#include <stdlib.h>
743	main() {	693	main() {
744	char *p;	694	char *p;
745	if ((p = XSetLocaleModifiers("@im=none")) != NULL && *p)	695	if ((p = XSetLocaleModifiers("@im=none")) != NULL && *p)
746	exit (XSupportsLocale() ? 0 : 1);	696	exit (XSupportsLocale() ? 0 : 1);
747	else	697	else
748	exit (1);}]])],[dnl	698	exit (1);}]])],[dnl
749	rxvt_cv_func_xlocale=yes],[rxvt_cv_func_xlocale=no],[dnl	699	rxvt_cv_func_xlocale=yes],[rxvt_cv_func_xlocale=no],[dnl
750	AC_MSG_WARN(Define NO_XLOCALE in config.h manually)])])	700	:])])
		701	if test x$support_xim = xyes; then
751	if test x$rxvt_cv_func_xlocale = xyes; then	702	if test x$rxvt_cv_func_xlocale = xyes; then
752	AC_DEFINE(HAVE_XLOCALE, 1, Define if Xlocale support works)	703	AC_DEFINE(USE_XIM, 1, Define if you want to have XIM (X Input Method) protocol support - required for multibyte characters input)
		704	fi
753	fi	705	fi
754		706
755	AC_CACHE_CHECK(for working X setlocale, rxvt_cv_func_xsetlocale,	707	AC_CACHE_CHECK(for working X setlocale, rxvt_cv_func_xsetlocale,
756	[AC_LINK_IFELSE([AC_LANG_PROGRAM([[#define X_LOCALE 1	708	[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])])	709	#include <X11/Xlocale.h>]], [[setlocale(LC_CTYPE, "");]])],[rxvt_cv_func_xsetlocale=yes],[rxvt_cv_func_xsetlocale=no])])
…		…
832	fi	784	fi
833	if test x$support_tinting = xyes; then	785	if test x$support_tinting = xyes; then
834	AC_DEFINE(TINTING, 1, Define if you want your background to be tinted)	786	AC_DEFINE(TINTING, 1, Define if you want your background to be tinted)
835	fi	787	fi
836	if test x$support_inheritpixmap = xyes; then	788	if test x$support_inheritpixmap = xyes; then
837	AC_DEFINE(TRANSPARENT, 1, Define if you want your background to use the parent window background)	789	AC_DEFINE(ENABLE_TRANSPARENCY, 1, Define if you want your background to use the parent window background)
838	fi	790	fi
839	if test x$support_keepscrolling = xno; then	791	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)	792	AC_DEFINE(NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING, 1, Define for continual scrolling when you keep the scrollbar button pressed)
841	fi	793	fi
842	if test x$support_selectionscrolling = xyes; then	794	if test x$support_selectionscrolling = xyes; then
843	AC_DEFINE(SELECTION_SCROLLING, 1, Define to allow scrolling when the selection moves to the top or bottom of the screen)	795	AC_DEFINE(SELECTION_SCROLLING, 1, Define to allow scrolling when the selection moves to the top or bottom of the screen)
844	fi	796	fi
845	if test x$support_frills = xyes; then
846	AC_DEFINE(ENABLE_FRILLS, 1, Define if you want handling for rarely used but handy features)
847	fi
848	if test x$support_mousewheel = xyes; then	797	if test x$support_mousewheel = xyes; then
849	AC_DEFINE(MOUSE_WHEEL, 1, Define to use wheel events (button4 and button5) to scroll)	798	AC_DEFINE(MOUSE_WHEEL, 1, Define to use wheel events (button4 and button5) to scroll)
850	fi	799	fi
851	if test x$support_mouseslipwheel = xyes; then	800	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)	801	AC_DEFINE(MOUSE_SLIP_WHEELING, 1, Define to have CTRL cause wheel events to accelerate scrolling. Release CTRL to halt scrolling)
853	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	802	fi
859	if test x$support_xpm = xyes -o x$support_afterimage = xyes ; then	803	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)	804	AC_DEFINE(XPM_BACKGROUND, 1, Define if you want to have sexy-looking background pixmaps. Needs libXpm or libAfterImage)
861	fi	805	fi
862		806
…		…
957		901
958	if test x$support_perl = xyes; then	902	if test x$support_perl = xyes; then
959	support_frills=yes	903	support_frills=yes
960	fi	904	fi
961		905
		906	if test x$support_frills = xyes; then
		907	AC_DEFINE(ENABLE_FRILLS, 1, Define if you want handling for rarely used but handy features)
		908	fi
		909
962	AC_SUBST(CFLAGS)	910	AC_SUBST(CFLAGS)
963	AC_SUBST(CPPFLAGS)	911	AC_SUBST(CPPFLAGS)
964	AC_SUBST(LDFLAGS)	912	AC_SUBST(LDFLAGS)
965	AC_SUBST(X_CFLAGS)	913	AC_SUBST(X_CFLAGS)
966		914
967	dnl# Attack the libs	915	dnl# Attack the libs
968	if test x$rxvt_cv_rpath = xyes -o x$rxvt_cv_R = xyes; then
969	LIBS=`echo $LIBS \| sed "$R_TRANSLATE"`
970	X_LIBS=`echo $X_LIBS \| sed "$R_TRANSLATE"`
971	X_EXTRA_LIBS=`echo $X_EXTRA_LIBS \| sed "$R_TRANSLATE"`
972	XPM_LIBS=`echo $XPM_LIBS \| sed "$R_TRANSLATE"`
973	fi
974	AC_SUBST(LIBS)	916	AC_SUBST(LIBS)
975	AC_SUBST(X_LIBS)	917	AC_SUBST(X_LIBS)
976	AC_SUBST(X_EXTRA_LIBS)	918	AC_SUBST(X_EXTRA_LIBS)
977		919
978	AC_SUBST(LIBAFTERIMAGE_CFLAGS)	920	AC_SUBST(LIBAFTERIMAGE_CFLAGS)

Diff Legend

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

Comparing rxvt-unicode/configure.ac (file contents): Revision 1.49 by ayin, Wed Jun 13 11:19:41 2007 UTC vs. Revision 1.64 by ayin, Thu Jul 26 17:41:46 2007 UTC

Diff Legend

Comparing rxvt-unicode/configure.ac (file contents):
Revision 1.49 by ayin, Wed Jun 13 11:19:41 2007 UTC vs.
Revision 1.64 by ayin, Thu Jul 26 17:41:46 2007 UTC