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

Diff Legend

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