--- rxvt-unicode/configure	2004/03/06 00:05:00	1.18
+++ rxvt-unicode/configure	2004/03/17 03:07:35	1.22
@@ -1060,8 +1060,6 @@
   --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-old-selection  enable v2.20 (& prior) mouse selection style support
-  --disable-new-selection disable new mouse (xterm) selection style support
   --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
@@ -3283,9 +3281,6 @@
 
 CPPFLAGS="-D_GNU_SOURCE -D_XOPEN_SOURCE"
 
-if test x$GXX = xyes; then
-   CXXFLAGS="$CXXFLAGS -fno-exceptions"
-fi
 
 ac_ext=cc
 ac_cpp='$CXXCPP $CPPFLAGS'
@@ -5037,7 +5032,7 @@
 case "$host" in
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 5040 "configure"' > conftest.$ac_ext
+  echo '#line 5035 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -5588,7 +5583,7 @@
 save_CFLAGS="$CFLAGS"
 CFLAGS="$CFLAGS -o out/conftest2.$ac_objext"
 compiler_c_o=no
-if { (eval echo configure:5591: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then
+if { (eval echo configure:5586: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then
   # The compiler can only warn and ignore the option if not recognized
   # So say no if there are warnings
   if test -s out/conftest.err; then
@@ -7204,7 +7199,7 @@
     lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 7207 "configure"
+#line 7202 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -7302,7 +7297,7 @@
     lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 7305 "configure"
+#line 7300 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -8040,7 +8035,6 @@
 support_menubar=no
 support_mousewheel=no
 support_mouseslipwheel=no
-support_oldselection=no
 support_utmp=no
 support_wtmp=no
 support_lastlog=no
@@ -8083,7 +8077,6 @@
     support_menubar=yes
     support_mousewheel=yes
     support_mouseslipwheel=yes
-    support_oldselection=yes
     support_cursor_blink=yes
     support_text_blink=yes
     support_pointer_blank=yes
@@ -8425,26 +8418,6 @@
   fi
 fi;
 
-# Check whether --enable-old-selection or --disable-old-selection was given.
-if test "${enable_old_selection+set}" = set; then
-  enableval="$enable_old_selection"
-  if test x$enableval = xyes -o x$enableval = xno; then
-    support_oldselection=$enableval
-  fi
-fi;
-
-# Check whether --enable-new-selection or --disable-new-selection was given.
-if test "${enable_new_selection+set}" = set; then
-  enableval="$enable_new_selection"
-  if test x$enableval = xno; then
-
-cat >>confdefs.h <<\_ACEOF
-#define NO_NEW_SELECTION 1
-_ACEOF
-
-  fi
-fi;
-
 # Check whether --enable-dmalloc or --disable-dmalloc was given.
 if test "${enable_dmalloc+set}" = set; then
   enableval="$enable_dmalloc"
@@ -16302,13 +16275,6 @@
 _ACEOF
 
 fi
-if test x$support_oldselection = xno; then
-
-cat >>confdefs.h <<\_ACEOF
-#define NO_OLD_SELECTION 1
-_ACEOF
-
-fi
 if test x$support_utmp = xyes; then
 
 cat >>confdefs.h <<\_ACEOF
@@ -16409,7 +16375,7 @@
 if test x$support_combining = xyes; then
 
 cat >>confdefs.h <<\_ACEOF
-#define ENCODING_COMPOSE 1
+#define ENABLE_COMBINING 1
 _ACEOF
 
 fi
@@ -18033,8 +17999,8 @@
 "
 echo "  pty/tty type:               "$rxvt_cv_ptys
 if test x$support_utmp != xyes; then
-  echo "  utmp support:               disabled
-"
+  echo "  utmp support:               disabled"
+  echo
 else
   echo "  utmp support:               enabled
   utmp file:                  $rxvt_cv_path_utmp
@@ -18042,8 +18008,8 @@
   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
-"
+  ttys/ttytab file:           $rxvt_cv_path_ttytab"
+  echo
 fi
 if test x$term != x; then
   echo "  set TERM to:                $term"
@@ -18080,5 +18046,13 @@
   echo ".          XIM is now being DISABLED!                            ."
   echo ".----------------------------------------------------------------."
 fi
-echo "  *** Please check src/feature.h for further options ***
-"
+
+echo "  *** Please check src/feature.h for further options ***"
+echo
+
+echo ".----------------------------------------------------------------."
+echo ". NOTE: most features are disabled by default, try               ."
+echo ". configure --help to get an idea of the optional features       ."
+echo ".----------------------------------------------------------------."
+echo
+