ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/configure.ac
(Generate patch)

Comparing rxvt-unicode/configure.ac (file contents):
Revision 1.94 by ayin, Tue Dec 11 09:10:56 2007 UTC vs.
Revision 1.102 by ayin, Fri Dec 28 14:00:47 2007 UTC

… …
475 475
476dnl# -------------------------------------------------------------------------- 476dnl# --------------------------------------------------------------------------
477dnl# CHECKING FOR HEADER FILES 477dnl# CHECKING FOR HEADER FILES
478dnl# -------------------------------------------------------------------------- 478dnl# --------------------------------------------------------------------------
479AC_CHECK_HEADERS( \ 479AC_CHECK_HEADERS( \
480 assert.h \
481 fcntl.h \
482 stdarg.h \
483 stdlib.h \
484 string.h \
485 termios.h \
486 unistd.h \
487 sys/byteorder.h \ 480 sys/byteorder.h \
488 sys/ioctl.h \ 481 sys/ioctl.h \
489 sys/select.h \
490 sys/sockio.h \ 482 sys/sockio.h \
491 sys/strredir.h \ 483 sys/strredir.h \
492 sys/time.h \
493 time.h \
494 stdint.h \ 484 stdint.h \
495 wchar.h \ 485 wchar.h \
496 cwchar \ 486 cwchar \
497 clocale \
498) 487)
499
500dnl# check to allow both <termios.h> and <sys/ioctl.h>
501AC_CACHE_CHECK(whether termios.h and sys/ioctl.h may both be included, rxvt_cv_header_sysioctl,
502[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stdio.h>
503#include <sys/ioctl.h>
504#ifdef HAVE_TERMIOS_H
505#include <termios.h>
506#endif]], [[int a = ECHO;]])],[rxvt_cv_header_sysioctl=yes],[rxvt_cv_header_sysioctl=no])])
507 488
508AC_CACHE_CHECK([for XPointer], rxvt_cv_xpointer, 489AC_CACHE_CHECK([for XPointer], rxvt_cv_xpointer,
509[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])])
510if test x$rxvt_cv_xpointer = xyes; then 491if test x$rxvt_cv_xpointer = xyes; then
511 AC_DEFINE(HAVE_XPOINTER, 1, Define if you have XPointer typedef) 492 AC_DEFINE(HAVE_XPOINTER, 1, Define if you have XPointer typedef)
… …
529dnl# -------------------------------------------------------------------------- 510dnl# --------------------------------------------------------------------------
530dnl# CHECKING FOR MISSING TYPEDEFS 511dnl# CHECKING FOR MISSING TYPEDEFS
531dnl# -------------------------------------------------------------------------- 512dnl# --------------------------------------------------------------------------
532dnl# Missing typedefs and replacements 513dnl# Missing typedefs and replacements
533AC_TYPE_MODE_T 514AC_TYPE_MODE_T
534dnl> AC_CHECK_TYPE(umode_t, int)
535dnl> AC_CHECK_TYPE(off_t, long)
536AC_TYPE_PID_T 515AC_TYPE_PID_T
537AC_TYPE_UID_T 516AC_TYPE_UID_T
538 517AC_TYPE_INT16_T
539AC_CHECK_SIZEOF(short, 2) 518AC_TYPE_UINT16_T
540AC_CHECK_SIZEOF(int, 4) 519AC_TYPE_INT32_T
541dnl AC_CHECK_SIZEOF(long, 4) 520AC_TYPE_UINT32_T
542AC_CHECK_SIZEOF(long long, 8)
543AC_CHECK_SIZEOF(int *, 4)
544
545dnl# see usage below
546AC_DEFUN([RXVT_CHECK_SIZE],
547 [AC_CACHE_CHECK([for $2], $1,
548 [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stdint.h>]], [[$2 dummy;]])],[$1=yes],[dnl
549if test "$ac_cv_sizeof_char" -ge $3; then
550 $1="$4 char"
551else
552 if test "$ac_cv_sizeof_short" -ge $3; then
553 $1="$4 short"
554 else
555 if test "$ac_cv_sizeof_int" -ge $3; then
556 $1="$4 int"
557 else
558 if test "$ac_cv_sizeof_long" -ge $3; then
559 $1="$4 long"
560 else
561 if test "$ac_cv_sizeof_long_long" -ge $3; then
562 $1="$4 long long"
563 else
564 $1="$4 $5" # we _must_ have a (possibly wrong) default
565 fi
566 fi
567 fi
568 fi
569fi])])]
570if test x"$$1" != xyes; then
571 $6="typedef $$1 $2;"
572else
573 if test x"$4" = x; then
574 $6="/* typedef $5 $2; */"
575 else
576 $6="/* typedef $4 $5 $2; */"
577 fi
578fi dnl
579)
580dnl#
581dnl# Look for types the system may know about anyway.
582dnl#
583RXVT_CHECK_SIZE(rxvt_cv_int16_t, int16_t, 2, , short, rxvt_int16_typedef)
584AC_SUBST(rxvt_int16_typedef)
585RXVT_CHECK_SIZE(rxvt_cv_uint16_t, uint16_t, 2, unsigned, short, rxvt_uint16_typedef)
586AC_SUBST(rxvt_uint16_typedef)
587RXVT_CHECK_SIZE(rxvt_cv_int32_t, int32_t, 4, , int, rxvt_int32_typedef)
588AC_SUBST(rxvt_int32_typedef)
589RXVT_CHECK_SIZE(rxvt_cv_uint32_t, uint32_t, 4, unsigned, int, rxvt_uint32_typedef)
590AC_SUBST(rxvt_uint32_typedef)
591dnl RXVT_CHECK_SIZE(rxvt_cv_int64_t, int64_t, 8, , long long, rxvt_int64_typedef)
592dnl AC_SUBST(rxvt_int64_typedef)
593dnl RXVT_CHECK_SIZE(rxvt_cv_uint64_t, uint64_t, 8, unsigned, long long, rxvt_uint64_typedef)
594dnl AC_SUBST(rxvt_uint64_typedef)
595 521
596dnl# -------------------------------------------------------------------------- 522dnl# --------------------------------------------------------------------------
597dnl# CHECKING FOR LIBRARY FUNCTIONS 523dnl# CHECKING FOR LIBRARY FUNCTIONS
598dnl# -------------------------------------------------------------------------- 524dnl# --------------------------------------------------------------------------
599AC_CHECK_FUNCS(unsetenv) 525AC_CHECK_FUNCS(unsetenv)
… …
787 713
788 save_CXXFLAGS="$CXXFLAGS" 714 save_CXXFLAGS="$CXXFLAGS"
789 save_LIBS="$LIBS" 715 save_LIBS="$LIBS"
790 CXXFLAGS="$CXXFLAGS `$PERL -MExtUtils::Embed -e ccopts`" 716 CXXFLAGS="$CXXFLAGS `$PERL -MExtUtils::Embed -e ccopts`"
791 LIBS="$LIBS `$PERL -MExtUtils::Embed -e ldopts`" 717 LIBS="$LIBS `$PERL -MExtUtils::Embed -e ldopts`"
792 AC_TRY_LINK([ 718 AC_LINK_IFELSE([AC_LANG_PROGRAM([[
793#include <EXTERN.h> 719#include <EXTERN.h>
794#include <perl.h> 720#include <perl.h>
795#include <XSUB.h> 721#include <XSUB.h>
796],[ 722]], [[
797 PerlInterpreter *perl = perl_alloc (); 723 PerlInterpreter *perl = perl_alloc ();
798],[rxvt_perl_link=yes],[rxvt_perl_link=no]) 724]])],[rxvt_perl_link=yes],[rxvt_perl_link=no])
799 CXXFLAGS="$save_CXXFLAGS" 725 CXXFLAGS="$save_CXXFLAGS"
800 LIBS="$save_LIBS" 726 LIBS="$save_LIBS"
801 727
802 if test x$rxvt_perl_link = xyes; then 728 if test x$rxvt_perl_link = xyes; then
803 AC_MSG_RESULT(ok) 729 AC_MSG_RESULT(ok)
… …
834AC_SUBST(AFTERIMAGE_CFLAGS) 760AC_SUBST(AFTERIMAGE_CFLAGS)
835AC_SUBST(AFTERIMAGE_LIBS) 761AC_SUBST(AFTERIMAGE_LIBS)
836 762
837AC_ARG_PROGRAM 763AC_ARG_PROGRAM
838 764
839dnl# test for "sun" or "__sun__" before include sys_ioctl
840
841dnl# revert HAVE_BLAH_H into a "#include <blah.h>"
842AC_DEFUN([RXVT_DEFINE_TO_INCLUDE], dnl
843[if test "$$3" = "$4" -o "$$5" = "$6"; then
844 $1="#include <$2>"
845else
846 $1="/* #include <$2> */"
847fi dnl
848AC_SUBST($1)])
849
850RXVT_DEFINE_TO_INCLUDE(include_stdint_h, stdint.h, ac_cv_header_stdint_h, yes, notset, dontmatch)
851RXVT_DEFINE_TO_INCLUDE(include_stdarg_h, cstdarg, ac_cv_header_stdarg_h, yes, notset, dontmatch)
852RXVT_DEFINE_TO_INCLUDE(include_stdlib_h, cstdlib, ac_cv_header_stdlib_h, yes, notset, dontmatch)
853RXVT_DEFINE_TO_INCLUDE(include_unistd_h, unistd.h, ac_cv_header_unistd_h, yes, notset, dontmatch)
854RXVT_DEFINE_TO_INCLUDE(include_string_h, cstring, ac_cv_header_string_h, yes, notset, dontmatch)
855RXVT_DEFINE_TO_INCLUDE(include_fcntl_h, fcntl.h, ac_cv_header_fcntl_h, yes, notset, dontmatch)
856RXVT_DEFINE_TO_INCLUDE(include_assert_h, assert.h, ac_cv_header_assert_h, yes, notset, dontmatch)
857RXVT_DEFINE_TO_INCLUDE(include_sys_ioctl_h, sys/ioctl.h, rxvt_cv_header_sysioctl, yes, notset, dontmatch)
858RXVT_DEFINE_TO_INCLUDE(include_sys_select_h, sys/select.h, ac_cv_header_sys_select_h, yes, notset, dontmatch)
859RXVT_DEFINE_TO_INCLUDE(include_sys_strredir_h, sys/strredir.h, ac_cv_header_sys_strredir_h, yes, notset, dontmatch)
860RXVT_DEFINE_TO_INCLUDE(include_sys_time_h, sys/time.h, ac_cv_header_sys_time_h, yes, notset, dontmatch)
861RXVT_DEFINE_TO_INCLUDE(include_time_h, time.h, ac_cv_header_sys_time_h, no, ac_cv_header_time, yes)
862
863AC_CONFIG_FILES([Makefile \ 765AC_CONFIG_FILES([Makefile \
864doc/Makefile \ 766doc/Makefile \
865src/Makefile \ 767src/Makefile \
866src/rxvtlib.h \
867]) 768])
868AC_OUTPUT 769AC_OUTPUT
869 770
870echo "Configuration: 771echo "Configuration:
871 772

Diff Legend

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