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.90 by ayin, Mon Dec 10 23:41:15 2007 UTC vs.
Revision 1.100 by root, Sun Dec 23 05:03:52 2007 UTC

… …
74case $host in 74case $host in
75 *-*-solaris* ) 75 *-*-solaris* )
76 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)
77 ;; 77 ;;
78esac 78esac
79
80dnl if test x$GXX = xyes; then
81dnl CXXFLAGS="$CXXFLAGS" dnl I once had -fno-exceptions, but I am using them now...
82dnl fi
83 79
84dnl# FreeBSD needs to link libxpg4 80dnl# FreeBSD needs to link libxpg4
85AC_CHECK_FUNC(setlocale, [], [AC_CHECK_LIB(xpg4, setlocale, [LIBS="$LIBS -lxpg4"])]) 81AC_CHECK_FUNC(setlocale, [], [AC_CHECK_LIB(xpg4, setlocale, [LIBS="$LIBS -lxpg4"])])
86 82
87dnl# solaris needs to link libnsl and socket 83dnl# solaris needs to link libnsl and socket
… …
479 475
480dnl# -------------------------------------------------------------------------- 476dnl# --------------------------------------------------------------------------
481dnl# CHECKING FOR HEADER FILES 477dnl# CHECKING FOR HEADER FILES
482dnl# -------------------------------------------------------------------------- 478dnl# --------------------------------------------------------------------------
483AC_CHECK_HEADERS( \ 479AC_CHECK_HEADERS( \
484 assert.h \
485 fcntl.h \
486 stdarg.h \
487 stdlib.h \
488 string.h \
489 termios.h \
490 unistd.h \
491 sys/byteorder.h \ 480 sys/byteorder.h \
492 sys/ioctl.h \ 481 sys/ioctl.h \
493 sys/select.h \
494 sys/sockio.h \ 482 sys/sockio.h \
495 sys/strredir.h \ 483 sys/strredir.h \
496 sys/time.h \
497 stdint.h \ 484 stdint.h \
498 wchar.h \ 485 wchar.h \
499 cwchar \ 486 cwchar \
500 clocale \
501) 487)
502 488
503dnl# check to allow both <termios.h> and <sys/ioctl.h> 489dnl# check to allow both <termios.h> and <sys/ioctl.h>
504AC_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,
505[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stdio.h> 491[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stdio.h>
506#include <sys/ioctl.h> 492#include <sys/ioctl.h>
507#ifdef HAVE_TERMIOS_H
508#include <termios.h> 493#include <termios.h>
509#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])])
510 495
511AC_CACHE_CHECK([for XPointer], rxvt_cv_xpointer, 496AC_CACHE_CHECK([for XPointer], rxvt_cv_xpointer,
512[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])])
513if test x$rxvt_cv_xpointer = xyes; then 498if test x$rxvt_cv_xpointer = xyes; then
514 AC_DEFINE(HAVE_XPOINTER, 1, Define if you have XPointer typedef) 499 AC_DEFINE(HAVE_XPOINTER, 1, Define if you have XPointer typedef)
… …
532dnl# -------------------------------------------------------------------------- 517dnl# --------------------------------------------------------------------------
533dnl# CHECKING FOR MISSING TYPEDEFS 518dnl# CHECKING FOR MISSING TYPEDEFS
534dnl# -------------------------------------------------------------------------- 519dnl# --------------------------------------------------------------------------
535dnl# Missing typedefs and replacements 520dnl# Missing typedefs and replacements
536AC_TYPE_MODE_T 521AC_TYPE_MODE_T
537dnl> AC_CHECK_TYPE(umode_t, int)
538dnl> AC_CHECK_TYPE(off_t, long)
539AC_TYPE_PID_T 522AC_TYPE_PID_T
540AC_TYPE_UID_T 523AC_TYPE_UID_T
541 524AC_TYPE_INT16_T
542AC_CHECK_SIZEOF(short, 2) 525AC_TYPE_UINT16_T
543AC_CHECK_SIZEOF(int, 4) 526AC_TYPE_INT32_T
544dnl AC_CHECK_SIZEOF(long, 4) 527AC_TYPE_UINT32_T
545AC_CHECK_SIZEOF(long long, 8)
546AC_CHECK_SIZEOF(int *, 4)
547
548dnl# see usage below
549AC_DEFUN([RXVT_CHECK_SIZE],
550 [AC_CACHE_CHECK([for $2], $1,
551 [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stdint.h>]], [[$2 dummy;]])],[$1=yes],[dnl
552if test "$ac_cv_sizeof_char" -ge $3; then
553 $1="$4 char"
554else
555 if test "$ac_cv_sizeof_short" -ge $3; then
556 $1="$4 short"
557 else
558 if test "$ac_cv_sizeof_int" -ge $3; then
559 $1="$4 int"
560 else
561 if test "$ac_cv_sizeof_long" -ge $3; then
562 $1="$4 long"
563 else
564 if test "$ac_cv_sizeof_long_long" -ge $3; then
565 $1="$4 long long"
566 else
567 $1="$4 $5" # we _must_ have a (possibly wrong) default
568 fi
569 fi
570 fi
571 fi
572fi])])]
573if test x"$$1" != xyes; then
574 $6="typedef $$1 $2;"
575else
576 if test x"$4" = x; then
577 $6="/* typedef $5 $2; */"
578 else
579 $6="/* typedef $4 $5 $2; */"
580 fi
581fi dnl
582)
583dnl#
584dnl# Look for types the system may know about anyway.
585dnl#
586RXVT_CHECK_SIZE(rxvt_cv_int16_t, int16_t, 2, , short, rxvt_int16_typedef)
587AC_SUBST(rxvt_int16_typedef)
588RXVT_CHECK_SIZE(rxvt_cv_uint16_t, uint16_t, 2, unsigned, short, rxvt_uint16_typedef)
589AC_SUBST(rxvt_uint16_typedef)
590RXVT_CHECK_SIZE(rxvt_cv_int32_t, int32_t, 4, , int, rxvt_int32_typedef)
591AC_SUBST(rxvt_int32_typedef)
592RXVT_CHECK_SIZE(rxvt_cv_uint32_t, uint32_t, 4, unsigned, int, rxvt_uint32_typedef)
593AC_SUBST(rxvt_uint32_typedef)
594dnl RXVT_CHECK_SIZE(rxvt_cv_int64_t, int64_t, 8, , long long, rxvt_int64_typedef)
595dnl AC_SUBST(rxvt_int64_typedef)
596dnl RXVT_CHECK_SIZE(rxvt_cv_uint64_t, uint64_t, 8, unsigned, long long, rxvt_uint64_typedef)
597dnl AC_SUBST(rxvt_uint64_typedef)
598dnl#
599dnl# Now look for another we use
600dnl#
601if test "$ac_cv_sizeof_int_p" -eq 8; then
602 rxvt_intp_define="#define intp_t int64_t"
603 rxvt_u_intp_define="#define u_intp_t u_int64_t"
604else
605 if test "$ac_cv_sizeof_int_p" -eq 4; then
606 rxvt_intp_define="#define intp_t int32_t"
607 rxvt_u_intp_define="#define u_intp_t u_int32_t"
608 else
609 if test "$ac_cv_sizeof_int_p" -eq 2; then
610 rxvt_intp_define="#define intp_t int16_t"
611 rxvt_u_intp_define="#define u_intp_t u_int16_t"
612 else
613 rxvt_intp_define="#error set intp_t"
614 rxvt_u_intp_define="#error set u_intp_t"
615 fi
616 fi
617fi
618AC_SUBST(rxvt_intp_define)
619AC_SUBST(rxvt_u_intp_define)
620 528
621dnl# -------------------------------------------------------------------------- 529dnl# --------------------------------------------------------------------------
622dnl# CHECKING FOR LIBRARY FUNCTIONS 530dnl# CHECKING FOR LIBRARY FUNCTIONS
623dnl# -------------------------------------------------------------------------- 531dnl# --------------------------------------------------------------------------
624AC_CHECK_FUNCS(unsetenv) 532AC_CHECK_FUNCS(unsetenv)
… …
812 720
813 save_CXXFLAGS="$CXXFLAGS" 721 save_CXXFLAGS="$CXXFLAGS"
814 save_LIBS="$LIBS" 722 save_LIBS="$LIBS"
815 CXXFLAGS="$CXXFLAGS `$PERL -MExtUtils::Embed -e ccopts`" 723 CXXFLAGS="$CXXFLAGS `$PERL -MExtUtils::Embed -e ccopts`"
816 LIBS="$LIBS `$PERL -MExtUtils::Embed -e ldopts`" 724 LIBS="$LIBS `$PERL -MExtUtils::Embed -e ldopts`"
817 AC_TRY_LINK([ 725 AC_LINK_IFELSE([AC_LANG_PROGRAM([[
818#include <EXTERN.h> 726#include <EXTERN.h>
819#include <perl.h> 727#include <perl.h>
820#include <XSUB.h> 728#include <XSUB.h>
821],[ 729]], [[
822 PerlInterpreter *perl = perl_alloc (); 730 PerlInterpreter *perl = perl_alloc ();
823],[rxvt_perl_link=yes],[rxvt_perl_link=no]) 731]])],[rxvt_perl_link=yes],[rxvt_perl_link=no])
824 CXXFLAGS="$save_CXXFLAGS" 732 CXXFLAGS="$save_CXXFLAGS"
825 LIBS="$save_LIBS" 733 LIBS="$save_LIBS"
826 734
827 if test x$rxvt_perl_link = xyes; then 735 if test x$rxvt_perl_link = xyes; then
828 AC_MSG_RESULT(ok) 736 AC_MSG_RESULT(ok)
… …
871 $1="/* #include <$2> */" 779 $1="/* #include <$2> */"
872fi dnl 780fi dnl
873AC_SUBST($1)]) 781AC_SUBST($1)])
874 782
875RXVT_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)
876RXVT_DEFINE_TO_INCLUDE(include_stdarg_h, cstdarg, ac_cv_header_stdarg_h, yes, notset, dontmatch)
877RXVT_DEFINE_TO_INCLUDE(include_stdlib_h, cstdlib, ac_cv_header_stdlib_h, yes, notset, dontmatch)
878RXVT_DEFINE_TO_INCLUDE(include_unistd_h, unistd.h, ac_cv_header_unistd_h, yes, notset, dontmatch)
879RXVT_DEFINE_TO_INCLUDE(include_string_h, cstring, ac_cv_header_string_h, yes, notset, dontmatch)
880RXVT_DEFINE_TO_INCLUDE(include_fcntl_h, fcntl.h, ac_cv_header_fcntl_h, yes, notset, dontmatch)
881RXVT_DEFINE_TO_INCLUDE(include_util_h, util.h, ac_cv_header_util_h, yes, notset, dontmatch)
882RXVT_DEFINE_TO_INCLUDE(include_assert_h, assert.h, ac_cv_header_assert_h, yes, notset, dontmatch)
883RXVT_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)
884RXVT_DEFINE_TO_INCLUDE(include_sys_select_h, sys/select.h, ac_cv_header_sys_select_h, yes, notset, dontmatch)
885RXVT_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)
886RXVT_DEFINE_TO_INCLUDE(include_sys_time_h, sys/time.h, ac_cv_header_sys_time_h, yes, notset, dontmatch)
887RXVT_DEFINE_TO_INCLUDE(include_time_h, time.h, ac_cv_header_sys_time_h, no, ac_cv_header_time, yes)
888 786
889AC_CONFIG_FILES([Makefile \ 787AC_CONFIG_FILES([Makefile \
890doc/Makefile \ 788doc/Makefile \
891src/Makefile \ 789src/Makefile \
892src/rxvtlib.h \ 790src/rxvtlib.h \

Diff Legend

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