--- rxvt-unicode/configure	2004/03/06 00:05:00	1.18
+++ rxvt-unicode/configure	2004/04/02 17:59:49	1.24
@@ -1038,6 +1038,7 @@
   --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-menubar        enable menubar
   --enable-rxvt-scroll    enable rxvt style scrollbar
   --enable-next-scroll    enable NeXT style scrollbar
@@ -1060,8 +1061,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 +3282,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 +5033,7 @@
 case "$host" in
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 5040 "configure"' > conftest.$ac_ext
+  echo '#line 5036 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -5588,7 +5584,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:5587: \"$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 +7200,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 7203 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -7302,7 +7298,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 7301 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -8035,12 +8031,12 @@
 support_frills=no
 support_linespace=no
 support_inheritpixmap=no
+support_tinting=no
 support_keepscrolling=no
 support_selectionscrolling=no
 support_menubar=no
 support_mousewheel=no
 support_mouseslipwheel=no
-support_oldselection=no
 support_utmp=no
 support_wtmp=no
 support_lastlog=no
@@ -8077,13 +8073,13 @@
     support_frills=yes
     support_linespace=yes
     support_inheritpixmap=yes
+    support_tinting=yes
     support_keepscrolling=yes
     support_selectionscrolling=yes
     support_lastlog=yes
     support_menubar=yes
     support_mousewheel=yes
     support_mouseslipwheel=yes
-    support_oldselection=yes
     support_cursor_blink=yes
     support_text_blink=yes
     support_pointer_blank=yes
@@ -8166,6 +8162,14 @@
   fi
 fi;
 
+# Check whether --enable-tinting or --disable-tinting was given.
+if test "${enable_tinting+set}" = set; then
+  enableval="$enable_tinting"
+  if test x$enableval = xyes -o x$enableval = xno; then
+    support_tinting=$enableval
+  fi
+fi;
+
 # Check whether --enable-menubar or --disable-menubar was given.
 if test "${enable_menubar+set}" = set; then
   enableval="$enable_menubar"
@@ -8425,26 +8429,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"
@@ -8877,9 +8861,12 @@
 
 
 
-echo "$as_me:$LINENO: checking for X" >&5
+
+if test "x$ac_path_x_has_been_run" != xyes; then
+  echo "$as_me:$LINENO: checking for X" >&5
 echo $ECHO_N "checking for X... $ECHO_C" >&6
 
+ac_path_x_has_been_run=yes
 
 # Check whether --with-x or --without-x was given.
 if test "${with_x+set}" = set; then
@@ -8972,7 +8959,7 @@
 /usr/openwin/share/include'
 
 if test "$ac_x_includes" = no; then
-  # Guess where to find include files, by looking for Intrinsic.h.
+  # Guess where to find include files, by looking for a specified header file.
   # First, try using that file with no special directory specified.
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -9106,10 +9093,15 @@
   # Update the cache value to reflect the command line values.
   ac_cv_have_x="have_x=yes \
 		ac_x_includes=$x_includes ac_x_libraries=$x_libraries"
-  echo "$as_me:$LINENO: result: libraries $x_libraries, headers $x_includes" >&5
-echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6
+  # It might be that x_includes is empty (headers are found in the
+  # standard search path. Then output the corresponding message
+  ac_out_x_includes=$x_includes
+  test "x$x_includes" = x && ac_out_x_includes="in standard search path"
+  echo "$as_me:$LINENO: result: libraries $x_libraries, headers $ac_out_x_includes" >&5
+echo "${ECHO_T}libraries $x_libraries, headers $ac_out_x_includes" >&6
 fi
 
+fi
 if test "$no_x" = yes; then
   # Not all programs may use this symbol, but it does not hurt to define it.
 
@@ -16239,6 +16231,13 @@
 fi
 
 
+if test x$support_tinting = xyes; then
+
+cat >>confdefs.h <<\_ACEOF
+#define TINTING 1
+_ACEOF
+
+fi
 if test x$support_inheritpixmap = xyes; then
 
 cat >>confdefs.h <<\_ACEOF
@@ -16302,13 +16301,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 +16401,7 @@
 if test x$support_combining = xyes; then
 
 cat >>confdefs.h <<\_ACEOF
-#define ENCODING_COMPOSE 1
+#define ENABLE_COMBINING 1
 _ACEOF
 
 fi
@@ -18033,8 +18025,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 +18034,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 +18072,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
+