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

Comparing rxvt-unicode/configure.ac (file contents):
Revision 1.57 by ayin, Tue Jun 26 09:30:04 2007 UTC vs.
Revision 1.64 by ayin, Thu Jul 26 17:41:46 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
…		…
464	dnl# only check if we want xpm-background	460	dnl# only check if we want xpm-background
465		461
466	LIBAFTERIMAGE_CFLAGS=	462	LIBAFTERIMAGE_CFLAGS=
467	AFTERIMAGE_LIBS=	463	AFTERIMAGE_LIBS=
468	have_afterimage=	464	have_afterimage=
		465	AFTERIMAGE_VERSION=
469		466
470	if test x$support_afterimage = xyes; then	467	if test x$support_afterimage = xyes; then
471	support_afterimage=no	468	support_afterimage=no
472		469
473	if test "x$afterimage_config" = "x" ; then	470	if test "x$afterimage_config" = "x" ; then
474	AC_PATH_PROG(afterimage_config, afterimage-config, no)	471	AC_PATH_PROG(afterimage_config, afterimage-config, no)
475	fi	472	fi
476		473	AC_PROG_AWK
477	AC_MSG_CHECKING(for libAfterImage)	474	AC_MSG_CHECKING(for libAfterImage version >= 1.15 )
478	if $afterimage_config --version >/dev/null 2>&1 ; then	475	AFTERIMAGE_VERSION=`$afterimage_config --version`
		476	if test -n $AFTERIMAGE_VERSION ; then
479	LIBAFTERIMAGE_CFLAGS=`$afterimage_config --cflags`	477	LIBAFTERIMAGE_CFLAGS=`$afterimage_config --cflags`
480	AFTERIMAGE_LIBS=`$afterimage_config --libs`	478	AFTERIMAGE_LIBS=`$afterimage_config --libs`
481	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
482	support_afterimage=yes	483	support_afterimage=yes;
		484	fi
483	fi	485	fi
484	fi	486	fi
485		487
486	if test "x$support_afterimage" = "xyes"; then	488	if test "x$support_afterimage" = "xyes"; then
487	AC_MSG_RESULT($AFTERIMAGE_LIBS)	489	AC_MSG_RESULT($AFTERIMAGE_LIBS)
…		…
529	#include <sys/ioctl.h>	531	#include <sys/ioctl.h>
530	#ifdef HAVE_TERMIOS_H	532	#ifdef HAVE_TERMIOS_H
531	#include <termios.h>	533	#include <termios.h>
532	#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])])
533		535
534	dnl# ELF systems may want to store paths for dynamic libraries.
535	dnl# Lets see if the compiler can accept "-Rpath" or "-Wl,-Rpath"
536	dnl# At least one version of SunOS wants "-R path" but it's not checked yet.
537	if test -n "$GCC"; then
538	LDARG="-Wl,"
539	else
540	LDARG=""
541	fi
542	changequote(, )dnl
543	R_TRANSLATE='s/-L$[^ ]*$/-L\1 '$LDARG'-rpath '$LDARG'\1/g'
544	changequote([, ])dnl
545
546	ac_save_CFLAGS=$CFLAGS
547	ac_save_LIBS=$LIBS
548	CFLAGS="$CFLAGS $X_CFLAGS"
549	LIBS=`echo "$LIBS $X_LIBS $X_EXTRA_LIBS -lX11" \| sed "$R_TRANSLATE"`
550	AC_CACHE_CHECK([for -rpath dynamic library path recording], rxvt_cv_rpath,
551	[AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <X11/Xlib.h>
552	#include <stdlib.h>
553	main()
554	{
555	exit(0);
556	(void) XOpenDisplay("foobar");
557	}]])],[rxvt_cv_rpath=yes],[rxvt_cv_rpath=no],[dnl
558	AC_MSG_WARN(You may need to check the LIBS line)])])
559	if test x$rxvt_cv_rpath != xyes; then
560	changequote(, )dnl
561	R_TRANSLATE='s/-L$[^ ]*$/-L\1 '$LDARG'-R\1/g'
562	changequote([, ])dnl
563	LIBS=`echo "$ac_save_LIBS $X_LIBS $X_EXTRA_LIBS -lX11" \| sed "$R_TRANSLATE"`
564	AC_CACHE_CHECK([for -R dynamic library path recording], rxvt_cv_R,
565	[AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <X11/Xlib.h>
566	#include <stdlib.h>
567	main()
568	{
569	exit(0);
570	(void) XOpenDisplay("foobar");
571	}]])],[rxvt_cv_R=yes],[rxvt_cv_R=no],[rxvt_cv_R=no])])
572	if test x$rxvt_cv_R != xyes; then
573	LIBS="$ac_save_LIBS $X_LIBS $X_EXTRA_LIBS -lX11"
574	fi
575	fi
576
577	AC_CACHE_CHECK([for XPointer], rxvt_cv_xpointer,	536	AC_CACHE_CHECK([for XPointer], rxvt_cv_xpointer,
578	[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])])
579	if test x$rxvt_cv_xpointer = xyes; then	538	if test x$rxvt_cv_xpointer = xyes; then
580	AC_DEFINE(HAVE_XPOINTER, 1, Define if you have XPointer typedef)	539	AC_DEFINE(HAVE_XPOINTER, 1, Define if you have XPointer typedef)
581	fi	540	fi
582	LIBS=$ac_save_LIBS
583	CFLAGS=$ac_save_CFLAGS
584		541
585	AC_CACHE_CHECK([for XLIB_ILLEGAL_ACCESS], rxvt_xlib_illegal_access,	542	AC_CACHE_CHECK([for XLIB_ILLEGAL_ACCESS], rxvt_xlib_illegal_access,
586	[AC_COMPILE_IFELSE(	543	[AC_COMPILE_IFELSE(
587	[AC_LANG_PROGRAM([	544	[AC_LANG_PROGRAM([
588	#define XLIB_ILLEGAL_ACCESS	545	#define XLIB_ILLEGAL_ACCESS
…		…
728	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
729	ac_save_LIBS=$LIBS	686	ac_save_LIBS=$LIBS
730	ac_save_CFLAGS=$CFLAGS	687	ac_save_CFLAGS=$CFLAGS
731	CFLAGS="$CFLAGS $X_CFLAGS"	688	CFLAGS="$CFLAGS $X_CFLAGS"
732	LIBS="$LIBS $X_LIBS $X_EXTRA_LIBS -lX11"	689	LIBS="$LIBS $X_LIBS $X_EXTRA_LIBS -lX11"
733	if test x$rxvt_cv_rpath = xyes -o x$rxvt_cv_R = xyes; then
734	LIBS=`echo $LIBS \| sed "$R_TRANSLATE"`
735	fi
736	AC_CACHE_CHECK(for working Xlocale, rxvt_cv_func_xlocale,	690	AC_CACHE_CHECK(for working Xlocale, rxvt_cv_func_xlocale,
737	[AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <X11/Xlib.h>	691	[AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <X11/Xlib.h>
738	#include <stdlib.h>	692	#include <stdlib.h>
739	main() {	693	main() {
740	char *p;	694	char *p;
…		…
957	AC_SUBST(CPPFLAGS)	911	AC_SUBST(CPPFLAGS)
958	AC_SUBST(LDFLAGS)	912	AC_SUBST(LDFLAGS)
959	AC_SUBST(X_CFLAGS)	913	AC_SUBST(X_CFLAGS)
960		914
961	dnl# Attack the libs	915	dnl# Attack the libs
962	if test x$rxvt_cv_rpath = xyes -o x$rxvt_cv_R = xyes; then
963	LIBS=`echo $LIBS \| sed "$R_TRANSLATE"`
964	X_LIBS=`echo $X_LIBS \| sed "$R_TRANSLATE"`
965	X_EXTRA_LIBS=`echo $X_EXTRA_LIBS \| sed "$R_TRANSLATE"`
966	XPM_LIBS=`echo $XPM_LIBS \| sed "$R_TRANSLATE"`
967	fi
968	AC_SUBST(LIBS)	916	AC_SUBST(LIBS)
969	AC_SUBST(X_LIBS)	917	AC_SUBST(X_LIBS)
970	AC_SUBST(X_EXTRA_LIBS)	918	AC_SUBST(X_EXTRA_LIBS)
971		919
972	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.57 by ayin, Tue Jun 26 09:30:04 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.57 by ayin, Tue Jun 26 09:30:04 2007 UTC vs.
Revision 1.64 by ayin, Thu Jul 26 17:41:46 2007 UTC