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.45 by root, Tue Jan 11 04:44:57 2005 UTC vs.
Revision 1.51 by root, Wed Feb 16 21:21:43 2005 UTC

1dnl# -*- sh -*- 1dnl# -*- sh -*-
2dnl# 2dnl#
3dnl# Process this file with autoconf to produce a configure script. 3dnl# Process this file with autoconf to produce a configure script.
4dnl# 4dnl#
5orig_CXXFLAGS="$CXXFLAGS"
6
5AC_INIT 7AC_INIT
6AC_CONFIG_SRCDIR([src/feature.h]) 8AC_CONFIG_SRCDIR([src/feature.h])
7AC_CONFIG_AUX_DIR(autoconf) 9AC_CONFIG_AUX_DIR(autoconf)
8AC_CONFIG_HEADER(config.h:autoconf/config.h.in) 10AC_CONFIG_HEADER(config.h:autoconf/config.h.in)
9 11
… …
11 13
12dnl RXVT version 14dnl RXVT version
13changequote(, )dnl 15changequote(, )dnl
14VERSION=`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`
15DATE=`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`
16LSMDATE=`sed -n -e 's/^.*[ \t]LSMDATE.*"\(.*\)"$/\1/p' ${srcdir}/src/version.h`
17LIBVERSION=`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`
18changequote([, ])dnl 19changequote([, ])dnl
19AC_SUBST(VERSION)dnl 20AC_SUBST(VERSION)dnl
20AC_SUBST(DATE)dnl 21AC_SUBST(DATE)dnl
21AC_SUBST(LSMDATE)dnl 22AC_SUBST(LSMDATE)dnl
22AC_SUBST(LIBVERSION)dnl 23AC_SUBST(LIBVERSION)dnl
… …
33AC_PROG_INSTALL 34AC_PROG_INSTALL
34AC_PROG_AWK 35AC_PROG_AWK
35 36
36AC_LANG(C) 37AC_LANG(C)
37 38
39dnl# --------------------------------------------------------------------------
40dnl# Supply default CFLAGS, if not specified by `CFLAGS=flags ./configure'
41dnl#
42if test -z "$orig_CXXFLAGS"; then
43 CXXFLAGS='-O'
44 if test x$GCC = xyes && test "x$GXX" = xyes; then
45 CXXFLAGS="-g -O3"
46 fi
47 CFLAGS="$CXXFLAGS"
48fi
49
38LINKER="$CXX" 50LINKER="$CXX"
39if test x$GCC = xyes && test x$GXX = xyes; then 51if test x$GCC = xyes && test x$GXX = xyes; then
40 AC_CHECK_LIB(supc++, main, [ 52 AC_CHECK_LIB(supc++, main, [
41 LINKER="$CC" 53 LINKER="$CC"
42 LIBS="$LIBS -lsupc++" 54 LIBS="$LIBS -lsupc++"
… …
69 81
70dnl solaris needs to link libnsl and socket 82dnl solaris needs to link libnsl and socket
71AC_CHECK_LIB(nsl, gethostbyname, [LIBS="$LIBS -lnsl"]) 83AC_CHECK_LIB(nsl, gethostbyname, [LIBS="$LIBS -lnsl"])
72AC_CHECK_LIB(socket, socket, [LIBS="$LIBS -lsocket"]) 84AC_CHECK_LIB(socket, socket, [LIBS="$LIBS -lsocket"])
73 85
74AC_ENABLE_SHARED(no)dnl# libtool 86dnl AC_ENABLE_SHARED(no)dnl# libtool
75AC_ENABLE_STATIC(yes)dnl# libtool 87dnl AC_ENABLE_STATIC(yes)dnl# libtool
76AC_PROG_LIBTOOL()dnl# libtool 88dnl AC_PROG_LIBTOOL()dnl# libtool
77 89
78MALLOC_TYPE=S 90MALLOC_TYPE=S
79support_addstrings=no 91support_addstrings=no
80support_frills=no 92support_frills=no
81support_inheritpixmap=no 93support_inheritpixmap=no
… …
445 457
446dnl# -------------------------------------------------------------------------- 458dnl# --------------------------------------------------------------------------
447 459
448AC_DEFINE(PROTOTYPES, 1, Define if you need function prototypes) 460AC_DEFINE(PROTOTYPES, 1, Define if you need function prototypes)
449 461
450dnl# --------------------------------------------------------------------------
451dnl# Supply default CFLAGS, if not specified by `CFLAGS=flags ./configure'
452dnl#
453if test -z "$CFLAGS"; then
454 if test -z "$CCOPTS"; then
455 CCOPTS='-O'
456dnl> if test "x$GCC" = xyes; then
457dnl> if test x$system = xLinux; then
458dnl> CCOPTS="$CCOPTS "'-O2 -fno-strength-reduce'
459dnl> fi
460dnl> fi
461 fi
462 CFLAGS="$CCOPTS"
463fi
464
465AC_PATH_PROG(MV, mv, mv) 462AC_PATH_PROG(MV, mv, mv)
466AC_PATH_PROG(RM, rm, rm) 463AC_PATH_PROG(RM, rm, rm)
467AC_PATH_PROG(CP, cp, cp) 464AC_PATH_PROG(CP, cp, cp)
468AC_PATH_PROG(LN, ln, ln) 465AC_PATH_PROG(LN, ln, ln)
469AC_PATH_PROG(SED, sed, sed) 466AC_PATH_PROG(SED, sed, sed)
… …
521 sys/time.h \ 518 sys/time.h \
522 utmp.h \ 519 utmp.h \
523 utmpx.h \ 520 utmpx.h \
524 stdint.h \ 521 stdint.h \
525 pty.h \ 522 pty.h \
523 wchar.h \
524 cwchar \
525 clocale \
526) 526)
527 527
528AC_HEADER_TIME 528AC_HEADER_TIME
529 529
530dnl# check to allow both <termios.h> and <sys/ioctl.h> 530dnl# check to allow both <termios.h> and <sys/ioctl.h>
… …
608 608
609dnl# see usage below 609dnl# see usage below
610AC_DEFUN(RXVT_CHECK_SIZE, 610AC_DEFUN(RXVT_CHECK_SIZE,
611 [AC_CACHE_CHECK([for $2], $1, 611 [AC_CACHE_CHECK([for $2], $1,
612 [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
613if test $ac_cv_sizeof_char -ge $3; then 613if test "$ac_cv_sizeof_char" -ge $3; then
614 $1="$4 char" 614 $1="$4 char"
615else 615else
616 if test $ac_cv_sizeof_short -ge $3; then 616 if test "$ac_cv_sizeof_short" -ge $3; then
617 $1="$4 short" 617 $1="$4 short"
618 else 618 else
619 if test $ac_cv_sizeof_int -ge $3; then 619 if test "$ac_cv_sizeof_int" -ge $3; then
620 $1="$4 int" 620 $1="$4 int"
621 else 621 else
622 if test $ac_cv_sizeof_long -ge $3; then 622 if test "$ac_cv_sizeof_long" -ge $3; then
623 $1="$4 long" 623 $1="$4 long"
624 else 624 else
625 if test $ac_cv_sizeof_long_long -ge $3; then 625 if test "$ac_cv_sizeof_long_long" -ge $3; then
626 $1="$4 long long" 626 $1="$4 long long"
627 else 627 else
628 $1="$4 $5" # we _must_ have a (possibly wrong) default 628 $1="$4 $5" # we _must_ have a (possibly wrong) default
629 fi 629 fi
630 fi 630 fi
… …
657dnl 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)
658dnl AC_SUBST(rxvt_uint64_typedef) 658dnl AC_SUBST(rxvt_uint64_typedef)
659dnl# 659dnl#
660dnl# Now look for another we use 660dnl# Now look for another we use
661dnl# 661dnl#
662if test $ac_cv_sizeof_int_p -eq 8; then 662if test "$ac_cv_sizeof_int_p" -eq 8; then
663 rxvt_intp_define="#define intp_t int64_t" 663 rxvt_intp_define="#define intp_t int64_t"
664 rxvt_u_intp_define="#define u_intp_t u_int64_t" 664 rxvt_u_intp_define="#define u_intp_t u_int64_t"
665else 665else
666 if test $ac_cv_sizeof_int_p -eq 4; then 666 if test "$ac_cv_sizeof_int_p" -eq 4; then
667 rxvt_intp_define="#define intp_t int32_t" 667 rxvt_intp_define="#define intp_t int32_t"
668 rxvt_u_intp_define="#define u_intp_t u_int32_t" 668 rxvt_u_intp_define="#define u_intp_t u_int32_t"
669 else 669 else
670 if test $ac_cv_sizeof_int_p -eq 2; then 670 if test "$ac_cv_sizeof_int_p" -eq 2; then
671 rxvt_intp_define="#define intp_t int16_t" 671 rxvt_intp_define="#define intp_t int16_t"
672 rxvt_u_intp_define="#define u_intp_t u_int16_t" 672 rxvt_u_intp_define="#define u_intp_t u_int16_t"
673 else 673 else
674 rxvt_intp_define="#error set intp_t" 674 rxvt_intp_define="#error set intp_t"
675 rxvt_u_intp_define="#error set u_intp_t" 675 rxvt_u_intp_define="#error set u_intp_t"
… …
707 unlockpt \ 707 unlockpt \
708 isastream \ 708 isastream \
709 on_exit \ 709 on_exit \
710 nanosleep \ 710 nanosleep \
711 updwtmp \ 711 updwtmp \
712 updwtmpx \
712 ttyslot \ 713 ttyslot \
713) 714)
714dnl# 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
715 716
716dnl# -------------------------------------------------------------------------- 717dnl# --------------------------------------------------------------------------
… …
759[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h> 760[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h>
760#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])])
761if test x$rxvt_cv_struct_utmpx_host = xyes; then 762if test x$rxvt_cv_struct_utmpx_host = xyes; then
762 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)
763fi 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
764) dnl# AC_CHECK_HEADER(utmpx.h 774) dnl# AC_CHECK_HEADER(utmpx.h
765
766 775
767dnl# -------------------------------------------------------------------------- 776dnl# --------------------------------------------------------------------------
768dnl# check for struct lastlog 777dnl# check for struct lastlog
769AC_CACHE_CHECK(for struct lastlog, rxvt_cv_struct_lastlog, 778AC_CACHE_CHECK(for struct lastlog, rxvt_cv_struct_lastlog,
770[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h> 779[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h>
… …
1363 1372
1364AC_CONFIG_FILES([autoconf/Make.common \ 1373AC_CONFIG_FILES([autoconf/Make.common \
1365Makefile \ 1374Makefile \
1366doc/Makefile \ 1375doc/Makefile \
1367src/Makefile \ 1376src/Makefile \
1368src/test/Makefile \
1369src/rxvtlib.h \ 1377src/rxvtlib.h \
1370W11/Makefile \
1371]) 1378])
1372AC_OUTPUT 1379AC_OUTPUT
1373 1380
1374echo "Configuration: 1381echo "Configuration:
1375 1382

Diff Legend

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