[ViewVC] Diff of: cvs/rxvt-unicode/configure

Comparing rxvt-unicode/configure (file contents):
Revision 1.86 by root, Sat Jan 21 22:34:05 2006 UTC vs.
Revision 1.97 by root, Sat Jan 28 21:27:17 2006 UTC

 #endif
 #if HAVE_UNISTD_H
 # include <unistd.h>
 #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.
 ac_init_help=
 ac_init_version=false
                      NOTE: automatically enabled with --enable-shared
   --enable-unicode3       use 21 instead of 16 bits to represent unicode characters
   --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
   --enable-fading         enable colors fading when off focus
   --enable-rxvt-scroll    enable rxvt style scrollbar
   --enable-next-scroll    enable NeXT style scrollbar
   --enable-xterm-scroll   enable Xterm style scrollbar
   --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
   --enable-8bitctrls      enable 8 bit control sequences (not recommended)
   --enable-fallback(=CLASS) fall back on CLASS resources in addition to URxvt ones (default: Rxvt)
   --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]
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
   --with-codesets=NAME,.. compile in additional codesets (jp,jp_ext,kr,zh,zh_ext,all)
 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 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
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 fi
 fi
-echo "$as_me:$LINENO: checking for sched_yield" >&5
-echo $ECHO_N "checking for sched_yield... $ECHO_C" >&6
-if test "${ac_cv_func_sched_yield+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define sched_yield to an innocuous variant, in case <limits.h> declares sched_yield.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define sched_yield innocuous_sched_yield
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char sched_yield (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-#undef sched_yield
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char sched_yield ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_sched_yield) || defined (__stub___sched_yield)
-choke me
-#else
-char (*f) () = sched_yield;
-#endif
-#ifdef __cplusplus
-}
-#endif
-int
-main ()
-{
-return f != sched_yield;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
-  { (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); }; } &&
-	 { ac_try='test -s 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
-  ac_cv_func_sched_yield=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_func_sched_yield=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_func_sched_yield" >&5
-echo "${ECHO_T}$ac_cv_func_sched_yield" >&6
-if test $ac_cv_func_sched_yield = yes; then
-  :
-else
-  echo "$as_me:$LINENO: checking for sched_yield in -lrt" >&5
-echo $ECHO_N "checking for sched_yield in -lrt... $ECHO_C" >&6
-if test "${ac_cv_lib_rt_sched_yield+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lrt  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char sched_yield ();
-int
-main ()
-{
-sched_yield ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
-  { (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); }; } &&
-	 { ac_try='test -s 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
-  ac_cv_lib_rt_sched_yield=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_rt_sched_yield=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_rt_sched_yield" >&5
-echo "${ECHO_T}$ac_cv_lib_rt_sched_yield" >&6
-if test $ac_cv_lib_rt_sched_yield = yes; then
-  LIBS="$LIBS -lrt"
-fi
-fi
-echo "$as_me:$LINENO: checking for sched_yield support" >&5
-echo $ECHO_N "checking for sched_yield support... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <sched.h>
-int
-main ()
-{
-sched_yield ()
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
-  { (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); }; } &&
-	 { ac_try='test -s 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
-  echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_SCHED_YIELD 1
-_ACEOF
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-MALLOC_TYPE=S
 support_frills=yes
 support_inheritpixmap=yes
 support_tinting=yes
 support_fading=yes
 support_keepscrolling=yes
 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
 support_scroll_next=yes
 support_scroll_xterm=yes
 # Check whether --enable-everything or --disable-everything was given.
 if test "${enable_everything+set}" = set; then
   enableval="$enable_everything"
     if test x$enableval = xno; then
-       support_24bit=no
        support_frills=no
        support_inheritpixmap=no
        support_tinting=no
        support_fading=no
        support_keepscrolling=no
        support_styles=no
        support_perl=no
        codesets=
     fi
     if test x$enableval = xyes; then
-       support_24bit=yes
        support_frills=yes
        support_inheritpixmap=yes
        support_tinting=yes
        support_fading=yes
        support_keepscrolling=yes
   if test x$enableval = xyes -o x$enableval = xno; then
     support_styles=$enableval
   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"
   if test x$enableval = xyes -o x$enableval = xno; then
     support_xpm=$enableval
   if test x$enableval = xyes -o x$enableval = xno; then
     support_xim=$enableval
   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"
   if test x$enableval = xno; then
   if test x$enableval = xyes -o x$enableval = xno; then
     support_frills=$enableval
   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"
   if test x$enableval = xyes -o x$enableval = xno; then
     support_keepscrolling=$enableval
 # Check whether --enable-slipwheeling or --disable-slipwheeling was given.
 if test "${enable_slipwheeling+set}" = set; then
   enableval="$enable_slipwheeling"
   if test x$enableval = xyes -o x$enableval = xno; then
     support_mouseslipwheel=$enableval
-  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
 MV=$ac_cv_path_MV
 if test -n "$MV"; then
   echo "$as_me:$LINENO: result: $MV" >&5
 echo "${ECHO_T}$MV" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-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
 for ac_func in \
 	unsetenv \
 	setutent \
-	seteuid \
-	setresuid \
-	setreuid \
 	on_exit \
-	nanosleep \
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
 echo "$as_me:$LINENO: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 fi
 done
+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
 for ac_func in \
 fi
 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
 /* confdefs.h.  */
 _ACEOF
   { (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
-  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 "$as_me:$LINENO: result: $struct_utmp" >&5
-echo "${ECHO_T}$rxvt_cv_struct_utmp" >&6
+echo "${ECHO_T}$struct_utmp" >&6
-if test x$rxvt_cv_struct_utmp = xyes; then
+if test x$struct_utmp = xyes; then
 cat >>confdefs.h <<\_ACEOF
 #define HAVE_STRUCT_UTMP 1
 _ACEOF
 fi
 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
 /* confdefs.h.  */
 _ACEOF
   { (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
-  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 "$as_me:$LINENO: result: $struct_utmp_host" >&5
-echo "${ECHO_T}$rxvt_cv_struct_utmp_host" >&6
+echo "${ECHO_T}$struct_utmp_host" >&6
-if test x$rxvt_cv_struct_utmp_host = xyes; then
+if test x$struct_utmp_host = xyes; then
 cat >>confdefs.h <<\_ACEOF
 #define HAVE_UTMP_HOST 1
 _ACEOF
 fi
 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
 /* confdefs.h.  */
 _ACEOF
   { (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
-  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 "$as_me:$LINENO: result: $struct_utmp_pid" >&5
-echo "${ECHO_T}$rxvt_cv_struct_utmp_pid" >&6
+echo "${ECHO_T}$struct_utmp_pid" >&6
-if test x$rxvt_cv_struct_utmp_pid = xyes; then
+if test x$struct_utmp_pid = xyes; then
 cat >>confdefs.h <<\_ACEOF
 #define HAVE_UTMP_PID 1
 _ACEOF
 fi
 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
 /* confdefs.h.  */
 _ACEOF
   { (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
-  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 "$as_me:$LINENO: result: $struct_utmpx" >&5
-echo "${ECHO_T}$rxvt_cv_struct_utmpx" >&6
+echo "${ECHO_T}$struct_utmpx" >&6
-if test x$rxvt_cv_struct_utmpx = xyes; then
+if test x$struct_utmpx = xyes; then
 cat >>confdefs.h <<\_ACEOF
 #define HAVE_STRUCT_UTMPX 1
 _ACEOF
 fi
 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
 /* confdefs.h.  */
 _ACEOF
   { (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
-  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 "$as_me:$LINENO: result: $struct_utmpx_host" >&5
-echo "${ECHO_T}$rxvt_cv_struct_utmpx_host" >&6
+echo "${ECHO_T}$struct_utmpx_host" >&6
-if test x$rxvt_cv_struct_utmpx_host = xyes; then
+if test x$struct_utmpx_host = xyes; then
 cat >>confdefs.h <<\_ACEOF
 #define HAVE_UTMPX_HOST 1
 _ACEOF
 fi
 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
 /* confdefs.h.  */
 _ACEOF
   { (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
-  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 "$as_me:$LINENO: result: $struct_utmpx_session" >&5
-echo "${ECHO_T}$rxvt_cv_struct_utmpx_session" >&6
+echo "${ECHO_T}$struct_utmpx_session" >&6
-if test x$rxvt_cv_struct_utmpx_session = xyes; then
+if test x$struct_utmpx_session = xyes; then
 cat >>confdefs.h <<\_ACEOF
 #define HAVE_UTMPX_SESSION 1
 _ACEOF
 fi
 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
 /* confdefs.h.  */
 _ACEOF
   { (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
-  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 "$as_me:$LINENO: result: $struct_lastlog" >&5
-echo "${ECHO_T}$rxvt_cv_struct_lastlog" >&6
+echo "${ECHO_T}$struct_lastlog" >&6
-if test x$rxvt_cv_struct_lastlog = xyes; then
+if test x$struct_lastlog = xyes; then
 cat >>confdefs.h <<\_ACEOF
 #define HAVE_STRUCT_LASTLOG 1
 _ACEOF
 fi
 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
 /* confdefs.h.  */
 _ACEOF
   { (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
-  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 "$as_me:$LINENO: result: $struct_lastlogx" >&5
-echo "${ECHO_T}$rxvt_cv_struct_lastlogx" >&6
+echo "${ECHO_T}$struct_lastlogx" >&6
-if test x$rxvt_cv_struct_lastlogx = xyes; then
+if test x$struct_lastlogx = xyes; then
 cat >>confdefs.h <<\_ACEOF
 #define HAVE_STRUCT_LASTLOGX 1
 _ACEOF
 fi
 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:$LINENO: WARNING: Define UTMP_FILE in config.h manually" >&5
-echo "$as_me: WARNING: Define RXVT_UTMP_FILE in config.h manually" >&2;}
+echo "$as_me: WARNING: Define UTMP_FILE in config.h manually" >&2;}
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
   { (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
-  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 "$as_me:$LINENO: result: $path_utmp" >&5
-echo "${ECHO_T}$rxvt_cv_path_utmp" >&6
+echo "${ECHO_T}$path_utmp" >&6
-if test x$rxvt_cv_path_utmp != x; then
+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
 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:$LINENO: WARNING: Define UTMPX_FILE in config.h manually" >&5
-echo "$as_me: WARNING: Define RXVT_UTMPX_FILE in config.h manually" >&2;}
+echo "$as_me: WARNING: Define UTMPX_FILE in config.h manually" >&2;}
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
   { (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
-  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 "$as_me:$LINENO: result: $path_utmpx" >&5
-echo "${ECHO_T}$rxvt_cv_path_utmpx" >&6
+echo "${ECHO_T}$path_utmpx" >&6
-if test x$rxvt_cv_path_utmpx != x; then
+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
 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:$LINENO: WARNING: Define WTMP_FILE in config.h manually" >&5
-echo "$as_me: WARNING: Define RXVT_WTMP_FILE in config.h manually" >&2;}
+echo "$as_me: WARNING: Define WTMP_FILE in config.h manually" >&2;}
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
   { (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
-  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 "$as_me:$LINENO: result: $path_wtmp" >&5
-echo "${ECHO_T}$rxvt_cv_path_wtmp" >&6
+echo "${ECHO_T}$path_wtmp" >&6
-if test x$rxvt_cv_path_wtmp != x; then
+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:$LINENO: WARNING: Define WTMPX_FILE in config.h manually" >&5
-echo "$as_me: WARNING: Define RXVT_WTMPX_FILE in config.h manually" >&2;}
+echo "$as_me: WARNING: Define WTMPX_FILE in config.h manually" >&2;}
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
   { (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
-  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 "$as_me:$LINENO: result: $path_wtmpx" >&5
-echo "${ECHO_T}$rxvt_cv_path_wtmpx" >&6
+echo "${ECHO_T}$path_wtmpx" >&6
-if test x$rxvt_cv_path_wtmpx != x; then
+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:$LINENO: WARNING: Define LASTLOG_FILE in config.h manually" >&5
-echo "$as_me: WARNING: Define RXVT_LASTLOG_FILE in config.h manually" >&2;}
+echo "$as_me: WARNING: Define LASTLOG_FILE in config.h manually" >&2;}
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
   { (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
-  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 "$as_me:$LINENO: result: $path_lastlog" >&5
-echo "${ECHO_T}$rxvt_cv_path_lastlog" >&6
+echo "${ECHO_T}$path_lastlog" >&6
-if test x$rxvt_cv_path_lastlog != x; then
+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
 _ACEOF
   fi
 fi
 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:$LINENO: WARNING: Define LASTLOGX_FILE in config.h manually" >&5
-echo "$as_me: WARNING: Define RXVT_LASTLOGX_FILE in config.h manually" >&2;}
+echo "$as_me: WARNING: Define LASTLOGX_FILE in config.h manually" >&2;}
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
   { (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
-  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 "$as_me:$LINENO: result: $path_lastlogx" >&5
-echo "${ECHO_T}$rxvt_cv_path_lastlogx" >&6
+echo "${ECHO_T}$path_lastlogx" >&6
-if test x$rxvt_cv_path_lastlogx != x; then
+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
 #define HAVE_NL_LANGINFO 1
 _ACEOF
 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
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#include <cstddef> // broken bsds (is that redundant) need this
+#include <cstddef> // broken bsds (is that redundant?) need this
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/uio.h>
 int
   { (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
-  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 "$as_me:$LINENO: result: $can_pass_fds" >&5
-echo "${ECHO_T}$rxvt_can_pass_fds" >&6
+echo "${ECHO_T}$can_pass_fds" >&6
-if test x$rxvt_can_pass_fds = xyes; then
+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:$LINENO: error: libptytty requires unix-compliant filehandle passing ability" >&5
-echo "$as_me: error: urxvt requires unix-compliant filehandle passing ability" >&2;}
+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
   echo $ECHO_N "(cached) $ECHO_C" >&6
 for ac_func in \
   revoke \
   _getpty \
   getpt \
   posix_openpt \
   isastream \
+  setuid \
+  seteuid \
+  setreuid \
+  setresuid \
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
 echo "$as_me:$LINENO: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 done
 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 <sys/types.h>
+#include <sys/stat.h>
+#include <unistd.h>
+#include <grp.h>
+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
 echo "$as_me:$LINENO: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 else
   echo "$as_me:$LINENO: result: no" >&5
 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
-  # Extract the first word of "xft-config", so it can be a program name with args.
+    # 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
 if test "${ac_cv_path_XFT_CONFIG+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   echo "$as_me:$LINENO: result: no" >&5
 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`"
     fi
   fi
 cat >>confdefs.h <<\_ACEOF
 #define ENABLE_FRILLS 1
 _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
 #define MOUSE_WHEEL 1
 _ACEOF
 fi
 if test x$support_mouseslipwheel = xyes; then
 cat >>confdefs.h <<\_ACEOF
 #define MOUSE_SLIP_WHEELING 1
-_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
 s,@EGREP@,$EGREP,;t t
 s,@LINKER@,$LINKER,;t t
 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
 s,@ECHO@,$ECHO,;t t
 s,@CMP@,$CMP,;t t
   Install path:               ${prefix}/bin
   Compiler:                   $CXX
   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
 if test x$terminfo != x; then
   echo "  set TERMINFO to:            $terminfo"
 echo "  default resource name:      $RESNAME"
 echo "  resource class:             $RESCLASS"
 if test x$RESFALLBACK != x; then
    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     ."
   echo ".          XPM includes files and libraries could not be found.  ."
   echo ".          functions could not be found.                         ."
   echo ".          XIM is now being DISABLED!                            ."
   echo ".----------------------------------------------------------------."
 fi
-echo "  *** Optionally check src/feature.h for further options ***"
+echo "*** Optionally check src/feature.h for further, rarely used options ***"
 echo
-echo ".----------------------------------------------------------------."
-echo ". NOTE: some 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

Diff Legend

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

Comparing rxvt-unicode/configure (file contents): Revision 1.86 by root, Sat Jan 21 22:34:05 2006 UTC vs. Revision 1.97 by root, Sat Jan 28 21:27:17 2006 UTC

Diff Legend

Comparing rxvt-unicode/configure (file contents):
Revision 1.86 by root, Sat Jan 21 22:34:05 2006 UTC vs.
Revision 1.97 by root, Sat Jan 28 21:27:17 2006 UTC