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

Comparing rxvt-unicode/configure.ac (file contents):
Revision 1.40 by ayin, Sat Jun 9 10:28:55 2007 UTC vs.
Revision 1.53 by ayin, Mon Jun 25 13:50:40 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	[
51	[AC_MSG_RESULT(ok)],	52	AC_MSG_RESULT(ok)
		53	CXXLIB="-lsupc++"
		54	],
52	[	55	[
53	AC_MSG_RESULT([no, making everything bigger and slower])	56	AC_MSG_RESULT([no, making everything bigger and slower])
54	LIBS="$save_LIBS"	57	LIBS="$save_LIBS"
55	LINKER="$save_CXX"	58	LINKER="$save_CXX"
56	]	59	]
57	)	60	)
58	CXX="$save_CXX"	61	CXX="$save_CXX"
59	fi	62	fi
60	AC_SUBST(LINKER,[$LINKER])	63	AC_SUBST(LINKER,[$LINKER])
		64	AC_SUBST(CXXLIB)
61		65
62	dnl# --------------------------------------------------------------------------	66	dnl# --------------------------------------------------------------------------
63	dnl# Supply default CXXFLAGS, if not specified by `CXXFLAGS=flags ./configure'	67	dnl# Supply default CXXFLAGS, if not specified by `CXXFLAGS=flags ./configure'
64	dnl#	68	dnl#
65	if test -z "$orig_CXXFLAGS"; then	69	if test -z "$orig_CXXFLAGS"; then
…		…
237	[ --enable-afterimage enable integration with libAfterImage for background images],	241	[ --enable-afterimage enable integration with libAfterImage for background images],
238	[if test x$enableval = xyes -o x$enableval = xno; then	242	[if test x$enableval = xyes -o x$enableval = xno; then
239	support_afterimage=$enableval	243	support_afterimage=$enableval
240	fi])	244	fi])
241		245
242	AC_ARG_WITH(afterimage_config, [ --with-afterimage-config=DIR use libAfterImage config script in DIR], afterimage_config="$withval",afterimage_config=NO)	246	AC_ARG_WITH(afterimage_config,
		247	[ --with-afterimage-config=DIR use libAfterImage config script in DIR],
		248	[if test "x$withval" != x; then
		249	afterimage_config=$withval/afterimage-config
		250	fi])
243		251
244	AC_ARG_ENABLE(afterstep,	252	AC_ARG_ENABLE(afterstep,
245	[ --enable-afterstep enable integration with AfterStep window manager],	253	[ --enable-afterstep enable integration with AfterStep window manager],
246	[if test x$enableval = xyes -o x$enableval = xno; then	254	[if test x$enableval = xyes -o x$enableval = xno; then
247	support_afterstep=$enableval	255	support_afterstep=$enableval
…		…
435	AC_DEFINE_UNQUOTED(RXVT_TERMINFO, "$withval", Set TERMINFO value to the value given by configure) terminfo="$withval"	443	AC_DEFINE_UNQUOTED(RXVT_TERMINFO, "$withval", Set TERMINFO value to the value given by configure) terminfo="$withval"
436	fi])	444	fi])
437		445
438	dnl# --------------------------------------------------------------------------	446	dnl# --------------------------------------------------------------------------
439		447
440	AC_PATH_PROG(MV, mv, mv)
441	AC_PATH_PROG(CP, cp, cp)
442	AC_PATH_PROG(LN, ln, ln)
443	AC_PATH_PROG(SED, sed, sed)
444	AC_PATH_PROG(ECHO, echo, echo)
445	AC_PATH_PROG(CMP, cmp, cmp)
446	AC_PATH_PROG(TIC, tic)	448	AC_PATH_PROG(TIC, tic)
447		449
448	dnl# need a neat way to detect SVR4 or its features	450	dnl# need a neat way to detect SVR4 or its features
449	dnl# in src/command.c we use these functions:	451	dnl# in src/command.c we use these functions:
450	dnl# grantpt(), unlockpt(), ptsname(), which are defined in <sys/ptms.h>	452	dnl# grantpt(), unlockpt(), ptsname(), which are defined in <sys/ptms.h>
…		…
465		467
466	LIBAFTERIMAGE_CFLAGS=	468	LIBAFTERIMAGE_CFLAGS=
467	AFTERIMAGE_LIBS=	469	AFTERIMAGE_LIBS=
468	have_afterimage=	470	have_afterimage=
469		471
470	if test x$support_afterimage == xyes; then	472	if test x$support_afterimage = xyes; then
471	AC_MSG_CHECKING(installed libAfterImage)
472	support_afterimage=no	473	support_afterimage=no
		474
473	if test "$afterimage_config" = "NO" ; then	475	if test "x$afterimage_config" = "x" ; then
474	if afterimage-config --version > /dev/null 2>&1 ; then	476	AC_PATH_PROG(afterimage_config, afterimage-config, no)
475	afterimage_config=afterimage-config	477	fi
476	else	478
477	if test -x /usr/local/bin/afterimage-config; then	479	AC_MSG_CHECKING(for libAfterImage)
478	afterimage_config=/usr/local/bin/afterimage-config
479	fi
480	fi
481	else
482	afterimage_config=$afterimage_config/afterimage-config
483	fi
484	if $afterimage_config --version > /dev/null 2>&1 ; then	480	if $afterimage_config --version >/dev/null 2>&1 ; then
485	LIBAFTERIMAGE_CFLAGS=`$afterimage_config --cflags`	481	LIBAFTERIMAGE_CFLAGS=`$afterimage_config --cflags`
486	AFTERIMAGE_LIBS=`$afterimage_config --libs`	482	AFTERIMAGE_LIBS=`$afterimage_config --libs`
487	if test "x$AFTERIMAGE_LIBS" != "x"; then	483	if test "x$AFTERIMAGE_LIBS" != "x"; then
488	support_afterimage=yes	484	support_afterimage=yes
489	fi	485	fi
490	fi	486	fi
491		487
492	if test "x$support_afterimage" = "xyes"; then	488	if test "x$support_afterimage" = "xyes"; then
493	AC_MSG_RESULT($AFTERIMAGE_LIBS)	489	AC_MSG_RESULT($AFTERIMAGE_LIBS)
494	else	490	else
495	AC_MSG_RESULT(afterimage-config not found in $afterimage_config - can't use libAfterImage for images.)	491	AC_MSG_RESULT(no)
496	fi	492	fi
497	fi	493	fi
498		494
499	if test x$support_afterimage != xyes -a x$support_xpm = xyes ; then	495	if test x$support_afterimage != xyes -a x$support_xpm = xyes ; then
500	VT_FIND_LIBXPM	496	VT_FIND_LIBXPM
501	if test x$no_xpm = xyes; then	497	if test x$no_xpm = xyes; then
…		…
747	if ((p = XSetLocaleModifiers("@im=none")) != NULL && *p)	743	if ((p = XSetLocaleModifiers("@im=none")) != NULL && *p)
748	exit (XSupportsLocale() ? 0 : 1);	744	exit (XSupportsLocale() ? 0 : 1);
749	else	745	else
750	exit (1);}]])],[dnl	746	exit (1);}]])],[dnl
751	rxvt_cv_func_xlocale=yes],[rxvt_cv_func_xlocale=no],[dnl	747	rxvt_cv_func_xlocale=yes],[rxvt_cv_func_xlocale=no],[dnl
752	AC_MSG_WARN(Define NO_XLOCALE in config.h manually)])])	748	:])])
753	if test x$rxvt_cv_func_xlocale = xyes; then
754	AC_DEFINE(HAVE_XLOCALE, 1, Define if Xlocale support works)
755	fi
756		749
757	AC_CACHE_CHECK(for working X setlocale, rxvt_cv_func_xsetlocale,	750	AC_CACHE_CHECK(for working X setlocale, rxvt_cv_func_xsetlocale,
758	[AC_LINK_IFELSE([AC_LANG_PROGRAM([[#define X_LOCALE 1	751	[AC_LINK_IFELSE([AC_LANG_PROGRAM([[#define X_LOCALE 1
759	#include <X11/Xlocale.h>]], [[setlocale(LC_CTYPE, "");]])],[rxvt_cv_func_xsetlocale=yes],[rxvt_cv_func_xsetlocale=no])])	752	#include <X11/Xlocale.h>]], [[setlocale(LC_CTYPE, "");]])],[rxvt_cv_func_xsetlocale=yes],[rxvt_cv_func_xsetlocale=no])])
760	if test x$rxvt_cv_func_xsetlocale = xyes; then	753	if test x$rxvt_cv_func_xsetlocale = xyes; then
…		…
959		952
960	if test x$support_perl = xyes; then	953	if test x$support_perl = xyes; then
961	support_frills=yes	954	support_frills=yes
962	fi	955	fi
963		956
964	AC_SUBST(DEBUG)
965	AC_SUBST(DINCLUDE)
966	AC_SUBST(CFLAGS)	957	AC_SUBST(CFLAGS)
967	AC_SUBST(CPPFLAGS)	958	AC_SUBST(CPPFLAGS)
968	AC_SUBST(LDFLAGS)	959	AC_SUBST(LDFLAGS)
969	AC_SUBST(X_CFLAGS)	960	AC_SUBST(X_CFLAGS)
970		961
971	dnl# Attack the libs	962	dnl# Attack the libs
972	if test x$rxvt_cv_rpath = xyes -o x$rxvt_cv_R = xyes; then	963	if test x$rxvt_cv_rpath = xyes -o x$rxvt_cv_R = xyes; then
973	DLIB=`echo $DLIB \| sed "$R_TRANSLATE"`
974	LIBS=`echo $LIBS \| sed "$R_TRANSLATE"`	964	LIBS=`echo $LIBS \| sed "$R_TRANSLATE"`
975	X_LIBS=`echo $X_LIBS \| sed "$R_TRANSLATE"`	965	X_LIBS=`echo $X_LIBS \| sed "$R_TRANSLATE"`
976	X_EXTRA_LIBS=`echo $X_EXTRA_LIBS \| sed "$R_TRANSLATE"`	966	X_EXTRA_LIBS=`echo $X_EXTRA_LIBS \| sed "$R_TRANSLATE"`
977	XPM_LIBS=`echo $XPM_LIBS \| sed "$R_TRANSLATE"`	967	XPM_LIBS=`echo $XPM_LIBS \| sed "$R_TRANSLATE"`
978	fi	968	fi
979	AC_SUBST(DLIB)
980	AC_SUBST(LIBS)	969	AC_SUBST(LIBS)
981	AC_SUBST(X_LIBS)	970	AC_SUBST(X_LIBS)
982	AC_SUBST(X_EXTRA_LIBS)	971	AC_SUBST(X_EXTRA_LIBS)
983		972
984	AC_SUBST(LIBAFTERIMAGE_CFLAGS)	973	AC_SUBST(LIBAFTERIMAGE_CFLAGS)
…		…
1030	if test x$support_xpm = xyes; then	1019	if test x$support_xpm = xyes; then
1031	echo " Xpm library: $XPM_LIBS"	1020	echo " Xpm library: $XPM_LIBS"
1032	fi	1021	fi
1033		1022
1034	if test x$support_afterimage = xyes; then	1023	if test x$support_afterimage = xyes; then
1035	echo " AfterImage library: $AFTERIMAGE_LIBS"	1024	echo " AfterImage support: yes"
1036	fi	1025	fi
1037		1026
1038	if test x$support_afterstep = xyes; then	1027	if test x$support_afterstep = xyes; then
1039	echo " With AfterStep integration"	1028	echo " AfterStep integration: yes"
1040	fi	1029	fi
1041		1030
1042	if test x$term != x; then	1031	if test x$term != x; then
1043	echo " set TERM to: $term"	1032	echo " set TERM to: $term"
1044	fi	1033	fi

Diff Legend

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

Comparing rxvt-unicode/configure.ac (file contents): Revision 1.40 by ayin, Sat Jun 9 10:28:55 2007 UTC vs. Revision 1.53 by ayin, Mon Jun 25 13:50:40 2007 UTC

Diff Legend

Comparing rxvt-unicode/configure.ac (file contents):
Revision 1.40 by ayin, Sat Jun 9 10:28:55 2007 UTC vs.
Revision 1.53 by ayin, Mon Jun 25 13:50:40 2007 UTC