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.97 by ayin, Tue Dec 11 18:07:08 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 \ 487 clocale \
498) 488)
499 489
500dnl# check to allow both <termios.h> and <sys/ioctl.h> 490dnl# 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, 491AC_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> 492[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stdio.h>
503#include <sys/ioctl.h> 493#include <sys/ioctl.h>
504#ifdef HAVE_TERMIOS_H
505#include <termios.h> 494#include <termios.h>
506#endif]], [[int a = ECHO;]])],[rxvt_cv_header_sysioctl=yes],[rxvt_cv_header_sysioctl=no])]) 495]], [[int a = ECHO;]])],[rxvt_cv_header_sysioctl=yes],[rxvt_cv_header_sysioctl=no])])
507 496
508AC_CACHE_CHECK([for XPointer], rxvt_cv_xpointer, 497AC_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])]) 498[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 499if test x$rxvt_cv_xpointer = xyes; then
511 AC_DEFINE(HAVE_XPOINTER, 1, Define if you have XPointer typedef) 500 AC_DEFINE(HAVE_XPOINTER, 1, Define if you have XPointer typedef)
… …
540AC_CHECK_SIZEOF(int, 4) 529AC_CHECK_SIZEOF(int, 4)
541dnl AC_CHECK_SIZEOF(long, 4) 530dnl AC_CHECK_SIZEOF(long, 4)
542AC_CHECK_SIZEOF(long long, 8) 531AC_CHECK_SIZEOF(long long, 8)
543AC_CHECK_SIZEOF(int *, 4) 532AC_CHECK_SIZEOF(int *, 4)
544 533
545dnl# see usage below 534AC_TYPE_INT16_T
546AC_DEFUN([RXVT_CHECK_SIZE], 535AC_TYPE_UINT16_T
547 [AC_CACHE_CHECK([for $2], $1, 536AC_TYPE_INT32_T
548 [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stdint.h>]], [[$2 dummy;]])],[$1=yes],[dnl 537AC_TYPE_UINT32_T
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 538
618dnl# -------------------------------------------------------------------------- 539dnl# --------------------------------------------------------------------------
619dnl# CHECKING FOR LIBRARY FUNCTIONS 540dnl# CHECKING FOR LIBRARY FUNCTIONS
620dnl# -------------------------------------------------------------------------- 541dnl# --------------------------------------------------------------------------
621AC_CHECK_FUNCS(unsetenv) 542AC_CHECK_FUNCS(unsetenv)
… …
868 $1="/* #include <$2> */" 789 $1="/* #include <$2> */"
869fi dnl 790fi dnl
870AC_SUBST($1)]) 791AC_SUBST($1)])
871 792
872RXVT_DEFINE_TO_INCLUDE(include_stdint_h, stdint.h, ac_cv_header_stdint_h, yes, notset, dontmatch) 793RXVT_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) 794RXVT_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) 795RXVT_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 796
885AC_CONFIG_FILES([Makefile \ 797AC_CONFIG_FILES([Makefile \
886doc/Makefile \ 798doc/Makefile \
887src/Makefile \ 799src/Makefile \
888src/rxvtlib.h \ 800src/rxvtlib.h \

Diff Legend

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