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.88 by ayin, Mon Dec 10 23:27:49 2007 UTC vs.
Revision 1.95 by ayin, Tue Dec 11 11:39:06 2007 UTC

… …
15DATE=`sed -n -e 's/^.*[ \t]DATE.*"\(.*\)"$/\1/p' ${srcdir}/src/version.h` 15DATE=`sed -n -e 's/^.*[ \t]DATE.*"\(.*\)"$/\1/p' ${srcdir}/src/version.h`
16dnl LIBVERSION=`sed -n -e 's/^.*[ \t]LIBVERSION.*"\(.*\)"$/\1/p' ${srcdir}/src/version.h` 16dnl LIBVERSION=`sed -n -e 's/^.*[ \t]LIBVERSION.*"\(.*\)"$/\1/p' ${srcdir}/src/version.h`
17changequote([, ])dnl 17changequote([, ])dnl
18AC_SUBST(VERSION)dnl 18AC_SUBST(VERSION)dnl
19AC_SUBST(DATE)dnl 19AC_SUBST(DATE)dnl
20AC_SUBST(LSMDATE)dnl
21AC_SUBST(LIBVERSION)dnl 20dnl AC_SUBST(LIBVERSION)dnl
22 21
23echo "" 22echo ""
24echo "configuring for rxvt $VERSION" 23echo "configuring for rxvt $VERSION"
25echo "" 24echo ""
26 25
… …
31AC_PROG_CXX 30AC_PROG_CXX
32AC_PROG_CPP 31AC_PROG_CPP
33AC_PROG_INSTALL 32AC_PROG_INSTALL
34 33
35AC_AIX 34AC_AIX
35AC_GNU_SOURCE
36AC_ISC_POSIX 36AC_ISC_POSIX
37AC_LANG(C++) 37AC_LANG(C++)
38 38
39dnl check wether we can link with gcc -lsupc++ 39dnl check wether we can link with gcc -lsupc++
40if test x$GCC = xyes && test x$GXX = xyes; then 40if test x$GCC = xyes && test x$GXX = xyes; then
… …
69 CXXFLAGS="-O" 69 CXXFLAGS="-O"
70 fi 70 fi
71 CFLAGS="$CXXFLAGS" 71 CFLAGS="$CXXFLAGS"
72fi 72fi
73 73
74AC_DEFINE(_GNU_SOURCE, 1, Use all glibc features.)
75
76case $host in 74case $host in
77 *-*-solaris* ) 75 *-*-solaris* )
78 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)
79 ;; 77 ;;
80esac 78esac
81
82dnl if test x$GXX = xyes; then
83dnl CXXFLAGS="$CXXFLAGS" dnl I once had -fno-exceptions, but I am using them now...
84dnl fi
85 79
86dnl# FreeBSD needs to link libxpg4 80dnl# FreeBSD needs to link libxpg4
87AC_CHECK_FUNC(setlocale, [], [AC_CHECK_LIB(xpg4, setlocale, [LIBS="$LIBS -lxpg4"])]) 81AC_CHECK_FUNC(setlocale, [], [AC_CHECK_LIB(xpg4, setlocale, [LIBS="$LIBS -lxpg4"])])
88 82
89dnl# solaris needs to link libnsl and socket 83dnl# solaris needs to link libnsl and socket
… …
121 115
122dnl# -------------------------------------------------------------------------- 116dnl# --------------------------------------------------------------------------
123dnl# CHECKING COMMAND LINE OPTIONS 117dnl# CHECKING COMMAND LINE OPTIONS
124dnl# -------------------------------------------------------------------------- 118dnl# --------------------------------------------------------------------------
125 119
126if test "x$enable_shared" = xyes; then 120dnl if test "x$enable_shared" = xyes; then
127 AC_DEFINE(LIBRXVT, 1, Build shared library version - specify via configure only) 121dnl AC_DEFINE(LIBRXVT, 1, Build shared library version - specify via configure only)
128 INSTALL_LIBRXVT=yes 122dnl INSTALL_LIBRXVT=yes
129fi 123dnl fi
130AC_SUBST(INSTALL_LIBRXVT) 124dnl AC_SUBST(INSTALL_LIBRXVT)
131 125
132AC_ARG_ENABLE(everything, 126AC_ARG_ENABLE(everything,
133 [ --enable-everything enable standard non-multichoice features 127 [ --enable-everything enable standard non-multichoice features
134 NOTE: this option is order dependent], 128 NOTE: this option is order dependent],
135 [ 129 [
… …
486 assert.h \ 480 assert.h \
487 fcntl.h \ 481 fcntl.h \
488 stdarg.h \ 482 stdarg.h \
489 stdlib.h \ 483 stdlib.h \
490 string.h \ 484 string.h \
491 termios.h \
492 unistd.h \ 485 unistd.h \
493 sys/byteorder.h \ 486 sys/byteorder.h \
494 sys/ioctl.h \ 487 sys/ioctl.h \
495 sys/select.h \ 488 sys/select.h \
496 sys/sockio.h \ 489 sys/sockio.h \
497 sys/strredir.h \ 490 sys/strredir.h \
498 sys/time.h \ 491 sys/time.h \
492 time.h \
499 stdint.h \ 493 stdint.h \
500 wchar.h \ 494 wchar.h \
501 cwchar \ 495 cwchar \
502 clocale \ 496 clocale \
503) 497)
504 498
505dnl# check to allow both <termios.h> and <sys/ioctl.h> 499dnl# check to allow both <termios.h> and <sys/ioctl.h>
506AC_CACHE_CHECK(whether termios.h and sys/ioctl.h may both be included, rxvt_cv_header_sysioctl, 500AC_CACHE_CHECK(whether termios.h and sys/ioctl.h may both be included, rxvt_cv_header_sysioctl,
507[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stdio.h> 501[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stdio.h>
508#include <sys/ioctl.h> 502#include <sys/ioctl.h>
509#ifdef HAVE_TERMIOS_H
510#include <termios.h> 503#include <termios.h>
511#endif]], [[int a = ECHO;]])],[rxvt_cv_header_sysioctl=yes],[rxvt_cv_header_sysioctl=no])]) 504]], [[int a = ECHO;]])],[rxvt_cv_header_sysioctl=yes],[rxvt_cv_header_sysioctl=no])])
512 505
513AC_CACHE_CHECK([for XPointer], rxvt_cv_xpointer, 506AC_CACHE_CHECK([for XPointer], rxvt_cv_xpointer,
514[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <X11/Xlib.h>]], [[XPointer dummy;]])],[rxvt_cv_xpointer=yes],[rxvt_cv_xpointer=no])]) 507[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <X11/Xlib.h>]], [[XPointer dummy;]])],[rxvt_cv_xpointer=yes],[rxvt_cv_xpointer=no])])
515if test x$rxvt_cv_xpointer = xyes; then 508if test x$rxvt_cv_xpointer = xyes; then
516 AC_DEFINE(HAVE_XPOINTER, 1, Define if you have XPointer typedef) 509 AC_DEFINE(HAVE_XPOINTER, 1, Define if you have XPointer typedef)
… …
595AC_SUBST(rxvt_uint32_typedef) 588AC_SUBST(rxvt_uint32_typedef)
596dnl RXVT_CHECK_SIZE(rxvt_cv_int64_t, int64_t, 8, , long long, rxvt_int64_typedef) 589dnl RXVT_CHECK_SIZE(rxvt_cv_int64_t, int64_t, 8, , long long, rxvt_int64_typedef)
597dnl AC_SUBST(rxvt_int64_typedef) 590dnl AC_SUBST(rxvt_int64_typedef)
598dnl RXVT_CHECK_SIZE(rxvt_cv_uint64_t, uint64_t, 8, unsigned, long long, rxvt_uint64_typedef) 591dnl RXVT_CHECK_SIZE(rxvt_cv_uint64_t, uint64_t, 8, unsigned, long long, rxvt_uint64_typedef)
599dnl AC_SUBST(rxvt_uint64_typedef) 592dnl AC_SUBST(rxvt_uint64_typedef)
600dnl#
601dnl# Now look for another we use
602dnl#
603if test "$ac_cv_sizeof_int_p" -eq 8; then
604 rxvt_intp_define="#define intp_t int64_t"
605 rxvt_u_intp_define="#define u_intp_t u_int64_t"
606else
607 if test "$ac_cv_sizeof_int_p" -eq 4; then
608 rxvt_intp_define="#define intp_t int32_t"
609 rxvt_u_intp_define="#define u_intp_t u_int32_t"
610 else
611 if test "$ac_cv_sizeof_int_p" -eq 2; then
612 rxvt_intp_define="#define intp_t int16_t"
613 rxvt_u_intp_define="#define u_intp_t u_int16_t"
614 else
615 rxvt_intp_define="#error set intp_t"
616 rxvt_u_intp_define="#error set u_intp_t"
617 fi
618 fi
619fi
620AC_SUBST(rxvt_intp_define)
621AC_SUBST(rxvt_u_intp_define)
622 593
623dnl# -------------------------------------------------------------------------- 594dnl# --------------------------------------------------------------------------
624dnl# CHECKING FOR LIBRARY FUNCTIONS 595dnl# CHECKING FOR LIBRARY FUNCTIONS
625dnl# -------------------------------------------------------------------------- 596dnl# --------------------------------------------------------------------------
626AC_CHECK_FUNCS(unsetenv) 597AC_CHECK_FUNCS(unsetenv)
… …
878RXVT_DEFINE_TO_INCLUDE(include_stdarg_h, cstdarg, ac_cv_header_stdarg_h, yes, notset, dontmatch) 849RXVT_DEFINE_TO_INCLUDE(include_stdarg_h, cstdarg, ac_cv_header_stdarg_h, yes, notset, dontmatch)
879RXVT_DEFINE_TO_INCLUDE(include_stdlib_h, cstdlib, ac_cv_header_stdlib_h, yes, notset, dontmatch) 850RXVT_DEFINE_TO_INCLUDE(include_stdlib_h, cstdlib, ac_cv_header_stdlib_h, yes, notset, dontmatch)
880RXVT_DEFINE_TO_INCLUDE(include_unistd_h, unistd.h, ac_cv_header_unistd_h, yes, notset, dontmatch) 851RXVT_DEFINE_TO_INCLUDE(include_unistd_h, unistd.h, ac_cv_header_unistd_h, yes, notset, dontmatch)
881RXVT_DEFINE_TO_INCLUDE(include_string_h, cstring, ac_cv_header_string_h, yes, notset, dontmatch) 852RXVT_DEFINE_TO_INCLUDE(include_string_h, cstring, ac_cv_header_string_h, yes, notset, dontmatch)
882RXVT_DEFINE_TO_INCLUDE(include_fcntl_h, fcntl.h, ac_cv_header_fcntl_h, yes, notset, dontmatch) 853RXVT_DEFINE_TO_INCLUDE(include_fcntl_h, fcntl.h, ac_cv_header_fcntl_h, yes, notset, dontmatch)
883RXVT_DEFINE_TO_INCLUDE(include_util_h, util.h, ac_cv_header_util_h, yes, notset, dontmatch)
884RXVT_DEFINE_TO_INCLUDE(include_assert_h, assert.h, ac_cv_header_assert_h, yes, notset, dontmatch) 854RXVT_DEFINE_TO_INCLUDE(include_assert_h, assert.h, ac_cv_header_assert_h, yes, notset, dontmatch)
885RXVT_DEFINE_TO_INCLUDE(include_sys_ioctl_h, sys/ioctl.h, rxvt_cv_header_sysioctl, yes, notset, dontmatch) 855RXVT_DEFINE_TO_INCLUDE(include_sys_ioctl_h, sys/ioctl.h, rxvt_cv_header_sysioctl, yes, notset, dontmatch)
886RXVT_DEFINE_TO_INCLUDE(include_sys_select_h, sys/select.h, ac_cv_header_sys_select_h, yes, notset, dontmatch) 856RXVT_DEFINE_TO_INCLUDE(include_sys_select_h, sys/select.h, ac_cv_header_sys_select_h, yes, notset, dontmatch)
887RXVT_DEFINE_TO_INCLUDE(include_sys_strredir_h, sys/strredir.h, ac_cv_header_sys_strredir_h, yes, notset, dontmatch) 857RXVT_DEFINE_TO_INCLUDE(include_sys_strredir_h, sys/strredir.h, ac_cv_header_sys_strredir_h, yes, notset, dontmatch)
888RXVT_DEFINE_TO_INCLUDE(include_sys_time_h, sys/time.h, ac_cv_header_sys_time_h, yes, notset, dontmatch) 858RXVT_DEFINE_TO_INCLUDE(include_sys_time_h, sys/time.h, ac_cv_header_sys_time_h, yes, notset, dontmatch)

Diff Legend

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