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.98 by ayin, Tue Dec 11 18:25:44 2007 UTC vs.
Revision 1.101 by ayin, Thu Dec 27 14:21:57 2007 UTC

… …
482 sys/sockio.h \ 482 sys/sockio.h \
483 sys/strredir.h \ 483 sys/strredir.h \
484 stdint.h \ 484 stdint.h \
485 wchar.h \ 485 wchar.h \
486 cwchar \ 486 cwchar \
487 clocale \
488) 487)
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 488
497AC_CACHE_CHECK([for XPointer], rxvt_cv_xpointer, 489AC_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])]) 490[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 491if test x$rxvt_cv_xpointer = xyes; then
500 AC_DEFINE(HAVE_XPOINTER, 1, Define if you have XPointer typedef) 492 AC_DEFINE(HAVE_XPOINTER, 1, Define if you have XPointer typedef)
… …
721 713
722 save_CXXFLAGS="$CXXFLAGS" 714 save_CXXFLAGS="$CXXFLAGS"
723 save_LIBS="$LIBS" 715 save_LIBS="$LIBS"
724 CXXFLAGS="$CXXFLAGS `$PERL -MExtUtils::Embed -e ccopts`" 716 CXXFLAGS="$CXXFLAGS `$PERL -MExtUtils::Embed -e ccopts`"
725 LIBS="$LIBS `$PERL -MExtUtils::Embed -e ldopts`" 717 LIBS="$LIBS `$PERL -MExtUtils::Embed -e ldopts`"
726 AC_TRY_LINK([ 718 AC_LINK_IFELSE([AC_LANG_PROGRAM([[
727#include <EXTERN.h> 719#include <EXTERN.h>
728#include <perl.h> 720#include <perl.h>
729#include <XSUB.h> 721#include <XSUB.h>
730],[ 722]], [[
731 PerlInterpreter *perl = perl_alloc (); 723 PerlInterpreter *perl = perl_alloc ();
732],[rxvt_perl_link=yes],[rxvt_perl_link=no]) 724]])],[rxvt_perl_link=yes],[rxvt_perl_link=no])
733 CXXFLAGS="$save_CXXFLAGS" 725 CXXFLAGS="$save_CXXFLAGS"
734 LIBS="$save_LIBS" 726 LIBS="$save_LIBS"
735 727
736 if test x$rxvt_perl_link = xyes; then 728 if test x$rxvt_perl_link = xyes; then
737 AC_MSG_RESULT(ok) 729 AC_MSG_RESULT(ok)
… …
768AC_SUBST(AFTERIMAGE_CFLAGS) 760AC_SUBST(AFTERIMAGE_CFLAGS)
769AC_SUBST(AFTERIMAGE_LIBS) 761AC_SUBST(AFTERIMAGE_LIBS)
770 762
771AC_ARG_PROGRAM 763AC_ARG_PROGRAM
772 764
773dnl# test for "sun" or "__sun__" before include sys_ioctl
774
775dnl# revert HAVE_BLAH_H into a "#include <blah.h>" 765dnl# revert HAVE_BLAH_H into a "#include <blah.h>"
776AC_DEFUN([RXVT_DEFINE_TO_INCLUDE], dnl 766AC_DEFUN([RXVT_DEFINE_TO_INCLUDE], dnl
777[if test "$$3" = "$4" -o "$$5" = "$6"; then 767[if test "$$3" = "$4" -o "$$5" = "$6"; then
778 $1="#include <$2>" 768 $1="#include <$2>"
779else 769else
780 $1="/* #include <$2> */" 770 $1="/* #include <$2> */"
781fi dnl 771fi dnl
782AC_SUBST($1)]) 772AC_SUBST($1)])
783 773
784RXVT_DEFINE_TO_INCLUDE(include_stdint_h, stdint.h, ac_cv_header_stdint_h, yes, notset, dontmatch) 774RXVT_DEFINE_TO_INCLUDE(include_stdint_h, stdint.h, ac_cv_header_stdint_h, yes, notset, dontmatch)
785RXVT_DEFINE_TO_INCLUDE(include_sys_ioctl_h, sys/ioctl.h, rxvt_cv_header_sysioctl, yes, notset, dontmatch) 775RXVT_DEFINE_TO_INCLUDE(include_sys_ioctl_h, sys/ioctl.h, ac_cv_header_sys_ioctl_h, yes, notset, dontmatch)
786RXVT_DEFINE_TO_INCLUDE(include_sys_strredir_h, sys/strredir.h, ac_cv_header_sys_strredir_h, yes, notset, dontmatch) 776RXVT_DEFINE_TO_INCLUDE(include_sys_strredir_h, sys/strredir.h, ac_cv_header_sys_strredir_h, yes, notset, dontmatch)
787 777
788AC_CONFIG_FILES([Makefile \ 778AC_CONFIG_FILES([Makefile \
789doc/Makefile \ 779doc/Makefile \
790src/Makefile \ 780src/Makefile \

Diff Legend

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