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.60 by root, Mon Jan 2 15:35:43 2006 UTC vs.
Revision 1.67 by root, Wed Jan 11 19:55:34 2006 UTC

… …
99 99
100MALLOC_TYPE=S 100MALLOC_TYPE=S
101 101
102support_addstrings=no 102support_addstrings=no
103support_frills=yes 103support_frills=yes
104support_inheritpixmap=no 104support_inheritpixmap=yes
105support_tinting=yes 105support_tinting=yes
106support_fading=yes 106support_fading=yes
107support_keepscrolling=yes 107support_keepscrolling=yes
108support_selectionscrolling=yes 108support_selectionscrolling=yes
109support_menubar=no 109support_menubar=no
… …
117support_scroll_rxvt=yes 117support_scroll_rxvt=yes
118support_scroll_next=yes 118support_scroll_next=yes
119support_scroll_xterm=yes 119support_scroll_xterm=yes
120support_scroll_plain=yes 120support_scroll_plain=yes
121support_xim=yes 121support_xim=yes
122support_xpm=no 122support_xpm=yes
123support_xft=yes 123support_xft=yes
124support_unicode3=no 124support_unicode3=no
125support_combining=yes 125support_combining=yes
126support_8bitctrls=no 126support_8bitctrls=no
127support_iso14755=yes 127support_iso14755=yes
128support_styles=yes 128support_styles=yes
129support_perl=no 129support_perl=yes
130codesets=all 130codesets=all
131 131
132dnl# -------------------------------------------------------------------------- 132dnl# --------------------------------------------------------------------------
133dnl# CHECKING COMMAND LINE OPTIONS 133dnl# CHECKING COMMAND LINE OPTIONS
134dnl# -------------------------------------------------------------------------- 134dnl# --------------------------------------------------------------------------
… …
348 [ --disable-resources disable all resource checking], 348 [ --disable-resources disable all resource checking],
349 [if test x$enableval = xno; then 349 [if test x$enableval = xno; then
350 AC_DEFINE(NO_RESOURCES, 1, Define if you don't want any resources read) 350 AC_DEFINE(NO_RESOURCES, 1, Define if you don't want any resources read)
351 fi]) 351 fi])
352 352
353AC_ARG_ENABLE(xgetdefault,
354 [ --enable-xgetdefault enable resources via X instead of our small version],
355 [if test x$enableval = xyes; then
356 AC_DEFINE(USE_XGETDEFAULT, 1, Define if you want to use XGetDefault instead of our internal version)
357 fi])
358
359AC_ARG_ENABLE(8bitctrls, 353AC_ARG_ENABLE(8bitctrls,
360 [ --enable-8bitctrls enable 8 bit control sequences (not recommended)], 354 [ --enable-8bitctrls enable 8 bit control sequences (not recommended)],
361 [if test x$enableval = xyes -o x$enableval = xno; then 355 [if test x$enableval = xyes -o x$enableval = xno; then
362 support_8bitctrls=$enableval 356 support_8bitctrls=$enableval
363 fi]) 357 fi])
… …
562 sys/time.h \ 556 sys/time.h \
563 utmp.h \ 557 utmp.h \
564 utmpx.h \ 558 utmpx.h \
565 stdint.h \ 559 stdint.h \
566 pty.h \ 560 pty.h \
561 util.h \
562 libutil.h \
567 wchar.h \ 563 wchar.h \
568 cwchar \ 564 cwchar \
569 clocale \ 565 clocale \
570) 566)
571 567
… …
743 seteuid \ 739 seteuid \
744 setreuid \ 740 setreuid \
745 setsid \ 741 setsid \
746 setpgrp \ 742 setpgrp \
747 setpgid \ 743 setpgid \
748 openpty \
749 _getpty \ 744 _getpty \
750 grantpt \ 745 grantpt \
751 unlockpt \ 746 unlockpt \
752 isastream \ 747 isastream \
753 on_exit \ 748 on_exit \
754 nanosleep \ 749 nanosleep \
755 updwtmp \ 750 updwtmp \
756 updwtmpx \ 751 updwtmpx \
757 ttyslot \ 752 ttyslot \
758) 753)
759dnl# Note: On NetBSD, openpty() exists in libutil. Don't pull it in
760 754
761dnl# -------------------------------------------------------------------------- 755dnl# --------------------------------------------------------------------------
762dnl# DO ALL UTMP AND WTMP CHECKING 756dnl# DO ALL UTMP AND WTMP CHECKING
763dnl# -------------------------------------------------------------------------- 757dnl# --------------------------------------------------------------------------
764dnl# check for host field in utmp structure 758dnl# check for host field in utmp structure
… …
1189AC_CACHE_CHECK(for getpt, rxvt_cv_func_getpt, 1183AC_CACHE_CHECK(for getpt, rxvt_cv_func_getpt,
1190[AC_LINK_IFELSE([AC_LANG_PROGRAM([[#define _GNU_SOURCE 1184[AC_LINK_IFELSE([AC_LANG_PROGRAM([[#define _GNU_SOURCE
1191#ifdef HAVE_STDLIB_H 1185#ifdef HAVE_STDLIB_H
1192# include <cstdlib> 1186# include <cstdlib>
1193#endif]], [[(void)getpt();]])],[rxvt_cv_func_getpt=yes],[rxvt_cv_func_getpt=no])]) 1187#endif]], [[(void)getpt();]])],[rxvt_cv_func_getpt=yes],[rxvt_cv_func_getpt=no])])
1194if test x$rxvt_cv_func_getpt = xyes; then 1188if test x$rxvt_cv_func_getpt = xno; then
1195 AC_DEFINE(HAVE_GETPT, 1, Define if you have _GNU_SOURCE getpt() ) 1189 AC_CHECK_FUNC(openpty, [], [AC_CHECK_LIB(util, openpty, [LIBS="$LIBS -lutil"])])
1196fi 1190fi
1197 1191
1198dnl# if we don't guess right then it's up to the user 1192dnl# if we don't guess right then it's up to the user
1199AC_CACHE_CHECK(for pty/tty type, rxvt_cv_ptys, 1193AC_CACHE_CHECK(for pty/tty type, rxvt_cv_ptys,
1200[if test x$ac_cv_func_openpty = xyes; then 1194[if test x$ac_cv_func_openpty = xyes -o x$ac_cv_lib_util_openpty = xyes; then
1201 rxvt_cv_ptys=OPENPTY 1195 rxvt_cv_ptys=OPENPTY
1202 else if test x$ac_cv_func__getpty = xyes; then 1196 else if test x$ac_cv_func__getpty = xyes; then
1203 rxvt_cv_ptys=SGI4 1197 rxvt_cv_ptys=SGI4
1204 else if test -c /dev/ttyp20; then 1198 else if test -c /dev/ttyp20; then
1205 rxvt_cv_ptys=SCO 1199 rxvt_cv_ptys=SCO
… …
1272dnl# -------------------------------------------------------------------------- 1266dnl# --------------------------------------------------------------------------
1273dnl# now add and remove other stuff 1267dnl# now add and remove other stuff
1274dnl# -------------------------------------------------------------------------- 1268dnl# --------------------------------------------------------------------------
1275if test x$support_xft = xyes; then 1269if test x$support_xft = xyes; then
1276 LIBS="$LIBS `pkg-config xft --libs`" 1270 LIBS="$LIBS `pkg-config xft --libs`"
1277 CFLAGS="$CFLAGS `pkg-config xft --cflags`"
1278 CPPFLAGS="$CPPFLAGS `pkg-config xft --cflags`" 1271 CPPFLAGS="$CPPFLAGS `pkg-config xft --cflags`"
1279 1272
1280 AC_CHECK_HEADERS(X11/Xft/Xft.h,,[support_xft=no]) 1273 AC_CHECK_HEADERS(X11/Xft/Xft.h,,[support_xft=no])
1281 AC_CHECK_LIB(Xft,XftDrawString32,,[support_xft=no]) 1274 AC_CHECK_LIB(Xft,XftDrawString32,,[support_xft=no])
1282 1275
… …
1388 AC_PATH_PROG(PERL, perl5) 1381 AC_PATH_PROG(PERL, perl5)
1389 AC_PATH_PROG(PERL, perl) 1382 AC_PATH_PROG(PERL, perl)
1390 1383
1391 AC_MSG_CHECKING(for $PERL suitability) 1384 AC_MSG_CHECKING(for $PERL suitability)
1392 if $PERL -MExtUtils::Embed -e "use v5.8" >/dev/null 2>/dev/null; then 1385 if $PERL -MExtUtils::Embed -e "use v5.8" >/dev/null 2>/dev/null; then
1386
1387 save_CXXFLAGS="$CXXFLAGS"
1388 save_LIBS="$LIBS"
1389 CXXFLAGS="$CXXFLAGS `$PERL -MExtUtils::Embed -e ccopts`"
1390 LIBS="$LIBS `$PERL -MExtUtils::Embed -e ldopts`"
1391 AC_TRY_LINK([
1392#include <EXTERN.h>
1393#include <perl.h>
1394#include <XSUB.h>
1395],[
1396 PerlInterpreter *perl = perl_alloc ();
1397],[rxvt_perl_link=yes],[rxvt_perl_link=no])
1398 CXXFLAGS="$save_CXXFLAGS"
1399 LIBS="$save_LIBS"
1400
1401 if test x$rxvt_perl_link = xyes; then
1402 AC_MSG_RESULT(ok)
1393 AC_DEFINE(ENABLE_PERL, 1, Define if you can embed a perl interpreter) 1403 AC_DEFINE(ENABLE_PERL, 1, Define if you can embed a perl interpreter)
1394 IF_PERL= 1404 IF_PERL=
1395 PERL_O=rxvtperl.o 1405 PERL_O=rxvtperl.o
1396 PERLFLAGS="`$PERL -MExtUtils::Embed -e ccopts`" 1406 PERLFLAGS="`$PERL -MExtUtils::Embed -e ccopts`"
1397 PERLLIB="`$PERL -MExtUtils::Embed -e ldopts`" 1407 PERLLIB="`$PERL -MExtUtils::Embed -e ldopts`"
1398 PERLARCHLIB="`$PERL -MConfig -e 'print $Config{archlib}'`" 1408 PERLPRIVLIBEXP="`$PERL -MConfig -e 'print $Config{privlibexp}'`"
1399 AC_MSG_RESULT(ok) 1409 else
1410 support_perl=no
1411 AC_MSG_RESULT([no, unable to link])
1412 fi
1400 else 1413 else
1401 AC_MSG_ERROR(no working perl found, or perl not version >= 5.8) 1414 AC_MSG_ERROR(no working perl found, or perl not version >= 5.8)
1415 support_perl=no
1402 fi 1416 fi
1403fi 1417fi
1404AC_SUBST(PERLLIB) 1418AC_SUBST(PERLLIB)
1405AC_SUBST(PERLFLAGS) 1419AC_SUBST(PERLFLAGS)
1406AC_SUBST(PERLARCHLIB) 1420AC_SUBST(PERLPRIVLIBEXP)
1407AC_SUBST(PERL) 1421AC_SUBST(PERL)
1408AC_SUBST(IF_PERL) 1422AC_SUBST(IF_PERL)
1409AC_SUBST(PERL_O) 1423AC_SUBST(PERL_O)
1424
1425if test x$support_perl = xyes; then
1426 support_frills=yes
1427fi
1410 1428
1411dnl> AC_CHECK_FUNCS(gettimeofday putenv select socket) 1429dnl> AC_CHECK_FUNCS(gettimeofday putenv select socket)
1412 1430
1413CFLAGS=${CFLAGS--O} 1431CFLAGS=${CFLAGS--O}
1414LDFLAGS=${LDFLAGS--O} 1432LDFLAGS=${LDFLAGS--O}

Diff Legend

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