--- rxvt-unicode/autoconf/configure.in 2005/02/16 21:21:43 1.51 +++ rxvt-unicode/autoconf/configure.in 2006/01/16 14:23:26 1.71 @@ -77,46 +77,56 @@ AC_ISC_POSIX dnl# FreeBSD needs to link libxpg4 -AC_CHECK_LIB(xpg4, setlocale, [LIBS="$LIBS -lxpg4"]) +AC_CHECK_FUNC(setlocale, [], [AC_CHECK_LIB(xpg4, setlocale, [LIBS="$LIBS -lxpg4"])]) -dnl solaris needs to link libnsl and socket -AC_CHECK_LIB(nsl, gethostbyname, [LIBS="$LIBS -lnsl"]) -AC_CHECK_LIB(socket, socket, [LIBS="$LIBS -lsocket"]) +dnl# solaris needs to link libnsl and socket +AC_CHECK_FUNC(gethostbyname, [], [AC_CHECK_LIB(nsl, gethostbyname, [LIBS="$LIBS -lnsl"])]) +AC_CHECK_FUNC(socket, [], [AC_CHECK_LIB(socket, socket, [LIBS="$LIBS -lsocket"])]) + +dnl# more solaris +AC_CHECK_FUNC(sched_yield, [], [AC_CHECK_LIB(rt, sched_yield, [LIBS="$LIBS -lrt"])]) + +dnl# sched_yield to improve terminal efficiency +AC_MSG_CHECKING(for sched_yield support) +AC_TRY_LINK([#include ],[sched_yield ()], + [AC_MSG_RESULT(yes) + AC_DEFINE(HAVE_SCHED_YIELD, 1, Define if you have sched-h and sched_yield)], + [AC_MSG_RESULT(no)]) dnl AC_ENABLE_SHARED(no)dnl# libtool dnl AC_ENABLE_STATIC(yes)dnl# libtool dnl AC_PROG_LIBTOOL()dnl# libtool MALLOC_TYPE=S -support_addstrings=no -support_frills=no -support_inheritpixmap=no -support_tinting=no -support_fading=no -support_keepscrolling=no -support_selectionscrolling=no + +support_frills=yes +support_inheritpixmap=yes +support_tinting=yes +support_fading=yes +support_keepscrolling=yes +support_selectionscrolling=yes support_menubar=no -support_mousewheel=no -support_mouseslipwheel=no -support_utmp=no -support_wtmp=no -support_lastlog=no -support_cursor_blink=no -support_text_blink=no -support_pointer_blank=no -support_scroll_rxvt=no -support_scroll_next=no -support_scroll_xterm=no -support_scroll_plain=no -support_xim=no -support_xpm=no -support_xft=no +support_mousewheel=yes +support_mouseslipwheel=yes +support_utmp=yes +support_wtmp=yes +support_lastlog=yes +support_text_blink=yes +support_pointer_blank=yes +support_scroll_rxvt=yes +support_scroll_next=yes +support_scroll_xterm=yes +support_scroll_plain=yes +support_xim=yes +support_xpm=yes +support_xft=yes support_unicode3=no -support_combining=no +support_combining=yes support_8bitctrls=no -support_iso14755=no -support_styles=no -codesets= +support_iso14755=yes +support_styles=yes +support_perl=yes +codesets=all dnl# -------------------------------------------------------------------------- dnl# CHECKING COMMAND LINE OPTIONS @@ -132,37 +142,70 @@ [ --enable-everything enable standard non-multichoice features NOTE: this option is order dependent NOTE: automatically enabled with --enable-shared], - [if test x$enableval = xyes; then - support_24bit=yes - support_frills=yes - support_inheritpixmap=yes - support_tinting=yes - support_fading=yes - support_keepscrolling=yes - support_selectionscrolling=yes - support_lastlog=yes - support_menubar=yes - support_mousewheel=yes - support_mouseslipwheel=yes - support_cursor_blink=yes - support_text_blink=yes - support_pointer_blank=yes - support_scroll_rxvt=yes - support_scroll_next=yes - support_scroll_xterm=yes - support_scroll_plain=yes - support_utmp=yes - support_wtmp=yes - support_xim=yes - support_xpm=yes - support_xft=yes - support_unicode3=yes - support_combining=yes - #support_8bitctrls=yes - support_iso14755=yes - support_styles=yes - codesets=all - fi]) + [ + if test x$enableval = xno; then + support_24bit=no + support_frills=no + support_inheritpixmap=no + support_tinting=no + support_fading=no + support_keepscrolling=no + support_selectionscrolling=no + support_lastlog=no + support_menubar=no + support_mousewheel=no + support_mouseslipwheel=no + support_text_blink=no + support_pointer_blank=no + support_scroll_rxvt=no + support_scroll_next=no + support_scroll_xterm=no + support_scroll_plain=no + support_utmp=no + support_wtmp=no + support_xim=no + support_xpm=no + support_xft=no + support_unicode3=no + support_combining=no + support_8bitctrls=no + support_iso14755=no + support_styles=no + support_perl=no + codesets= + fi + if test x$enableval = xyes; then + support_24bit=yes + support_frills=yes + support_inheritpixmap=yes + support_tinting=yes + support_fading=yes + support_keepscrolling=yes + support_selectionscrolling=yes + support_lastlog=yes + support_menubar=yes + support_mousewheel=yes + support_mouseslipwheel=yes + support_text_blink=yes + support_pointer_blank=yes + support_scroll_rxvt=yes + support_scroll_next=yes + support_scroll_xterm=yes + support_scroll_plain=yes + support_utmp=yes + support_wtmp=yes + support_xim=yes + support_xpm=yes + support_xft=yes + support_unicode3=yes + support_combining=yes + #support_8bitctrls=yes + support_iso14755=yes + support_styles=yes + support_perl=yes + codesets=all + fi + ]) AC_ARG_ENABLE(unicode3, [ --enable-unicode3 use 21 instead of 16 bits to represent unicode characters], @@ -254,6 +297,12 @@ support_scroll_xterm=$enableval fi]) +AC_ARG_ENABLE(perl, + [ --enable-perl enable embedded perl interpreter], + [if test x$enableval = xyes -o x$enableval = xno; then + support_perl=$enableval + fi]) + AC_ARG_ENABLE(plain-scroll, [ --enable-plain-scroll enable plain style scrollbar], [if test x$enableval = xyes -o x$enableval = xno; then @@ -300,12 +349,6 @@ AC_DEFINE(NO_RESOURCES, 1, Define if you don't want any resources read) fi]) -AC_ARG_ENABLE(xgetdefault, - [ --enable-xgetdefault enable resources via X instead of our small version], - [if test x$enableval = xyes; then - AC_DEFINE(USE_XGETDEFAULT, 1, Define if you want to use XGetDefault instead of our internal version) - fi]) - AC_ARG_ENABLE(8bitctrls, [ --enable-8bitctrls enable 8 bit control sequences (not recommended)], [if test x$enableval = xyes -o x$enableval = xno; then @@ -346,12 +389,6 @@ RXVTNAME=`echo "$RXVTNAME"|sed "$program_transform_name"` AC_SUBST(RXVTNAME) -AC_ARG_ENABLE(strings, - [ --enable-strings enable some replacement system functions], - [if test x$enableval = xyes -o x$enableval = xno; then - support_addstrings=$enableval - fi]) - AC_ARG_ENABLE(swapscreen, [ --disable-swapscreen disable swap screen support], [if test x$enableval = xno; then @@ -425,12 +462,6 @@ AC_DEFINE(SMART_RESIZE, 1, Define to use "smart" resize behavior) fi]) -AC_ARG_ENABLE(cursor-blink, - [ --enable-cursor-blink enable blinking cursor], - [if test x$enableval = xyes -o x$enableval = xno; then - support_cursor_blink=$enableval - fi]) - AC_ARG_ENABLE(text-blink, [ --enable-text-blink enable blinking text], [if test x$enableval = xyes -o x$enableval = xno; then @@ -520,6 +551,8 @@ utmpx.h \ stdint.h \ pty.h \ + util.h \ + libutil.h \ wchar.h \ cwchar \ clocale \ @@ -701,8 +734,8 @@ setsid \ setpgrp \ setpgid \ - openpty \ _getpty \ + posix_openpt \ grantpt \ unlockpt \ isastream \ @@ -712,7 +745,6 @@ updwtmpx \ ttyslot \ ) -dnl# Note: On NetBSD, openpty() exists in libutil. Don't pull it in dnl# -------------------------------------------------------------------------- dnl# DO ALL UTMP AND WTMP CHECKING @@ -1093,6 +1125,39 @@ AC_DEFINE(HAVE_NL_LANGINFO, 1, Define if nl_langinfo(CODESET) works) fi +AC_CACHE_CHECK(for unix-compliant filehandle passing ability, rxvt_can_pass_fds, +[AC_TRY_LINK([ +#include +#include +],[ +{ + msghdr msg; + iovec iov; + char buf [100]; + char data = 0; + + iov.iov_base = &data; + iov.iov_len = 1; + + msg.msg_iov = &iov; + msg.msg_iovlen = 1; + msg.msg_control = buf; + msg.msg_controllen = sizeof buf; + + cmsghdr *cmsg = CMSG_FIRSTHDR (&msg); + cmsg->cmsg_level = SOL_SOCKET; + cmsg->cmsg_type = SCM_RIGHTS; + cmsg->cmsg_len = 100; + + *(int *)CMSG_DATA (cmsg) = 5; + + return sendmsg (3, &msg, 0); +} +],[rxvt_can_pass_fds=yes],[rxvt_can_pass_fds=no])]) +if test x$rxvt_can_pass_fds = xyes; then + AC_DEFINE(HAVE_UNIX_FDPASS, 1, Define if sys/socket.h defines the necessary macros/functions for file handle passing) +fi + AC_CACHE_CHECK(for broken XIM callback, rxvt_broken_ximcb, [AC_COMPILE_IFELSE([ #include @@ -1109,27 +1174,22 @@ AC_DEFINE(XIMCB_PROTO_BROKEN, 1, Define if your XIMCallback specifies XIC as first type.) fi -AC_CACHE_CHECK(for getpt, rxvt_cv_func_getpt, -[AC_LINK_IFELSE([AC_LANG_PROGRAM([[#define _GNU_SOURCE -#ifdef HAVE_STDLIB_H -# include -#endif]], [[(void)getpt();]])],[rxvt_cv_func_getpt=yes],[rxvt_cv_func_getpt=no])]) -if test x$rxvt_cv_func_getpt = xyes; then - AC_DEFINE(HAVE_GETPT, 1, Define if you have _GNU_SOURCE getpt() ) +if test x$ac_cv_func_posix_openpt = xno; then + AC_CHECK_FUNC(openpty, [], [AC_CHECK_LIB(util, openpty, [LIBS="$LIBS -lutil"])]) fi dnl# if we don't guess right then it's up to the user AC_CACHE_CHECK(for pty/tty type, rxvt_cv_ptys, -[if test x$ac_cv_func_openpty = xyes; then +[if test x$ac_cv_func_openpty = xyes -o x$ac_cv_lib_util_openpty = xyes; then rxvt_cv_ptys=OPENPTY + else if test x$ac_cv_func_posix_openpt = xyes; then + rxvt_cv_ptys=POSIX else if test x$ac_cv_func__getpty = xyes; then rxvt_cv_ptys=SGI4 else if test -c /dev/ttyp20; then rxvt_cv_ptys=SCO else if test -c /dev/ptym/clone; then rxvt_cv_ptys=HPUX - else if test x$rxvt_cv_func_getpt = xyes; then - rxvt_cv_ptys=GLIBC else if test -c /dev/ptc -a -c /dev/pts; then rxvt_cv_ptys=PTC else if test -c /dev/ptc -a -d /dev/pts; then @@ -1152,6 +1212,9 @@ fi ]) +if test x$rxvt_cv_ptys = xPOSIX; then + AC_DEFINE(PTYS_ARE_POSIX, 1, Define for this pty type) +fi if test x$rxvt_cv_ptys = xOPENPTY; then AC_DEFINE(PTYS_ARE_OPENPTY, 1, Define for this pty type) fi @@ -1167,16 +1230,10 @@ if test x$rxvt_cv_ptys = xSGI4; then AC_DEFINE(PTYS_ARE__GETPTY, 1, Define for this pty type) fi -if test x$rxvt_cv_ptys = xCONVEX; then - AC_DEFINE(PTYS_ARE_GETPTY, 1, Define for this pty type) -fi -if test x$rxvt_cv_ptys = xGLIBC; then - AC_DEFINE(PTYS_ARE_GETPT, 1, Define for this pty type) -fi if test x$rxvt_cv_ptys = xHPUX; then AC_DEFINE(PTYS_ARE_CLONE, 1, Define for this pty type) fi -if test x$rxvt_cv_ptys = xBSD -o x$rxvt_cv_ptys = xHPUX -o x$rxvt_cv_ptys = xGLIBC; then +if test x$rxvt_cv_ptys = xBSD -o x$rxvt_cv_ptys = xHPUX -o x$rxvt_cv_ptys = xPOSIX; then AC_DEFINE(PTYS_ARE_SEARCHED, 1, Define for this pty type) fi @@ -1197,7 +1254,6 @@ dnl# -------------------------------------------------------------------------- if test x$support_xft = xyes; then LIBS="$LIBS `pkg-config xft --libs`" - CFLAGS="$CFLAGS `pkg-config xft --cflags`" CPPFLAGS="$CPPFLAGS `pkg-config xft --cflags`" AC_CHECK_HEADERS(X11/Xft/Xft.h,,[support_xft=no]) @@ -1282,9 +1338,6 @@ if test x$support_pointer_blank = xyes; then AC_DEFINE(POINTER_BLANK, 1, Define if you want hide the pointer while typing) fi -if test x$support_cursor_blink = xyes; then - AC_DEFINE(CURSOR_BLINK, 1, Define if you want blinking cursor support) -fi if test x$support_text_blink = xyes; then AC_DEFINE(TEXT_BLINK, 1, Define if you want blinking text support) fi @@ -1309,6 +1362,56 @@ esac done +IF_PERL=\# +if test x$support_perl = xyes; then + AC_PATH_PROG(PERL, perl5) + AC_PATH_PROG(PERL, perl) + + AC_MSG_CHECKING(for $PERL suitability) + if $PERL -MExtUtils::Embed -e "use v5.8" >/dev/null 2>/dev/null; then + + save_CXXFLAGS="$CXXFLAGS" + save_LIBS="$LIBS" + CXXFLAGS="$CXXFLAGS `$PERL -MExtUtils::Embed -e ccopts`" + LIBS="$LIBS `$PERL -MExtUtils::Embed -e ldopts`" + AC_TRY_LINK([ +#include +#include +#include +],[ + PerlInterpreter *perl = perl_alloc (); +],[rxvt_perl_link=yes],[rxvt_perl_link=no]) + CXXFLAGS="$save_CXXFLAGS" + LIBS="$save_LIBS" + + if test x$rxvt_perl_link = xyes; then + AC_MSG_RESULT(ok) + AC_DEFINE(ENABLE_PERL, 1, Define if you can embed a perl interpreter) + IF_PERL= + PERL_O=rxvtperl.o + PERLFLAGS="`$PERL -MExtUtils::Embed -e ccopts`" + PERLLIB="`$PERL -MExtUtils::Embed -e ldopts`" + PERLPRIVLIBEXP="`$PERL -MConfig -e 'print $Config{privlibexp}'`" + else + support_perl=no + AC_MSG_RESULT([no, unable to link]) + fi + else + AC_MSG_ERROR(no working perl found, or perl not version >= 5.8) + support_perl=no + fi +fi +AC_SUBST(PERLLIB) +AC_SUBST(PERLFLAGS) +AC_SUBST(PERLPRIVLIBEXP) +AC_SUBST(PERL) +AC_SUBST(IF_PERL) +AC_SUBST(PERL_O) + +if test x$support_perl = xyes; then + support_frills=yes +fi + dnl> AC_CHECK_FUNCS(gettimeofday putenv select socket) CFLAGS=${CFLAGS--O} @@ -1335,10 +1438,6 @@ AC_SUBST(X_LIBS) AC_SUBST(X_EXTRA_LIBS) -if test x$support_addstrings = xno; then - AC_DEFINE(NO_STRINGS, 1, Define if you don't need to use our replacement string functions) -fi - dnl# common parts of the Makefile MCOMMON=./autoconf/Make.common AC_SUBST_FILE(MCOMMON) @@ -1415,7 +1514,8 @@ wtmp file: $rxvt_cv_path_wtmp wtmpx file: $rxvt_cv_path_wtmpx lastlog file: $rxvt_cv_path_lastlog - ttys/ttytab file: $rxvt_cv_path_ttytab" + ttys/ttytab file: $rxvt_cv_path_ttytab + embedded perl: $support_perl" echo fi if test x$term != x; then @@ -1454,12 +1554,17 @@ echo ".----------------------------------------------------------------." fi -echo " *** Please check src/feature.h for further options ***" +echo " *** Optionally check src/feature.h for further options ***" echo echo ".----------------------------------------------------------------." -echo ". NOTE: most features are disabled by default, try ." -echo ". configure --help to get an idea of the optional features ." +echo ". NOTE: some features are disabled by default, try ." +echo ". configure --help to get an idea of the optional features, ." +echo ". or read ./README.configure ." +echo ". ." +echo ". The script ./reconf gives a reasonable baseline, try it if ." +echo ". you do not want to read documentation and still want some ." +echo ". useful features. ." echo ".----------------------------------------------------------------." echo