--- rxvt-unicode/configure	2006/01/21 18:34:25	1.83
+++ rxvt-unicode/configure	2006/01/21 19:50:52	1.84
@@ -3223,35 +3223,33 @@
 
 fi
 
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ac_ext=cc
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
 
-LINKER="$CXX"
 if test x$GCC = xyes && test x$GXX = xyes; then
-   echo "$as_me:$LINENO: checking for main in -lsupc++" >&5
-echo $ECHO_N "checking for main in -lsupc++... $ECHO_C" >&6
-if test "${ac_cv_lib_supcpp_main+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lsupc++  $LIBS"
+      echo "$as_me:$LINENO: checking for working libsupc++" >&5
+echo $ECHO_N "checking for working libsupc++... $ECHO_C" >&6
+   save_CXX="$CXX"
+   save_LIBS="$LIBS"
+   CXX="$CC"
+   LIBS="$LIBS -lsupc++"
+   LINKER="$CC"
+
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-
-
+struct test { }; void f() try { throw new test; } catch (...) { throw; }
 int
 main ()
 {
-main ();
+
   ;
   return 0;
 }
@@ -3265,7 +3263,7 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -3277,27 +3275,24 @@
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  ac_cv_lib_supcpp_main=yes
+  echo "$as_me:$LINENO: result: ok" >&5
+echo "${ECHO_T}ok" >&6
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_lib_supcpp_main=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_supcpp_main" >&5
-echo "${ECHO_T}$ac_cv_lib_supcpp_main" >&6
-if test $ac_cv_lib_supcpp_main = yes; then
 
-      LINKER="$CC"
-      LIBS="$LIBS -lsupc++"
+         echo "$as_me:$LINENO: result: no, make everything bigger and slower" >&5
+echo "${ECHO_T}no, make everything bigger and slower" >&6
+         CXX="$save_CXX"
+         LIBS="$save_LIBS"
+         LINKER="$CXX"
 
-fi
 
 fi
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
+fi
 LINKER=$LINKER
 
 
@@ -3310,8 +3305,7 @@
 if test -z "$orig_CXXFLAGS"; then
   if test x$GCC = xyes && test "x$GXX" = xyes; then
     CXXFLAGS="-g -O3 -fno-threadsafe-statics -fno-enforce-eh-specs"
-
-cat >conftest.$ac_ext <<_ACEOF
+    cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -12001,8 +11995,10 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
+#include <cstddef> // broken bsds (is that redundant) need this
 #include <sys/types.h>
 #include <sys/socket.h>
+#include <sys/uio.h>
 
 int
 main ()