--- rxvt-unicode/configure	2011/12/18 02:23:11	1.150
+++ rxvt-unicode/configure	2012/01/19 17:10:54	1.152
@@ -2740,8 +2740,8 @@
 
 
 
-VERSION=`sed -n -e 's/^.*[ \t]VERSION.*"\(.*\)"$/\1/p' ${srcdir}/src/version.h`
-DATE=`sed -n -e 's/^.*[ \t]DATE.*"\(.*\)"$/\1/p' ${srcdir}/src/version.h`
+VERSION=`sed -n -e 's/^.* VERSION.*"\(.*\)"$/\1/p' ${srcdir}/src/version.h`
+DATE=`sed -n -e 's/^.* DATE.*"\(.*\)"$/\1/p' ${srcdir}/src/version.h`
 
 echo ""
 echo "configuring for rxvt $VERSION"
@@ -4414,6 +4414,7 @@
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
 
+LINKER="$CXX"
 if test x$GCC = xyes && test x$GXX = xyes; then
       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working libsupc++" >&5
 $as_echo_n "checking for working libsupc++... " >&6; }
@@ -4421,7 +4422,6 @@
    save_LIBS="$LIBS"
    CXX="$CC"
    LIBS="$LIBS -lsupc++"
-   LINKER="$CC"
 
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -4437,12 +4437,12 @@
 if ac_fn_cxx_try_link "$LINENO"; then :
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
 $as_echo "ok" >&6; }
+       LINKER="$CC"
 else
 
          { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, making everything bigger and slower" >&5
 $as_echo "no, making everything bigger and slower" >&6; }
          LIBS="$save_LIBS"
-         LINKER="$save_CXX"
 
 
 fi
@@ -4479,14 +4479,6 @@
   CFLAGS="$CXXFLAGS"
 fi
 
-case $host in
-   *-*-solaris* )
-
-$as_echo "#define _XOPEN_SOURCE 500" >>confdefs.h
-
-      ;;
-esac
-
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing setlocale" >&5
 $as_echo_n "checking for library containing setlocale... " >&6; }
 if test "${ac_cv_search_setlocale+set}" = set; then :
@@ -6514,7 +6506,6 @@
 	sys/strredir.h \
 	stdint.h \
 	wchar.h \
-	cwchar \
 
 do :
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -6755,6 +6746,14 @@
 done
 
 
+case $host in
+   *-*-solaris*)
+
+$as_echo "#define __EXTENSIONS__ 1" >>confdefs.h
+
+      ;;
+esac
+
 
 for ac_header in utmp.h
 do :
@@ -6898,18 +6897,6 @@
 fi
 
 
-ac_fn_cxx_check_member "$LINENO" "struct utmpx" "ut_session" "ac_cv_member_struct_utmpx_ut_session" "
-#include <sys/types.h>
-#include <utmpx.h>
-
-"
-if test "x$ac_cv_member_struct_utmpx_ut_session" = x""yes; then :
-
-$as_echo "#define HAVE_UTMPX_SESSION 1" >>confdefs.h
-
-fi
-
-
 fi
 
 done
@@ -7043,7 +7030,7 @@
 else
 
 if test "$cross_compiling" != yes; then
-  for file in "/var/log/lastlog"; do
+  for file in "/var/log/lastlog" "/var/adm/lastlog"; do
     if test -f "$file"; then
       pt_cv_path_lastlog=$file
       break
@@ -7216,7 +7203,7 @@
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#include <clocale>
+#include <locale.h>
 int
 main ()
 {
@@ -7274,6 +7261,70 @@
 fi
 
 
+case $host in
+   *-*-solaris*)
+
+$as_echo "#define _XOPEN_SOURCE 500" >>confdefs.h
+
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing sendmsg" >&5
+$as_echo_n "checking for library containing sendmsg... " >&6; }
+if test "${ac_cv_search_sendmsg+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_func_search_save_LIBS=$LIBS
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char sendmsg ();
+int
+main ()
+{
+return sendmsg ();
+  ;
+  return 0;
+}
+_ACEOF
+for ac_lib in '' socket; do
+  if test -z "$ac_lib"; then
+    ac_res="none required"
+  else
+    ac_res=-l$ac_lib
+    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+  fi
+  if ac_fn_cxx_try_link "$LINENO"; then :
+  ac_cv_search_sendmsg=$ac_res
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext
+  if test "${ac_cv_search_sendmsg+set}" = set; then :
+  break
+fi
+done
+if test "${ac_cv_search_sendmsg+set}" = set; then :
+
+else
+  ac_cv_search_sendmsg=no
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_sendmsg" >&5
+$as_echo "$ac_cv_search_sendmsg" >&6; }
+ac_res=$ac_cv_search_sendmsg
+if test "$ac_res" != no; then :
+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+
+fi
+
+      ;;
+esac
+
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for unix-compliant filehandle passing ability" >&5
 $as_echo_n "checking for unix-compliant filehandle passing ability... " >&6; }
 if test "${pt_cv_can_pass_fds+set}" = set; then :
@@ -7282,7 +7333,7 @@
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
-#include <cstddef> // broken bsds (is that redundant?) need this
+#include <stddef.h> // broken bsds (is that redundant?) need this
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/uio.h>