--- rxvt-unicode/configure.ac	2006/01/20 11:02:46	1.10
+++ rxvt-unicode/configure.ac	2006/01/21 00:09:06	1.14
@@ -50,12 +50,12 @@
 
 AC_LANG(C++)
 dnl# --------------------------------------------------------------------------
-dnl# Supply default CXXLAGS, if not specified by `CXXLAGS=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 -fno-threadsafe-statics -fno-enforce-eh-specs"
-    AC_COMPILE_IFELSE([int i;], [echo didididid], [CXXFLAGS="-g -O3"])
+    AC_COMPILE_IFELSE([AC_LANG_PROGRAM()], [], [CXXFLAGS="-g -O3"])
   else
     CXXFLAGS="-O"
   fi
@@ -533,17 +533,17 @@
 	sys/select.h \
 	sys/sockio.h \
 	sys/strredir.h \
-        sys/stropts.h \
+	sys/stropts.h \
 	sys/time.h \
 	utmp.h \
 	utmpx.h \
-        stdint.h \
-        pty.h \
-        util.h \
-        libutil.h \
-        wchar.h \
-        cwchar \
-        clocale \
+	stdint.h \
+	pty.h \
+	util.h \
+	libutil.h \
+	wchar.h \
+	cwchar \
+	clocale \
 )
 
 AC_HEADER_TIME
@@ -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