--- rxvt-unicode/autoconf/configure.in 2004/02/29 22:32:31 1.15 +++ rxvt-unicode/autoconf/configure.in 2005/04/17 22:36:13 1.53 @@ -2,16 +2,20 @@ dnl# dnl# Process this file with autoconf to produce a configure script. dnl# -AC_INIT(src/feature.h) +orig_CXXFLAGS="$CXXFLAGS" + +AC_INIT +AC_CONFIG_SRCDIR([src/feature.h]) AC_CONFIG_AUX_DIR(autoconf) AC_CONFIG_HEADER(config.h:autoconf/config.h.in) +AC_CANONICAL_HOST + dnl RXVT version changequote(, )dnl VERSION=`sed -n -e 's/^.*[ \t]VERSION.*"\(.*\)"$/\1/p' ${srcdir}/src/version.h` DATE=`sed -n -e 's/^.*[ \t]DATE.*"\(.*\)"$/\1/p' ${srcdir}/src/version.h` -LSMDATE=`sed -n -e 's/^.*[ \t]LSMDATE.*"\(.*\)"$/\1/p' ${srcdir}/src/version.h` -LIBVERSION=`sed -n -e 's/^.*[ \t]LIBVERSION.*"\(.*\)"$/\1/p' ${srcdir}/src/version.h` +dnl LIBVERSION=`sed -n -e 's/^.*[ \t]LIBVERSION.*"\(.*\)"$/\1/p' ${srcdir}/src/version.h` changequote([, ])dnl AC_SUBST(VERSION)dnl AC_SUBST(DATE)dnl @@ -30,29 +34,73 @@ AC_PROG_INSTALL AC_PROG_AWK +AC_LANG(C) + +dnl# -------------------------------------------------------------------------- +dnl# Supply default CFLAGS, if not specified by `CFLAGS=flags ./configure' +dnl# +if test -z "$orig_CXXFLAGS"; then + CXXFLAGS='-O' + if test x$GCC = xyes && test "x$GXX" = xyes; then + CXXFLAGS="-g -O3" + fi + CFLAGS="$CXXFLAGS" +fi + +LINKER="$CXX" +if test x$GCC = xyes && test x$GXX = xyes; then + AC_CHECK_LIB(supc++, main, [ + LINKER="$CC" + LIBS="$LIBS -lsupc++" + ]) +fi +AC_SUBST(LINKER,[$LINKER]) + +AC_DEFINE(_GNU_SOURCE, 1, Use all glibc features.) + +case $host in + *-*-solaris* ) + AC_DEFINE(_XOPEN_SOURCE_EXTENDED, 1, Needed to get declarations for msg_control and msg_controllen on Solaris) + AC_DEFINE(_XOPEN_SOURCE, 2, Needed to get declarations for msg_control and msg_controllen on Solaris) + AC_DEFINE(__EXTENSIONS__, 1, Needed to get declarations for msg_control and msg_controllen on Solaris) + ;; +esac + +dnl if test x$GXX = xyes; then +dnl CXXFLAGS="$CXXFLAGS" dnl I once had -fno-exceptions, but I am using them now... +dnl fi + +AC_LANG(C++) + dnl# system hacks AC_AIX AC_ISC_POSIX -AC_ENABLE_SHARED(no)dnl# libtool -AC_ENABLE_STATIC(yes)dnl# libtool -AC_PROG_LIBTOOL()dnl# libtool +dnl# FreeBSD needs to link libxpg4 +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 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_linespace=no support_inheritpixmap=no +support_tinting=no +support_fading=no support_keepscrolling=no support_selectionscrolling=no support_menubar=no support_mousewheel=no support_mouseslipwheel=no -support_oldselection=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 @@ -63,6 +111,10 @@ support_xpm=no support_xft=no support_unicode3=no +support_combining=no +support_8bitctrls=no +support_iso14755=no +support_styles=no codesets= dnl# -------------------------------------------------------------------------- @@ -82,16 +134,15 @@ [if test x$enableval = xyes; then support_24bit=yes support_frills=yes - support_linespace=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_oldselection=yes - support_cursor_blink=yes support_text_blink=yes support_pointer_blank=yes support_scroll_rxvt=yes @@ -104,24 +155,36 @@ support_xpm=yes support_xft=yes support_unicode3=yes + support_combining=yes + #support_8bitctrls=yes + support_iso14755=yes + support_styles=yes codesets=all fi]) AC_ARG_ENABLE(unicode3, [ --enable-unicode3 use 21 instead of 16 bits to represent unicode characters], [if test x$enableval = xyes -o x$enableval = xno; then - support_unicode3=yes + support_unicode3=$enableval + fi]) + +AC_ARG_ENABLE(combining, + [ --enable-combining enable composition of base and combining characters], + [if test x$enableval = xyes -o x$enableval = xno; then + support_combining=$enableval fi]) AC_ARG_ENABLE(xft, - [ --enable-xft enable xft support on systems that have it], + [ --enable-xft enable xft support on systems that have it], [if test x$enableval = xyes -o x$enableval = xno; then - support_xft=yes + support_xft=$enableval fi]) -AC_ARG_WITH(codesets, - [ --with-codesets=NAME,... compile in additional codesets (jp,jp_ext,kr,cn,cn_ext,vn,all)], - [codesets="$withval"]) +AC_ARG_ENABLE(font-styles, + [ --enable-font-styles enable bold and italic support], + [if test x$enableval = xyes -o x$enableval = xno; then + support_styles=$enableval + fi]) AC_ARG_ENABLE(utmp, [ --enable-utmp enable utmp (utmpx) support], @@ -153,6 +216,18 @@ support_inheritpixmap=$enableval fi]) +AC_ARG_ENABLE(tinting, + [ --enable-tinting enable tinting of transparent bg], + [if test x$enableval = xyes -o x$enableval = xno; then + support_tinting=$enableval + fi]) + +AC_ARG_ENABLE(fading, + [ --enable-fading enable colors fading when off focus], + [if test x$enableval = xyes -o x$enableval = xno; then + support_fading=$enableval + fi]) + AC_ARG_ENABLE(menubar, [ --enable-menubar enable menubar], [if test x$enableval = xyes -o x$enableval = xno; then @@ -189,6 +264,10 @@ AC_DEFINE(HALFSHADOW, 1, Define if you want the depth of scrollbars and menus to be less) fi]) +AC_ARG_WITH(codesets, + [ --with-codesets=NAME,.. compile in additional codesets (jp,jp_ext,kr,zh,zh_ext,all)], + [codesets="$withval"]) + AC_ARG_ENABLE(xim, [ --enable-xim XIM (X Input Method) protocol support], [if test x$enableval = xyes -o x$enableval = xno; then @@ -225,6 +304,46 @@ 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 + support_8bitctrls=$enableval + fi]) + +RESFALLBACK=Rxvt +AC_ARG_ENABLE(fallback, + [ --enable-fallback(=CLASS) fall back on CLASS resources in addition to URxvt ones (default: Rxvt)], + [ + test x$enableval = xyes && enableval=Rxvt + test x$enableval = xno && enableval= + RESFALLBACK="$enableval" + ]) + +if test x$RESFALLBACK != x; then + AC_DEFINE_UNQUOTED(RESFALLBACK, "$RESFALLBACK", [Fallback resource class]) +fi + +RESNAME=urxvt +AC_ARG_WITH(res-name, + [ --with-res-name=NAME use this as default resource name (default: urxvt)], + [RESNAME="$withval"]) +AC_DEFINE_UNQUOTED(RESNAME,"$RESNAME", [Default resource name]) + +RESCLASS=URxvt +AC_ARG_WITH(res-class, + [ --with-res-class=CLASS use this as the resource class (default: URxvt)], + [RESCLASS="$withval"]) +AC_DEFINE_UNQUOTED(RESCLASS,"$RESCLASS", [Resource class]) + +RXVTNAME=urxvt +AC_ARG_WITH(name, + [ --with-name=NAME set the basename for the installed binaries (default: urxvt)], + [RXVTNAME="$withval"]) +AC_DEFINE_UNQUOTED(RXVTNAME,"$RXVTNAME", [Binary base name]) + +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 @@ -237,16 +356,16 @@ AC_DEFINE(NO_SECONDARY_SCREEN, 1, Disable the secondary screen. Many programs use the secondary screen as their workplace) fi]) -AC_ARG_ENABLE(frills, - [ --enable-frills enable support for rarely used features], +AC_ARG_ENABLE(iso14755, + [ --enable-iso14755 enable support for extended ISO 14755 modes], [if test x$enableval = xyes -o x$enableval = xno; then - support_frills=$enableval + support_iso14755=$enableval fi]) -AC_ARG_ENABLE(linespace, - [ --enable-linespace enable support for linespace], +AC_ARG_ENABLE(frills, + [ --enable-frills enable support for rarely used features], [if test x$enableval = xyes -o x$enableval = xno; then - support_linespace=$enableval + support_frills=$enableval fi]) AC_ARG_ENABLE(24bit, @@ -279,18 +398,6 @@ support_mouseslipwheel=$enableval fi]) -AC_ARG_ENABLE(old-selection, - [ --enable-old-selection enable v2.20 (& prior) mouse selection style support], - [if test x$enableval = xyes -o x$enableval = xno; then - support_oldselection=$enableval - fi]) - -AC_ARG_ENABLE(new-selection, - [ --disable-new-selection disable new mouse (xterm) selection style support], - [if test x$enableval = xno; then - AC_DEFINE(NO_NEW_SELECTION, 1, Define to remove xterm style mouse selection) - fi]) - AC_ARG_ENABLE(dmalloc, [ --enable-dmalloc enable Gray Watson's malloc - for debugging use], [if test x$enableval = xyes; then @@ -316,18 +423,6 @@ AC_DEFINE(SMART_RESIZE, 1, Define to use "smart" resize behavior) fi]) -AC_ARG_ENABLE(256-color, - [ --enable-256-color enable 256-color support], - [if test x$enableval = xyes; then - AC_DEFINE(TTY_256COLOR, 1, Define if you want 256 colour support) - 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 @@ -341,7 +436,7 @@ fi]) AC_ARG_WITH(term, - [ --with-term=NAME set the terminal to NAME (default \"rxvt\")], + [ --with-term=NAME set the terminal to NAME (default: rxvt)], [if test x$withval != x; then AC_DEFINE_UNQUOTED(TERMENV, "$withval",Set TERM to the value given by configure) term="$withval" fi]) @@ -356,21 +451,6 @@ AC_DEFINE(PROTOTYPES, 1, Define if you need function prototypes) -dnl# -------------------------------------------------------------------------- -dnl# Supply default CFLAGS, if not specified by `CFLAGS=flags ./configure' -dnl# -if test -z "$CFLAGS"; then - if test -z "$CCOPTS"; then - CCOPTS='-O' -dnl> if test "x$GCC" = xyes; then -dnl> if test x$system = xLinux; then -dnl> CCOPTS="$CCOPTS "'-O2 -fno-strength-reduce' -dnl> fi -dnl> fi - fi - CFLAGS="$CCOPTS" -fi - AC_PATH_PROG(MV, mv, mv) AC_PATH_PROG(RM, rm, rm) AC_PATH_PROG(CP, cp, cp) @@ -379,6 +459,7 @@ AC_PATH_PROG(ECHO, echo, echo) AC_PATH_PROG(CMP, cmp, cmp) AC_PATH_PROG(TBL, tbl) +AC_PATH_PROG(TIC, tic) dnl# need a neat way to detect SVR4 or its features dnl# in src/command.c we use these functions: @@ -425,21 +506,26 @@ sys/select.h \ sys/sockio.h \ sys/strredir.h \ + sys/stropts.h \ sys/time.h \ utmp.h \ utmpx.h \ stdint.h \ + pty.h \ + wchar.h \ + cwchar \ + clocale \ ) AC_HEADER_TIME dnl# check to allow both and AC_CACHE_CHECK(whether termios.h and sys/ioctl.h may both be included, rxvt_cv_header_sysioctl, -[AC_TRY_COMPILE([#include +[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include #include #ifdef HAVE_TERMIOS_H #include -#endif], [int a = ECHO;], rxvt_cv_header_sysioctl=yes, rxvt_cv_header_sysioctl=no)]) +#endif]], [[int a = ECHO;]])],[rxvt_cv_header_sysioctl=yes],[rxvt_cv_header_sysioctl=no])]) dnl# ELF systems may want to store paths for dynamic libraries. dnl# Lets see if the compiler can accept "-Rpath" or "-Wl,-Rpath" @@ -458,33 +544,32 @@ CFLAGS="$CFLAGS $X_CFLAGS" LIBS=`echo "$LIBS $X_LIBS $X_EXTRA_LIBS -lX11" | sed "$R_TRANSLATE"` AC_CACHE_CHECK([for -rpath dynamic library path recording], rxvt_cv_rpath, -[AC_TRY_RUN([ +[AC_RUN_IFELSE([AC_LANG_SOURCE([[ main() { exit(0); (void) XOpenDisplay("foobar"); -}], rxvt_cv_rpath=yes, rxvt_cv_rpath=no, dnl - AC_MSG_WARN([You may need to check the LIBS line]))]) +}]])],[rxvt_cv_rpath=yes],[rxvt_cv_rpath=no],[dnl + AC_MSG_WARN(You may need to check the LIBS line)])]) if test x$rxvt_cv_rpath != xyes; then changequote(, )dnl R_TRANSLATE='s/-L\([^ ]*\)/-L\1 '$LDARG'-R\1/g' changequote([, ])dnl LIBS=`echo "$ac_save_LIBS $X_LIBS $X_EXTRA_LIBS -lX11" | sed "$R_TRANSLATE"` AC_CACHE_CHECK([for -R dynamic library path recording], rxvt_cv_R, -[AC_TRY_RUN([ +[AC_RUN_IFELSE([AC_LANG_SOURCE([[ main() { exit(0); (void) XOpenDisplay("foobar"); -}], rxvt_cv_R=yes, rxvt_cv_R=no, rxvt_cv_R=no)]) +}]])],[rxvt_cv_R=yes],[rxvt_cv_R=no],[rxvt_cv_R=no])]) if test x$rxvt_cv_R != xyes; then LIBS="$ac_save_LIBS $X_LIBS $X_EXTRA_LIBS -lX11" fi fi AC_CACHE_CHECK([for XPointer], rxvt_cv_xpointer, -[AC_TRY_COMPILE([#include ], [XPointer dummy;], -rxvt_cv_xpointer=yes, rxvt_cv_xpointer=no)]) +[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include ]], [[XPointer dummy;]])],[rxvt_cv_xpointer=yes],[rxvt_cv_xpointer=no])]) if test x$rxvt_cv_xpointer = xyes; then AC_DEFINE(HAVE_XPOINTER, 1, Define if you have XPointer typedef) fi @@ -507,33 +592,29 @@ AC_TYPE_PID_T AC_TYPE_UID_T - -AC_CHECK_SIZEOF(char, 1) AC_CHECK_SIZEOF(short, 2) AC_CHECK_SIZEOF(int, 4) -AC_CHECK_SIZEOF(long, 4) +dnl AC_CHECK_SIZEOF(long, 4) AC_CHECK_SIZEOF(long long, 8) AC_CHECK_SIZEOF(int *, 4) dnl# see usage below AC_DEFUN(RXVT_CHECK_SIZE, [AC_CACHE_CHECK([for $2], $1, - [AC_TRY_COMPILE([#include ], $2 dummy;, - [$1=yes], - [dnl -if test $ac_cv_sizeof_char -ge $3; then + [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include ]], [[$2 dummy;]])],[$1=yes],[dnl +if test "$ac_cv_sizeof_char" -ge $3; then $1="$4 char" else - if test $ac_cv_sizeof_short -ge $3; then + if test "$ac_cv_sizeof_short" -ge $3; then $1="$4 short" else - if test $ac_cv_sizeof_int -ge $3; then + if test "$ac_cv_sizeof_int" -ge $3; then $1="$4 int" else - if test $ac_cv_sizeof_long -ge $3; then + if test "$ac_cv_sizeof_long" -ge $3; then $1="$4 long" else - if test $ac_cv_sizeof_long_long -ge $3; then + if test "$ac_cv_sizeof_long_long" -ge $3; then $1="$4 long long" else $1="$4 $5" # we _must_ have a (possibly wrong) default @@ -570,15 +651,15 @@ dnl# dnl# Now look for another we use dnl# -if test $ac_cv_sizeof_int_p -eq 8; then +if test "$ac_cv_sizeof_int_p" -eq 8; then rxvt_intp_define="#define intp_t int64_t" rxvt_u_intp_define="#define u_intp_t u_int64_t" else - if test $ac_cv_sizeof_int_p -eq 4; then + if test "$ac_cv_sizeof_int_p" -eq 4; then rxvt_intp_define="#define intp_t int32_t" rxvt_u_intp_define="#define u_intp_t u_int32_t" else - if test $ac_cv_sizeof_int_p -eq 2; then + if test "$ac_cv_sizeof_int_p" -eq 2; then rxvt_intp_define="#define intp_t int16_t" rxvt_u_intp_define="#define u_intp_t u_int16_t" else @@ -620,6 +701,7 @@ on_exit \ nanosleep \ updwtmp \ + updwtmpx \ ttyslot \ ) dnl# Note: On NetBSD, openpty() exists in libutil. Don't pull it in @@ -632,30 +714,24 @@ dnl# -------------------------------------------- AC_CHECK_HEADER(utmp.h, [AC_CACHE_CHECK([for struct utmp], rxvt_cv_struct_utmp, -[AC_TRY_COMPILE([#include +[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include #include -#include ], -[struct utmp ut;], -rxvt_cv_struct_utmp=yes, rxvt_cv_struct_utmp=no)]) +#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_TRY_COMPILE([#include -#include ], -[struct utmp ut; ut.ut_host;], -rxvt_cv_struct_utmp_host=yes, rxvt_cv_struct_utmp_host=no)]) +[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_TRY_COMPILE([#include -#include ], -[struct utmp ut; ut.ut_pid;], -rxvt_cv_struct_utmp_pid=yes, rxvt_cv_struct_utmp_pid=no)]) +[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 @@ -665,51 +741,51 @@ AC_CHECK_HEADER(utmpx.h, [AC_CACHE_CHECK([for struct utmpx], rxvt_cv_struct_utmpx, -[AC_TRY_COMPILE([#include -#include ], -[struct utmpx ut;], -rxvt_cv_struct_utmpx=yes, rxvt_cv_struct_utmpx=no)]) +[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_TRY_COMPILE([#include -#include ], -[struct utmpx utx; utx.ut_host;], -rxvt_cv_struct_utmpx_host=yes, rxvt_cv_struct_utmpx_host=no)]) +[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 -) dnl# AC_CHECK_HEADER(utmpx.h +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_TRY_COMPILE([#include +[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)]) +]], [[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_TRY_COMPILE([#include +[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)]) +]], [[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 @@ -720,7 +796,7 @@ dnl# find utmp AC_CACHE_CHECK(where utmp is located, rxvt_cv_path_utmp, -[AC_TRY_RUN([#include +[AC_RUN_IFELSE([AC_LANG_SOURCE([[#include #include #include #include @@ -745,8 +821,8 @@ } } exit(0); -}], rxvt_cv_path_utmp=`cat conftestval`, rxvt_cv_path_utmp=, dnl - AC_MSG_WARN([Define RXVT_UTMP_FILE in config.h manually]))]) +}]])],[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 @@ -756,7 +832,7 @@ 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_TRY_RUN([#include +[AC_RUN_IFELSE([AC_LANG_SOURCE([[#include #include #include #include @@ -791,8 +867,8 @@ } } exit(0); -}], rxvt_cv_path_utmpx=`cat conftestval`, rxvt_cv_path_utmpx=, dnl - AC_MSG_WARN([Define RXVT_UTMPX_FILE in config.h manually]))]) +}]])],[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 @@ -801,7 +877,7 @@ dnl# find wtmp AC_CACHE_CHECK(where wtmp is located, rxvt_cv_path_wtmp, -[AC_TRY_RUN([#include +[AC_RUN_IFELSE([AC_LANG_SOURCE([[#include #include #ifdef HAVE_UTMP_H #include @@ -828,8 +904,8 @@ } } exit(0); -}], rxvt_cv_path_wtmp=`cat conftestval`, rxvt_cv_path_wtmp=, dnl - AC_MSG_WARN([Define RXVT_WTMP_FILE in config.h manually]))]) +}]])],[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 @@ -837,7 +913,7 @@ dnl# find wtmpx AC_CACHE_CHECK(where wtmpx is located, rxvt_cv_path_wtmpx, -[AC_TRY_RUN([#include +[AC_RUN_IFELSE([AC_LANG_SOURCE([[#include #ifdef HAVE_UTMPX_H #include #endif @@ -863,8 +939,8 @@ } } exit(0); -}], rxvt_cv_path_wtmpx=`cat conftestval`, rxvt_cv_path_wtmpx=, dnl - AC_MSG_WARN([Define RXVT_WTMPX_FILE in config.h manually]))]) +}]])],[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 @@ -872,7 +948,7 @@ dnl# find lastlog AC_CACHE_CHECK(where lastlog is located, rxvt_cv_path_lastlog, -[AC_TRY_RUN([#include +[AC_RUN_IFELSE([AC_LANG_SOURCE([[#include #include #ifdef HAVE_UTMPX_H #include @@ -903,8 +979,8 @@ } } exit(0); -}], rxvt_cv_path_lastlog=`cat conftestval`, rxvt_cv_path_lastlog=, dnl - AC_MSG_WARN([Define RXVT_LASTLOG_FILE in config.h manually]))]) +}]])],[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 @@ -915,7 +991,7 @@ dnl# find lastlogx AC_CACHE_CHECK(where lastlogx is located, rxvt_cv_path_lastlogx, -[AC_TRY_RUN([#include +[AC_RUN_IFELSE([AC_LANG_SOURCE([[#include #ifdef HAVE_UTMPX_H #include #endif @@ -940,8 +1016,8 @@ } } exit(0); -}], rxvt_cv_path_lastlogx=`cat conftestval`, rxvt_cv_path_lastlogx=, dnl - AC_MSG_WARN([Define RXVT_LASTLOGX_FILE in config.h manually]))]) +}]])],[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 @@ -975,24 +1051,22 @@ LIBS=`echo $LIBS | sed "$R_TRANSLATE"` fi AC_CACHE_CHECK(for working Xlocale, rxvt_cv_func_xlocale, -[AC_TRY_RUN([#include +[AC_RUN_IFELSE([AC_LANG_SOURCE([[#include main() { char *p; if ((p = XSetLocaleModifiers("@im=none")) != NULL && *p) exit (XSupportsLocale() ? 0 : 1); else -exit (1);}], dnl - rxvt_cv_func_xlocale=yes, rxvt_cv_func_xlocale=no, dnl - AC_MSG_WARN([Define NO_XLOCALE in config.h manually]))]) +exit (1);}]])],[dnl + rxvt_cv_func_xlocale=yes],[rxvt_cv_func_xlocale=no],[dnl + AC_MSG_WARN(Define NO_XLOCALE in config.h manually)])]) if test x$rxvt_cv_func_xlocale = xyes; then AC_DEFINE(HAVE_XLOCALE, 1, Define if Xlocale support works) fi AC_CACHE_CHECK(for working X setlocale, rxvt_cv_func_xsetlocale, -[AC_TRY_LINK([#define X_LOCALE 1 -#include ], - [setlocale(LC_CTYPE, "");], - rxvt_cv_func_xsetlocale=yes, rxvt_cv_func_xsetlocale=no)]) +[AC_LINK_IFELSE([AC_LANG_PROGRAM([[#define X_LOCALE 1 +#include ]], [[setlocale(LC_CTYPE, "");]])],[rxvt_cv_func_xsetlocale=yes],[rxvt_cv_func_xsetlocale=no])]) if test x$rxvt_cv_func_xsetlocale = xyes; then AC_DEFINE(HAVE_XSETLOCALE, 1, Define if setlocale (defined to Xsetlocale) works) fi @@ -1000,28 +1074,38 @@ CFLAGS=$ac_save_CFLAGS AC_CACHE_CHECK(for working plain setlocale, rxvt_cv_func_setlocale, -[AC_TRY_LINK([#include ], - [setlocale(LC_CTYPE, "");], - rxvt_cv_func_setlocale=yes, rxvt_cv_func_setlocale=no)]) +[AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include ]], [[setlocale(LC_CTYPE, "");]])],[rxvt_cv_func_setlocale=yes],[rxvt_cv_func_setlocale=no])]) if test x$rxvt_cv_func_setlocale = xyes; then AC_DEFINE(HAVE_SETLOCALE, 1, Define if plain old setlocale works) fi AC_CACHE_CHECK(for working nl_langinfo, rxvt_cv_func_nl_langinfo, -[AC_TRY_LINK([#include ], - [nl_langinfo(CODESET);], - rxvt_cv_func_nl_langinfo=yes, rxvt_cv_func_nl_langinfo=no)]) +[AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include ]], [[nl_langinfo(CODESET);]])],[rxvt_cv_func_nl_langinfo=yes],[rxvt_cv_func_nl_langinfo=no])]) if test x$rxvt_cv_func_nl_langinfo = xyes; then AC_DEFINE(HAVE_NL_LANGINFO, 1, Define if nl_langinfo(CODESET) works) fi +AC_CACHE_CHECK(for broken XIM callback, rxvt_broken_ximcb, +[AC_COMPILE_IFELSE([ +#include + +void im_destroy_cb (XIC unused1, XPointer client_data, XPointer unused3); + +void f() { + XIMCallback cb; + cb.callback = im_destroy_cb; +} +],rxvt_broken_ximcb=yes,rxvt_broken_ximcb=no)]) + +if test x$rxvt_broken_ximcb = xyes; then + 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_TRY_LINK([#define _GNU_SOURCE +[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)]) +# 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() ) fi @@ -1089,7 +1173,7 @@ fi -AC_CHECKING(for pty ranges) +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'` @@ -1100,12 +1184,36 @@ AC_DEFINE_UNQUOTED(PTYCHAR2, "$pch2", Define for second char in devptyXX) fi -dnl# FreeBSD needs to link libxpg4 -AC_CHECK_LIB(xpg4, setlocale, [LIBS="$LIBS -lxpg4"]) - dnl# -------------------------------------------------------------------------- dnl# now add and remove other stuff 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]) + AC_CHECK_LIB(Xft,XftDrawString32,,[support_xft=no]) + + if test x$support_xft = xyes; then + AC_DEFINE(XFT, 1, Define to enable xft support) + fi +fi +if test x$support_styles = xyes; then + AC_DEFINE(ENABLE_STYLES, 1, Define if you want bold and italic support) +fi +if test x$support_iso14755 = xyes; then + AC_DEFINE(ISO_14755, 1, Define if you want ISO 14755 extended support) +fi +if test x$support_8bitctrls = xyes; then + AC_DEFINE(EIGHT_BIT_CONTROLS, 1, Define if you want 8 bit control sequences) +fi +if test x$support_fading = xyes; then + AC_DEFINE(OFF_FOCUS_FADING, 1, Define if you want faded colors when focus is lost) +fi +if test x$support_tinting = xyes; then + AC_DEFINE(TINTING, 1, Define if you want your background to be tinted) +fi if test x$support_inheritpixmap = xyes; then AC_DEFINE(TRANSPARENT, 1, Define if you want your background to use the parent window background) fi @@ -1118,11 +1226,8 @@ if test x$support_menubar = xyes; then AC_DEFINE(MENUBAR, 1, Define if you want Menubar support) fi -if test x$support_frills = xno; then - AC_DEFINE(NO_FRILLS, 1, Define if you don't want handling for rarely used features) -fi -if test x$support_linespace = xno; then - AC_DEFINE(NO_LINESPACE, 1, Define if you don't want support linespace) +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) @@ -1133,9 +1238,6 @@ 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_oldselection = xno; then - AC_DEFINE(NO_OLD_SELECTION, 1, Define to remove old rxvt (ver 2.20 and before) style selection) -fi if test x$support_utmp = xyes; then AC_DEFINE(UTMP_SUPPORT, 1, Define if you want to have utmp/utmpx support) fi @@ -1172,27 +1274,27 @@ 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 if test x$support_unicode3 = xyes; then AC_DEFINE(UNICODE_3, 1, Define if you want to represent unicode characters outside plane 0) fi +if test x$support_combining = xyes; then + AC_DEFINE(ENABLE_COMBINING, 1, Define if you want to automatically compose combining characters) +fi if test x$codesets = xall; then - codesets=jp,jp-ext,kr,cn,cn-ext,vn + codesets=jp,jp-ext,kr,zh,zh-ext fi +AC_DEFINE(ENCODING_EU, 1, Define if you want european extended codesets) +AC_DEFINE(ENCODING_VN, 1, Define if you want vietnamese codesets) for codeset in `echo $codesets | tr "[a-z,\\-]" "[A-Z _]"`; do - AC_DEFINE(ENCODING_EU, 1, Define if you want european extended codesets) case "$codeset" in - VN ) AC_DEFINE(ENCODING_VN, 1, Define if you want vietnamese codesets) ;; JP ) AC_DEFINE(ENCODING_JP, 1, Define if you want japanese codesets) ;; JP_EXT ) AC_DEFINE(ENCODING_JP_EXT, 1, Define if you want extended japanese codesets) ;; KR ) AC_DEFINE(ENCODING_KR, 1, Define if you want korean codesets) ;; - CN ) AC_DEFINE(ENCODING_CN, 1, Define if you want chinese codesets) ;; - CN_EXT ) AC_DEFINE(ENCODING_CN_EXT, 1, Define if you want extended chinese codesets) ;; + ZH ) AC_DEFINE(ENCODING_ZH, 1, Define if you want chinese codesets) ;; + ZH_EXT ) AC_DEFINE(ENCODING_ZH_EXT, 1, Define if you want extended chinese codesets) ;; esac done @@ -1232,9 +1334,6 @@ AC_ARG_PROGRAM -RXVTNAME=`echo rxvt|sed "$program_transform_name"` -AC_SUBST(RXVTNAME) - dnl# test for "sun" or "__sun__" before include sys_ioctl dnl# revert HAVE_BLAH_H into a "#include " @@ -1247,10 +1346,10 @@ AC_SUBST($1)]) RXVT_DEFINE_TO_INCLUDE(include_stdint_h, stdint.h, ac_cv_header_stdint_h, yes, notset, dontmatch) -RXVT_DEFINE_TO_INCLUDE(include_stdarg_h, stdarg.h, ac_cv_header_stdarg_h, yes, notset, dontmatch) -RXVT_DEFINE_TO_INCLUDE(include_stdlib_h, stdlib.h, ac_cv_header_stdlib_h, yes, notset, dontmatch) +RXVT_DEFINE_TO_INCLUDE(include_stdarg_h, cstdarg, ac_cv_header_stdarg_h, yes, notset, dontmatch) +RXVT_DEFINE_TO_INCLUDE(include_stdlib_h, cstdlib, ac_cv_header_stdlib_h, yes, notset, dontmatch) RXVT_DEFINE_TO_INCLUDE(include_unistd_h, unistd.h, ac_cv_header_unistd_h, yes, notset, dontmatch) -RXVT_DEFINE_TO_INCLUDE(include_string_h, string.h, ac_cv_header_string_h, yes, notset, dontmatch) +RXVT_DEFINE_TO_INCLUDE(include_string_h, cstring, ac_cv_header_string_h, yes, notset, dontmatch) RXVT_DEFINE_TO_INCLUDE(include_fcntl_h, fcntl.h, ac_cv_header_fcntl_h, yes, notset, dontmatch) RXVT_DEFINE_TO_INCLUDE(include_util_h, util.h, ac_cv_header_util_h, yes, notset, dontmatch) RXVT_DEFINE_TO_INCLUDE(include_assert_h, assert.h, ac_cv_header_assert_h, yes, notset, dontmatch) @@ -1260,35 +1359,22 @@ RXVT_DEFINE_TO_INCLUDE(include_sys_time_h, sys/time.h, ac_cv_header_sys_time_h, yes, notset, dontmatch) RXVT_DEFINE_TO_INCLUDE(include_time_h, time.h, ac_cv_header_sys_time_h, no, ac_cv_header_time, yes) -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]) - AC_CHECK_LIB(Xft,XftDrawString32,,[support_xft=no]) - - if test x$support_xft = xyes; then - AC_DEFINE(XFT, 1, Define to enable xft support) - fi -fi - -AC_OUTPUT(autoconf/Make.common \ +AC_CONFIG_FILES([autoconf/Make.common \ Makefile \ doc/Makefile \ src/Makefile \ -src/test/Makefile \ src/rxvtlib.h \ -W11/Makefile \ -) +]) +AC_OUTPUT echo "Configuration: Rxvt version: $VERSION : $DATE Source code location: $srcdir Install path: ${prefix}/bin - Compiler: $CC - Compiler flags: $CFLAGS" + Compiler: $CXX + Compiler flags: $CFLAGS + Linker: $LINKER" if test "$MALLOC_TYPE" = S; then echo " malloc support: system default" @@ -1309,8 +1395,8 @@ " echo " pty/tty type: "$rxvt_cv_ptys if test x$support_utmp != xyes; then - echo " utmp support: disabled -" + echo " utmp support: disabled" + echo else echo " utmp support: enabled utmp file: $rxvt_cv_path_utmp @@ -1318,17 +1404,21 @@ 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" + echo fi if test x$term != x; then - echo " set TERM to: $term -" + echo " set TERM to: $term" fi if test x$terminfo != x; then - echo " set TERMINFO to: $terminfo -" + echo " set TERMINFO to: $terminfo" +fi +echo " default resource name: $RESNAME" +echo " resource class: $RESCLASS" +if test x$RESFALLBACK != x; then + 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 ." @@ -1352,5 +1442,18 @@ echo ". XIM is now being DISABLED! ." 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 ". 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 +