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

Comparing rxvt-unicode/configure.ac (file contents):
Revision 1.83 by root, Sun Nov 18 01:02:09 2007 UTC vs.
Revision 1.100 by root, Sun Dec 23 05:03:52 2007 UTC

…		…
15	DATE=`sed -n -e 's/^.[ \t]DATE."$.*$"$/\1/p' ${srcdir}/src/version.h`	15	DATE=`sed -n -e 's/^.[ \t]DATE."$.*$"$/\1/p' ${srcdir}/src/version.h`
16	dnl LIBVERSION=`sed -n -e 's/^.[ \t]LIBVERSION."$.*$"$/\1/p' ${srcdir}/src/version.h`	16	dnl LIBVERSION=`sed -n -e 's/^.[ \t]LIBVERSION."$.*$"$/\1/p' ${srcdir}/src/version.h`
17	changequote([, ])dnl	17	changequote([, ])dnl
18	AC_SUBST(VERSION)dnl	18	AC_SUBST(VERSION)dnl
19	AC_SUBST(DATE)dnl	19	AC_SUBST(DATE)dnl
20	AC_SUBST(LSMDATE)dnl
21	AC_SUBST(LIBVERSION)dnl	20	dnl AC_SUBST(LIBVERSION)dnl
22		21
23	echo ""	22	echo ""
24	echo "configuring for rxvt $VERSION"	23	echo "configuring for rxvt $VERSION"
25	echo ""	24	echo ""
26		25
27	orig_CXXFLAGS="$CXXFLAGS"	26	orig_CXXFLAGS="$CXXFLAGS"
28		27
29	dnl# Checks for programs.	28	dnl# Checks for programs.
30	dnl AC_MAKE_SET
31
32	AC_PROG_CC	29	AC_PROG_CC
33	AC_PROG_CXX	30	AC_PROG_CXX
34	AC_PROG_CPP	31	AC_PROG_CPP
35	AC_PROG_INSTALL	32	AC_PROG_INSTALL
36		33
37	AC_AIX	34	AC_AIX
		35	AC_GNU_SOURCE
38	AC_ISC_POSIX	36	AC_ISC_POSIX
39	AC_LANG(C++)	37	AC_LANG(C++)
40		38
41	dnl check wether we can link with gcc -lsupc++	39	dnl check wether we can link with gcc -lsupc++
42	if test x$GCC = xyes && test x$GXX = xyes; then	40	if test x$GCC = xyes && test x$GXX = xyes; then
…		…
63	dnl# --------------------------------------------------------------------------	61	dnl# --------------------------------------------------------------------------
64	dnl# Supply default CXXFLAGS, if not specified by `CXXFLAGS=flags ./configure'	62	dnl# Supply default CXXFLAGS, if not specified by `CXXFLAGS=flags ./configure'
65	dnl#	63	dnl#
66	if test -z "$orig_CXXFLAGS"; then	64	if test -z "$orig_CXXFLAGS"; then
67	if test x$GCC = xyes && test "x$GXX" = xyes; then	65	if test x$GCC = xyes && test "x$GXX" = xyes; then
68	CXXFLAGS="-g -O3 -fno-threadsafe-statics -fno-enforce-eh-specs"	66	CXXFLAGS="-g -O3 -fno-rtti -fvisibility-inlines-hidden -fno-threadsafe-statics -fno-enforce-eh-specs"
69	AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[])], [], [CXXFLAGS="-g -O3"])	67	AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[])], [], [CXXFLAGS="-g -O3"])
70	else	68	else
71	CXXFLAGS="-O"	69	CXXFLAGS="-O"
72	fi	70	fi
73	CFLAGS="$CXXFLAGS"	71	CFLAGS="$CXXFLAGS"
74	fi	72	fi
75		73
76	AC_DEFINE(_GNU_SOURCE, 1, Use all glibc features.)
77
78	case $host in	74	case $host in
79	--solaris* )	75	--solaris* )
80	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)
81	;;	77	;;
82	esac	78	esac
83
84	dnl if test x$GXX = xyes; then
85	dnl CXXFLAGS="$CXXFLAGS" dnl I once had -fno-exceptions, but I am using them now...
86	dnl fi
87		79
88	dnl# FreeBSD needs to link libxpg4	80	dnl# FreeBSD needs to link libxpg4
89	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"])])
90		82
91	dnl# solaris needs to link libnsl and socket	83	dnl# solaris needs to link libnsl and socket
…		…
123		115
124	dnl# --------------------------------------------------------------------------	116	dnl# --------------------------------------------------------------------------
125	dnl# CHECKING COMMAND LINE OPTIONS	117	dnl# CHECKING COMMAND LINE OPTIONS
126	dnl# --------------------------------------------------------------------------	118	dnl# --------------------------------------------------------------------------
127		119
128	if test "x$enable_shared" = xyes; then	120	dnl if test "x$enable_shared" = xyes; then
129	AC_DEFINE(LIBRXVT, 1, Build shared library version - specify via configure only)	121	dnl AC_DEFINE(LIBRXVT, 1, Build shared library version - specify via configure only)
130	INSTALL_LIBRXVT=yes	122	dnl INSTALL_LIBRXVT=yes
131	fi	123	dnl fi
132	AC_SUBST(INSTALL_LIBRXVT)	124	dnl AC_SUBST(INSTALL_LIBRXVT)
133		125
134	AC_ARG_ENABLE(everything,	126	AC_ARG_ENABLE(everything,
135	[ --enable-everything enable standard non-multichoice features	127	[ --enable-everything enable standard non-multichoice features
136	NOTE: this option is order dependent	128	NOTE: this option is order dependent],
137	NOTE: automatically enabled with --enable-shared],
138	[	129	[
139	if test x$enableval = xno; then	130	if test x$enableval = xno; then
140	support_frills=no	131	support_frills=no
141	support_inheritpixmap=no	132	support_inheritpixmap=no
142	support_fading=no	133	support_fading=no
…		…
282	[ --enable-xterm-scroll enable Xterm style scrollbar],	273	[ --enable-xterm-scroll enable Xterm style scrollbar],
283	[if test x$enableval = xyes -o x$enableval = xno; then	274	[if test x$enableval = xyes -o x$enableval = xno; then
284	support_scroll_xterm=$enableval	275	support_scroll_xterm=$enableval
285	fi])	276	fi])
286		277
		278	AC_ARG_ENABLE(plain-scroll,
		279	[ --enable-plain-scroll enable plain style scrollbar],
		280	[if test x$enableval = xyes -o x$enableval = xno; then
		281	support_scroll_plain=$enableval
		282	fi])
		283
287	AC_ARG_ENABLE(perl,	284	AC_ARG_ENABLE(perl,
288	[ --enable-perl enable embedded perl interpreter],	285	[ --enable-perl enable embedded perl interpreter],
289	[if test x$enableval = xyes -o x$enableval = xno; then	286	[if test x$enableval = xyes -o x$enableval = xno; then
290	support_perl=$enableval	287	support_perl=$enableval
291	fi])
292
293	AC_ARG_ENABLE(plain-scroll,
294	[ --enable-plain-scroll enable plain style scrollbar],
295	[if test x$enableval = xyes -o x$enableval = xno; then
296	support_scroll_plain=$enableval
297	fi])	288	fi])
298		289
299	AC_ARG_WITH(codesets,	290	AC_ARG_WITH(codesets,
300	[ --with-codesets=CS,... compile in additional codesets (jp,jp_ext,kr,zh,zh_ext,all)],	291	[ --with-codesets=CS,... compile in additional codesets (jp,jp_ext,kr,zh,zh_ext,all)],
301	[codesets="$withval"])	292	[codesets="$withval"])
…		…
436	AC_DEFINE_UNQUOTED(RXVT_TERMINFO, "$withval", Set TERMINFO value to the value given by configure) terminfo="$withval"	427	AC_DEFINE_UNQUOTED(RXVT_TERMINFO, "$withval", Set TERMINFO value to the value given by configure) terminfo="$withval"
437	fi])	428	fi])
438		429
439	dnl# --------------------------------------------------------------------------	430	dnl# --------------------------------------------------------------------------
440		431
		432	LIBEV_M4_AVOID_LIBRT=1
441	m4_include([libev/libev.m4])	433	m4_include([libev/libev.m4])
442		434
443	dnl# --------------------------------------------------------------------------	435	dnl# --------------------------------------------------------------------------
444		436
445	AC_PATH_PROG(TIC, tic, :)	437	AC_PATH_PROG(TIC, tic, :)
446
447	dnl# need a neat way to detect SVR4 or its features
448	dnl# in src/command.c we use these functions:
449	dnl# grantpt(), unlockpt(), ptsname(), which are defined in <sys/ptms.h>
450	dnl# - but are these also defined for other systems?
451
452	dnl# hack to find if this is SVR4 -- who knows?
453	dnl## AC_MSG_CHECKING(for SVR4)
454	dnl## AC_EGREP_CPP(yes,
455	dnl## [#if defined (SVR4) \|\| defined (_SVR4) \|\| defined (__svr4__)
456	dnl## yes;
457	dnl## #endif
458	dnl## ], [AC_MSG_RESULT(yes); AC_DEFINE(PERHAPS_SVR4)], AC_MSG_RESULT(perhaps not?))
459		438
460	AC_PATH_XTRA	439	AC_PATH_XTRA
461		440
462	AFTERIMAGE_CFLAGS=	441	AFTERIMAGE_CFLAGS=
463	AFTERIMAGE_LIBS=	442	AFTERIMAGE_LIBS=
…		…
495	fi	474	fi
496		475
497	dnl# --------------------------------------------------------------------------	476	dnl# --------------------------------------------------------------------------
498	dnl# CHECKING FOR HEADER FILES	477	dnl# CHECKING FOR HEADER FILES
499	dnl# --------------------------------------------------------------------------	478	dnl# --------------------------------------------------------------------------
500	AC_HEADER_SYS_WAIT
501	AC_CHECK_HEADERS( \	479	AC_CHECK_HEADERS( \
502	assert.h \
503	fcntl.h \
504	stdarg.h \
505	stdlib.h \
506	string.h \
507	termios.h \
508	unistd.h \
509	sys/byteorder.h \	480	sys/byteorder.h \
510	sys/ioctl.h \	481	sys/ioctl.h \
511	sys/select.h \
512	sys/sockio.h \	482	sys/sockio.h \
513	sys/strredir.h \	483	sys/strredir.h \
514	sys/time.h \
515	stdint.h \	484	stdint.h \
516	wchar.h \	485	wchar.h \
517	cwchar \	486	cwchar \
518	clocale \
519	)	487	)
520
521	AC_HEADER_TIME
522		488
523	dnl# check to allow both <termios.h> and <sys/ioctl.h>	489	dnl# check to allow both <termios.h> and <sys/ioctl.h>
524	AC_CACHE_CHECK(whether termios.h and sys/ioctl.h may both be included, rxvt_cv_header_sysioctl,	490	AC_CACHE_CHECK(whether termios.h and sys/ioctl.h may both be included, rxvt_cv_header_sysioctl,
525	[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stdio.h>	491	[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stdio.h>
526	#include <sys/ioctl.h>	492	#include <sys/ioctl.h>
527	#ifdef HAVE_TERMIOS_H
528	#include <termios.h>	493	#include <termios.h>
529	#endif]], [[int a = ECHO;]])],[rxvt_cv_header_sysioctl=yes],[rxvt_cv_header_sysioctl=no])])	494	]], [[int a = ECHO;]])],[rxvt_cv_header_sysioctl=yes],[rxvt_cv_header_sysioctl=no])])
530		495
531	AC_CACHE_CHECK([for XPointer], rxvt_cv_xpointer,	496	AC_CACHE_CHECK([for XPointer], rxvt_cv_xpointer,
532	[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <X11/Xlib.h>]], [[XPointer dummy;]])],[rxvt_cv_xpointer=yes],[rxvt_cv_xpointer=no])])	497	[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <X11/Xlib.h>]], [[XPointer dummy;]])],[rxvt_cv_xpointer=yes],[rxvt_cv_xpointer=no])])
533	if test x$rxvt_cv_xpointer = xyes; then	498	if test x$rxvt_cv_xpointer = xyes; then
534	AC_DEFINE(HAVE_XPOINTER, 1, Define if you have XPointer typedef)	499	AC_DEFINE(HAVE_XPOINTER, 1, Define if you have XPointer typedef)
…		…
547	)])	512	)])
548	if test x$rxvt_xlib_illegal_access = xyes; then	513	if test x$rxvt_xlib_illegal_access = xyes; then
549	AC_DEFINE(XLIB_ILLEGAL_ACCESS, 1, Define ONLY iff Xlib.h supports it)	514	AC_DEFINE(XLIB_ILLEGAL_ACCESS, 1, Define ONLY iff Xlib.h supports it)
550	fi	515	fi
551		516
552	AC_C_CONST
553	AC_C_INLINE
554
555	dnl> AC_HEADER_STDC dnl# skip this test, Sun always fails anyhow.
556
557	dnl# --------------------------------------------------------------------------	517	dnl# --------------------------------------------------------------------------
558	dnl# CHECKING FOR MISSING TYPEDEFS	518	dnl# CHECKING FOR MISSING TYPEDEFS
559	dnl# --------------------------------------------------------------------------	519	dnl# --------------------------------------------------------------------------
560	dnl# Missing typedefs and replacements	520	dnl# Missing typedefs and replacements
561	AC_TYPE_MODE_T	521	AC_TYPE_MODE_T
562	dnl> AC_CHECK_TYPE(umode_t, int)
563	dnl> AC_CHECK_TYPE(off_t, long)
564	AC_TYPE_PID_T	522	AC_TYPE_PID_T
565	AC_TYPE_UID_T	523	AC_TYPE_UID_T
566		524	AC_TYPE_INT16_T
567	AC_CHECK_SIZEOF(short, 2)	525	AC_TYPE_UINT16_T
568	AC_CHECK_SIZEOF(int, 4)	526	AC_TYPE_INT32_T
569	dnl AC_CHECK_SIZEOF(long, 4)	527	AC_TYPE_UINT32_T
570	AC_CHECK_SIZEOF(long long, 8)
571	AC_CHECK_SIZEOF(int *, 4)
572
573	dnl# see usage below
574	AC_DEFUN([RXVT_CHECK_SIZE],
575	[AC_CACHE_CHECK([for $2], $1,
576	[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stdint.h>]], [[$2 dummy;]])],[$1=yes],[dnl
577	if test "$ac_cv_sizeof_char" -ge $3; then
578	$1="$4 char"
579	else
580	if test "$ac_cv_sizeof_short" -ge $3; then
581	$1="$4 short"
582	else
583	if test "$ac_cv_sizeof_int" -ge $3; then
584	$1="$4 int"
585	else
586	if test "$ac_cv_sizeof_long" -ge $3; then
587	$1="$4 long"
588	else
589	if test "$ac_cv_sizeof_long_long" -ge $3; then
590	$1="$4 long long"
591	else
592	$1="$4 $5" # we _must_ have a (possibly wrong) default
593	fi
594	fi
595	fi
596	fi
597	fi])])]
598	if test x"$$1" != xyes; then
599	$6="typedef $$1 $2;"
600	else
601	if test x"$4" = x; then
602	$6="/* typedef $5 $2; */"
603	else
604	$6="/* typedef $4 $5 $2; */"
605	fi
606	fi dnl
607	)
608	dnl#
609	dnl# Look for types the system may know about anyway.
610	dnl#
611	RXVT_CHECK_SIZE(rxvt_cv_int16_t, int16_t, 2, , short, rxvt_int16_typedef)
612	AC_SUBST(rxvt_int16_typedef)
613	RXVT_CHECK_SIZE(rxvt_cv_uint16_t, uint16_t, 2, unsigned, short, rxvt_uint16_typedef)
614	AC_SUBST(rxvt_uint16_typedef)
615	RXVT_CHECK_SIZE(rxvt_cv_int32_t, int32_t, 4, , int, rxvt_int32_typedef)
616	AC_SUBST(rxvt_int32_typedef)
617	RXVT_CHECK_SIZE(rxvt_cv_uint32_t, uint32_t, 4, unsigned, int, rxvt_uint32_typedef)
618	AC_SUBST(rxvt_uint32_typedef)
619	dnl RXVT_CHECK_SIZE(rxvt_cv_int64_t, int64_t, 8, , long long, rxvt_int64_typedef)
620	dnl AC_SUBST(rxvt_int64_typedef)
621	dnl RXVT_CHECK_SIZE(rxvt_cv_uint64_t, uint64_t, 8, unsigned, long long, rxvt_uint64_typedef)
622	dnl AC_SUBST(rxvt_uint64_typedef)
623	dnl#
624	dnl# Now look for another we use
625	dnl#
626	if test "$ac_cv_sizeof_int_p" -eq 8; then
627	rxvt_intp_define="#define intp_t int64_t"
628	rxvt_u_intp_define="#define u_intp_t u_int64_t"
629	else
630	if test "$ac_cv_sizeof_int_p" -eq 4; then
631	rxvt_intp_define="#define intp_t int32_t"
632	rxvt_u_intp_define="#define u_intp_t u_int32_t"
633	else
634	if test "$ac_cv_sizeof_int_p" -eq 2; then
635	rxvt_intp_define="#define intp_t int16_t"
636	rxvt_u_intp_define="#define u_intp_t u_int16_t"
637	else
638	rxvt_intp_define="#error set intp_t"
639	rxvt_u_intp_define="#error set u_intp_t"
640	fi
641	fi
642	fi
643	AC_SUBST(rxvt_intp_define)
644	AC_SUBST(rxvt_u_intp_define)
645		528
646	dnl# --------------------------------------------------------------------------	529	dnl# --------------------------------------------------------------------------
647	dnl# CHECKING FOR LIBRARY FUNCTIONS	530	dnl# CHECKING FOR LIBRARY FUNCTIONS
648	dnl# --------------------------------------------------------------------------	531	dnl# --------------------------------------------------------------------------
649	AC_TYPE_SIGNAL
650	dnl> AC_FUNC_VPRINTF
651
652	AC_CHECK_FUNCS(unsetenv)	532	AC_CHECK_FUNCS(unsetenv)
653		533
654	UTMP_CHECK	534	UTMP_CHECK
655		535
656	dnl# --------------------------------------------------------------------------	536	dnl# --------------------------------------------------------------------------
…		…
840		720
841	save_CXXFLAGS="$CXXFLAGS"	721	save_CXXFLAGS="$CXXFLAGS"
842	save_LIBS="$LIBS"	722	save_LIBS="$LIBS"
843	CXXFLAGS="$CXXFLAGS `$PERL -MExtUtils::Embed -e ccopts`"	723	CXXFLAGS="$CXXFLAGS `$PERL -MExtUtils::Embed -e ccopts`"
844	LIBS="$LIBS `$PERL -MExtUtils::Embed -e ldopts`"	724	LIBS="$LIBS `$PERL -MExtUtils::Embed -e ldopts`"
845	AC_TRY_LINK([	725	AC_LINK_IFELSE([AC_LANG_PROGRAM([[
846	#include <EXTERN.h>	726	#include <EXTERN.h>
847	#include <perl.h>	727	#include <perl.h>
848	#include <XSUB.h>	728	#include <XSUB.h>
849	],[	729	]], [[
850	PerlInterpreter *perl = perl_alloc ();	730	PerlInterpreter *perl = perl_alloc ();
851	],[rxvt_perl_link=yes],[rxvt_perl_link=no])	731	]])],[rxvt_perl_link=yes],[rxvt_perl_link=no])
852	CXXFLAGS="$save_CXXFLAGS"	732	CXXFLAGS="$save_CXXFLAGS"
853	LIBS="$save_LIBS"	733	LIBS="$save_LIBS"
854		734
855	if test x$rxvt_perl_link = xyes; then	735	if test x$rxvt_perl_link = xyes; then
856	AC_MSG_RESULT(ok)	736	AC_MSG_RESULT(ok)
…		…
899	$1="/* #include <$2> */"	779	$1="/* #include <$2> */"
900	fi dnl	780	fi dnl
901	AC_SUBST($1)])	781	AC_SUBST($1)])
902		782
903	RXVT_DEFINE_TO_INCLUDE(include_stdint_h, stdint.h, ac_cv_header_stdint_h, yes, notset, dontmatch)	783	RXVT_DEFINE_TO_INCLUDE(include_stdint_h, stdint.h, ac_cv_header_stdint_h, yes, notset, dontmatch)
904	RXVT_DEFINE_TO_INCLUDE(include_stdarg_h, cstdarg, ac_cv_header_stdarg_h, yes, notset, dontmatch)
905	RXVT_DEFINE_TO_INCLUDE(include_stdlib_h, cstdlib, ac_cv_header_stdlib_h, yes, notset, dontmatch)
906	RXVT_DEFINE_TO_INCLUDE(include_unistd_h, unistd.h, ac_cv_header_unistd_h, yes, notset, dontmatch)
907	RXVT_DEFINE_TO_INCLUDE(include_string_h, cstring, ac_cv_header_string_h, yes, notset, dontmatch)
908	RXVT_DEFINE_TO_INCLUDE(include_fcntl_h, fcntl.h, ac_cv_header_fcntl_h, yes, notset, dontmatch)
909	RXVT_DEFINE_TO_INCLUDE(include_util_h, util.h, ac_cv_header_util_h, yes, notset, dontmatch)
910	RXVT_DEFINE_TO_INCLUDE(include_assert_h, assert.h, ac_cv_header_assert_h, yes, notset, dontmatch)
911	RXVT_DEFINE_TO_INCLUDE(include_sys_ioctl_h, sys/ioctl.h, rxvt_cv_header_sysioctl, yes, notset, dontmatch)	784	RXVT_DEFINE_TO_INCLUDE(include_sys_ioctl_h, sys/ioctl.h, rxvt_cv_header_sysioctl, yes, notset, dontmatch)
912	RXVT_DEFINE_TO_INCLUDE(include_sys_select_h, sys/select.h, ac_cv_header_sys_select_h, yes, notset, dontmatch)
913	RXVT_DEFINE_TO_INCLUDE(include_sys_strredir_h, sys/strredir.h, ac_cv_header_sys_strredir_h, yes, notset, dontmatch)	785	RXVT_DEFINE_TO_INCLUDE(include_sys_strredir_h, sys/strredir.h, ac_cv_header_sys_strredir_h, yes, notset, dontmatch)
914	RXVT_DEFINE_TO_INCLUDE(include_sys_time_h, sys/time.h, ac_cv_header_sys_time_h, yes, notset, dontmatch)
915	RXVT_DEFINE_TO_INCLUDE(include_time_h, time.h, ac_cv_header_sys_time_h, no, ac_cv_header_time, yes)
916		786
917	AC_CONFIG_FILES([Makefile \	787	AC_CONFIG_FILES([Makefile \
918	doc/Makefile \	788	doc/Makefile \
919	src/Makefile \	789	src/Makefile \
920	src/rxvtlib.h \	790	src/rxvtlib.h \

Diff Legend

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

…		…
15	DATE=`sed -n -e 's/^.[ \t]DATE."\(.*\)"$/\1/p' ${srcdir}/src/version.h`	15	DATE=`sed -n -e 's/^.[ \t]DATE."\(.*\)"$/\1/p' ${srcdir}/src/version.h`
16	dnl LIBVERSION=`sed -n -e 's/^.[ \t]LIBVERSION."\(.*\)"$/\1/p' ${srcdir}/src/version.h`	16	dnl LIBVERSION=`sed -n -e 's/^.[ \t]LIBVERSION."\(.*\)"$/\1/p' ${srcdir}/src/version.h`
17	changequote([, ])dnl	17	changequote([, ])dnl
18	AC_SUBST(VERSION)dnl	18	AC_SUBST(VERSION)dnl
19	AC_SUBST(DATE)dnl	19	AC_SUBST(DATE)dnl
20	AC_SUBST(LSMDATE)dnl
21	AC_SUBST(LIBVERSION)dnl	20	dnl AC_SUBST(LIBVERSION)dnl
22		21
23	echo ""	22	echo ""
24	echo "configuring for rxvt $VERSION"	23	echo "configuring for rxvt $VERSION"
25	echo ""	24	echo ""
26		25
27	orig_CXXFLAGS="$CXXFLAGS"	26	orig_CXXFLAGS="$CXXFLAGS"
28		27
29	dnl# Checks for programs.	28	dnl# Checks for programs.
30	dnl AC_MAKE_SET
31
32	AC_PROG_CC	29	AC_PROG_CC
33	AC_PROG_CXX	30	AC_PROG_CXX
34	AC_PROG_CPP	31	AC_PROG_CPP
35	AC_PROG_INSTALL	32	AC_PROG_INSTALL
36		33
37	AC_AIX	34	AC_AIX
		35	AC_GNU_SOURCE
38	AC_ISC_POSIX	36	AC_ISC_POSIX
39	AC_LANG(C++)	37	AC_LANG(C++)
40		38
41	dnl check wether we can link with gcc -lsupc++	39	dnl check wether we can link with gcc -lsupc++
42	if test x$GCC = xyes && test x$GXX = xyes; then	40	if test x$GCC = xyes && test x$GXX = xyes; then
…		…
63	dnl# --------------------------------------------------------------------------	61	dnl# --------------------------------------------------------------------------
64	dnl# Supply default CXXFLAGS, if not specified by `CXXFLAGS=flags ./configure'	62	dnl# Supply default CXXFLAGS, if not specified by `CXXFLAGS=flags ./configure'
65	dnl#	63	dnl#
66	if test -z "$orig_CXXFLAGS"; then	64	if test -z "$orig_CXXFLAGS"; then
67	if test x$GCC = xyes && test "x$GXX" = xyes; then	65	if test x$GCC = xyes && test "x$GXX" = xyes; then
68	CXXFLAGS="-g -O3 -fno-threadsafe-statics -fno-enforce-eh-specs"	66	CXXFLAGS="-g -O3 -fno-rtti -fvisibility-inlines-hidden -fno-threadsafe-statics -fno-enforce-eh-specs"
69	AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[])], [], [CXXFLAGS="-g -O3"])	67	AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[])], [], [CXXFLAGS="-g -O3"])
70	else	68	else
71	CXXFLAGS="-O"	69	CXXFLAGS="-O"
72	fi	70	fi
73	CFLAGS="$CXXFLAGS"	71	CFLAGS="$CXXFLAGS"
74	fi	72	fi
75		73
76	AC_DEFINE(_GNU_SOURCE, 1, Use all glibc features.)
77
78	case $host in	74	case $host in
79	--solaris* )	75	--solaris* )
80	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)
81	;;	77	;;
82	esac	78	esac
83
84	dnl if test x$GXX = xyes; then
85	dnl CXXFLAGS="$CXXFLAGS" dnl I once had -fno-exceptions, but I am using them now...
86	dnl fi
87		79
88	dnl# FreeBSD needs to link libxpg4	80	dnl# FreeBSD needs to link libxpg4
89	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"])])
90		82
91	dnl# solaris needs to link libnsl and socket	83	dnl# solaris needs to link libnsl and socket
…		…
123		115
124	dnl# --------------------------------------------------------------------------	116	dnl# --------------------------------------------------------------------------
125	dnl# CHECKING COMMAND LINE OPTIONS	117	dnl# CHECKING COMMAND LINE OPTIONS
126	dnl# --------------------------------------------------------------------------	118	dnl# --------------------------------------------------------------------------
127		119
128	if test "x$enable_shared" = xyes; then	120	dnl if test "x$enable_shared" = xyes; then
129	AC_DEFINE(LIBRXVT, 1, Build shared library version - specify via configure only)	121	dnl AC_DEFINE(LIBRXVT, 1, Build shared library version - specify via configure only)
130	INSTALL_LIBRXVT=yes	122	dnl INSTALL_LIBRXVT=yes
131	fi	123	dnl fi
132	AC_SUBST(INSTALL_LIBRXVT)	124	dnl AC_SUBST(INSTALL_LIBRXVT)
133		125
134	AC_ARG_ENABLE(everything,	126	AC_ARG_ENABLE(everything,
135	[ --enable-everything enable standard non-multichoice features	127	[ --enable-everything enable standard non-multichoice features
136	NOTE: this option is order dependent	128	NOTE: this option is order dependent],
137	NOTE: automatically enabled with --enable-shared],
138	[	129	[
139	if test x$enableval = xno; then	130	if test x$enableval = xno; then
140	support_frills=no	131	support_frills=no
141	support_inheritpixmap=no	132	support_inheritpixmap=no
142	support_fading=no	133	support_fading=no
…		…
282	[ --enable-xterm-scroll enable Xterm style scrollbar],	273	[ --enable-xterm-scroll enable Xterm style scrollbar],
283	[if test x$enableval = xyes -o x$enableval = xno; then	274	[if test x$enableval = xyes -o x$enableval = xno; then
284	support_scroll_xterm=$enableval	275	support_scroll_xterm=$enableval
285	fi])	276	fi])
286		277
		278	AC_ARG_ENABLE(plain-scroll,
		279	[ --enable-plain-scroll enable plain style scrollbar],
		280	[if test x$enableval = xyes -o x$enableval = xno; then
		281	support_scroll_plain=$enableval
		282	fi])
		283
287	AC_ARG_ENABLE(perl,	284	AC_ARG_ENABLE(perl,
288	[ --enable-perl enable embedded perl interpreter],	285	[ --enable-perl enable embedded perl interpreter],
289	[if test x$enableval = xyes -o x$enableval = xno; then	286	[if test x$enableval = xyes -o x$enableval = xno; then
290	support_perl=$enableval	287	support_perl=$enableval
291	fi])
292
293	AC_ARG_ENABLE(plain-scroll,
294	[ --enable-plain-scroll enable plain style scrollbar],
295	[if test x$enableval = xyes -o x$enableval = xno; then
296	support_scroll_plain=$enableval
297	fi])	288	fi])
298		289
299	AC_ARG_WITH(codesets,	290	AC_ARG_WITH(codesets,
300	[ --with-codesets=CS,... compile in additional codesets (jp,jp_ext,kr,zh,zh_ext,all)],	291	[ --with-codesets=CS,... compile in additional codesets (jp,jp_ext,kr,zh,zh_ext,all)],
301	[codesets="$withval"])	292	[codesets="$withval"])
…		…
436	AC_DEFINE_UNQUOTED(RXVT_TERMINFO, "$withval", Set TERMINFO value to the value given by configure) terminfo="$withval"	427	AC_DEFINE_UNQUOTED(RXVT_TERMINFO, "$withval", Set TERMINFO value to the value given by configure) terminfo="$withval"
437	fi])	428	fi])
438		429
439	dnl# --------------------------------------------------------------------------	430	dnl# --------------------------------------------------------------------------
440		431
		432	LIBEV_M4_AVOID_LIBRT=1
441	m4_include([libev/libev.m4])	433	m4_include([libev/libev.m4])
442		434
443	dnl# --------------------------------------------------------------------------	435	dnl# --------------------------------------------------------------------------
444		436
445	AC_PATH_PROG(TIC, tic, :)	437	AC_PATH_PROG(TIC, tic, :)
446
447	dnl# need a neat way to detect SVR4 or its features
448	dnl# in src/command.c we use these functions:
449	dnl# grantpt(), unlockpt(), ptsname(), which are defined in <sys/ptms.h>
450	dnl# - but are these also defined for other systems?
451
452	dnl# hack to find if this is SVR4 -- who knows?
453	dnl## AC_MSG_CHECKING(for SVR4)
454	dnl## AC_EGREP_CPP(yes,
455	dnl## [#if defined (SVR4) \|\| defined (_SVR4) \|\| defined (__svr4__)
456	dnl## yes;
457	dnl## #endif
458	dnl## ], [AC_MSG_RESULT(yes); AC_DEFINE(PERHAPS_SVR4)], AC_MSG_RESULT(perhaps not?))
459		438
460	AC_PATH_XTRA	439	AC_PATH_XTRA
461		440
462	AFTERIMAGE_CFLAGS=	441	AFTERIMAGE_CFLAGS=
463	AFTERIMAGE_LIBS=	442	AFTERIMAGE_LIBS=
…		…
495	fi	474	fi
496		475
497	dnl# --------------------------------------------------------------------------	476	dnl# --------------------------------------------------------------------------
498	dnl# CHECKING FOR HEADER FILES	477	dnl# CHECKING FOR HEADER FILES
499	dnl# --------------------------------------------------------------------------	478	dnl# --------------------------------------------------------------------------
500	AC_HEADER_SYS_WAIT
501	AC_CHECK_HEADERS( \	479	AC_CHECK_HEADERS( \
502	assert.h \
503	fcntl.h \
504	stdarg.h \
505	stdlib.h \
506	string.h \
507	termios.h \
508	unistd.h \
509	sys/byteorder.h \	480	sys/byteorder.h \
510	sys/ioctl.h \	481	sys/ioctl.h \
511	sys/select.h \
512	sys/sockio.h \	482	sys/sockio.h \
513	sys/strredir.h \	483	sys/strredir.h \
514	sys/time.h \
515	stdint.h \	484	stdint.h \
516	wchar.h \	485	wchar.h \
517	cwchar \	486	cwchar \
518	clocale \
519	)	487	)
520
521	AC_HEADER_TIME
522		488
523	dnl# check to allow both <termios.h> and <sys/ioctl.h>	489	dnl# check to allow both <termios.h> and <sys/ioctl.h>
524	AC_CACHE_CHECK(whether termios.h and sys/ioctl.h may both be included, rxvt_cv_header_sysioctl,	490	AC_CACHE_CHECK(whether termios.h and sys/ioctl.h may both be included, rxvt_cv_header_sysioctl,
525	[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stdio.h>	491	[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stdio.h>
526	#include <sys/ioctl.h>	492	#include <sys/ioctl.h>
527	#ifdef HAVE_TERMIOS_H
528	#include <termios.h>	493	#include <termios.h>
529	#endif]], [[int a = ECHO;]])],[rxvt_cv_header_sysioctl=yes],[rxvt_cv_header_sysioctl=no])])	494	]], [[int a = ECHO;]])],[rxvt_cv_header_sysioctl=yes],[rxvt_cv_header_sysioctl=no])])
530		495
531	AC_CACHE_CHECK([for XPointer], rxvt_cv_xpointer,	496	AC_CACHE_CHECK([for XPointer], rxvt_cv_xpointer,
532	[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <X11/Xlib.h>]], [[XPointer dummy;]])],[rxvt_cv_xpointer=yes],[rxvt_cv_xpointer=no])])	497	[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <X11/Xlib.h>]], [[XPointer dummy;]])],[rxvt_cv_xpointer=yes],[rxvt_cv_xpointer=no])])
533	if test x$rxvt_cv_xpointer = xyes; then	498	if test x$rxvt_cv_xpointer = xyes; then
534	AC_DEFINE(HAVE_XPOINTER, 1, Define if you have XPointer typedef)	499	AC_DEFINE(HAVE_XPOINTER, 1, Define if you have XPointer typedef)
…		…
547	)])	512	)])
548	if test x$rxvt_xlib_illegal_access = xyes; then	513	if test x$rxvt_xlib_illegal_access = xyes; then
549	AC_DEFINE(XLIB_ILLEGAL_ACCESS, 1, Define ONLY iff Xlib.h supports it)	514	AC_DEFINE(XLIB_ILLEGAL_ACCESS, 1, Define ONLY iff Xlib.h supports it)
550	fi	515	fi
551		516
552	AC_C_CONST
553	AC_C_INLINE
554
555	dnl> AC_HEADER_STDC dnl# skip this test, Sun always fails anyhow.
556
557	dnl# --------------------------------------------------------------------------	517	dnl# --------------------------------------------------------------------------
558	dnl# CHECKING FOR MISSING TYPEDEFS	518	dnl# CHECKING FOR MISSING TYPEDEFS
559	dnl# --------------------------------------------------------------------------	519	dnl# --------------------------------------------------------------------------
560	dnl# Missing typedefs and replacements	520	dnl# Missing typedefs and replacements
561	AC_TYPE_MODE_T	521	AC_TYPE_MODE_T
562	dnl> AC_CHECK_TYPE(umode_t, int)
563	dnl> AC_CHECK_TYPE(off_t, long)
564	AC_TYPE_PID_T	522	AC_TYPE_PID_T
565	AC_TYPE_UID_T	523	AC_TYPE_UID_T
566		524	AC_TYPE_INT16_T
567	AC_CHECK_SIZEOF(short, 2)	525	AC_TYPE_UINT16_T
568	AC_CHECK_SIZEOF(int, 4)	526	AC_TYPE_INT32_T
569	dnl AC_CHECK_SIZEOF(long, 4)	527	AC_TYPE_UINT32_T
570	AC_CHECK_SIZEOF(long long, 8)
571	AC_CHECK_SIZEOF(int *, 4)
572
573	dnl# see usage below
574	AC_DEFUN([RXVT_CHECK_SIZE],
575	[AC_CACHE_CHECK([for $2], $1,
576	[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stdint.h>]], [[$2 dummy;]])],[$1=yes],[dnl
577	if test "$ac_cv_sizeof_char" -ge $3; then
578	$1="$4 char"
579	else
580	if test "$ac_cv_sizeof_short" -ge $3; then
581	$1="$4 short"
582	else
583	if test "$ac_cv_sizeof_int" -ge $3; then
584	$1="$4 int"
585	else
586	if test "$ac_cv_sizeof_long" -ge $3; then
587	$1="$4 long"
588	else
589	if test "$ac_cv_sizeof_long_long" -ge $3; then
590	$1="$4 long long"
591	else
592	$1="$4 $5" # we _must_ have a (possibly wrong) default
593	fi
594	fi
595	fi
596	fi
597	fi])])]
598	if test x"$$1" != xyes; then
599	$6="typedef $$1 $2;"
600	else
601	if test x"$4" = x; then
602	$6="/* typedef $5 $2; */"
603	else
604	$6="/* typedef $4 $5 $2; */"
605	fi
606	fi dnl
607	)
608	dnl#
609	dnl# Look for types the system may know about anyway.
610	dnl#
611	RXVT_CHECK_SIZE(rxvt_cv_int16_t, int16_t, 2, , short, rxvt_int16_typedef)
612	AC_SUBST(rxvt_int16_typedef)
613	RXVT_CHECK_SIZE(rxvt_cv_uint16_t, uint16_t, 2, unsigned, short, rxvt_uint16_typedef)
614	AC_SUBST(rxvt_uint16_typedef)
615	RXVT_CHECK_SIZE(rxvt_cv_int32_t, int32_t, 4, , int, rxvt_int32_typedef)
616	AC_SUBST(rxvt_int32_typedef)
617	RXVT_CHECK_SIZE(rxvt_cv_uint32_t, uint32_t, 4, unsigned, int, rxvt_uint32_typedef)
618	AC_SUBST(rxvt_uint32_typedef)
619	dnl RXVT_CHECK_SIZE(rxvt_cv_int64_t, int64_t, 8, , long long, rxvt_int64_typedef)
620	dnl AC_SUBST(rxvt_int64_typedef)
621	dnl RXVT_CHECK_SIZE(rxvt_cv_uint64_t, uint64_t, 8, unsigned, long long, rxvt_uint64_typedef)
622	dnl AC_SUBST(rxvt_uint64_typedef)
623	dnl#
624	dnl# Now look for another we use
625	dnl#
626	if test "$ac_cv_sizeof_int_p" -eq 8; then
627	rxvt_intp_define="#define intp_t int64_t"
628	rxvt_u_intp_define="#define u_intp_t u_int64_t"
629	else
630	if test "$ac_cv_sizeof_int_p" -eq 4; then
631	rxvt_intp_define="#define intp_t int32_t"
632	rxvt_u_intp_define="#define u_intp_t u_int32_t"
633	else
634	if test "$ac_cv_sizeof_int_p" -eq 2; then
635	rxvt_intp_define="#define intp_t int16_t"
636	rxvt_u_intp_define="#define u_intp_t u_int16_t"
637	else
638	rxvt_intp_define="#error set intp_t"
639	rxvt_u_intp_define="#error set u_intp_t"
640	fi
641	fi
642	fi
643	AC_SUBST(rxvt_intp_define)
644	AC_SUBST(rxvt_u_intp_define)
645		528
646	dnl# --------------------------------------------------------------------------	529	dnl# --------------------------------------------------------------------------
647	dnl# CHECKING FOR LIBRARY FUNCTIONS	530	dnl# CHECKING FOR LIBRARY FUNCTIONS
648	dnl# --------------------------------------------------------------------------	531	dnl# --------------------------------------------------------------------------
649	AC_TYPE_SIGNAL
650	dnl> AC_FUNC_VPRINTF
651
652	AC_CHECK_FUNCS(unsetenv)	532	AC_CHECK_FUNCS(unsetenv)
653		533
654	UTMP_CHECK	534	UTMP_CHECK
655		535
656	dnl# --------------------------------------------------------------------------	536	dnl# --------------------------------------------------------------------------
…		…
840		720
841	save_CXXFLAGS="$CXXFLAGS"	721	save_CXXFLAGS="$CXXFLAGS"
842	save_LIBS="$LIBS"	722	save_LIBS="$LIBS"
843	CXXFLAGS="$CXXFLAGS `$PERL -MExtUtils::Embed -e ccopts`"	723	CXXFLAGS="$CXXFLAGS `$PERL -MExtUtils::Embed -e ccopts`"
844	LIBS="$LIBS `$PERL -MExtUtils::Embed -e ldopts`"	724	LIBS="$LIBS `$PERL -MExtUtils::Embed -e ldopts`"
845	AC_TRY_LINK([	725	AC_LINK_IFELSE([AC_LANG_PROGRAM([[
846	#include <EXTERN.h>	726	#include <EXTERN.h>
847	#include <perl.h>	727	#include <perl.h>
848	#include <XSUB.h>	728	#include <XSUB.h>
849	],[	729	]], [[
850	PerlInterpreter *perl = perl_alloc ();	730	PerlInterpreter *perl = perl_alloc ();
851	],[rxvt_perl_link=yes],[rxvt_perl_link=no])	731	]])],[rxvt_perl_link=yes],[rxvt_perl_link=no])
852	CXXFLAGS="$save_CXXFLAGS"	732	CXXFLAGS="$save_CXXFLAGS"
853	LIBS="$save_LIBS"	733	LIBS="$save_LIBS"
854		734
855	if test x$rxvt_perl_link = xyes; then	735	if test x$rxvt_perl_link = xyes; then
856	AC_MSG_RESULT(ok)	736	AC_MSG_RESULT(ok)
…		…
899	$1="/* #include <$2> */"	779	$1="/* #include <$2> */"
900	fi dnl	780	fi dnl
901	AC_SUBST($1)])	781	AC_SUBST($1)])
902		782
903	RXVT_DEFINE_TO_INCLUDE(include_stdint_h, stdint.h, ac_cv_header_stdint_h, yes, notset, dontmatch)	783	RXVT_DEFINE_TO_INCLUDE(include_stdint_h, stdint.h, ac_cv_header_stdint_h, yes, notset, dontmatch)
904	RXVT_DEFINE_TO_INCLUDE(include_stdarg_h, cstdarg, ac_cv_header_stdarg_h, yes, notset, dontmatch)
905	RXVT_DEFINE_TO_INCLUDE(include_stdlib_h, cstdlib, ac_cv_header_stdlib_h, yes, notset, dontmatch)
906	RXVT_DEFINE_TO_INCLUDE(include_unistd_h, unistd.h, ac_cv_header_unistd_h, yes, notset, dontmatch)
907	RXVT_DEFINE_TO_INCLUDE(include_string_h, cstring, ac_cv_header_string_h, yes, notset, dontmatch)
908	RXVT_DEFINE_TO_INCLUDE(include_fcntl_h, fcntl.h, ac_cv_header_fcntl_h, yes, notset, dontmatch)
909	RXVT_DEFINE_TO_INCLUDE(include_util_h, util.h, ac_cv_header_util_h, yes, notset, dontmatch)
910	RXVT_DEFINE_TO_INCLUDE(include_assert_h, assert.h, ac_cv_header_assert_h, yes, notset, dontmatch)
911	RXVT_DEFINE_TO_INCLUDE(include_sys_ioctl_h, sys/ioctl.h, rxvt_cv_header_sysioctl, yes, notset, dontmatch)	784	RXVT_DEFINE_TO_INCLUDE(include_sys_ioctl_h, sys/ioctl.h, rxvt_cv_header_sysioctl, yes, notset, dontmatch)
912	RXVT_DEFINE_TO_INCLUDE(include_sys_select_h, sys/select.h, ac_cv_header_sys_select_h, yes, notset, dontmatch)
913	RXVT_DEFINE_TO_INCLUDE(include_sys_strredir_h, sys/strredir.h, ac_cv_header_sys_strredir_h, yes, notset, dontmatch)	785	RXVT_DEFINE_TO_INCLUDE(include_sys_strredir_h, sys/strredir.h, ac_cv_header_sys_strredir_h, yes, notset, dontmatch)
914	RXVT_DEFINE_TO_INCLUDE(include_sys_time_h, sys/time.h, ac_cv_header_sys_time_h, yes, notset, dontmatch)
915	RXVT_DEFINE_TO_INCLUDE(include_time_h, time.h, ac_cv_header_sys_time_h, no, ac_cv_header_time, yes)
916		786
917	AC_CONFIG_FILES([Makefile \	787	AC_CONFIG_FILES([Makefile \
918	doc/Makefile \	788	doc/Makefile \
919	src/Makefile \	789	src/Makefile \
920	src/rxvtlib.h \	790	src/rxvtlib.h \

Comparing rxvt-unicode/configure.ac (file contents): Revision 1.83 by root, Sun Nov 18 01:02:09 2007 UTC vs. Revision 1.100 by root, Sun Dec 23 05:03:52 2007 UTC

Diff Legend

Comparing rxvt-unicode/configure.ac (file contents):
Revision 1.83 by root, Sun Nov 18 01:02:09 2007 UTC vs.
Revision 1.100 by root, Sun Dec 23 05:03:52 2007 UTC