ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/autoconf/configure.in
(Generate patch)

Comparing rxvt-unicode/autoconf/configure.in (file contents):
Revision 1.47 by root, Tue Jan 18 01:31:45 2005 UTC vs.
Revision 1.51 by root, Wed Feb 16 21:21:43 2005 UTC

… …
13 13
14dnl RXVT version 14dnl RXVT version
15changequote(, )dnl 15changequote(, )dnl
16VERSION=`sed -n -e 's/^.*[ \t]VERSION.*"\(.*\)"$/\1/p' ${srcdir}/src/version.h` 16VERSION=`sed -n -e 's/^.*[ \t]VERSION.*"\(.*\)"$/\1/p' ${srcdir}/src/version.h`
17DATE=`sed -n -e 's/^.*[ \t]DATE.*"\(.*\)"$/\1/p' ${srcdir}/src/version.h` 17DATE=`sed -n -e 's/^.*[ \t]DATE.*"\(.*\)"$/\1/p' ${srcdir}/src/version.h`
18LSMDATE=`sed -n -e 's/^.*[ \t]LSMDATE.*"\(.*\)"$/\1/p' ${srcdir}/src/version.h`
19LIBVERSION=`sed -n -e 's/^.*[ \t]LIBVERSION.*"\(.*\)"$/\1/p' ${srcdir}/src/version.h` 18dnl LIBVERSION=`sed -n -e 's/^.*[ \t]LIBVERSION.*"\(.*\)"$/\1/p' ${srcdir}/src/version.h`
20changequote([, ])dnl 19changequote([, ])dnl
21AC_SUBST(VERSION)dnl 20AC_SUBST(VERSION)dnl
22AC_SUBST(DATE)dnl 21AC_SUBST(DATE)dnl
23AC_SUBST(LSMDATE)dnl 22AC_SUBST(LSMDATE)dnl
24AC_SUBST(LIBVERSION)dnl 23AC_SUBST(LIBVERSION)dnl
… …
82 81
83dnl solaris needs to link libnsl and socket 82dnl solaris needs to link libnsl and socket
84AC_CHECK_LIB(nsl, gethostbyname, [LIBS="$LIBS -lnsl"]) 83AC_CHECK_LIB(nsl, gethostbyname, [LIBS="$LIBS -lnsl"])
85AC_CHECK_LIB(socket, socket, [LIBS="$LIBS -lsocket"]) 84AC_CHECK_LIB(socket, socket, [LIBS="$LIBS -lsocket"])
86 85
87AC_ENABLE_SHARED(no)dnl# libtool 86dnl AC_ENABLE_SHARED(no)dnl# libtool
88AC_ENABLE_STATIC(yes)dnl# libtool 87dnl AC_ENABLE_STATIC(yes)dnl# libtool
89AC_PROG_LIBTOOL()dnl# libtool 88dnl AC_PROG_LIBTOOL()dnl# libtool
90 89
91MALLOC_TYPE=S 90MALLOC_TYPE=S
92support_addstrings=no 91support_addstrings=no
93support_frills=no 92support_frills=no
94support_inheritpixmap=no 93support_inheritpixmap=no
… …
519 sys/time.h \ 518 sys/time.h \
520 utmp.h \ 519 utmp.h \
521 utmpx.h \ 520 utmpx.h \
522 stdint.h \ 521 stdint.h \
523 pty.h \ 522 pty.h \
523 wchar.h \
524 cwchar \
525 clocale \
524) 526)
525 527
526AC_HEADER_TIME 528AC_HEADER_TIME
527 529
528dnl# check to allow both <termios.h> and <sys/ioctl.h> 530dnl# check to allow both <termios.h> and <sys/ioctl.h>
… …
606 608
607dnl# see usage below 609dnl# see usage below
608AC_DEFUN(RXVT_CHECK_SIZE, 610AC_DEFUN(RXVT_CHECK_SIZE,
609 [AC_CACHE_CHECK([for $2], $1, 611 [AC_CACHE_CHECK([for $2], $1,
610 [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stdint.h>]], [[$2 dummy;]])],[$1=yes],[dnl 612 [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stdint.h>]], [[$2 dummy;]])],[$1=yes],[dnl
611if test $ac_cv_sizeof_char -ge $3; then 613if test "$ac_cv_sizeof_char" -ge $3; then
612 $1="$4 char" 614 $1="$4 char"
613else 615else
614 if test $ac_cv_sizeof_short -ge $3; then 616 if test "$ac_cv_sizeof_short" -ge $3; then
615 $1="$4 short" 617 $1="$4 short"
616 else 618 else
617 if test $ac_cv_sizeof_int -ge $3; then 619 if test "$ac_cv_sizeof_int" -ge $3; then
618 $1="$4 int" 620 $1="$4 int"
619 else 621 else
620 if test $ac_cv_sizeof_long -ge $3; then 622 if test "$ac_cv_sizeof_long" -ge $3; then
621 $1="$4 long" 623 $1="$4 long"
622 else 624 else
623 if test $ac_cv_sizeof_long_long -ge $3; then 625 if test "$ac_cv_sizeof_long_long" -ge $3; then
624 $1="$4 long long" 626 $1="$4 long long"
625 else 627 else
626 $1="$4 $5" # we _must_ have a (possibly wrong) default 628 $1="$4 $5" # we _must_ have a (possibly wrong) default
627 fi 629 fi
628 fi 630 fi
… …
655dnl RXVT_CHECK_SIZE(rxvt_cv_uint64_t, uint64_t, 8, unsigned, long long, rxvt_uint64_typedef) 657dnl RXVT_CHECK_SIZE(rxvt_cv_uint64_t, uint64_t, 8, unsigned, long long, rxvt_uint64_typedef)
656dnl AC_SUBST(rxvt_uint64_typedef) 658dnl AC_SUBST(rxvt_uint64_typedef)
657dnl# 659dnl#
658dnl# Now look for another we use 660dnl# Now look for another we use
659dnl# 661dnl#
660if test $ac_cv_sizeof_int_p -eq 8; then 662if test "$ac_cv_sizeof_int_p" -eq 8; then
661 rxvt_intp_define="#define intp_t int64_t" 663 rxvt_intp_define="#define intp_t int64_t"
662 rxvt_u_intp_define="#define u_intp_t u_int64_t" 664 rxvt_u_intp_define="#define u_intp_t u_int64_t"
663else 665else
664 if test $ac_cv_sizeof_int_p -eq 4; then 666 if test "$ac_cv_sizeof_int_p" -eq 4; then
665 rxvt_intp_define="#define intp_t int32_t" 667 rxvt_intp_define="#define intp_t int32_t"
666 rxvt_u_intp_define="#define u_intp_t u_int32_t" 668 rxvt_u_intp_define="#define u_intp_t u_int32_t"
667 else 669 else
668 if test $ac_cv_sizeof_int_p -eq 2; then 670 if test "$ac_cv_sizeof_int_p" -eq 2; then
669 rxvt_intp_define="#define intp_t int16_t" 671 rxvt_intp_define="#define intp_t int16_t"
670 rxvt_u_intp_define="#define u_intp_t u_int16_t" 672 rxvt_u_intp_define="#define u_intp_t u_int16_t"
671 else 673 else
672 rxvt_intp_define="#error set intp_t" 674 rxvt_intp_define="#error set intp_t"
673 rxvt_u_intp_define="#error set u_intp_t" 675 rxvt_u_intp_define="#error set u_intp_t"
… …
705 unlockpt \ 707 unlockpt \
706 isastream \ 708 isastream \
707 on_exit \ 709 on_exit \
708 nanosleep \ 710 nanosleep \
709 updwtmp \ 711 updwtmp \
712 updwtmpx \
710 ttyslot \ 713 ttyslot \
711) 714)
712dnl# Note: On NetBSD, openpty() exists in libutil. Don't pull it in 715dnl# Note: On NetBSD, openpty() exists in libutil. Don't pull it in
713 716
714dnl# -------------------------------------------------------------------------- 717dnl# --------------------------------------------------------------------------
… …
757[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h> 760[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h>
758#include <utmpx.h>]], [[struct utmpx utx; utx.ut_host;]])],[rxvt_cv_struct_utmpx_host=yes],[rxvt_cv_struct_utmpx_host=no])]) 761#include <utmpx.h>]], [[struct utmpx utx; utx.ut_host;]])],[rxvt_cv_struct_utmpx_host=yes],[rxvt_cv_struct_utmpx_host=no])])
759if test x$rxvt_cv_struct_utmpx_host = xyes; then 762if test x$rxvt_cv_struct_utmpx_host = xyes; then
760 AC_DEFINE(HAVE_UTMPX_HOST, 1, Define if struct utmpx contains ut_host) 763 AC_DEFINE(HAVE_UTMPX_HOST, 1, Define if struct utmpx contains ut_host)
761fi 764fi
765
766AC_CACHE_CHECK(for session in utmpx struct, rxvt_cv_struct_utmpx_session,
767[AC_TRY_COMPILE([#include <sys/types.h>
768#include <utmpx.h>],
769[struct utmpx utx; utx.ut_session;],
770rxvt_cv_struct_utmpx_session=yes, rxvt_cv_struct_utmpx_session=no)])
771if test x$rxvt_cv_struct_utmpx_session = xyes; then
772 AC_DEFINE(HAVE_UTMPX_SESSION, 1, Define if struct utmpx contains ut_session)
773fi
762) dnl# AC_CHECK_HEADER(utmpx.h 774) dnl# AC_CHECK_HEADER(utmpx.h
763
764 775
765dnl# -------------------------------------------------------------------------- 776dnl# --------------------------------------------------------------------------
766dnl# check for struct lastlog 777dnl# check for struct lastlog
767AC_CACHE_CHECK(for struct lastlog, rxvt_cv_struct_lastlog, 778AC_CACHE_CHECK(for struct lastlog, rxvt_cv_struct_lastlog,
768[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h> 779[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h>
… …
1361 1372
1362AC_CONFIG_FILES([autoconf/Make.common \ 1373AC_CONFIG_FILES([autoconf/Make.common \
1363Makefile \ 1374Makefile \
1364doc/Makefile \ 1375doc/Makefile \
1365src/Makefile \ 1376src/Makefile \
1366src/test/Makefile \
1367src/rxvtlib.h \ 1377src/rxvtlib.h \
1368]) 1378])
1369AC_OUTPUT 1379AC_OUTPUT
1370 1380
1371echo "Configuration: 1381echo "Configuration:

Diff Legend

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