--- rxvt-unicode/autoconf/configure.in	2006/01/04 05:24:55	1.63
+++ rxvt-unicode/autoconf/configure.in	2006/01/16 15:12:48	1.74
@@ -2,6 +2,7 @@
 dnl#
 dnl# Process this file with autoconf to produce a configure script.
 dnl#
+AC_PREREQ(2.50)
 orig_CXXFLAGS="$CXXFLAGS"
 
 AC_INIT
@@ -99,14 +100,12 @@
 
 MALLOC_TYPE=S
 
-support_addstrings=no
 support_frills=yes
 support_inheritpixmap=yes
 support_tinting=yes
 support_fading=yes
 support_keepscrolling=yes
 support_selectionscrolling=yes
-support_menubar=no 
 support_mousewheel=yes
 support_mouseslipwheel=yes
 support_utmp=yes
@@ -153,7 +152,6 @@
        support_keepscrolling=no
        support_selectionscrolling=no
        support_lastlog=no
-       support_menubar=no
        support_mousewheel=no
        support_mouseslipwheel=no
        support_text_blink=no
@@ -184,7 +182,6 @@
        support_keepscrolling=yes
        support_selectionscrolling=yes
        support_lastlog=yes
-       support_menubar=yes
        support_mousewheel=yes
        support_mouseslipwheel=yes
        support_text_blink=yes
@@ -274,12 +271,6 @@
     support_fading=$enableval
   fi])
 
-AC_ARG_ENABLE(menubar,
-  [  --enable-menubar        enable menubar],
-  [if test x$enableval = xyes -o x$enableval = xno; then
-    support_menubar=$enableval
-  fi])
-
 AC_ARG_ENABLE(rxvt-scroll,
   [  --enable-rxvt-scroll    enable rxvt style scrollbar],
   [if test x$enableval = xyes -o x$enableval = xno; then
@@ -310,11 +301,11 @@
     support_scroll_plain=$enableval
   fi])
 
-AC_ARG_ENABLE(half-shadow,
-  [  --enable-half-shadow    use half width/height shadow on rxvt scrollbar],
-  [if test x$enableval = xyes; then
-    AC_DEFINE(HALFSHADOW, 1, Define if you want the depth of scrollbars and menus to be less)
-  fi])
+dnl AC_ARG_ENABLE(half-shadow,
+dnl   [  --enable-half-shadow    use half width/height shadow on rxvt scrollbar],
+dnl   [if test x$enableval = xyes; then
+dnl     AC_DEFINE(HALFSHADOW, 1, Define if you want the depth of scrollbars and menus to be less)
+dnl   fi])
 
 AC_ARG_WITH(codesets,
   [  --with-codesets=NAME,.. compile in additional codesets (jp,jp_ext,kr,zh,zh_ext,all)],
@@ -350,12 +341,6 @@
     AC_DEFINE(NO_RESOURCES, 1, Define if you don't want any resources read)
   fi])
 
-AC_ARG_ENABLE(xgetdefault,
-  [  --enable-xgetdefault    enable resources via X instead of our small version],
-  [if test x$enableval = xyes; then
-    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
@@ -396,12 +381,6 @@
 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
-    support_addstrings=$enableval
-  fi])
-
 AC_ARG_ENABLE(swapscreen,
   [  --disable-swapscreen    disable swap screen support],
   [if test x$enableval = xno; then
@@ -564,6 +543,8 @@
 	utmpx.h \
         stdint.h \
         pty.h \
+        util.h \
+        libutil.h \
         wchar.h \
         cwchar \
         clocale \
@@ -745,8 +726,8 @@
 	setsid \
 	setpgrp \
 	setpgid \
-	openpty \
 	_getpty \
+	posix_openpt \
 	grantpt \
 	unlockpt \
 	isastream \
@@ -756,7 +737,6 @@
 	updwtmpx \
 	ttyslot \
 )
-dnl# Note: On NetBSD, openpty() exists in libutil.  Don't pull it in
 
 dnl# --------------------------------------------------------------------------
 dnl# DO ALL UTMP AND WTMP CHECKING
@@ -1186,27 +1166,22 @@
    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_LINK_IFELSE([AC_LANG_PROGRAM([[#define _GNU_SOURCE
-#ifdef HAVE_STDLIB_H
-# include <cstdlib>
-#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() )
+if test x$ac_cv_func_posix_openpt = xno; then
+  AC_CHECK_FUNC(openpty, [], [AC_CHECK_LIB(util, openpty, [LIBS="$LIBS -lutil"])])
 fi
 
 dnl# if we don't guess right then it's up to the user
 AC_CACHE_CHECK(for pty/tty type, rxvt_cv_ptys,
-[if test x$ac_cv_func_openpty = xyes; then
+[if test x$ac_cv_func_openpty = xyes -o x$ac_cv_lib_util_openpty = xyes; then
     rxvt_cv_ptys=OPENPTY
+ else if test x$ac_cv_func_posix_openpt = xyes; then
+    rxvt_cv_ptys=POSIX
  else if test x$ac_cv_func__getpty = xyes; then
     rxvt_cv_ptys=SGI4
  else if test -c /dev/ttyp20; then
     rxvt_cv_ptys=SCO
  else if test -c /dev/ptym/clone; then
     rxvt_cv_ptys=HPUX
- else if test x$rxvt_cv_func_getpt = xyes; then
-    rxvt_cv_ptys=GLIBC
  else if test -c /dev/ptc -a -c /dev/pts; then
     rxvt_cv_ptys=PTC
  else if test -c /dev/ptc -a -d /dev/pts; then
@@ -1229,6 +1204,9 @@
 fi
 ])
 
+if test x$rxvt_cv_ptys = xPOSIX; then
+  AC_DEFINE(PTYS_ARE_POSIX, 1, Define for this pty type)
+fi
 if test x$rxvt_cv_ptys = xOPENPTY; then
   AC_DEFINE(PTYS_ARE_OPENPTY, 1, Define for this pty type)
 fi
@@ -1244,16 +1222,10 @@
 if test x$rxvt_cv_ptys = xSGI4; then
   AC_DEFINE(PTYS_ARE__GETPTY, 1, Define for this pty type)
 fi
-if test x$rxvt_cv_ptys = xCONVEX; then
-  AC_DEFINE(PTYS_ARE_GETPTY, 1, Define for this pty type)
-fi
-if test x$rxvt_cv_ptys = xGLIBC; then
-  AC_DEFINE(PTYS_ARE_GETPT, 1, Define for this pty type)
-fi
 if test x$rxvt_cv_ptys = xHPUX; then
   AC_DEFINE(PTYS_ARE_CLONE, 1, Define for this pty type)
 fi
-if test x$rxvt_cv_ptys = xBSD -o x$rxvt_cv_ptys = xHPUX -o x$rxvt_cv_ptys = xGLIBC; then
+if test x$rxvt_cv_ptys = xBSD -o x$rxvt_cv_ptys = xHPUX -o x$rxvt_cv_ptys = xPOSIX; then
   AC_DEFINE(PTYS_ARE_SEARCHED, 1, Define for this pty type)
 fi
 
@@ -1307,9 +1279,6 @@
 if test x$support_selectionscrolling = xyes; then
   AC_DEFINE(SELECTION_SCROLLING, 1, Define to allow scrolling when the selection moves to the top or bottom of the screen)
 fi
-if test x$support_menubar = xyes; then
-  AC_DEFINE(MENUBAR, 1, Define if you want Menubar support)
-fi
 if test x$support_frills = xyes; then
   AC_DEFINE(ENABLE_FRILLS, 1, Define if you want handling for rarely used but handy features)
 fi
@@ -1428,6 +1397,10 @@
 AC_SUBST(IF_PERL)
 AC_SUBST(PERL_O)
 
+if test x$support_perl = xyes; then
+   support_frills=yes
+fi
+
 dnl> AC_CHECK_FUNCS(gettimeofday putenv select socket)
 
 CFLAGS=${CFLAGS--O}
@@ -1454,10 +1427,6 @@
 AC_SUBST(X_LIBS)
 AC_SUBST(X_EXTRA_LIBS)
 
-if test x$support_addstrings = xno; then
-    AC_DEFINE(NO_STRINGS, 1, Define if you don't need to use our replacement string functions)
-fi
-
 dnl# common parts of the Makefile
 MCOMMON=./autoconf/Make.common
 AC_SUBST_FILE(MCOMMON)