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.93 by ayin, Tue Dec 11 09:04:34 2007 UTC vs.
Revision 1.100 by root, Sun Dec 23 05:03:52 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 488
500dnl# check to allow both <termios.h> and <sys/ioctl.h> 489dnl# 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, 490AC_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> 491[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stdio.h>
503#include <sys/ioctl.h> 492#include <sys/ioctl.h>
504#ifdef HAVE_TERMIOS_H
505#include <termios.h> 493#include <termios.h>
506#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])])
507 495
508AC_CACHE_CHECK([for XPointer], rxvt_cv_xpointer, 496AC_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])]) 497[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 498if test x$rxvt_cv_xpointer = xyes; then
511 AC_DEFINE(HAVE_XPOINTER, 1, Define if you have XPointer typedef) 499 AC_DEFINE(HAVE_XPOINTER, 1, Define if you have XPointer typedef)
… …
529dnl# -------------------------------------------------------------------------- 517dnl# --------------------------------------------------------------------------
530dnl# CHECKING FOR MISSING TYPEDEFS 518dnl# CHECKING FOR MISSING TYPEDEFS
531dnl# -------------------------------------------------------------------------- 519dnl# --------------------------------------------------------------------------
532dnl# Missing typedefs and replacements 520dnl# Missing typedefs and replacements
533AC_TYPE_MODE_T 521AC_TYPE_MODE_T
534dnl> AC_CHECK_TYPE(umode_t, int)
535dnl> AC_CHECK_TYPE(off_t, long)
536AC_TYPE_PID_T 522AC_TYPE_PID_T
537AC_TYPE_UID_T 523AC_TYPE_UID_T
538 524AC_TYPE_INT16_T
539AC_CHECK_SIZEOF(short, 2) 525AC_TYPE_UINT16_T
540AC_CHECK_SIZEOF(int, 4) 526AC_TYPE_INT32_T
541dnl AC_CHECK_SIZEOF(long, 4) 527AC_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)
595dnl#
596dnl# Now look for another we use
597dnl#
598if test "$ac_cv_sizeof_int_p" -eq 8; then
599 rxvt_intp_define="#define intp_t int64_t"
600 rxvt_u_intp_define="#define u_intp_t u_int64_t"
601else
602 if test "$ac_cv_sizeof_int_p" -eq 4; then
603 rxvt_intp_define="#define intp_t int32_t"
604 rxvt_u_intp_define="#define u_intp_t u_int32_t"
605 else
606 if test "$ac_cv_sizeof_int_p" -eq 2; then
607 rxvt_intp_define="#define intp_t int16_t"
608 rxvt_u_intp_define="#define u_intp_t u_int16_t"
609 else
610 rxvt_intp_define="#error set intp_t"
611 rxvt_u_intp_define="#error set u_intp_t"
612 fi
613 fi
614fi
615AC_SUBST(rxvt_intp_define)
616AC_SUBST(rxvt_u_intp_define)
617 528
618dnl# -------------------------------------------------------------------------- 529dnl# --------------------------------------------------------------------------
619dnl# CHECKING FOR LIBRARY FUNCTIONS 530dnl# CHECKING FOR LIBRARY FUNCTIONS
620dnl# -------------------------------------------------------------------------- 531dnl# --------------------------------------------------------------------------
621AC_CHECK_FUNCS(unsetenv) 532AC_CHECK_FUNCS(unsetenv)
… …
809 720
810 save_CXXFLAGS="$CXXFLAGS" 721 save_CXXFLAGS="$CXXFLAGS"
811 save_LIBS="$LIBS" 722 save_LIBS="$LIBS"
812 CXXFLAGS="$CXXFLAGS `$PERL -MExtUtils::Embed -e ccopts`" 723 CXXFLAGS="$CXXFLAGS `$PERL -MExtUtils::Embed -e ccopts`"
813 LIBS="$LIBS `$PERL -MExtUtils::Embed -e ldopts`" 724 LIBS="$LIBS `$PERL -MExtUtils::Embed -e ldopts`"
814 AC_TRY_LINK([ 725 AC_LINK_IFELSE([AC_LANG_PROGRAM([[
815#include <EXTERN.h> 726#include <EXTERN.h>
816#include <perl.h> 727#include <perl.h>
817#include <XSUB.h> 728#include <XSUB.h>
818],[ 729]], [[
819 PerlInterpreter *perl = perl_alloc (); 730 PerlInterpreter *perl = perl_alloc ();
820],[rxvt_perl_link=yes],[rxvt_perl_link=no]) 731]])],[rxvt_perl_link=yes],[rxvt_perl_link=no])
821 CXXFLAGS="$save_CXXFLAGS" 732 CXXFLAGS="$save_CXXFLAGS"
822 LIBS="$save_LIBS" 733 LIBS="$save_LIBS"
823 734
824 if test x$rxvt_perl_link = xyes; then 735 if test x$rxvt_perl_link = xyes; then
825 AC_MSG_RESULT(ok) 736 AC_MSG_RESULT(ok)
… …
868 $1="/* #include <$2> */" 779 $1="/* #include <$2> */"
869fi dnl 780fi dnl
870AC_SUBST($1)]) 781AC_SUBST($1)])
871 782
872RXVT_DEFINE_TO_INCLUDE(include_stdint_h, stdint.h, ac_cv_header_stdint_h, yes, notset, dontmatch) 783RXVT_DEFINE_TO_INCLUDE(include_stdint_h, stdint.h, ac_cv_header_stdint_h, yes, notset, dontmatch)
873RXVT_DEFINE_TO_INCLUDE(include_stdarg_h, cstdarg, ac_cv_header_stdarg_h, yes, notset, dontmatch)
874RXVT_DEFINE_TO_INCLUDE(include_stdlib_h, cstdlib, ac_cv_header_stdlib_h, yes, notset, dontmatch)
875RXVT_DEFINE_TO_INCLUDE(include_unistd_h, unistd.h, ac_cv_header_unistd_h, yes, notset, dontmatch)
876RXVT_DEFINE_TO_INCLUDE(include_string_h, cstring, ac_cv_header_string_h, yes, notset, dontmatch)
877RXVT_DEFINE_TO_INCLUDE(include_fcntl_h, fcntl.h, ac_cv_header_fcntl_h, yes, notset, dontmatch)
878RXVT_DEFINE_TO_INCLUDE(include_assert_h, assert.h, ac_cv_header_assert_h, yes, notset, dontmatch)
879RXVT_DEFINE_TO_INCLUDE(include_sys_ioctl_h, sys/ioctl.h, rxvt_cv_header_sysioctl, yes, notset, dontmatch) 784RXVT_DEFINE_TO_INCLUDE(include_sys_ioctl_h, sys/ioctl.h, rxvt_cv_header_sysioctl, yes, notset, dontmatch)
880RXVT_DEFINE_TO_INCLUDE(include_sys_select_h, sys/select.h, ac_cv_header_sys_select_h, yes, notset, dontmatch)
881RXVT_DEFINE_TO_INCLUDE(include_sys_strredir_h, sys/strredir.h, ac_cv_header_sys_strredir_h, yes, notset, dontmatch) 785RXVT_DEFINE_TO_INCLUDE(include_sys_strredir_h, sys/strredir.h, ac_cv_header_sys_strredir_h, yes, notset, dontmatch)
882RXVT_DEFINE_TO_INCLUDE(include_sys_time_h, sys/time.h, ac_cv_header_sys_time_h, yes, notset, dontmatch)
883RXVT_DEFINE_TO_INCLUDE(include_time_h, time.h, ac_cv_header_sys_time_h, no, ac_cv_header_time, yes)
884 786
885AC_CONFIG_FILES([Makefile \ 787AC_CONFIG_FILES([Makefile \
886doc/Makefile \ 788doc/Makefile \
887src/Makefile \ 789src/Makefile \
888src/rxvtlib.h \ 790src/rxvtlib.h \

Diff Legend

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