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.96 by ayin, Tue Dec 11 17:42:04 2007 UTC vs.
Revision 1.102 by ayin, Fri Dec 28 14:00:47 2007 UTC

… …
482 sys/sockio.h \ 482 sys/sockio.h \
483 sys/strredir.h \ 483 sys/strredir.h \
484 stdint.h \ 484 stdint.h \
485 wchar.h \ 485 wchar.h \
486 cwchar \ 486 cwchar \
487 clocale \
488) 487)
489
490dnl# check to allow both <termios.h> and <sys/ioctl.h>
491AC_CACHE_CHECK(whether termios.h and sys/ioctl.h may both be included, rxvt_cv_header_sysioctl,
492[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stdio.h>
493#include <sys/ioctl.h>
494#include <termios.h>
495]], [[int a = ECHO;]])],[rxvt_cv_header_sysioctl=yes],[rxvt_cv_header_sysioctl=no])])
496 488
497AC_CACHE_CHECK([for XPointer], rxvt_cv_xpointer, 489AC_CACHE_CHECK([for XPointer], rxvt_cv_xpointer,
498[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])])
499if test x$rxvt_cv_xpointer = xyes; then 491if test x$rxvt_cv_xpointer = xyes; then
500 AC_DEFINE(HAVE_XPOINTER, 1, Define if you have XPointer typedef) 492 AC_DEFINE(HAVE_XPOINTER, 1, Define if you have XPointer typedef)
… …
518dnl# -------------------------------------------------------------------------- 510dnl# --------------------------------------------------------------------------
519dnl# CHECKING FOR MISSING TYPEDEFS 511dnl# CHECKING FOR MISSING TYPEDEFS
520dnl# -------------------------------------------------------------------------- 512dnl# --------------------------------------------------------------------------
521dnl# Missing typedefs and replacements 513dnl# Missing typedefs and replacements
522AC_TYPE_MODE_T 514AC_TYPE_MODE_T
523dnl> AC_CHECK_TYPE(umode_t, int)
524dnl> AC_CHECK_TYPE(off_t, long)
525AC_TYPE_PID_T 515AC_TYPE_PID_T
526AC_TYPE_UID_T 516AC_TYPE_UID_T
527 517AC_TYPE_INT16_T
528AC_CHECK_SIZEOF(short, 2) 518AC_TYPE_UINT16_T
529AC_CHECK_SIZEOF(int, 4) 519AC_TYPE_INT32_T
530dnl AC_CHECK_SIZEOF(long, 4) 520AC_TYPE_UINT32_T
531AC_CHECK_SIZEOF(long long, 8)
532AC_CHECK_SIZEOF(int *, 4)
533
534dnl# see usage below
535AC_DEFUN([RXVT_CHECK_SIZE],
536 [AC_CACHE_CHECK([for $2], $1,
537 [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stdint.h>]], [[$2 dummy;]])],[$1=yes],[dnl
538if test "$ac_cv_sizeof_char" -ge $3; then
539 $1="$4 char"
540else
541 if test "$ac_cv_sizeof_short" -ge $3; then
542 $1="$4 short"
543 else
544 if test "$ac_cv_sizeof_int" -ge $3; then
545 $1="$4 int"
546 else
547 if test "$ac_cv_sizeof_long" -ge $3; then
548 $1="$4 long"
549 else
550 if test "$ac_cv_sizeof_long_long" -ge $3; then
551 $1="$4 long long"
552 else
553 $1="$4 $5" # we _must_ have a (possibly wrong) default
554 fi
555 fi
556 fi
557 fi
558fi])])]
559if test x"$$1" != xyes; then
560 $6="typedef $$1 $2;"
561else
562 if test x"$4" = x; then
563 $6="/* typedef $5 $2; */"
564 else
565 $6="/* typedef $4 $5 $2; */"
566 fi
567fi dnl
568)
569dnl#
570dnl# Look for types the system may know about anyway.
571dnl#
572RXVT_CHECK_SIZE(rxvt_cv_int16_t, int16_t, 2, , short, rxvt_int16_typedef)
573AC_SUBST(rxvt_int16_typedef)
574RXVT_CHECK_SIZE(rxvt_cv_uint16_t, uint16_t, 2, unsigned, short, rxvt_uint16_typedef)
575AC_SUBST(rxvt_uint16_typedef)
576RXVT_CHECK_SIZE(rxvt_cv_int32_t, int32_t, 4, , int, rxvt_int32_typedef)
577AC_SUBST(rxvt_int32_typedef)
578RXVT_CHECK_SIZE(rxvt_cv_uint32_t, uint32_t, 4, unsigned, int, rxvt_uint32_typedef)
579AC_SUBST(rxvt_uint32_typedef)
580dnl RXVT_CHECK_SIZE(rxvt_cv_int64_t, int64_t, 8, , long long, rxvt_int64_typedef)
581dnl AC_SUBST(rxvt_int64_typedef)
582dnl RXVT_CHECK_SIZE(rxvt_cv_uint64_t, uint64_t, 8, unsigned, long long, rxvt_uint64_typedef)
583dnl AC_SUBST(rxvt_uint64_typedef)
584 521
585dnl# -------------------------------------------------------------------------- 522dnl# --------------------------------------------------------------------------
586dnl# CHECKING FOR LIBRARY FUNCTIONS 523dnl# CHECKING FOR LIBRARY FUNCTIONS
587dnl# -------------------------------------------------------------------------- 524dnl# --------------------------------------------------------------------------
588AC_CHECK_FUNCS(unsetenv) 525AC_CHECK_FUNCS(unsetenv)
… …
776 713
777 save_CXXFLAGS="$CXXFLAGS" 714 save_CXXFLAGS="$CXXFLAGS"
778 save_LIBS="$LIBS" 715 save_LIBS="$LIBS"
779 CXXFLAGS="$CXXFLAGS `$PERL -MExtUtils::Embed -e ccopts`" 716 CXXFLAGS="$CXXFLAGS `$PERL -MExtUtils::Embed -e ccopts`"
780 LIBS="$LIBS `$PERL -MExtUtils::Embed -e ldopts`" 717 LIBS="$LIBS `$PERL -MExtUtils::Embed -e ldopts`"
781 AC_TRY_LINK([ 718 AC_LINK_IFELSE([AC_LANG_PROGRAM([[
782#include <EXTERN.h> 719#include <EXTERN.h>
783#include <perl.h> 720#include <perl.h>
784#include <XSUB.h> 721#include <XSUB.h>
785],[ 722]], [[
786 PerlInterpreter *perl = perl_alloc (); 723 PerlInterpreter *perl = perl_alloc ();
787],[rxvt_perl_link=yes],[rxvt_perl_link=no]) 724]])],[rxvt_perl_link=yes],[rxvt_perl_link=no])
788 CXXFLAGS="$save_CXXFLAGS" 725 CXXFLAGS="$save_CXXFLAGS"
789 LIBS="$save_LIBS" 726 LIBS="$save_LIBS"
790 727
791 if test x$rxvt_perl_link = xyes; then 728 if test x$rxvt_perl_link = xyes; then
792 AC_MSG_RESULT(ok) 729 AC_MSG_RESULT(ok)
… …
823AC_SUBST(AFTERIMAGE_CFLAGS) 760AC_SUBST(AFTERIMAGE_CFLAGS)
824AC_SUBST(AFTERIMAGE_LIBS) 761AC_SUBST(AFTERIMAGE_LIBS)
825 762
826AC_ARG_PROGRAM 763AC_ARG_PROGRAM
827 764
828dnl# test for "sun" or "__sun__" before include sys_ioctl
829
830dnl# revert HAVE_BLAH_H into a "#include <blah.h>"
831AC_DEFUN([RXVT_DEFINE_TO_INCLUDE], dnl
832[if test "$$3" = "$4" -o "$$5" = "$6"; then
833 $1="#include <$2>"
834else
835 $1="/* #include <$2> */"
836fi dnl
837AC_SUBST($1)])
838
839RXVT_DEFINE_TO_INCLUDE(include_stdint_h, stdint.h, ac_cv_header_stdint_h, yes, notset, dontmatch)
840RXVT_DEFINE_TO_INCLUDE(include_sys_ioctl_h, sys/ioctl.h, rxvt_cv_header_sysioctl, yes, notset, dontmatch)
841RXVT_DEFINE_TO_INCLUDE(include_sys_strredir_h, sys/strredir.h, ac_cv_header_sys_strredir_h, yes, notset, dontmatch)
842
843AC_CONFIG_FILES([Makefile \ 765AC_CONFIG_FILES([Makefile \
844doc/Makefile \ 766doc/Makefile \
845src/Makefile \ 767src/Makefile \
846src/rxvtlib.h \
847]) 768])
848AC_OUTPUT 769AC_OUTPUT
849 770
850echo "Configuration: 771echo "Configuration:
851 772

Diff Legend

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