--- rxvt-unicode/configure.ac 2006/01/20 10:27:08 1.9 +++ rxvt-unicode/configure.ac 2006/01/28 21:25:12 1.31 @@ -35,27 +35,38 @@ AC_AIX AC_ISC_POSIX +AC_LANG(C++) -AC_LANG(C) - -dnl check wetehr we can link with gcc -lsupc++ -LINKER="$CXX" +dnl check wether we can link with gcc -lsupc++ if test x$GCC = xyes && test x$GXX = xyes; then - AC_CHECK_LIB(supc++, main, [ - LINKER="$CC" - LIBS="$LIBS -lsupc++" - ]) + dnl FreeBSD (at least up to 5.3) has a broken GCC, workaround it + AC_MSG_CHECKING([for working libsupc++]) + save_CXX="$CXX" + save_LIBS="$LIBS" + CXX="$CC" + LIBS="$LIBS -lsupc++" + LINKER="$CC" + AC_LINK_IFELSE( + [AC_LANG_PROGRAM([struct test { }; void f() try { throw new test; } catch (...) { throw; }])], + [AC_MSG_RESULT(ok)], + [ + AC_MSG_RESULT([no, making everything bigger and slower]) + LIBS="$save_LIBS" + LINKER="$save_CXX" + ] + ) + CXX="$save_CXX" fi AC_SUBST(LINKER,[$LINKER]) AC_LANG(C++) dnl# -------------------------------------------------------------------------- -dnl# Supply default CXXLAGS, if not specified by `CXXLAGS=flags ./configure' +dnl# Supply default CXXFLAGS, if not specified by `CXXFLAGS=flags ./configure' dnl# if test -z "$orig_CXXFLAGS"; then if test x$GCC = xyes && test "x$GXX" = xyes; then - CXXFLAGS="-g -O3 -Os -fno-threadsafe-statics -fno-enforce-eh-specs" - AC_COMPILE_IFELSE([int i;], [echo didididid], [CXXFLAGS="-g -O3"]) + CXXFLAGS="-g -O3 -fno-threadsafe-statics -fno-enforce-eh-specs" + AC_COMPILE_IFELSE([AC_LANG_PROGRAM()], [], [CXXFLAGS="-g -O3"]) else CXXFLAGS="-O" fi @@ -83,22 +94,10 @@ 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_frills=yes support_inheritpixmap=yes support_tinting=yes @@ -107,9 +106,6 @@ support_selectionscrolling=yes 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 @@ -143,7 +139,6 @@ NOTE: automatically enabled with --enable-shared], [ if test x$enableval = xno; then - support_24bit=no support_frills=no support_inheritpixmap=no support_tinting=no @@ -173,7 +168,6 @@ codesets= fi if test x$enableval = xyes; then - support_24bit=yes support_frills=yes support_inheritpixmap=yes support_tinting=yes @@ -228,24 +222,6 @@ support_styles=$enableval fi]) -AC_ARG_ENABLE(utmp, - [ --enable-utmp enable utmp (utmpx) support], - [if test x$enableval = xyes -o x$enableval = xno; then - support_utmp=$enableval - fi]) - -AC_ARG_ENABLE(wtmp, - [ --enable-wtmp enable wtmp (wtmpx) support (requires --enable-utmp)], - [if test x$enableval = xyes -o x$enableval = xno; then - support_wtmp=$enableval - fi]) - -AC_ARG_ENABLE(lastlog, - [ --enable-lastlog enable lastlog support (requires --enable-utmp)], - [if test x$enableval = xyes -o x$enableval = xno; then - support_lastlog=$enableval - fi]) - AC_ARG_ENABLE(xpm-background, [ --enable-xpm-background enable XPM background pixmaps], [if test x$enableval = xyes -o x$enableval = xno; then @@ -316,12 +292,6 @@ support_xim=$enableval fi]) -AC_ARG_ENABLE(ttygid, - [ --enable-ttygid enable tty setting to group named "tty"], - [if test x$enableval = xyes; then - AC_DEFINE(TTY_GID_SUPPORT, 1, Define to change gid of ttys to group tty) - fi]) - AC_ARG_ENABLE(backspace-key, [ --disable-backspace-key disable handling of the backspace key], [if test x$enableval = xno; then @@ -398,12 +368,6 @@ support_frills=$enableval fi]) -AC_ARG_ENABLE(24bit, - [ --enable-24bit enable support for using 24bit visuals if available], - [if test x$enableval = xyes -o x$enableval = xno; then - support_24bit=$enableval - fi]) - AC_ARG_ENABLE(keepscrolling, [ --enable-keepscrolling enable continual scrolling on scrollbar arrow press], [if test x$enableval = xyes -o x$enableval = xno; then @@ -428,25 +392,6 @@ support_mouseslipwheel=$enableval fi]) -AC_ARG_ENABLE(dmalloc, - [ --enable-dmalloc enable Gray Watson's malloc - for debugging use], - [if test x$enableval = xyes; then - MALLOC_TYPE=G - DEBUG=-DDEBUG_MALLOC - DLIB="-L/usr/local/lib -ldmalloc" - DINCLUDE=-I/usr/local/include - fi]) - -AC_ARG_ENABLE(dlmalloc, - [ --enable-dlmalloc enable Doug Lea's malloc - for production use - NOTE: enable only one malloc package], - [if test x$enableval = xyes; then - MALLOC_TYPE=D - DEBUG= - DLIB="-L/usr/local/lib -ldlmalloc" - DINCLUDE= - fi]) - AC_ARG_ENABLE(smart-resize, [ --enable-smart-resize enable smart growth/shrink behaviour], [if test x$enableval = xyes; then @@ -480,7 +425,6 @@ dnl# -------------------------------------------------------------------------- AC_PATH_PROG(MV, mv, mv) -AC_PATH_PROG(RM, rm, rm) AC_PATH_PROG(CP, cp, cp) AC_PATH_PROG(LN, ln, ln) AC_PATH_PROG(SED, sed, sed) @@ -520,9 +464,6 @@ AC_CHECK_HEADERS( \ assert.h \ fcntl.h \ - grp.h \ - libc.h \ - lastlog.h \ stdarg.h \ stdlib.h \ string.h \ @@ -533,17 +474,11 @@ sys/select.h \ sys/sockio.h \ sys/strredir.h \ - sys/stropts.h \ sys/time.h \ - utmp.h \ - utmpx.h \ - stdint.h \ - pty.h \ - util.h \ - libutil.h \ - wchar.h \ - cwchar \ - clocale \ + stdint.h \ + wchar.h \ + cwchar \ + clocale \ ) AC_HEADER_TIME @@ -628,7 +563,7 @@ AC_CHECK_SIZEOF(int *, 4) dnl# see usage below -AC_DEFUN(RXVT_CHECK_SIZE, +AC_DEFUN([RXVT_CHECK_SIZE], [AC_CACHE_CHECK([for $2], $1, [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include ]], [[$2 dummy;]])],[$1=yes],[dnl if test "$ac_cv_sizeof_char" -ge $3; then @@ -707,339 +642,12 @@ dnl> AC_FUNC_VPRINTF AC_CHECK_FUNCS( \ - revoke \ unsetenv \ setutent \ - seteuid \ - setresuid \ - setreuid \ - _getpty \ - getpt \ - posix_openpt \ - grantpt \ - unlockpt \ - isastream \ on_exit \ - nanosleep \ - updwtmp \ - updwtmpx \ - ttyslot \ ) -dnl# -------------------------------------------------------------------------- -dnl# DO ALL UTMP AND WTMP CHECKING -dnl# -------------------------------------------------------------------------- -dnl# check for host field in utmp structure - -dnl# -------------------------------------------- -AC_CHECK_HEADER(utmp.h, -[AC_CACHE_CHECK([for struct utmp], rxvt_cv_struct_utmp, -[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include -#include ]], [[struct utmp ut;]])],[rxvt_cv_struct_utmp=yes],[rxvt_cv_struct_utmp=no])]) -if test x$rxvt_cv_struct_utmp = xyes; then - AC_DEFINE(HAVE_STRUCT_UTMP, 1, Define if utmp.h has struct utmp) -fi -] - -AC_CACHE_CHECK(for ut_host in utmp struct, rxvt_cv_struct_utmp_host, -[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include -#include ]], [[struct utmp ut; ut.ut_host;]])],[rxvt_cv_struct_utmp_host=yes],[rxvt_cv_struct_utmp_host=no])]) -if test x$rxvt_cv_struct_utmp_host = xyes; then - AC_DEFINE(HAVE_UTMP_HOST, 1, Define if struct utmp contains ut_host) -fi - -AC_CACHE_CHECK(for ut_pid in utmp struct, rxvt_cv_struct_utmp_pid, -[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include -#include ]], [[struct utmp ut; ut.ut_pid;]])],[rxvt_cv_struct_utmp_pid=yes],[rxvt_cv_struct_utmp_pid=no])]) -if test x$rxvt_cv_struct_utmp_pid = xyes; then - AC_DEFINE(HAVE_UTMP_PID, 1, Define if struct utmp contains ut_pid) -fi -) dnl# AC_CHECK_HEADER(utmp.h - -dnl# -------------------------------------------- - -AC_CHECK_HEADER(utmpx.h, -[AC_CACHE_CHECK([for struct utmpx], rxvt_cv_struct_utmpx, -[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include -#include ]], [[struct utmpx ut;]])],[rxvt_cv_struct_utmpx=yes],[rxvt_cv_struct_utmpx=no])]) -if test x$rxvt_cv_struct_utmpx = xyes; then - AC_DEFINE(HAVE_STRUCT_UTMPX, 1, Define if utmpx.h has struct utmpx) -fi -] - -AC_CACHE_CHECK(for host in utmpx struct, rxvt_cv_struct_utmpx_host, -[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include -#include ]], [[struct utmpx utx; utx.ut_host;]])],[rxvt_cv_struct_utmpx_host=yes],[rxvt_cv_struct_utmpx_host=no])]) -if test x$rxvt_cv_struct_utmpx_host = xyes; then - AC_DEFINE(HAVE_UTMPX_HOST, 1, Define if struct utmpx contains ut_host) -fi - -AC_CACHE_CHECK(for session in utmpx struct, rxvt_cv_struct_utmpx_session, -[AC_TRY_COMPILE([#include -#include ], -[struct utmpx utx; utx.ut_session;], -rxvt_cv_struct_utmpx_session=yes, rxvt_cv_struct_utmpx_session=no)]) -if test x$rxvt_cv_struct_utmpx_session = xyes; then - AC_DEFINE(HAVE_UTMPX_SESSION, 1, Define if struct utmpx contains ut_session) -fi -) dnl# AC_CHECK_HEADER(utmpx.h - -dnl# -------------------------------------------------------------------------- -dnl# check for struct lastlog -AC_CACHE_CHECK(for struct lastlog, rxvt_cv_struct_lastlog, -[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include -#include -#ifdef HAVE_LASTLOG_H -#include -#endif -]], [[struct lastlog ll;]])],[rxvt_cv_struct_lastlog=yes],[rxvt_cv_struct_lastlog=no])]) -if test x$rxvt_cv_struct_lastlog = xyes; then - AC_DEFINE(HAVE_STRUCT_LASTLOG, 1, Define if utmp.h or lastlog.h has struct lastlog) -fi - -dnl# check for struct lastlogx -AC_CACHE_CHECK(for struct lastlogx, rxvt_cv_struct_lastlogx, -[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include -#include -#ifdef HAVE_LASTLOG_H -#include -#endif -]], [[struct lastlogx ll;]])],[rxvt_cv_struct_lastlogx=yes],[rxvt_cv_struct_lastlogx=no])]) -if test x$rxvt_cv_struct_lastlogx = xyes; then - AC_DEFINE(HAVE_STRUCT_LASTLOGX, 1, Define if utmpx.h or lastlog.h has struct lastlogx) -fi - -dnl# -------------------------------------------------------------------------- -dnl# FIND FILES -dnl# -------------------------------------------------------------------------- - -dnl# find utmp -AC_CACHE_CHECK(where utmp is located, rxvt_cv_path_utmp, -[AC_RUN_IFELSE([AC_LANG_SOURCE([[#include -#include -#include -#include -main() -{ - char **u, *utmplist[] = { - "/var/run/utmp", "/var/adm/utmp", "/etc/utmp", "/usr/etc/utmp", "/usr/adm/utmp", NULL }; - FILE *a, *f=fopen("conftestval", "w"); - if (!f) exit(1); -#ifdef UTMP_FILE - fprintf(f, "%s\n", UTMP_FILE); - exit(0); -#endif -#ifdef _PATH_UTMP - fprintf(f, "%s\n", _PATH_UTMP); - exit(0); -#endif - for (u = utmplist; *u; u++) { - if ((a = fopen(*u, "r")) != NULL || errno == EACCES) { - fprintf(f, "%s\n", *u); - exit(0); - } - } - exit(0); -}]])],[rxvt_cv_path_utmp=`cat conftestval`],[rxvt_cv_path_utmp=],[dnl - AC_MSG_WARN(Define RXVT_UTMP_FILE in config.h manually)])]) -if test x$rxvt_cv_path_utmp != x; then - AC_DEFINE_UNQUOTED(RXVT_UTMP_FILE, "$rxvt_cv_path_utmp", Define location of utmp) -fi - -dnl# -------------------------------------------------------------------------- - -dnl# find utmpx - if a utmp file exists at the same location and is more than -dnl# a day newer, then dump the utmpx. People leave lots of junk around. -AC_CACHE_CHECK(where utmpx is located, rxvt_cv_path_utmpx, -[AC_RUN_IFELSE([AC_LANG_SOURCE([[#include -#include -#include -#include -#include -#ifdef HAVE_STRING_H -#include -#endif -main() -{ - char **u, *p, *utmplist[] = { -#ifdef UTMPX_FILE - UTMPX_FILE, -#endif -#ifdef _PATH_UTMPX - _PATH_UTMPX, -#endif - "/var/adm/utmpx", "/etc/utmpx", NULL }; - FILE *a, *f=fopen("conftestval", "w"); - struct stat statu, statux; - if (!f) exit(1); - for (u = utmplist; *u; u++) { - if ((a = fopen(*u, "r")) != NULL || errno == EACCES) { - if (stat(*u, &statux) < 0) - continue; - p = strdup(*u); - p[strlen(p) - 1] = '\0'; - if (stat(p, &statu) >= 0 - && (statu.st_mtime - statux.st_mtime > 86400)) - continue; - fprintf(f, "%s\n", *u); - exit(0); - } - } - exit(0); -}]])],[rxvt_cv_path_utmpx=`cat conftestval`],[rxvt_cv_path_utmpx=],[dnl - AC_MSG_WARN(Define RXVT_UTMPX_FILE in config.h manually)])]) -if test x$rxvt_cv_path_utmpx != x; then - AC_DEFINE_UNQUOTED(RXVT_UTMPX_FILE, "$rxvt_cv_path_utmpx", Define location of utmpx) -fi - -dnl# -------------------------------------------------------------------------- - -dnl# find wtmp -AC_CACHE_CHECK(where wtmp is located, rxvt_cv_path_wtmp, -[AC_RUN_IFELSE([AC_LANG_SOURCE([[#include -#include -#ifdef HAVE_UTMP_H -#include -#endif -#include -main() -{ - char **w, *wtmplist[] = { - "/var/log/wtmp", "/var/adm/wtmp", "/etc/wtmp", "/usr/etc/wtmp", "/usr/adm/wtmp", NULL }; - FILE *a, *f=fopen("conftestval", "w"); - if (!f) exit(1); -#ifdef WTMP_FILE - fprintf(f, "%s\n", WTMP_FILE); - exit(0); -#endif -#ifdef _PATH_WTMP - fprintf(f, "%s\n", _PATH_WTMP); - exit(0); -#endif - for (w = wtmplist; *w; w++) { - if ((a = fopen(*w, "r")) != NULL || errno == EACCES) { - fprintf(f, "%s\n", *w); - exit(0); - } - } - exit(0); -}]])],[rxvt_cv_path_wtmp=`cat conftestval`],[rxvt_cv_path_wtmp=],[dnl - AC_MSG_WARN(Define RXVT_WTMP_FILE in config.h manually)])]) -if test x$rxvt_cv_path_wtmp != x; then - AC_DEFINE_UNQUOTED(RXVT_WTMP_FILE, "$rxvt_cv_path_wtmp", Define location of wtmp) -fi -dnl# -------------------------------------------------------------------------- - -dnl# find wtmpx -AC_CACHE_CHECK(where wtmpx is located, rxvt_cv_path_wtmpx, -[AC_RUN_IFELSE([AC_LANG_SOURCE([[#include -#ifdef HAVE_UTMPX_H -#include -#endif -#include -main() -{ - char **w, *wtmplist[] = { - "/var/log/wtmpx", "/var/adm/wtmpx", NULL }; - FILE *a, *f=fopen("conftestval", "w"); - if (!f) exit(1); -#ifdef WTMPX_FILE - fprintf(f, "%s\n", WTMPX_FILE); - exit(0); -#endif -#ifdef _PATH_WTMPX - fprintf(f, "%s\n", _PATH_WTMPX); - exit(0); -#endif - for (w = wtmplist; *w; w++) { - if ((a = fopen(*w, "r")) != NULL || errno == EACCES) { - fprintf(f, "%s\n", *w); - exit(0); - } - } - exit(0); -}]])],[rxvt_cv_path_wtmpx=`cat conftestval`],[rxvt_cv_path_wtmpx=],[dnl - AC_MSG_WARN(Define RXVT_WTMPX_FILE in config.h manually)])]) -if test x$rxvt_cv_path_wtmpx != x; then - AC_DEFINE_UNQUOTED(RXVT_WTMPX_FILE, "$rxvt_cv_path_wtmpx", Define location of wtmpx) -fi -dnl# -------------------------------------------------------------------------- - -dnl# find lastlog -AC_CACHE_CHECK(where lastlog is located, rxvt_cv_path_lastlog, -[AC_RUN_IFELSE([AC_LANG_SOURCE([[#include -#include -#ifdef HAVE_UTMPX_H -#include -#elif defined(HAVE_UTMP_H) -#include -#endif -#ifdef HAVE_LASTLOG_H -#include -#endif -#include -main() -{ - char **w, *lastloglist[] = { "/var/log/lastlog", NULL }; - FILE *a, *f=fopen("conftestval", "w"); - if (!f) exit(1); -#ifdef LASTLOG_FILE - fprintf(f, "%s\n", LASTLOG_FILE); - exit(0); -#endif -#ifdef _PATH_LASTLOG - fprintf(f, "%s\n", _PATH_LASTLOG); - exit(0); -#endif - for (w = lastloglist; *w; w++) { - if ((a = fopen(*w, "r")) != NULL || errno == EACCES) { - fprintf(f, "%s\n", *w); - exit(0); - } - } - exit(0); -}]])],[rxvt_cv_path_lastlog=`cat conftestval`],[rxvt_cv_path_lastlog=],[dnl - AC_MSG_WARN(Define RXVT_LASTLOG_FILE in config.h manually)])]) -if test x$rxvt_cv_path_lastlog != x; then - AC_DEFINE_UNQUOTED(RXVT_LASTLOG_FILE, "$rxvt_cv_path_lastlog", Define location of lastlog) - if test -d "$rxvt_cv_path_lastlog"; then - AC_DEFINE(LASTLOG_IS_DIR, 1, Define if lastlog is provided via a directory) - fi -fi -dnl# -------------------------------------------------------------------------- - -dnl# find lastlogx -AC_CACHE_CHECK(where lastlogx is located, rxvt_cv_path_lastlogx, -[AC_RUN_IFELSE([AC_LANG_SOURCE([[#include -#ifdef HAVE_UTMPX_H -#include -#endif -#include -main() -{ - char **w, *wtmplist[] = { "/var/log/lastlogx", "/var/adm/lastlogx", NULL }; - FILE *a, *f=fopen("conftestval", "w"); - if (!f) exit(1); -#ifdef LASTLOGX_FILE - fprintf(f, "%s\n", LASTLOGX_FILE); - exit(0); -#endif -#ifdef _PATH_LASTLOGX - fprintf(f, "%s\n", _PATH_LASTLOGX); - exit(0); -#endif - for (w = wtmplist; *w; w++) { - if ((a = fopen(*w, "r")) != NULL || errno == EACCES) { - fprintf(f, "%s\n", *w); - exit(0); - } - } - exit(0); -}]])],[rxvt_cv_path_lastlogx=`cat conftestval`],[rxvt_cv_path_lastlogx=],[dnl - AC_MSG_WARN(Define RXVT_LASTLOGX_FILE in config.h manually)])]) -if test x$rxvt_cv_path_lastlogx != x; then - AC_DEFINE_UNQUOTED(RXVT_LASTLOGX_FILE, "$rxvt_cv_path_lastlogx", Define location of lastlogx) -fi +UTMP_CHECK dnl# -------------------------------------------------------------------------- @@ -1104,40 +712,7 @@ 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) -else - AC_MSG_ERROR([urxvt requires unix-compliant filehandle passing ability]) -fi +SCM_RIGHTS_CHECK AC_CACHE_CHECK(for broken XIM callback, rxvt_broken_ximcb, [AC_COMPILE_IFELSE([ @@ -1155,93 +730,25 @@ AC_DEFINE(XIMCB_PROTO_BROKEN, 1, Define if your XIMCallback specifies XIC as first type.) fi -if test x$ac_cv_func_getpt = xno -a x$ac_cv_func_posix_openpt = xno; then - AC_CHECK_FUNC(openpty, [], [AC_CHECK_LIB(util, openpty, [LIBS="$LIBS -lutil"])]) -fi +PTY_CHECK -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 -o x$ac_cv_lib_util_openpty = xyes; then - rxvt_cv_ptys=OPENPTY - else if test x$ac_cv_func_getpt = xyes; then - rxvt_cv_ptys=GLIBC - 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 -c /dev/ptc -a -c /dev/pts; then - rxvt_cv_ptys=PTC - else if test -c /dev/ptc -a -d /dev/pts; then - rxvt_cv_ptys=PTC - else if test -c /dev/ptmx -a -c /dev/pts/0; then - rxvt_cv_ptys=STREAMS - else if test x$ac_cv_func_grantpt = xyes && test x$ac_cv_func_unlockpt = xyes; then -dnl# catch CYGWIN - rxvt_cv_ptys=STREAMS - else - rxvt_cv_ptys=BSD -fi -fi -fi -fi -fi -fi -fi -fi -fi -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 = 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 -if test x$rxvt_cv_ptys = xSCO; then - AC_DEFINE(PTYS_ARE_NUMERIC, 1, Define for this pty type) -fi -if test x$rxvt_cv_ptys = xSTREAMS; then - AC_DEFINE(PTYS_ARE_PTMX, 1, Define for this pty type) -fi -if test x$rxvt_cv_ptys = xPTC; then - AC_DEFINE(PTYS_ARE_PTC, 1, Define for this pty type) -fi -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 = 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 = xPOSIX; then - AC_DEFINE(PTYS_ARE_SEARCHED, 1, Define for this pty type) -fi - - -AS_MESSAGE(checking for pty ranges...) -ptys=`echo /dev/pty??` -pch1=`echo $ptys | tr ' ' '\012' | sed -e 's/^.*\(.\).$/\1/g' | sort -u | tr -d '\012'` -pch2=`echo $ptys | tr ' ' '\012' | sed -e 's/^.*\(.\)$/\1/g' | sort -u | tr -d '\012'` -if test x$pch1 != x; then - AC_DEFINE_UNQUOTED(PTYCHAR1, "$pch1", Define for first char in devptyXX) -fi -if test x$pch2 != x; then - AC_DEFINE_UNQUOTED(PTYCHAR2, "$pch2", Define for second char in devptyXX) -fi +TTY_GROUP_CHECK dnl# -------------------------------------------------------------------------- dnl# now add and remove other stuff dnl# -------------------------------------------------------------------------- if test x$support_xft = xyes; then - LIBS="$LIBS `pkg-config xft --libs`" - CPPFLAGS="$CPPFLAGS `pkg-config xft --cflags`" + AC_PATH_PROG(PKG_CONFIG, pkg-config, no) + if test $PKG_CONFIG != no && $PKG_CONFIG --exists xft; then + LIBS="$LIBS `$PKG_CONFIG xft --libs`" + CPPFLAGS="$CPPFLAGS `$PKG_CONFIG xft --cflags`" + else + AC_PATH_PROG(XFT_CONFIG, xft-config, no) + if test $XFT_CONFIG != no; then + LIBS="$LIBS `$XFT_CONFIG --libs`" + CPPFLAGS="$CPPFLAGS `$XFT_CONFIG --cflags`" + fi + fi AC_CHECK_HEADERS(X11/Xft/Xft.h,,[support_xft=no]) AC_CHECK_LIB(Xft,XftDrawString32,,[support_xft=no]) @@ -1277,24 +784,12 @@ if test x$support_frills = xyes; then AC_DEFINE(ENABLE_FRILLS, 1, Define if you want handling for rarely used but handy features) fi -if test x$support_24bit = xyes; then - AC_DEFINE(PREFER_24BIT, 1, Define to use a 24 bit visual if the screen has 24 bit mode, even if the default is 8 bit) -fi if test x$support_mousewheel = xyes; then AC_DEFINE(MOUSE_WHEEL, 1, Define to use wheel events (button4 and button5) to scroll) fi if test x$support_mouseslipwheel = xyes; then AC_DEFINE(MOUSE_SLIP_WHEELING, 1, Define to have CTRL cause wheel events to accelerate scrolling. Release CTRL to halt scrolling) fi -if test x$support_utmp = xyes; then - AC_DEFINE(UTMP_SUPPORT, 1, Define if you want to have utmp/utmpx support) -fi -if test x$support_wtmp = xyes; then - AC_DEFINE(WTMP_SUPPORT, 1, Define if you want to have wtmp support when utmp/utmpx is enabled) -fi -if test x$support_lastlog = xyes; then - AC_DEFINE(LASTLOG_SUPPORT, 1, Define if you want to have lastlog support when utmp/utmpx is enabled) -fi if test x$support_xim = xyes -o x$multichar_set = xyes; then if test x$rxvt_cv_func_xlocale = xyes; then AC_DEFINE(USE_XIM, 1, Define if you want to have XIM (X Input Method) protocol support - required for multibyte characters input) @@ -1425,7 +920,7 @@ dnl# test for "sun" or "__sun__" before include sys_ioctl dnl# revert HAVE_BLAH_H into a "#include " -AC_DEFUN(RXVT_DEFINE_TO_INCLUDE, dnl +AC_DEFUN([RXVT_DEFINE_TO_INCLUDE], dnl [if test "$$3" = "$4" -o "$$5" = "$6"; then $1="#include <$2>" else @@ -1463,38 +958,10 @@ Compiler flags: $CFLAGS Linker: $LINKER" -if test "$MALLOC_TYPE" = S; then - echo " malloc support: system default" -fi -if test "$MALLOC_TYPE" = G; then - echo " malloc support: Gray Watson's dmalloc" -fi -if test "$MALLOC_TYPE" = D; then - echo " malloc support: Doug Lea's malloc" -fi - if test x$support_xpm = xyes; then echo " Xpm library: $XPM_LIBS" fi -echo " -The following are set in config.h -" -echo " pty/tty type: "$rxvt_cv_ptys -if test x$support_utmp != xyes; then - echo " utmp support: disabled" - echo -else - echo " utmp support: enabled - utmp file: $rxvt_cv_path_utmp - utmpx file: $rxvt_cv_path_utmpx - 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 - embedded perl: $support_perl" - echo -fi if test x$term != x; then echo " set TERM to: $term" fi @@ -1507,12 +974,8 @@ echo " resource class fallback: $RESFALLBACK" fi echo -if test x$rxvt_cv_ptys = xUNKNOWN; then - echo ".----------------------------------------------------------------." - echo ". WARNING: could not determine pty/tty type. Do not build until ." - echo ". the appropriate PTYS_ARE_* is defined in config.h ." - echo ".----------------------------------------------------------------." -fi +echo " embedded perl: $support_perl" +echo if test x$support_xpm = xneedsmanualspecification; then echo ".----------------------------------------------------------------." echo ". WARNING: --enable-xpm-background was specified however the ."