--- rxvt-unicode/autoconf/configure.in	2006/01/16 09:28:45	1.69
+++ rxvt-unicode/autoconf/configure.in	2006/01/16 15:36:55	1.75
@@ -2,9 +2,9 @@
 dnl#
 dnl# Process this file with autoconf to produce a configure script.
 dnl#
-orig_CXXFLAGS="$CXXFLAGS"
 
 AC_INIT
+AC_PREREQ(2.50)
 AC_CONFIG_SRCDIR([src/feature.h])
 AC_CONFIG_AUX_DIR(autoconf)
 AC_CONFIG_HEADER(config.h:autoconf/config.h.in)
@@ -25,6 +25,8 @@
 echo "configuring for rxvt $VERSION"
 echo ""
 
+orig_CXXFLAGS="$CXXFLAGS"
+
 dnl# Checks for programs.
 dnl AC_MAKE_SET
 
@@ -40,9 +42,10 @@
 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"
+  else
+    CXXFLAGS="-O"
   fi
   CFLAGS="$CXXFLAGS"
 fi
@@ -105,7 +108,6 @@
 support_fading=yes
 support_keepscrolling=yes
 support_selectionscrolling=yes
-support_menubar=no 
 support_mousewheel=yes
 support_mouseslipwheel=yes
 support_utmp=yes
@@ -152,7 +154,6 @@
        support_keepscrolling=no
        support_selectionscrolling=no
        support_lastlog=no
-       support_menubar=no
        support_mousewheel=no
        support_mouseslipwheel=no
        support_text_blink=no
@@ -183,7 +184,6 @@
        support_keepscrolling=yes
        support_selectionscrolling=yes
        support_lastlog=yes
-       support_menubar=yes
        support_mousewheel=yes
        support_mouseslipwheel=yes
        support_text_blink=yes
@@ -273,12 +273,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
@@ -309,11 +303,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)],
@@ -1174,7 +1168,7 @@
    AC_DEFINE(XIMCB_PROTO_BROKEN, 1, Define if your XIMCallback specifies XIC as first type.)
 fi
 
-if test x$rxvt_cv_func_posix_openpt = xno; then
+if test x$ac_cv_func_posix_openpt = xno; then
   AC_CHECK_FUNC(openpty, [], [AC_CHECK_LIB(util, openpty, [LIBS="$LIBS -lutil"])])
 fi
 
@@ -1230,13 +1224,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 = 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
 
@@ -1290,9 +1281,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