--- rxvt-unicode/autoconf/configure.in	2004/01/30 18:12:17	1.8
+++ rxvt-unicode/autoconf/configure.in	2004/03/01 01:06:46	1.16
@@ -30,6 +30,25 @@
 AC_PROG_INSTALL
 AC_PROG_AWK
 
+AC_LANG(C)
+
+LINKER="$CXX"
+if test x$GCC = xyes && test x$GXX = xyes; then
+   AC_CHECK_LIB(supc++, main, [
+      LINKER="$CC"
+      LIBS="$LIBS -lsupc++"
+   ])
+fi
+AC_SUBST(LINKER,[$LINKER])
+
+CPPFLAGS="-D_GNU_SOURCE -D_XOPEN_SOURCE"
+
+if test x$GXX = xyes; then
+   CXXFLAGS="$CXXFLAGS -fno-exceptions"
+fi
+
+AC_LANG(C++)
+
 dnl# system hacks
 AC_AIX
 AC_ISC_POSIX
@@ -58,6 +77,7 @@
 support_scroll_rxvt=no
 support_scroll_next=no
 support_scroll_xterm=no
+support_scroll_plain=no
 support_xim=no
 support_xpm=no
 support_xft=no
@@ -75,7 +95,7 @@
 AC_SUBST(INSTALL_LIBRXVT)
 
 AC_ARG_ENABLE(everything,
-  [  --enable-everything     enable standard non-multichoice features: marked *
+  [  --enable-everything     enable standard non-multichoice features
                      NOTE: this option is order dependent
                      NOTE: automatically enabled with --enable-shared],
   [if test x$enableval = xyes; then
@@ -96,6 +116,7 @@
     support_scroll_rxvt=yes
     support_scroll_next=yes
     support_scroll_xterm=yes
+    support_scroll_plain=yes
     support_utmp=yes
     support_wtmp=yes
     support_xim=yes
@@ -105,46 +126,21 @@
     codesets=all
   fi])
 
-echo
-if test x$support_inheritpixmap = xyes; then
-    support_inheritpixmap=no
-    echo "******* transparency support disabled, does not work"
-fi
-if test x$support_xpm = xyes; then
-    support_xpm=no
-    echo "******* pixmap support disabled, does not work"
-fi
-if test x$support_menubar = xyes; then
-    support_menubar=no
-    echo "******* menubar support disabled, does not work"
-fi
-echo
-
 AC_ARG_ENABLE(unicode3,
   [  --enable-unicode3       use 21 instead of 16 bits to represent unicode characters],
-  [if test x$enableval = xyes; then
+  [if test x$enableval = xyes -o x$enableval = xno; then
     support_unicode3=yes
   fi])
 
 AC_ARG_ENABLE(xft,
   [  --enable-xft       enable xft support on systems that have it],
-  [if test x$enableval = xyes; then
+  [if test x$enableval = xyes -o x$enableval = xno; then
     support_xft=yes
   fi])
 
 AC_ARG_WITH(codesets,
-  [  --with-codesets=NAME,...    compile in additional codesets (jp,jp_ext,kr,cn,cn_ext,vn,all)],
-  [if test x$enableval = xyes; then
-    codesets="$withval"
-  fi])
-
-AC_ARG_WITH(encoding,
-  [  --with-encoding=NAME    set language default encoding to NAME (default: sjis)
-                          (eucj|sjis|big5|gb|kr|noenc)],
-  [if test x$enableval = xyes; then
-    withval=`echo $withval | tr '[a-z]' '[A-Z]'`
-    AC_DEFINE_UNQUOTED(MULTICHAR_ENCODING, $withval, Define default multichar glyph encoding)
-  fi])
+  [  --with-codesets=NAME,...    compile in additional codesets (jp,jp_ext,kr,cn,cn_ext,all)],
+  [codesets="$withval"])
 
 AC_ARG_ENABLE(utmp,
   [  --enable-utmp           enable utmp (utmpx) support],
@@ -200,6 +196,12 @@
     support_scroll_xterm=$enableval
   fi])
 
+AC_ARG_ENABLE(plain-scroll,
+  [  --enable-plain-scroll   enable plain style scrollbar],
+  [if test x$enableval = xyes -o x$enableval = xno; then
+    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
@@ -212,12 +214,6 @@
     support_xim=$enableval
   fi])
 
-AC_ARG_ENABLE(greek,
-  [  --enable-greek          enable greek keyboard support],
-  [if test x$enableval = xyes; then
-    AC_DEFINE(GREEK_SUPPORT, 1, Define if you want support for Greek Elot-928 & IBM-437 keyboard)
-  fi])
-
 AC_ARG_ENABLE(ttygid,
   [  --enable-ttygid         enable tty setting to group named "tty"],
   [if test x$enableval = xyes; then
@@ -364,7 +360,7 @@
   fi])
 
 AC_ARG_WITH(term,
-  [  --with-term=NAME        set the terminal to NAME (default \"xterm\")],
+  [  --with-term=NAME        set the terminal to NAME (default \"rxvt\")],
   [if test x$withval != x; then
     AC_DEFINE_UNQUOTED(TERMENV, "$withval",Set TERM to the value given by configure) term="$withval"
   fi])
@@ -1188,6 +1184,10 @@
   AC_DEFINE(XTERM_SCROLLBAR, 1, Support Xterm style scrollbars)
   scrolltypes="$scrolltypes xterm"
 fi
+if test x$support_scroll_plain = xyes; then
+  AC_DEFINE(PLAIN_SCROLLBAR, 1, Support plain style scrollbars)
+  scrolltypes="$scrolltypes plain"
+fi
 if test x$support_pointer_blank = xyes; then
   AC_DEFINE(POINTER_BLANK, 1, Define if you want hide the pointer while typing)
 fi
@@ -1204,9 +1204,9 @@
   codesets=jp,jp-ext,kr,cn,cn-ext,vn
 fi
 for codeset in `echo $codesets | tr "[a-z,\\-]" "[A-Z _]"`; do
-  AC_DEFINE(ENCODING_EU, 1, Define if you want europeean extended codesets)
+  AC_DEFINE(ENCODING_EU, 1, Define if you want european extended codesets)
+  AC_DEFINE(ENCODING_VN, 1, Define if you want vietnamese codesets)
   case "$codeset" in
-    VN     ) AC_DEFINE(ENCODING_VN,     1, Define if you want vietnamese codesets) ;;
     JP     ) AC_DEFINE(ENCODING_JP,     1, Define if you want japanese codesets) ;;
     JP_EXT ) AC_DEFINE(ENCODING_JP_EXT, 1, Define if you want extended japanese codesets) ;;
     KR     ) AC_DEFINE(ENCODING_KR,     1, Define if you want korean codesets) ;;
@@ -1306,8 +1306,9 @@
   Rxvt version:               $VERSION : $DATE
   Source code location:       $srcdir
   Install path:               ${prefix}/bin
-  Compiler:                   $CC
-  Compiler flags:             $CFLAGS"
+  Compiler:                   $CXX
+  Compiler flags:             $CFLAGS
+  Linker:                     $LINKER"
 
 if test "$MALLOC_TYPE" = S; then
   echo "  malloc support:             system default"