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

Comparing rxvt-unicode/configure.ac (file contents):
Revision 1.90 by ayin, Mon Dec 10 23:41:15 2007 UTC vs.
Revision 1.102 by ayin, Fri Dec 28 14:00:47 2007 UTC

…		…
74	case $host in	74	case $host in
75	--solaris* )	75	--solaris* )
76	AC_DEFINE(_XOPEN_SOURCE, 500, Needed to get declarations for msg_control and msg_controllen on Solaris)	76	AC_DEFINE(_XOPEN_SOURCE, 500, Needed to get declarations for msg_control and msg_controllen on Solaris)
77	;;	77	;;
78	esac	78	esac
79
80	dnl if test x$GXX = xyes; then
81	dnl CXXFLAGS="$CXXFLAGS" dnl I once had -fno-exceptions, but I am using them now...
82	dnl fi
83		79
84	dnl# FreeBSD needs to link libxpg4	80	dnl# FreeBSD needs to link libxpg4
85	AC_CHECK_FUNC(setlocale, [], [AC_CHECK_LIB(xpg4, setlocale, [LIBS="$LIBS -lxpg4"])])	81	AC_CHECK_FUNC(setlocale, [], [AC_CHECK_LIB(xpg4, setlocale, [LIBS="$LIBS -lxpg4"])])
86		82
87	dnl# solaris needs to link libnsl and socket	83	dnl# solaris needs to link libnsl and socket
…		…
479		475
480	dnl# --------------------------------------------------------------------------	476	dnl# --------------------------------------------------------------------------
481	dnl# CHECKING FOR HEADER FILES	477	dnl# CHECKING FOR HEADER FILES
482	dnl# --------------------------------------------------------------------------	478	dnl# --------------------------------------------------------------------------
483	AC_CHECK_HEADERS( \	479	AC_CHECK_HEADERS( \
484	assert.h \
485	fcntl.h \
486	stdarg.h \
487	stdlib.h \
488	string.h \
489	termios.h \
490	unistd.h \
491	sys/byteorder.h \	480	sys/byteorder.h \
492	sys/ioctl.h \	481	sys/ioctl.h \
493	sys/select.h \
494	sys/sockio.h \	482	sys/sockio.h \
495	sys/strredir.h \	483	sys/strredir.h \
496	sys/time.h \
497	stdint.h \	484	stdint.h \
498	wchar.h \	485	wchar.h \
499	cwchar \	486	cwchar \
500	clocale \
501	)	487	)
502
503	dnl# check to allow both <termios.h> and <sys/ioctl.h>
504	AC_CACHE_CHECK(whether termios.h and sys/ioctl.h may both be included, rxvt_cv_header_sysioctl,
505	[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stdio.h>
506	#include <sys/ioctl.h>
507	#ifdef HAVE_TERMIOS_H
508	#include <termios.h>
509	#endif]], [[int a = ECHO;]])],[rxvt_cv_header_sysioctl=yes],[rxvt_cv_header_sysioctl=no])])
510		488
511	AC_CACHE_CHECK([for XPointer], rxvt_cv_xpointer,	489	AC_CACHE_CHECK([for XPointer], rxvt_cv_xpointer,
512	[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <X11/Xlib.h>]], [[XPointer dummy;]])],[rxvt_cv_xpointer=yes],[rxvt_cv_xpointer=no])])	490	[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <X11/Xlib.h>]], [[XPointer dummy;]])],[rxvt_cv_xpointer=yes],[rxvt_cv_xpointer=no])])
513	if test x$rxvt_cv_xpointer = xyes; then	491	if test x$rxvt_cv_xpointer = xyes; then
514	AC_DEFINE(HAVE_XPOINTER, 1, Define if you have XPointer typedef)	492	AC_DEFINE(HAVE_XPOINTER, 1, Define if you have XPointer typedef)
…		…
532	dnl# --------------------------------------------------------------------------	510	dnl# --------------------------------------------------------------------------
533	dnl# CHECKING FOR MISSING TYPEDEFS	511	dnl# CHECKING FOR MISSING TYPEDEFS
534	dnl# --------------------------------------------------------------------------	512	dnl# --------------------------------------------------------------------------
535	dnl# Missing typedefs and replacements	513	dnl# Missing typedefs and replacements
536	AC_TYPE_MODE_T	514	AC_TYPE_MODE_T
537	dnl> AC_CHECK_TYPE(umode_t, int)
538	dnl> AC_CHECK_TYPE(off_t, long)
539	AC_TYPE_PID_T	515	AC_TYPE_PID_T
540	AC_TYPE_UID_T	516	AC_TYPE_UID_T
541		517	AC_TYPE_INT16_T
542	AC_CHECK_SIZEOF(short, 2)	518	AC_TYPE_UINT16_T
543	AC_CHECK_SIZEOF(int, 4)	519	AC_TYPE_INT32_T
544	dnl AC_CHECK_SIZEOF(long, 4)	520	AC_TYPE_UINT32_T
545	AC_CHECK_SIZEOF(long long, 8)
546	AC_CHECK_SIZEOF(int *, 4)
547
548	dnl# see usage below
549	AC_DEFUN([RXVT_CHECK_SIZE],
550	[AC_CACHE_CHECK([for $2], $1,
551	[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stdint.h>]], [[$2 dummy;]])],[$1=yes],[dnl
552	if test "$ac_cv_sizeof_char" -ge $3; then
553	$1="$4 char"
554	else
555	if test "$ac_cv_sizeof_short" -ge $3; then
556	$1="$4 short"
557	else
558	if test "$ac_cv_sizeof_int" -ge $3; then
559	$1="$4 int"
560	else
561	if test "$ac_cv_sizeof_long" -ge $3; then
562	$1="$4 long"
563	else
564	if test "$ac_cv_sizeof_long_long" -ge $3; then
565	$1="$4 long long"
566	else
567	$1="$4 $5" # we _must_ have a (possibly wrong) default
568	fi
569	fi
570	fi
571	fi
572	fi])])]
573	if test x"$$1" != xyes; then
574	$6="typedef $$1 $2;"
575	else
576	if test x"$4" = x; then
577	$6="/* typedef $5 $2; */"
578	else
579	$6="/* typedef $4 $5 $2; */"
580	fi
581	fi dnl
582	)
583	dnl#
584	dnl# Look for types the system may know about anyway.
585	dnl#
586	RXVT_CHECK_SIZE(rxvt_cv_int16_t, int16_t, 2, , short, rxvt_int16_typedef)
587	AC_SUBST(rxvt_int16_typedef)
588	RXVT_CHECK_SIZE(rxvt_cv_uint16_t, uint16_t, 2, unsigned, short, rxvt_uint16_typedef)
589	AC_SUBST(rxvt_uint16_typedef)
590	RXVT_CHECK_SIZE(rxvt_cv_int32_t, int32_t, 4, , int, rxvt_int32_typedef)
591	AC_SUBST(rxvt_int32_typedef)
592	RXVT_CHECK_SIZE(rxvt_cv_uint32_t, uint32_t, 4, unsigned, int, rxvt_uint32_typedef)
593	AC_SUBST(rxvt_uint32_typedef)
594	dnl RXVT_CHECK_SIZE(rxvt_cv_int64_t, int64_t, 8, , long long, rxvt_int64_typedef)
595	dnl AC_SUBST(rxvt_int64_typedef)
596	dnl RXVT_CHECK_SIZE(rxvt_cv_uint64_t, uint64_t, 8, unsigned, long long, rxvt_uint64_typedef)
597	dnl AC_SUBST(rxvt_uint64_typedef)
598	dnl#
599	dnl# Now look for another we use
600	dnl#
601	if test "$ac_cv_sizeof_int_p" -eq 8; then
602	rxvt_intp_define="#define intp_t int64_t"
603	rxvt_u_intp_define="#define u_intp_t u_int64_t"
604	else
605	if test "$ac_cv_sizeof_int_p" -eq 4; then
606	rxvt_intp_define="#define intp_t int32_t"
607	rxvt_u_intp_define="#define u_intp_t u_int32_t"
608	else
609	if test "$ac_cv_sizeof_int_p" -eq 2; then
610	rxvt_intp_define="#define intp_t int16_t"
611	rxvt_u_intp_define="#define u_intp_t u_int16_t"
612	else
613	rxvt_intp_define="#error set intp_t"
614	rxvt_u_intp_define="#error set u_intp_t"
615	fi
616	fi
617	fi
618	AC_SUBST(rxvt_intp_define)
619	AC_SUBST(rxvt_u_intp_define)
620		521
621	dnl# --------------------------------------------------------------------------	522	dnl# --------------------------------------------------------------------------
622	dnl# CHECKING FOR LIBRARY FUNCTIONS	523	dnl# CHECKING FOR LIBRARY FUNCTIONS
623	dnl# --------------------------------------------------------------------------	524	dnl# --------------------------------------------------------------------------
624	AC_CHECK_FUNCS(unsetenv)	525	AC_CHECK_FUNCS(unsetenv)
…		…
812		713
813	save_CXXFLAGS="$CXXFLAGS"	714	save_CXXFLAGS="$CXXFLAGS"
814	save_LIBS="$LIBS"	715	save_LIBS="$LIBS"
815	CXXFLAGS="$CXXFLAGS `$PERL -MExtUtils::Embed -e ccopts`"	716	CXXFLAGS="$CXXFLAGS `$PERL -MExtUtils::Embed -e ccopts`"
816	LIBS="$LIBS `$PERL -MExtUtils::Embed -e ldopts`"	717	LIBS="$LIBS `$PERL -MExtUtils::Embed -e ldopts`"
817	AC_TRY_LINK([	718	AC_LINK_IFELSE([AC_LANG_PROGRAM([[
818	#include <EXTERN.h>	719	#include <EXTERN.h>
819	#include <perl.h>	720	#include <perl.h>
820	#include <XSUB.h>	721	#include <XSUB.h>
821	],[	722	]], [[
822	PerlInterpreter *perl = perl_alloc ();	723	PerlInterpreter *perl = perl_alloc ();
823	],[rxvt_perl_link=yes],[rxvt_perl_link=no])	724	]])],[rxvt_perl_link=yes],[rxvt_perl_link=no])
824	CXXFLAGS="$save_CXXFLAGS"	725	CXXFLAGS="$save_CXXFLAGS"
825	LIBS="$save_LIBS"	726	LIBS="$save_LIBS"
826		727
827	if test x$rxvt_perl_link = xyes; then	728	if test x$rxvt_perl_link = xyes; then
828	AC_MSG_RESULT(ok)	729	AC_MSG_RESULT(ok)
…		…
859	AC_SUBST(AFTERIMAGE_CFLAGS)	760	AC_SUBST(AFTERIMAGE_CFLAGS)
860	AC_SUBST(AFTERIMAGE_LIBS)	761	AC_SUBST(AFTERIMAGE_LIBS)
861		762
862	AC_ARG_PROGRAM	763	AC_ARG_PROGRAM
863		764
864	dnl# test for "sun" or "__sun__" before include sys_ioctl
865
866	dnl# revert HAVE_BLAH_H into a "#include <blah.h>"
867	AC_DEFUN([RXVT_DEFINE_TO_INCLUDE], dnl
868	[if test "$$3" = "$4" -o "$$5" = "$6"; then
869	$1="#include <$2>"
870	else
871	$1="/* #include <$2> */"
872	fi dnl
873	AC_SUBST($1)])
874
875	RXVT_DEFINE_TO_INCLUDE(include_stdint_h, stdint.h, ac_cv_header_stdint_h, yes, notset, dontmatch)
876	RXVT_DEFINE_TO_INCLUDE(include_stdarg_h, cstdarg, ac_cv_header_stdarg_h, yes, notset, dontmatch)
877	RXVT_DEFINE_TO_INCLUDE(include_stdlib_h, cstdlib, ac_cv_header_stdlib_h, yes, notset, dontmatch)
878	RXVT_DEFINE_TO_INCLUDE(include_unistd_h, unistd.h, ac_cv_header_unistd_h, yes, notset, dontmatch)
879	RXVT_DEFINE_TO_INCLUDE(include_string_h, cstring, ac_cv_header_string_h, yes, notset, dontmatch)
880	RXVT_DEFINE_TO_INCLUDE(include_fcntl_h, fcntl.h, ac_cv_header_fcntl_h, yes, notset, dontmatch)
881	RXVT_DEFINE_TO_INCLUDE(include_util_h, util.h, ac_cv_header_util_h, yes, notset, dontmatch)
882	RXVT_DEFINE_TO_INCLUDE(include_assert_h, assert.h, ac_cv_header_assert_h, yes, notset, dontmatch)
883	RXVT_DEFINE_TO_INCLUDE(include_sys_ioctl_h, sys/ioctl.h, rxvt_cv_header_sysioctl, yes, notset, dontmatch)
884	RXVT_DEFINE_TO_INCLUDE(include_sys_select_h, sys/select.h, ac_cv_header_sys_select_h, yes, notset, dontmatch)
885	RXVT_DEFINE_TO_INCLUDE(include_sys_strredir_h, sys/strredir.h, ac_cv_header_sys_strredir_h, yes, notset, dontmatch)
886	RXVT_DEFINE_TO_INCLUDE(include_sys_time_h, sys/time.h, ac_cv_header_sys_time_h, yes, notset, dontmatch)
887	RXVT_DEFINE_TO_INCLUDE(include_time_h, time.h, ac_cv_header_sys_time_h, no, ac_cv_header_time, yes)
888
889	AC_CONFIG_FILES([Makefile \	765	AC_CONFIG_FILES([Makefile \
890	doc/Makefile \	766	doc/Makefile \
891	src/Makefile \	767	src/Makefile \
892	src/rxvtlib.h \
893	])	768	])
894	AC_OUTPUT	769	AC_OUTPUT
895		770
896	echo "Configuration:	771	echo "Configuration:
897		772

Diff Legend

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

Comparing rxvt-unicode/configure.ac (file contents): Revision 1.90 by ayin, Mon Dec 10 23:41:15 2007 UTC vs. Revision 1.102 by ayin, Fri Dec 28 14:00:47 2007 UTC

Diff Legend

Comparing rxvt-unicode/configure.ac (file contents):
Revision 1.90 by ayin, Mon Dec 10 23:41:15 2007 UTC vs.
Revision 1.102 by ayin, Fri Dec 28 14:00:47 2007 UTC