--- rxvt-unicode/autoconf/configure.in	2004/03/03 04:07:52	1.17
+++ rxvt-unicode/autoconf/configure.in	2004/03/14 17:50:40	1.22
@@ -82,6 +82,7 @@
 support_xpm=no
 support_xft=no
 support_unicode3=no
+support_combining=no
 codesets=
 
 dnl# --------------------------------------------------------------------------
@@ -123,6 +124,7 @@
     support_xpm=yes
     support_xft=yes
     support_unicode3=yes
+    support_combining=yes
     codesets=all
   fi])
 
@@ -132,6 +134,12 @@
     support_unicode3=yes
   fi])
 
+AC_ARG_ENABLE(combining,
+  [  --enable-combining      enable composition of base and combining characters],
+  [if test x$enableval = xyes -o x$enableval = xno; then
+    support_combining=yes
+  fi])
+
 AC_ARG_ENABLE(xft,
   [  --enable-xft            enable xft support on systems that have it],
   [if test x$enableval = xyes -o x$enableval = xno; then
@@ -1052,7 +1060,7 @@
 CFLAGS=$ac_save_CFLAGS
 
 AC_CACHE_CHECK(for working plain setlocale, rxvt_cv_func_setlocale,
-[AC_TRY_LINK([#include <locale.h>],
+[AC_TRY_LINK([#include <clocale>],
   [setlocale(LC_CTYPE, "");],
   rxvt_cv_func_setlocale=yes, rxvt_cv_func_setlocale=no)])
 if test x$rxvt_cv_func_setlocale = xyes; then
@@ -1070,7 +1078,7 @@
 AC_CACHE_CHECK(for getpt, rxvt_cv_func_getpt,
 [AC_TRY_LINK([#define _GNU_SOURCE
 #ifdef HAVE_STDLIB_H
-# include <stdlib.h>
+# include <cstdlib>
 #endif],
   [(void)getpt();],
   rxvt_cv_func_getpt=yes, rxvt_cv_func_getpt=no)])
@@ -1233,8 +1241,11 @@
 if test x$support_unicode3 = xyes; then
   AC_DEFINE(UNICODE_3, 1, Define if you want to represent unicode characters outside plane 0)
 fi
+if test x$support_combining = xyes; then
+  AC_DEFINE(ENABLE_COMBINING, 1, Define if you want to automatically compose combining characters)
+fi
 if test x$codesets = xall; then
-  codesets=jp,jp-ext,kr,cn,cn-ext,vn
+  codesets=jp,jp-ext,kr,cn,cn-ext
 fi
 for codeset in `echo $codesets | tr "[a-z,\\-]" "[A-Z _]"`; do
   AC_DEFINE(ENCODING_EU, 1, Define if you want european extended codesets)
@@ -1296,10 +1307,10 @@
 AC_SUBST($1)])
 
 RXVT_DEFINE_TO_INCLUDE(include_stdint_h, stdint.h, ac_cv_header_stdint_h, yes, notset, dontmatch)
-RXVT_DEFINE_TO_INCLUDE(include_stdarg_h, stdarg.h, ac_cv_header_stdarg_h, yes, notset, dontmatch)
-RXVT_DEFINE_TO_INCLUDE(include_stdlib_h, stdlib.h, ac_cv_header_stdlib_h, yes, notset, dontmatch)
+RXVT_DEFINE_TO_INCLUDE(include_stdarg_h, cstdarg, ac_cv_header_stdarg_h, yes, notset, dontmatch)
+RXVT_DEFINE_TO_INCLUDE(include_stdlib_h, cstdlib, ac_cv_header_stdlib_h, yes, notset, dontmatch)
 RXVT_DEFINE_TO_INCLUDE(include_unistd_h, unistd.h, ac_cv_header_unistd_h, yes, notset, dontmatch)
-RXVT_DEFINE_TO_INCLUDE(include_string_h, string.h, ac_cv_header_string_h, yes, notset, dontmatch)
+RXVT_DEFINE_TO_INCLUDE(include_string_h, cstring, ac_cv_header_string_h, yes, notset, dontmatch)
 RXVT_DEFINE_TO_INCLUDE(include_fcntl_h, fcntl.h, ac_cv_header_fcntl_h, yes, notset, dontmatch)
 RXVT_DEFINE_TO_INCLUDE(include_util_h, util.h, ac_cv_header_util_h, yes, notset, dontmatch)
 RXVT_DEFINE_TO_INCLUDE(include_assert_h, assert.h, ac_cv_header_assert_h, yes, notset, dontmatch)
@@ -1359,8 +1370,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
@@ -1368,17 +1379,21 @@
   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
-"
+  echo "  set TERM to:                $term"
 fi
 if test x$terminfo != x; then
-  echo "  set TERMINFO to:            $terminfo
-"
+  echo "  set TERMINFO to:            $terminfo"
+fi
+echo "  default resource name:      $RESNAME"
+echo "  resource class:             $RESCLASS"
+if test x$RESFALLBACK != x; then
+   echo "  resource class fallback:    $RESFALLBACK"
 fi
+echo
 if test x$rxvt_cv_ptys = xUNKNOWN; then
   echo ".----------------------------------------------------------------."
   echo ". WARNING: could not determine pty/tty type.  Do not build until ."
@@ -1402,5 +1417,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
+