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.61 by root, Mon Jan 2 18:25:03 2006 UTC vs.
Revision 1.68 by root, Wed Jan 11 23:08:54 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 \
745 posix_openpt \
750 grantpt \ 746 grantpt \
751 unlockpt \ 747 unlockpt \
752 isastream \ 748 isastream \
753 on_exit \ 749 on_exit \
754 nanosleep \ 750 nanosleep \
755 updwtmp \ 751 updwtmp \
756 updwtmpx \ 752 updwtmpx \
757 ttyslot \ 753 ttyslot \
758) 754)
759dnl# Note: On NetBSD, openpty() exists in libutil. Don't pull it in
760 755
761dnl# -------------------------------------------------------------------------- 756dnl# --------------------------------------------------------------------------
762dnl# DO ALL UTMP AND WTMP CHECKING 757dnl# DO ALL UTMP AND WTMP CHECKING
763dnl# -------------------------------------------------------------------------- 758dnl# --------------------------------------------------------------------------
764dnl# check for host field in utmp structure 759dnl# check for host field in utmp structure
… …
1184 1179
1185if test x$rxvt_broken_ximcb = xyes; then 1180if test x$rxvt_broken_ximcb = xyes; then
1186 AC_DEFINE(XIMCB_PROTO_BROKEN, 1, Define if your XIMCallback specifies XIC as first type.) 1181 AC_DEFINE(XIMCB_PROTO_BROKEN, 1, Define if your XIMCallback specifies XIC as first type.)
1187fi 1182fi
1188 1183
1189AC_CACHE_CHECK(for getpt, rxvt_cv_func_getpt,
1190[AC_LINK_IFELSE([AC_LANG_PROGRAM([[#define _GNU_SOURCE
1191#ifdef HAVE_STDLIB_H
1192# include <cstdlib>
1193#endif]], [[(void)getpt();]])],[rxvt_cv_func_getpt=yes],[rxvt_cv_func_getpt=no])])
1194if test x$rxvt_cv_func_getpt = xyes; then 1184if test x$rxvt_cv_func_posix_openpt = xno; then
1195 AC_DEFINE(HAVE_GETPT, 1, Define if you have _GNU_SOURCE getpt() ) 1185 AC_CHECK_FUNC(openpty, [], [AC_CHECK_LIB(util, openpty, [LIBS="$LIBS -lutil"])])
1196fi 1186fi
1197 1187
1198dnl# if we don't guess right then it's up to the user 1188dnl# if we don't guess right then it's up to the user
1199AC_CACHE_CHECK(for pty/tty type, rxvt_cv_ptys, 1189AC_CACHE_CHECK(for pty/tty type, rxvt_cv_ptys,
1200[if test x$ac_cv_func_openpty = xyes; then 1190[if test x$ac_cv_func_openpty = xyes -o x$ac_cv_lib_util_openpty = xyes; then
1201 rxvt_cv_ptys=OPENPTY 1191 rxvt_cv_ptys=OPENPTY
1192 else if test x$ac_cv_func_posix_openpt = xyes; then
1193 rxvt_cv_ptys=POSIX
1202 else if test x$ac_cv_func__getpty = xyes; then 1194 else if test x$ac_cv_func__getpty = xyes; then
1203 rxvt_cv_ptys=SGI4 1195 rxvt_cv_ptys=SGI4
1204 else if test -c /dev/ttyp20; then 1196 else if test -c /dev/ttyp20; then
1205 rxvt_cv_ptys=SCO 1197 rxvt_cv_ptys=SCO
1206 else if test -c /dev/ptym/clone; then 1198 else if test -c /dev/ptym/clone; then
1207 rxvt_cv_ptys=HPUX 1199 rxvt_cv_ptys=HPUX
1208 else if test x$rxvt_cv_func_getpt = xyes; then
1209 rxvt_cv_ptys=GLIBC
1210 else if test -c /dev/ptc -a -c /dev/pts; then 1200 else if test -c /dev/ptc -a -c /dev/pts; then
1211 rxvt_cv_ptys=PTC 1201 rxvt_cv_ptys=PTC
1212 else if test -c /dev/ptc -a -d /dev/pts; then 1202 else if test -c /dev/ptc -a -d /dev/pts; then
1213 rxvt_cv_ptys=PTC 1203 rxvt_cv_ptys=PTC
1214 else if test -c /dev/ptmx -a -c /dev/pts/0; then 1204 else if test -c /dev/ptmx -a -c /dev/pts/0; then
… …
1227fi 1217fi
1228fi 1218fi
1229fi 1219fi
1230]) 1220])
1231 1221
1222if test x$rxvt_cv_ptys = xPOSIX; then
1223 AC_DEFINE(PTYS_ARE_POSIX, 1, Define for this pty type)
1224fi
1232if test x$rxvt_cv_ptys = xOPENPTY; then 1225if test x$rxvt_cv_ptys = xOPENPTY; then
1233 AC_DEFINE(PTYS_ARE_OPENPTY, 1, Define for this pty type) 1226 AC_DEFINE(PTYS_ARE_OPENPTY, 1, Define for this pty type)
1234fi 1227fi
1235if test x$rxvt_cv_ptys = xSCO; then 1228if test x$rxvt_cv_ptys = xSCO; then
1236 AC_DEFINE(PTYS_ARE_NUMERIC, 1, Define for this pty type) 1229 AC_DEFINE(PTYS_ARE_NUMERIC, 1, Define for this pty type)
… …
1241if test x$rxvt_cv_ptys = xPTC; then 1234if test x$rxvt_cv_ptys = xPTC; then
1242 AC_DEFINE(PTYS_ARE_PTC, 1, Define for this pty type) 1235 AC_DEFINE(PTYS_ARE_PTC, 1, Define for this pty type)
1243fi 1236fi
1244if test x$rxvt_cv_ptys = xSGI4; then 1237if test x$rxvt_cv_ptys = xSGI4; then
1245 AC_DEFINE(PTYS_ARE__GETPTY, 1, Define for this pty type) 1238 AC_DEFINE(PTYS_ARE__GETPTY, 1, Define for this pty type)
1246fi
1247if test x$rxvt_cv_ptys = xCONVEX; then
1248 AC_DEFINE(PTYS_ARE_GETPTY, 1, Define for this pty type)
1249fi 1239fi
1250if test x$rxvt_cv_ptys = xGLIBC; then 1240if test x$rxvt_cv_ptys = xGLIBC; then
1251 AC_DEFINE(PTYS_ARE_GETPT, 1, Define for this pty type) 1241 AC_DEFINE(PTYS_ARE_GETPT, 1, Define for this pty type)
1252fi 1242fi
1253if test x$rxvt_cv_ptys = xHPUX; then 1243if test x$rxvt_cv_ptys = xHPUX; then
… …
1272dnl# -------------------------------------------------------------------------- 1262dnl# --------------------------------------------------------------------------
1273dnl# now add and remove other stuff 1263dnl# now add and remove other stuff
1274dnl# -------------------------------------------------------------------------- 1264dnl# --------------------------------------------------------------------------
1275if test x$support_xft = xyes; then 1265if test x$support_xft = xyes; then
1276 LIBS="$LIBS `pkg-config xft --libs`" 1266 LIBS="$LIBS `pkg-config xft --libs`"
1277 CFLAGS="$CFLAGS `pkg-config xft --cflags`"
1278 CPPFLAGS="$CPPFLAGS `pkg-config xft --cflags`" 1267 CPPFLAGS="$CPPFLAGS `pkg-config xft --cflags`"
1279 1268
1280 AC_CHECK_HEADERS(X11/Xft/Xft.h,,[support_xft=no]) 1269 AC_CHECK_HEADERS(X11/Xft/Xft.h,,[support_xft=no])
1281 AC_CHECK_LIB(Xft,XftDrawString32,,[support_xft=no]) 1270 AC_CHECK_LIB(Xft,XftDrawString32,,[support_xft=no])
1282 1271
… …
1388 AC_PATH_PROG(PERL, perl5) 1377 AC_PATH_PROG(PERL, perl5)
1389 AC_PATH_PROG(PERL, perl) 1378 AC_PATH_PROG(PERL, perl)
1390 1379
1391 AC_MSG_CHECKING(for $PERL suitability) 1380 AC_MSG_CHECKING(for $PERL suitability)
1392 if $PERL -MExtUtils::Embed -e "use v5.8" >/dev/null 2>/dev/null; then 1381 if $PERL -MExtUtils::Embed -e "use v5.8" >/dev/null 2>/dev/null; then
1382
1383 save_CXXFLAGS="$CXXFLAGS"
1384 save_LIBS="$LIBS"
1385 CXXFLAGS="$CXXFLAGS `$PERL -MExtUtils::Embed -e ccopts`"
1386 LIBS="$LIBS `$PERL -MExtUtils::Embed -e ldopts`"
1387 AC_TRY_LINK([
1388#include <EXTERN.h>
1389#include <perl.h>
1390#include <XSUB.h>
1391],[
1392 PerlInterpreter *perl = perl_alloc ();
1393],[rxvt_perl_link=yes],[rxvt_perl_link=no])
1394 CXXFLAGS="$save_CXXFLAGS"
1395 LIBS="$save_LIBS"
1396
1397 if test x$rxvt_perl_link = xyes; then
1398 AC_MSG_RESULT(ok)
1393 AC_DEFINE(ENABLE_PERL, 1, Define if you can embed a perl interpreter) 1399 AC_DEFINE(ENABLE_PERL, 1, Define if you can embed a perl interpreter)
1394 IF_PERL= 1400 IF_PERL=
1395 PERL_O=rxvtperl.o 1401 PERL_O=rxvtperl.o
1396 PERLFLAGS="`$PERL -MExtUtils::Embed -e ccopts`" 1402 PERLFLAGS="`$PERL -MExtUtils::Embed -e ccopts`"
1397 PERLLIB="`$PERL -MExtUtils::Embed -e ldopts`" 1403 PERLLIB="`$PERL -MExtUtils::Embed -e ldopts`"
1398 PERLPRIVLIBEXP="`$PERL -MConfig -e 'print $Config{privlibexp}'`" 1404 PERLPRIVLIBEXP="`$PERL -MConfig -e 'print $Config{privlibexp}'`"
1399 AC_MSG_RESULT(ok) 1405 else
1406 support_perl=no
1407 AC_MSG_RESULT([no, unable to link])
1408 fi
1400 else 1409 else
1401 AC_MSG_ERROR(no working perl found, or perl not version >= 5.8) 1410 AC_MSG_ERROR(no working perl found, or perl not version >= 5.8)
1411 support_perl=no
1402 fi 1412 fi
1403fi 1413fi
1404AC_SUBST(PERLLIB) 1414AC_SUBST(PERLLIB)
1405AC_SUBST(PERLFLAGS) 1415AC_SUBST(PERLFLAGS)
1406AC_SUBST(PERLPRIVLIBEXP) 1416AC_SUBST(PERLPRIVLIBEXP)
1407AC_SUBST(PERL) 1417AC_SUBST(PERL)
1408AC_SUBST(IF_PERL) 1418AC_SUBST(IF_PERL)
1409AC_SUBST(PERL_O) 1419AC_SUBST(PERL_O)
1420
1421if test x$support_perl = xyes; then
1422 support_frills=yes
1423fi
1410 1424
1411dnl> AC_CHECK_FUNCS(gettimeofday putenv select socket) 1425dnl> AC_CHECK_FUNCS(gettimeofday putenv select socket)
1412 1426
1413CFLAGS=${CFLAGS--O} 1427CFLAGS=${CFLAGS--O}
1414LDFLAGS=${LDFLAGS--O} 1428LDFLAGS=${LDFLAGS--O}

Diff Legend

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