--- rxvt-unicode/configure.ac	2006/01/18 11:28:42	1.8
+++ rxvt-unicode/configure.ac	2006/01/20 23:53:21	1.13
@@ -33,29 +33,35 @@
 AC_PROG_CPP
 AC_PROG_INSTALL
 
+AC_AIX
+AC_ISC_POSIX
+
 AC_LANG(C)
 
+dnl check wetehr we can link with gcc -lsupc++
+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])
+
+AC_LANG(C++)
 dnl# --------------------------------------------------------------------------
-dnl# Supply default CFLAGS, if not specified by `CFLAGS=flags ./configure'
+dnl# Supply default CXXFLAGS, if not specified by `CXXFLAGS=flags ./configure'
 dnl#
 if test -z "$orig_CXXFLAGS"; then
   if test x$GCC = xyes && test "x$GXX" = xyes; then
-    CXXFLAGS="-g -O3"
+    CXXFLAGS="-g -O3 -fno-threadsafe-statics -fno-enforce-eh-specs"
+    AC_COMPILE_IFELSE([AC_LANG_PROGRAM()], [], [CXXFLAGS="-g -O3"])
   else
     CXXFLAGS="-O"
   fi
   CFLAGS="$CXXFLAGS"
 fi
 
-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])
-
 AC_DEFINE(_GNU_SOURCE, 1, Use all glibc features.)
 
 case $host in
@@ -70,12 +76,6 @@
 dnl    CXXFLAGS="$CXXFLAGS" dnl I once had -fno-exceptions, but I am using them now...
 dnl fi
 
-AC_LANG(C++)
-
-dnl# system hacks
-AC_AIX
-AC_ISC_POSIX
-
 dnl# FreeBSD needs to link libxpg4
 AC_CHECK_FUNC(setlocale,     [], [AC_CHECK_LIB(xpg4,   setlocale,     [LIBS="$LIBS -lxpg4"])])
 
@@ -628,7 +628,7 @@
 AC_CHECK_SIZEOF(int *, 4)
 
 dnl# see usage below
-AC_DEFUN(RXVT_CHECK_SIZE,
+AC_DEFUN([RXVT_CHECK_SIZE],
   [AC_CACHE_CHECK([for $2], $1,
     [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stdint.h>]], [[$2 dummy;]])],[$1=yes],[dnl
 if test "$ac_cv_sizeof_char" -ge $3; then
@@ -1425,7 +1425,7 @@
 dnl# test for "sun" or "__sun__" before include sys_ioctl
 
 dnl# revert HAVE_BLAH_H into a "#include <blah.h>"
-AC_DEFUN(RXVT_DEFINE_TO_INCLUDE, dnl
+AC_DEFUN([RXVT_DEFINE_TO_INCLUDE], dnl
 [if test "$$3" = "$4" -o "$$5" = "$6"; then
   $1="#include <$2>"
 else