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.97 by ayin, Tue Dec 11 18:07:08 2007 UTC vs.
Revision 1.103 by ayin, Fri Dec 28 20:57:52 2007 UTC

… …
11 11
12dnl RXVT version 12dnl RXVT version
13changequote(, )dnl 13changequote(, )dnl
14VERSION=`sed -n -e 's/^.*[ \t]VERSION.*"\(.*\)"$/\1/p' ${srcdir}/src/version.h` 14VERSION=`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` 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`
17changequote([, ])dnl 16changequote([, ])dnl
18AC_SUBST(VERSION)dnl 17AC_SUBST(VERSION)dnl
19AC_SUBST(DATE)dnl 18AC_SUBST(DATE)dnl
20dnl AC_SUBST(LIBVERSION)dnl
21 19
22echo "" 20echo ""
23echo "configuring for rxvt $VERSION" 21echo "configuring for rxvt $VERSION"
24echo "" 22echo ""
25 23
… …
81AC_CHECK_FUNC(setlocale, [], [AC_CHECK_LIB(xpg4, setlocale, [LIBS="$LIBS -lxpg4"])]) 79AC_CHECK_FUNC(setlocale, [], [AC_CHECK_LIB(xpg4, setlocale, [LIBS="$LIBS -lxpg4"])])
82 80
83dnl# solaris needs to link libnsl and socket 81dnl# solaris needs to link libnsl and socket
84AC_CHECK_FUNC(gethostbyname, [], [AC_CHECK_LIB(nsl, gethostbyname, [LIBS="$LIBS -lnsl"])]) 82AC_CHECK_FUNC(gethostbyname, [], [AC_CHECK_LIB(nsl, gethostbyname, [LIBS="$LIBS -lnsl"])])
85AC_CHECK_FUNC(socket, [], [AC_CHECK_LIB(socket, socket, [LIBS="$LIBS -lsocket"])]) 83AC_CHECK_FUNC(socket, [], [AC_CHECK_LIB(socket, socket, [LIBS="$LIBS -lsocket"])])
86
87dnl AC_ENABLE_SHARED(no)dnl# libtool
88dnl AC_ENABLE_STATIC(yes)dnl# libtool
89dnl AC_PROG_LIBTOOL()dnl# libtool
90 84
91support_frills=yes 85support_frills=yes
92support_inheritpixmap=yes 86support_inheritpixmap=yes
93support_fading=yes 87support_fading=yes
94support_keepscrolling=yes 88support_keepscrolling=yes
… …
114codesets=all 108codesets=all
115 109
116dnl# -------------------------------------------------------------------------- 110dnl# --------------------------------------------------------------------------
117dnl# CHECKING COMMAND LINE OPTIONS 111dnl# CHECKING COMMAND LINE OPTIONS
118dnl# -------------------------------------------------------------------------- 112dnl# --------------------------------------------------------------------------
119
120dnl if test "x$enable_shared" = xyes; then
121dnl AC_DEFINE(LIBRXVT, 1, Build shared library version - specify via configure only)
122dnl INSTALL_LIBRXVT=yes
123dnl fi
124dnl AC_SUBST(INSTALL_LIBRXVT)
125 113
126AC_ARG_ENABLE(everything, 114AC_ARG_ENABLE(everything,
127 [ --enable-everything enable standard non-multichoice features 115 [ --enable-everything enable standard non-multichoice features
128 NOTE: this option is order dependent], 116 NOTE: this option is order dependent],
129 [ 117 [
… …
482 sys/sockio.h \ 470 sys/sockio.h \
483 sys/strredir.h \ 471 sys/strredir.h \
484 stdint.h \ 472 stdint.h \
485 wchar.h \ 473 wchar.h \
486 cwchar \ 474 cwchar \
487 clocale \
488) 475)
489
490dnl# check to allow both <termios.h> and <sys/ioctl.h>
491AC_CACHE_CHECK(whether termios.h and sys/ioctl.h may both be included, rxvt_cv_header_sysioctl,
492[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stdio.h>
493#include <sys/ioctl.h>
494#include <termios.h>
495]], [[int a = ECHO;]])],[rxvt_cv_header_sysioctl=yes],[rxvt_cv_header_sysioctl=no])])
496 476
497AC_CACHE_CHECK([for XPointer], rxvt_cv_xpointer, 477AC_CACHE_CHECK([for XPointer], rxvt_cv_xpointer,
498[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <X11/Xlib.h>]], [[XPointer dummy;]])],[rxvt_cv_xpointer=yes],[rxvt_cv_xpointer=no])]) 478[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <X11/Xlib.h>]], [[XPointer dummy;]])],[rxvt_cv_xpointer=yes],[rxvt_cv_xpointer=no])])
499if test x$rxvt_cv_xpointer = xyes; then 479if test x$rxvt_cv_xpointer = xyes; then
500 AC_DEFINE(HAVE_XPOINTER, 1, Define if you have XPointer typedef) 480 AC_DEFINE(HAVE_XPOINTER, 1, Define if you have XPointer typedef)
… …
518dnl# -------------------------------------------------------------------------- 498dnl# --------------------------------------------------------------------------
519dnl# CHECKING FOR MISSING TYPEDEFS 499dnl# CHECKING FOR MISSING TYPEDEFS
520dnl# -------------------------------------------------------------------------- 500dnl# --------------------------------------------------------------------------
521dnl# Missing typedefs and replacements 501dnl# Missing typedefs and replacements
522AC_TYPE_MODE_T 502AC_TYPE_MODE_T
523dnl> AC_CHECK_TYPE(umode_t, int)
524dnl> AC_CHECK_TYPE(off_t, long)
525AC_TYPE_PID_T 503AC_TYPE_PID_T
526AC_TYPE_UID_T 504AC_TYPE_UID_T
527
528AC_CHECK_SIZEOF(short, 2)
529AC_CHECK_SIZEOF(int, 4)
530dnl AC_CHECK_SIZEOF(long, 4)
531AC_CHECK_SIZEOF(long long, 8)
532AC_CHECK_SIZEOF(int *, 4)
533
534AC_TYPE_INT16_T 505AC_TYPE_INT16_T
535AC_TYPE_UINT16_T 506AC_TYPE_UINT16_T
536AC_TYPE_INT32_T 507AC_TYPE_INT32_T
537AC_TYPE_UINT32_T 508AC_TYPE_UINT32_T
538 509
… …
730 701
731 save_CXXFLAGS="$CXXFLAGS" 702 save_CXXFLAGS="$CXXFLAGS"
732 save_LIBS="$LIBS" 703 save_LIBS="$LIBS"
733 CXXFLAGS="$CXXFLAGS `$PERL -MExtUtils::Embed -e ccopts`" 704 CXXFLAGS="$CXXFLAGS `$PERL -MExtUtils::Embed -e ccopts`"
734 LIBS="$LIBS `$PERL -MExtUtils::Embed -e ldopts`" 705 LIBS="$LIBS `$PERL -MExtUtils::Embed -e ldopts`"
735 AC_TRY_LINK([ 706 AC_LINK_IFELSE([AC_LANG_PROGRAM([[
736#include <EXTERN.h> 707#include <EXTERN.h>
737#include <perl.h> 708#include <perl.h>
738#include <XSUB.h> 709#include <XSUB.h>
739],[ 710]], [[
740 PerlInterpreter *perl = perl_alloc (); 711 PerlInterpreter *perl = perl_alloc ();
741],[rxvt_perl_link=yes],[rxvt_perl_link=no]) 712]])],[rxvt_perl_link=yes],[rxvt_perl_link=no])
742 CXXFLAGS="$save_CXXFLAGS" 713 CXXFLAGS="$save_CXXFLAGS"
743 LIBS="$save_LIBS" 714 LIBS="$save_LIBS"
744 715
745 if test x$rxvt_perl_link = xyes; then 716 if test x$rxvt_perl_link = xyes; then
746 AC_MSG_RESULT(ok) 717 AC_MSG_RESULT(ok)
… …
777AC_SUBST(AFTERIMAGE_CFLAGS) 748AC_SUBST(AFTERIMAGE_CFLAGS)
778AC_SUBST(AFTERIMAGE_LIBS) 749AC_SUBST(AFTERIMAGE_LIBS)
779 750
780AC_ARG_PROGRAM 751AC_ARG_PROGRAM
781 752
782dnl# test for "sun" or "__sun__" before include sys_ioctl
783
784dnl# revert HAVE_BLAH_H into a "#include <blah.h>"
785AC_DEFUN([RXVT_DEFINE_TO_INCLUDE], dnl
786[if test "$$3" = "$4" -o "$$5" = "$6"; then
787 $1="#include <$2>"
788else
789 $1="/* #include <$2> */"
790fi dnl
791AC_SUBST($1)])
792
793RXVT_DEFINE_TO_INCLUDE(include_stdint_h, stdint.h, ac_cv_header_stdint_h, yes, notset, dontmatch)
794RXVT_DEFINE_TO_INCLUDE(include_sys_ioctl_h, sys/ioctl.h, rxvt_cv_header_sysioctl, yes, notset, dontmatch)
795RXVT_DEFINE_TO_INCLUDE(include_sys_strredir_h, sys/strredir.h, ac_cv_header_sys_strredir_h, yes, notset, dontmatch)
796
797AC_CONFIG_FILES([Makefile \ 753AC_CONFIG_FILES([Makefile \
798doc/Makefile \ 754doc/Makefile \
799src/Makefile \ 755src/Makefile \
800src/rxvtlib.h \
801]) 756])
802AC_OUTPUT 757AC_OUTPUT
803 758
804echo "Configuration: 759echo "Configuration:
805 760

Diff Legend

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