--- rxvt-unicode/configure 2006/01/21 22:34:05 1.86 +++ rxvt-unicode/configure 2006/01/25 21:04:15 1.92 @@ -309,7 +309,7 @@ # include #endif" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os VERSION DATE LSMDATE LIBVERSION CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX CPP INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA EGREP LINKER INSTALL_LIBRXVT RXVTNAME MV RM CP LN SED ECHO CMP TIC CXXCPP X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS XPM_CPPFLAGS XPM_CFLAGS XPM_LIBS rxvt_int16_typedef rxvt_uint16_typedef rxvt_int32_typedef rxvt_uint32_typedef rxvt_intp_define rxvt_u_intp_define PKG_CONFIG XFT_CONFIG PERL PERLLIB PERLFLAGS PERLPRIVLIBEXP IF_PERL PERL_O DEBUG DINCLUDE DLIB include_stdint_h include_stdarg_h include_stdlib_h include_unistd_h include_string_h include_fcntl_h include_util_h include_assert_h include_sys_ioctl_h include_sys_select_h include_sys_strredir_h include_sys_time_h include_time_h LIBOBJS LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os VERSION DATE LSMDATE LIBVERSION CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX CPP INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA EGREP LINKER INSTALL_LIBRXVT RXVTNAME MV CP LN SED ECHO CMP TIC CXXCPP X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS XPM_CPPFLAGS XPM_CFLAGS XPM_LIBS rxvt_int16_typedef rxvt_uint16_typedef rxvt_int32_typedef rxvt_uint32_typedef rxvt_intp_define rxvt_u_intp_define PKG_CONFIG XFT_CONFIG PERL PERLLIB PERLFLAGS PERLPRIVLIBEXP IF_PERL PERL_O DEBUG DINCLUDE DLIB include_stdint_h include_stdarg_h include_stdlib_h include_unistd_h include_string_h include_fcntl_h include_util_h include_assert_h include_sys_ioctl_h include_sys_select_h include_sys_strredir_h include_sys_time_h include_time_h LIBOBJS LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -872,9 +872,6 @@ --enable-combining enable composition of base and combining characters --enable-xft enable xft support on systems that have it --enable-font-styles enable bold and italic support - --enable-utmp enable utmp (utmpx) support - --enable-wtmp enable wtmp (wtmpx) support (requires --enable-utmp) - --enable-lastlog enable lastlog support (requires --enable-utmp) --enable-xpm-background enable XPM background pixmaps --enable-transparency enable transparent backgrounds --enable-tinting enable tinting of transparent bg @@ -885,7 +882,6 @@ --enable-perl enable embedded perl interpreter --enable-plain-scroll enable plain style scrollbar --enable-xim XIM (X Input Method) protocol support - --enable-ttygid enable tty setting to group named "tty" --disable-backspace-key disable handling of the backspace key --disable-delete-key disable handling of the delete key --disable-resources disable all resource checking @@ -894,17 +890,16 @@ --disable-swapscreen disable swap screen support --enable-iso14755 enable support for extended ISO 14755 modes --enable-frills enable support for rarely used features - --enable-24bit enable support for using 24bit visuals if available --enable-keepscrolling enable continual scrolling on scrollbar arrow press --enable-selectionscrolling enable scrolling during selections --enable-mousewheel enable scrolling via mouse wheel or buttons 4 & 5 --enable-slipwheeling enable slip wheel scrolling (requires previous) - --enable-dmalloc enable Gray Watson's malloc - for debugging use - --enable-dlmalloc enable Doug Lea's malloc - for production use - NOTE: enable only one malloc package --enable-smart-resize enable smart growth/shrink behaviour --enable-text-blink enable blinking text --enable-pointer-blank enable pointer blank when typing or inactive pointer + --enable-utmp enable utmp (utmpx) support + --enable-wtmp enable wtmp (wtmpx) support (requires --enable-utmp) + --enable-lastlog enable lastlog support (requires --enable-utmp) Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] @@ -3304,7 +3299,7 @@ if test -z "$orig_CXXFLAGS"; then if test x$GCC = xyes && test "x$GXX" = xyes; then - CXXFLAGS="-g -O3 -fno-threadsafe-statics -fno-enforce-eh-specs" + CXXFLAGS="-g -O3 -fno-threadsafe-statics -fno-enforce-eh-specs" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -4085,8 +4080,6 @@ conftest$ac_exeext conftest.$ac_ext -MALLOC_TYPE=S - support_frills=yes support_inheritpixmap=yes support_tinting=yes @@ -4095,9 +4088,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 @@ -4131,7 +4121,6 @@ enableval="$enable_everything" if test x$enableval = xno; then - support_24bit=no support_frills=no support_inheritpixmap=no support_tinting=no @@ -4161,7 +4150,6 @@ codesets= fi if test x$enableval = xyes; then - support_24bit=yes support_frills=yes support_inheritpixmap=yes support_tinting=yes @@ -4225,30 +4213,6 @@ fi fi; -# Check whether --enable-utmp or --disable-utmp was given. -if test "${enable_utmp+set}" = set; then - enableval="$enable_utmp" - if test x$enableval = xyes -o x$enableval = xno; then - support_utmp=$enableval - fi -fi; - -# Check whether --enable-wtmp or --disable-wtmp was given. -if test "${enable_wtmp+set}" = set; then - enableval="$enable_wtmp" - if test x$enableval = xyes -o x$enableval = xno; then - support_wtmp=$enableval - fi -fi; - -# Check whether --enable-lastlog or --disable-lastlog was given. -if test "${enable_lastlog+set}" = set; then - enableval="$enable_lastlog" - if test x$enableval = xyes -o x$enableval = xno; then - support_lastlog=$enableval - fi -fi; - # Check whether --enable-xpm-background or --disable-xpm-background was given. if test "${enable_xpm_background+set}" = set; then enableval="$enable_xpm_background" @@ -4337,18 +4301,6 @@ fi fi; -# Check whether --enable-ttygid or --disable-ttygid was given. -if test "${enable_ttygid+set}" = set; then - enableval="$enable_ttygid" - if test x$enableval = xyes; then - -cat >>confdefs.h <<\_ACEOF -#define TTY_GID_SUPPORT 1 -_ACEOF - - fi -fi; - # Check whether --enable-backspace-key or --disable-backspace-key was given. if test "${enable_backspace_key+set}" = set; then enableval="$enable_backspace_key" @@ -4482,14 +4434,6 @@ fi fi; -# Check whether --enable-24bit or --disable-24bit was given. -if test "${enable_24bit+set}" = set; then - enableval="$enable_24bit" - if test x$enableval = xyes -o x$enableval = xno; then - support_24bit=$enableval - fi -fi; - # Check whether --enable-keepscrolling or --disable-keepscrolling was given. if test "${enable_keepscrolling+set}" = set; then enableval="$enable_keepscrolling" @@ -4522,28 +4466,6 @@ fi fi; -# Check whether --enable-dmalloc or --disable-dmalloc was given. -if test "${enable_dmalloc+set}" = set; then - enableval="$enable_dmalloc" - if test x$enableval = xyes; then - MALLOC_TYPE=G - DEBUG=-DDEBUG_MALLOC - DLIB="-L/usr/local/lib -ldmalloc" - DINCLUDE=-I/usr/local/include - fi -fi; - -# Check whether --enable-dlmalloc or --disable-dlmalloc was given. -if test "${enable_dlmalloc+set}" = set; then - enableval="$enable_dlmalloc" - if test x$enableval = xyes; then - MALLOC_TYPE=D - DEBUG= - DLIB="-L/usr/local/lib -ldlmalloc" - DINCLUDE= - fi -fi; - # Check whether --enable-smart-resize or --disable-smart-resize was given. if test "${enable_smart_resize+set}" = set; then enableval="$enable_smart_resize" @@ -4639,46 +4561,6 @@ echo "${ECHO_T}no" >&6 fi -# Extract the first word of "rm", so it can be a program name with args. -set dummy rm; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_path_RM+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - case $RM in - [\\/]* | ?:[\\/]*) - ac_cv_path_RM="$RM" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_RM="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done - - test -z "$ac_cv_path_RM" && ac_cv_path_RM="rm" - ;; -esac -fi -RM=$ac_cv_path_RM - -if test -n "$RM"; then - echo "$as_me:$LINENO: result: $RM" >&5 -echo "${ECHO_T}$RM" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - # Extract the first word of "cp", so it can be a program name with args. set dummy cp; ac_word=$2 echo "$as_me:$LINENO: checking for $ac_word" >&5 @@ -10073,7 +9955,6 @@ - for ac_func in \ unsetenv \ setutent \ @@ -10081,7 +9962,6 @@ setresuid \ setreuid \ on_exit \ - nanosleep \ do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` @@ -10184,6 +10064,56 @@ +support_utmp=yes +support_wtmp=yes +support_lastlog=yes + +# Check whether --enable-utmp or --disable-utmp was given. +if test "${enable_utmp+set}" = set; then + enableval="$enable_utmp" + if test x$enableval = xyes -o x$enableval = xno; then + support_utmp=$enableval + fi +fi; + +# Check whether --enable-wtmp or --disable-wtmp was given. +if test "${enable_wtmp+set}" = set; then + enableval="$enable_wtmp" + if test x$enableval = xyes -o x$enableval = xno; then + support_wtmp=$enableval + fi +fi; + +# Check whether --enable-lastlog or --disable-lastlog was given. +if test "${enable_lastlog+set}" = set; then + enableval="$enable_lastlog" + if test x$enableval = xyes -o x$enableval = xno; then + support_lastlog=$enableval + fi +fi; + +if test x$support_utmp = xyes; then + +cat >>confdefs.h <<\_ACEOF +#define UTMP_SUPPORT 1 +_ACEOF + +fi +if test x$support_wtmp = xyes; then + +cat >>confdefs.h <<\_ACEOF +#define WTMP_SUPPORT 1 +_ACEOF + +fi +if test x$support_lastlog = xyes; then + +cat >>confdefs.h <<\_ACEOF +#define LASTLOG_SUPPORT 1 +_ACEOF + +fi + @@ -10588,7 +10518,7 @@ if test $ac_cv_header_utmp_h = yes; then echo "$as_me:$LINENO: checking for struct utmp" >&5 echo $ECHO_N "checking for struct utmp... $ECHO_C" >&6 -if test "${rxvt_cv_struct_utmp+set}" = set; then +if test "${struct_utmp+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -10628,18 +10558,18 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - rxvt_cv_struct_utmp=yes + struct_utmp=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -rxvt_cv_struct_utmp=no +struct_utmp=no fi rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $rxvt_cv_struct_utmp" >&5 -echo "${ECHO_T}$rxvt_cv_struct_utmp" >&6 -if test x$rxvt_cv_struct_utmp = xyes; then +echo "$as_me:$LINENO: result: $struct_utmp" >&5 +echo "${ECHO_T}$struct_utmp" >&6 +if test x$struct_utmp = xyes; then cat >>confdefs.h <<\_ACEOF #define HAVE_STRUCT_UTMP 1 @@ -10650,7 +10580,7 @@ echo "$as_me:$LINENO: checking for ut_host in utmp struct" >&5 echo $ECHO_N "checking for ut_host in utmp struct... $ECHO_C" >&6 -if test "${rxvt_cv_struct_utmp_host+set}" = set; then +if test "${struct_utmp_host+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -10690,18 +10620,18 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - rxvt_cv_struct_utmp_host=yes + struct_utmp_host=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -rxvt_cv_struct_utmp_host=no +struct_utmp_host=no fi rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $rxvt_cv_struct_utmp_host" >&5 -echo "${ECHO_T}$rxvt_cv_struct_utmp_host" >&6 -if test x$rxvt_cv_struct_utmp_host = xyes; then +echo "$as_me:$LINENO: result: $struct_utmp_host" >&5 +echo "${ECHO_T}$struct_utmp_host" >&6 +if test x$struct_utmp_host = xyes; then cat >>confdefs.h <<\_ACEOF #define HAVE_UTMP_HOST 1 @@ -10711,7 +10641,7 @@ echo "$as_me:$LINENO: checking for ut_pid in utmp struct" >&5 echo $ECHO_N "checking for ut_pid in utmp struct... $ECHO_C" >&6 -if test "${rxvt_cv_struct_utmp_pid+set}" = set; then +if test "${struct_utmp_pid+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -10751,18 +10681,18 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - rxvt_cv_struct_utmp_pid=yes + struct_utmp_pid=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -rxvt_cv_struct_utmp_pid=no +struct_utmp_pid=no fi rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $rxvt_cv_struct_utmp_pid" >&5 -echo "${ECHO_T}$rxvt_cv_struct_utmp_pid" >&6 -if test x$rxvt_cv_struct_utmp_pid = xyes; then +echo "$as_me:$LINENO: result: $struct_utmp_pid" >&5 +echo "${ECHO_T}$struct_utmp_pid" >&6 +if test x$struct_utmp_pid = xyes; then cat >>confdefs.h <<\_ACEOF #define HAVE_UTMP_PID 1 @@ -10913,7 +10843,7 @@ if test $ac_cv_header_utmpx_h = yes; then echo "$as_me:$LINENO: checking for struct utmpx" >&5 echo $ECHO_N "checking for struct utmpx... $ECHO_C" >&6 -if test "${rxvt_cv_struct_utmpx+set}" = set; then +if test "${struct_utmpx+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -10953,18 +10883,18 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - rxvt_cv_struct_utmpx=yes + struct_utmpx=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -rxvt_cv_struct_utmpx=no +struct_utmpx=no fi rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $rxvt_cv_struct_utmpx" >&5 -echo "${ECHO_T}$rxvt_cv_struct_utmpx" >&6 -if test x$rxvt_cv_struct_utmpx = xyes; then +echo "$as_me:$LINENO: result: $struct_utmpx" >&5 +echo "${ECHO_T}$struct_utmpx" >&6 +if test x$struct_utmpx = xyes; then cat >>confdefs.h <<\_ACEOF #define HAVE_STRUCT_UTMPX 1 @@ -10975,7 +10905,7 @@ echo "$as_me:$LINENO: checking for host in utmpx struct" >&5 echo $ECHO_N "checking for host in utmpx struct... $ECHO_C" >&6 -if test "${rxvt_cv_struct_utmpx_host+set}" = set; then +if test "${struct_utmpx_host+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -11015,18 +10945,18 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - rxvt_cv_struct_utmpx_host=yes + struct_utmpx_host=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -rxvt_cv_struct_utmpx_host=no +struct_utmpx_host=no fi rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $rxvt_cv_struct_utmpx_host" >&5 -echo "${ECHO_T}$rxvt_cv_struct_utmpx_host" >&6 -if test x$rxvt_cv_struct_utmpx_host = xyes; then +echo "$as_me:$LINENO: result: $struct_utmpx_host" >&5 +echo "${ECHO_T}$struct_utmpx_host" >&6 +if test x$struct_utmpx_host = xyes; then cat >>confdefs.h <<\_ACEOF #define HAVE_UTMPX_HOST 1 @@ -11036,7 +10966,7 @@ echo "$as_me:$LINENO: checking for session in utmpx struct" >&5 echo $ECHO_N "checking for session in utmpx struct... $ECHO_C" >&6 -if test "${rxvt_cv_struct_utmpx_session+set}" = set; then +if test "${struct_utmpx_session+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -11076,18 +11006,18 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - rxvt_cv_struct_utmpx_session=yes + struct_utmpx_session=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -rxvt_cv_struct_utmpx_session=no +struct_utmpx_session=no fi rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $rxvt_cv_struct_utmpx_session" >&5 -echo "${ECHO_T}$rxvt_cv_struct_utmpx_session" >&6 -if test x$rxvt_cv_struct_utmpx_session = xyes; then +echo "$as_me:$LINENO: result: $struct_utmpx_session" >&5 +echo "${ECHO_T}$struct_utmpx_session" >&6 +if test x$struct_utmpx_session = xyes; then cat >>confdefs.h <<\_ACEOF #define HAVE_UTMPX_SESSION 1 @@ -11100,7 +11030,7 @@ echo "$as_me:$LINENO: checking for struct lastlog" >&5 echo $ECHO_N "checking for struct lastlog... $ECHO_C" >&6 -if test "${rxvt_cv_struct_lastlog+set}" = set; then +if test "${struct_lastlog+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -11144,18 +11074,18 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - rxvt_cv_struct_lastlog=yes + struct_lastlog=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -rxvt_cv_struct_lastlog=no +struct_lastlog=no fi rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $rxvt_cv_struct_lastlog" >&5 -echo "${ECHO_T}$rxvt_cv_struct_lastlog" >&6 -if test x$rxvt_cv_struct_lastlog = xyes; then +echo "$as_me:$LINENO: result: $struct_lastlog" >&5 +echo "${ECHO_T}$struct_lastlog" >&6 +if test x$struct_lastlog = xyes; then cat >>confdefs.h <<\_ACEOF #define HAVE_STRUCT_LASTLOG 1 @@ -11165,7 +11095,7 @@ echo "$as_me:$LINENO: checking for struct lastlogx" >&5 echo $ECHO_N "checking for struct lastlogx... $ECHO_C" >&6 -if test "${rxvt_cv_struct_lastlogx+set}" = set; then +if test "${struct_lastlogx+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -11209,18 +11139,18 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - rxvt_cv_struct_lastlogx=yes + struct_lastlogx=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -rxvt_cv_struct_lastlogx=no +struct_lastlogx=no fi rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $rxvt_cv_struct_lastlogx" >&5 -echo "${ECHO_T}$rxvt_cv_struct_lastlogx" >&6 -if test x$rxvt_cv_struct_lastlogx = xyes; then +echo "$as_me:$LINENO: result: $struct_lastlogx" >&5 +echo "${ECHO_T}$struct_lastlogx" >&6 +if test x$struct_lastlogx = xyes; then cat >>confdefs.h <<\_ACEOF #define HAVE_STRUCT_LASTLOGX 1 @@ -11231,12 +11161,12 @@ echo "$as_me:$LINENO: checking where utmp is located" >&5 echo $ECHO_N "checking where utmp is located... $ECHO_C" >&6 -if test "${rxvt_cv_path_utmp+set}" = set; then +if test "${path_utmp+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else if test "$cross_compiling" = yes; then - { echo "$as_me:$LINENO: WARNING: Define RXVT_UTMP_FILE in config.h manually" >&5 -echo "$as_me: WARNING: Define RXVT_UTMP_FILE in config.h manually" >&2;} + { echo "$as_me:$LINENO: WARNING: Define UTMP_FILE in config.h manually" >&5 +echo "$as_me: WARNING: Define UTMP_FILE in config.h manually" >&2;} else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -11282,24 +11212,24 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - rxvt_cv_path_utmp=`cat conftestval` + path_utmp=`cat conftestval` else echo "$as_me: program exited with status $ac_status" >&5 echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ( exit $ac_status ) -rxvt_cv_path_utmp= +path_utmp= fi rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi -echo "$as_me:$LINENO: result: $rxvt_cv_path_utmp" >&5 -echo "${ECHO_T}$rxvt_cv_path_utmp" >&6 -if test x$rxvt_cv_path_utmp != x; then +echo "$as_me:$LINENO: result: $path_utmp" >&5 +echo "${ECHO_T}$path_utmp" >&6 +if test x$path_utmp != x; then cat >>confdefs.h <<_ACEOF -#define RXVT_UTMP_FILE "$rxvt_cv_path_utmp" +#define UTMP_FILE "$path_utmp" _ACEOF fi @@ -11307,12 +11237,12 @@ echo "$as_me:$LINENO: checking where utmpx is located" >&5 echo $ECHO_N "checking where utmpx is located... $ECHO_C" >&6 -if test "${rxvt_cv_path_utmpx+set}" = set; then +if test "${path_utmpx+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else if test "$cross_compiling" = yes; then - { echo "$as_me:$LINENO: WARNING: Define RXVT_UTMPX_FILE in config.h manually" >&5 -echo "$as_me: WARNING: Define RXVT_UTMPX_FILE in config.h manually" >&2;} + { echo "$as_me:$LINENO: WARNING: Define UTMPX_FILE in config.h manually" >&5 +echo "$as_me: WARNING: Define UTMPX_FILE in config.h manually" >&2;} else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -11368,24 +11298,24 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - rxvt_cv_path_utmpx=`cat conftestval` + path_utmpx=`cat conftestval` else echo "$as_me: program exited with status $ac_status" >&5 echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ( exit $ac_status ) -rxvt_cv_path_utmpx= +path_utmpx= fi rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi -echo "$as_me:$LINENO: result: $rxvt_cv_path_utmpx" >&5 -echo "${ECHO_T}$rxvt_cv_path_utmpx" >&6 -if test x$rxvt_cv_path_utmpx != x; then +echo "$as_me:$LINENO: result: $path_utmpx" >&5 +echo "${ECHO_T}$path_utmpx" >&6 +if test x$path_utmpx != x; then cat >>confdefs.h <<_ACEOF -#define RXVT_UTMPX_FILE "$rxvt_cv_path_utmpx" +#define UTMPX_FILE "$path_utmpx" _ACEOF fi @@ -11393,12 +11323,12 @@ echo "$as_me:$LINENO: checking where wtmp is located" >&5 echo $ECHO_N "checking where wtmp is located... $ECHO_C" >&6 -if test "${rxvt_cv_path_wtmp+set}" = set; then +if test "${path_wtmp+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else if test "$cross_compiling" = yes; then - { echo "$as_me:$LINENO: WARNING: Define RXVT_WTMP_FILE in config.h manually" >&5 -echo "$as_me: WARNING: Define RXVT_WTMP_FILE in config.h manually" >&2;} + { echo "$as_me:$LINENO: WARNING: Define WTMP_FILE in config.h manually" >&5 +echo "$as_me: WARNING: Define WTMP_FILE in config.h manually" >&2;} else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -11446,36 +11376,36 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - rxvt_cv_path_wtmp=`cat conftestval` + path_wtmp=`cat conftestval` else echo "$as_me: program exited with status $ac_status" >&5 echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ( exit $ac_status ) -rxvt_cv_path_wtmp= +path_wtmp= fi rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi -echo "$as_me:$LINENO: result: $rxvt_cv_path_wtmp" >&5 -echo "${ECHO_T}$rxvt_cv_path_wtmp" >&6 -if test x$rxvt_cv_path_wtmp != x; then +echo "$as_me:$LINENO: result: $path_wtmp" >&5 +echo "${ECHO_T}$path_wtmp" >&6 +if test x$path_wtmp != x; then cat >>confdefs.h <<_ACEOF -#define RXVT_WTMP_FILE "$rxvt_cv_path_wtmp" +#define WTMP_FILE "$path_wtmp" _ACEOF fi echo "$as_me:$LINENO: checking where wtmpx is located" >&5 echo $ECHO_N "checking where wtmpx is located... $ECHO_C" >&6 -if test "${rxvt_cv_path_wtmpx+set}" = set; then +if test "${path_wtmpx+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else if test "$cross_compiling" = yes; then - { echo "$as_me:$LINENO: WARNING: Define RXVT_WTMPX_FILE in config.h manually" >&5 -echo "$as_me: WARNING: Define RXVT_WTMPX_FILE in config.h manually" >&2;} + { echo "$as_me:$LINENO: WARNING: Define WTMPX_FILE in config.h manually" >&5 +echo "$as_me: WARNING: Define WTMPX_FILE in config.h manually" >&2;} else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -11522,36 +11452,36 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - rxvt_cv_path_wtmpx=`cat conftestval` + path_wtmpx=`cat conftestval` else echo "$as_me: program exited with status $ac_status" >&5 echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ( exit $ac_status ) -rxvt_cv_path_wtmpx= +path_wtmpx= fi rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi -echo "$as_me:$LINENO: result: $rxvt_cv_path_wtmpx" >&5 -echo "${ECHO_T}$rxvt_cv_path_wtmpx" >&6 -if test x$rxvt_cv_path_wtmpx != x; then +echo "$as_me:$LINENO: result: $path_wtmpx" >&5 +echo "${ECHO_T}$path_wtmpx" >&6 +if test x$path_wtmpx != x; then cat >>confdefs.h <<_ACEOF -#define RXVT_WTMPX_FILE "$rxvt_cv_path_wtmpx" +#define WTMPX_FILE "$path_wtmpx" _ACEOF fi echo "$as_me:$LINENO: checking where lastlog is located" >&5 echo $ECHO_N "checking where lastlog is located... $ECHO_C" >&6 -if test "${rxvt_cv_path_lastlog+set}" = set; then +if test "${path_lastlog+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else if test "$cross_compiling" = yes; then - { echo "$as_me:$LINENO: WARNING: Define RXVT_LASTLOG_FILE in config.h manually" >&5 -echo "$as_me: WARNING: Define RXVT_LASTLOG_FILE in config.h manually" >&2;} + { echo "$as_me:$LINENO: WARNING: Define LASTLOG_FILE in config.h manually" >&5 +echo "$as_me: WARNING: Define LASTLOG_FILE in config.h manually" >&2;} else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -11603,27 +11533,27 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - rxvt_cv_path_lastlog=`cat conftestval` + path_lastlog=`cat conftestval` else echo "$as_me: program exited with status $ac_status" >&5 echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ( exit $ac_status ) -rxvt_cv_path_lastlog= +path_lastlog= fi rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi -echo "$as_me:$LINENO: result: $rxvt_cv_path_lastlog" >&5 -echo "${ECHO_T}$rxvt_cv_path_lastlog" >&6 -if test x$rxvt_cv_path_lastlog != x; then +echo "$as_me:$LINENO: result: $path_lastlog" >&5 +echo "${ECHO_T}$path_lastlog" >&6 +if test x$path_lastlog != x; then cat >>confdefs.h <<_ACEOF -#define RXVT_LASTLOG_FILE "$rxvt_cv_path_lastlog" +#define LASTLOG_FILE "$path_lastlog" _ACEOF - if test -d "$rxvt_cv_path_lastlog"; then + if test -d "$path_lastlog"; then cat >>confdefs.h <<\_ACEOF #define LASTLOG_IS_DIR 1 @@ -11634,12 +11564,12 @@ echo "$as_me:$LINENO: checking where lastlogx is located" >&5 echo $ECHO_N "checking where lastlogx is located... $ECHO_C" >&6 -if test "${rxvt_cv_path_lastlogx+set}" = set; then +if test "${path_lastlogx+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else if test "$cross_compiling" = yes; then - { echo "$as_me:$LINENO: WARNING: Define RXVT_LASTLOGX_FILE in config.h manually" >&5 -echo "$as_me: WARNING: Define RXVT_LASTLOGX_FILE in config.h manually" >&2;} + { echo "$as_me:$LINENO: WARNING: Define LASTLOGX_FILE in config.h manually" >&5 +echo "$as_me: WARNING: Define LASTLOGX_FILE in config.h manually" >&2;} else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -11685,28 +11615,41 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - rxvt_cv_path_lastlogx=`cat conftestval` + path_lastlogx=`cat conftestval` else echo "$as_me: program exited with status $ac_status" >&5 echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ( exit $ac_status ) -rxvt_cv_path_lastlogx= +path_lastlogx= fi rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi -echo "$as_me:$LINENO: result: $rxvt_cv_path_lastlogx" >&5 -echo "${ECHO_T}$rxvt_cv_path_lastlogx" >&6 -if test x$rxvt_cv_path_lastlogx != x; then +echo "$as_me:$LINENO: result: $path_lastlogx" >&5 +echo "${ECHO_T}$path_lastlogx" >&6 +if test x$path_lastlogx != x; then cat >>confdefs.h <<_ACEOF -#define RXVT_LASTLOGX_FILE "$rxvt_cv_path_lastlogx" +#define LASTLOGX_FILE "$path_lastlogx" _ACEOF fi +if test x$support_utmp != xyes; then + echo " utmp support: disabled" + echo +else + echo " utmp support: enabled + utmp file: $path_utmp + utmpx file: $path_utmpx + wtmp file: $path_wtmp + wtmpx file: $path_wtmpx + lastlog file: $path_lastlog + lastlogx file: $path_lastlogx" +fi + echo "$as_me:$LINENO: checking where ttys/ttytab is located" >&5 @@ -11983,9 +11926,10 @@ fi + echo "$as_me:$LINENO: checking for unix-compliant filehandle passing ability" >&5 echo $ECHO_N "checking for unix-compliant filehandle passing ability... $ECHO_C" >&6 -if test "${rxvt_can_pass_fds+set}" = set; then +if test "${can_pass_fds+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -12053,30 +11997,31 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - rxvt_can_pass_fds=yes + can_pass_fds=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -rxvt_can_pass_fds=no +can_pass_fds=no fi rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $rxvt_can_pass_fds" >&5 -echo "${ECHO_T}$rxvt_can_pass_fds" >&6 -if test x$rxvt_can_pass_fds = xyes; then +echo "$as_me:$LINENO: result: $can_pass_fds" >&5 +echo "${ECHO_T}$can_pass_fds" >&6 +if test x$can_pass_fds = xyes; then cat >>confdefs.h <<\_ACEOF #define HAVE_UNIX_FDPASS 1 _ACEOF else - { { echo "$as_me:$LINENO: error: urxvt requires unix-compliant filehandle passing ability" >&5 -echo "$as_me: error: urxvt requires unix-compliant filehandle passing ability" >&2;} + { { echo "$as_me:$LINENO: error: libptytty requires unix-compliant filehandle passing ability" >&5 +echo "$as_me: error: libptytty requires unix-compliant filehandle passing ability" >&2;} { (exit 1); exit 1; }; } fi + echo "$as_me:$LINENO: checking for broken XIM callback" >&5 echo $ECHO_N "checking for broken XIM callback... $ECHO_C" >&6 if test "${rxvt_broken_ximcb+set}" = set; then @@ -12719,6 +12664,76 @@ fi + +echo "$as_me:$LINENO: checking for tty group" >&5 +echo $ECHO_N "checking for tty group... $ECHO_C" >&6 +if test "${tty_group+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test "$cross_compiling" = yes; then + tty_group=no +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +#include +#include +#include +#include + +main() +{ + struct stat st; + struct group *gr; + char *tty; + gr = getgrnam("tty"); + tty = ttyname(0); + if (gr != 0 + && tty != 0 + && (stat(tty, &st)) == 0 + && st.st_gid == gr->gr_gid) + return 0; + else + return 1; +} +_ACEOF +rm -f conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + tty_group=yes +else + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +( exit $ac_status ) +tty_group=no +fi +rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +fi +fi +echo "$as_me:$LINENO: result: $tty_group" >&5 +echo "${ECHO_T}$tty_group" >&6 +if test x$tty_group = xyes; then + +cat >>confdefs.h <<\_ACEOF +#define TTY_GID_SUPPORT 1 +_ACEOF + +fi + if test x$support_xft = xyes; then # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 @@ -12760,7 +12775,11 @@ echo "${ECHO_T}no" >&6 fi - # Extract the first word of "xft-config", so it can be a program name with args. + if test $PKG_CONFIG != no && $PKG_CONFIG --exists xft; then + LIBS="$LIBS `$PKG_CONFIG xft --libs`" + CPPFLAGS="$CPPFLAGS `$PKG_CONFIG xft --cflags`" + else + # Extract the first word of "xft-config", so it can be a program name with args. set dummy xft-config; ac_word=$2 echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 @@ -12800,10 +12819,6 @@ echo "${ECHO_T}no" >&6 fi - if test $PKG_CONFIG != no && $PKG_CONFIG --exists xft; then - LIBS="$LIBS `$PKG_CONFIG xft --libs`" - CPPFLAGS="$CPPFLAGS `$PKG_CONFIG xft --cflags`" - else if test $XFT_CONFIG != no; then LIBS="$LIBS `$XFT_CONFIG --libs`" CPPFLAGS="$CPPFLAGS `$XFT_CONFIG --cflags`" @@ -13108,13 +13123,6 @@ _ACEOF fi -if test x$support_24bit = xyes; then - -cat >>confdefs.h <<\_ACEOF -#define PREFER_24BIT 1 -_ACEOF - -fi if test x$support_mousewheel = xyes; then cat >>confdefs.h <<\_ACEOF @@ -13129,27 +13137,6 @@ _ACEOF fi -if test x$support_utmp = xyes; then - -cat >>confdefs.h <<\_ACEOF -#define UTMP_SUPPORT 1 -_ACEOF - -fi -if test x$support_wtmp = xyes; then - -cat >>confdefs.h <<\_ACEOF -#define WTMP_SUPPORT 1 -_ACEOF - -fi -if test x$support_lastlog = xyes; then - -cat >>confdefs.h <<\_ACEOF -#define LASTLOG_SUPPORT 1 -_ACEOF - -fi if test x$support_xim = xyes -o x$multichar_set = xyes; then if test x$rxvt_cv_func_xlocale = xyes; then @@ -14201,7 +14188,6 @@ s,@INSTALL_LIBRXVT@,$INSTALL_LIBRXVT,;t t s,@RXVTNAME@,$RXVTNAME,;t t s,@MV@,$MV,;t t -s,@RM@,$RM,;t t s,@CP@,$CP,;t t s,@LN@,$LN,;t t s,@SED@,$SED,;t t @@ -14750,37 +14736,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 -" -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 @@ -14793,6 +14752,8 @@ echo " resource class fallback: $RESFALLBACK" fi echo +echo " embedded perl: $support_perl" +echo if test x$support_xpm = xneedsmanualspecification; then echo ".----------------------------------------------------------------." echo ". WARNING: --enable-xpm-background was specified however the ."