--- rxvt-unicode/autoconf/configure.in 2006/01/16 11:26:39 1.70 +++ 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 @@ -105,7 +106,6 @@ support_fading=yes support_keepscrolling=yes support_selectionscrolling=yes -support_menubar=no support_mousewheel=yes support_mouseslipwheel=yes support_utmp=yes @@ -152,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 @@ -183,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 @@ -273,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 @@ -309,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)], @@ -1174,7 +1166,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 @@ -1287,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