--- rxvt-unicode/configure.ac	2008/01/27 22:48:31	1.105
+++ rxvt-unicode/configure.ac	2010/08/30 18:14:38	1.114
@@ -34,7 +34,7 @@
 AC_ISC_POSIX
 AC_LANG(C++)
 
-dnl check wether we can link with gcc -lsupc++
+dnl check whether we can link with gcc -lsupc++
 if test x$GCC = xyes && test x$GXX = xyes; then
    dnl FreeBSD (at least up to 5.3) has a broken GCC, workaround it
    AC_MSG_CHECKING([for working libsupc++])
@@ -76,11 +76,11 @@
 esac
 
 dnl# FreeBSD needs to link libxpg4
-AC_CHECK_FUNC(setlocale,     [], [AC_CHECK_LIB(xpg4,   setlocale,     [LIBS="$LIBS -lxpg4"])])
+AC_SEARCH_LIBS(setlocale,     xpg4)
 
 dnl# solaris needs to link libnsl and socket
-AC_CHECK_FUNC(gethostbyname, [], [AC_CHECK_LIB(nsl,    gethostbyname, [LIBS="$LIBS -lnsl"])])
-AC_CHECK_FUNC(socket,        [], [AC_CHECK_LIB(socket, socket,        [LIBS="$LIBS -lsocket"])])
+AC_SEARCH_LIBS(gethostbyname, nsl)
+AC_SEARCH_LIBS(socket,        socket)
 
 support_frills=yes
 support_inheritpixmap=yes
@@ -172,6 +172,16 @@
     fi
   ])
 
+ASSERTIONS=no
+AC_ARG_ENABLE(assert,
+  [  --enable-assert         enable assertions],
+  [if test x$enableval = xyes; then
+    ASSERTIONS=yes
+  fi])
+if test x$ASSERTIONS = xno; then
+  AC_DEFINE(NDEBUG, 1, Disable assertions (good for debugging))
+fi
+
 WARNINGS=no
 AC_ARG_ENABLE(warnings,
   [  --enable-warnings       turn on g++ warnings],
@@ -188,6 +198,16 @@
   fi
 fi
 
+support_256_color=no
+AC_ARG_ENABLE(256-color,
+  [  --enable-256-color      enable 256-color support],
+  [if test x$enableval = xyes; then
+    support_256_color=yes
+  fi])
+if test x$support_256_color = xyes; then
+  AC_DEFINE(USE_256_COLORS, 1, Define if you want 256-color support)
+fi
+
 AC_ARG_ENABLE(unicode3,
   [  --enable-unicode3       use 21 instead of 16 bits to represent unicode characters],
   [if test x$enableval = xyes -o x$enableval = xno; then
@@ -331,7 +351,6 @@
   [RXVTNAME="$withval"])
 AC_DEFINE_UNQUOTED(RXVTNAME,"$RXVTNAME", [Binary base name])
 
-RXVTNAME=`echo "$RXVTNAME"|sed "$program_transform_name"`
 AC_SUBST(RXVTNAME)
 
 AC_ARG_ENABLE(swapscreen,
@@ -389,7 +408,7 @@
   fi])
 
 AC_ARG_ENABLE(pointer-blank,
-  [  --enable-pointer-blank  enable pointer blank when typing or inactive pointer],
+  [  --enable-pointer-blank  enable pointer blanking when typing or inactive],
   [if test x$enableval = xyes -o x$enableval = xno; then
     support_pointer_blank=$enableval
   fi])
@@ -446,12 +465,17 @@
     fi
     if test "x$support_afterimage" = "xyes"; then
       AC_MSG_RESULT($AFTERIMAGE_LIBS)
+      AC_DEFINE(HAVE_AFTERIMAGE, 1, Define if you want to use libAfterImage for image processing)
+      AC_DEFINE(BG_IMAGE_FROM_FILE, 1, Define if you want to have sexy-looking background pixmaps.)
     else
       AC_MSG_RESULT(no)
     fi
   fi
 fi
 
+AC_SUBST(AFTERIMAGE_CFLAGS)
+AC_SUBST(AFTERIMAGE_LIBS)
+
 dnl# --------------------------------------------------------------------------
 dnl# CHECKING FOR HEADER FILES
 dnl# --------------------------------------------------------------------------
@@ -471,7 +495,7 @@
   AC_DEFINE(HAVE_XPOINTER, 1, Define if you have XPointer typedef)
 fi
 
-AC_CACHE_CHECK([for XLIB_ILLEGAL_ACCESS], rxvt_xlib_illegal_access,
+AC_CACHE_CHECK([for XLIB_ILLEGAL_ACCESS], rxvt_cv_xlib_illegal_access,
 [AC_COMPILE_IFELSE(
    [AC_LANG_PROGRAM([
 #define XLIB_ILLEGAL_ACCESS
@@ -480,9 +504,9 @@
       Display *dpy;
       dpy->xdefaults = (char *)0;
    ])],
-   [rxvt_xlib_illegal_access=yes],[rxvt_xlib_illegal_access=no]
+   [rxvt_cv_xlib_illegal_access=yes],[rxvt_cv_xlib_illegal_access=no]
 )])
-if test x$rxvt_xlib_illegal_access = xyes; then
+if test x$rxvt_cv_xlib_illegal_access = xyes; then
    AC_DEFINE(XLIB_ILLEGAL_ACCESS, 1, Define ONLY iff Xlib.h supports it)
 fi
 
@@ -529,7 +553,7 @@
     :])])
   if test x$rxvt_cv_func_xlocale = xyes; then
     AC_DEFINE(USE_XIM, 1, Define if you want to have XIM (X Input Method) protocol support - required for multibyte characters input)
-    AC_CACHE_CHECK(for broken XIM callback, rxvt_broken_ximcb,
+    AC_CACHE_CHECK(for broken XIM callback, rxvt_cv_broken_ximcb,
     [AC_COMPILE_IFELSE([
     #include <X11/Xlib.h>
 
@@ -539,9 +563,9 @@
       XIMCallback cb;
       cb.callback = im_destroy_cb;
     }
-    ],rxvt_broken_ximcb=yes,rxvt_broken_ximcb=no)])
+    ],rxvt_cv_broken_ximcb=yes,rxvt_cv_broken_ximcb=no)])
 
-    if test x$rxvt_broken_ximcb = xyes; then
+    if test x$rxvt_cv_broken_ximcb = xyes; then
        AC_DEFINE(XIMCB_PROTO_BROKEN, 1, Define if your XIMCallback specifies XIC as first type.)
     fi
   fi
@@ -630,10 +654,6 @@
 if test x$support_mouseslipwheel = xyes; then
   AC_DEFINE(MOUSE_SLIP_WHEELING, 1, Define to have CTRL cause wheel events to accelerate scrolling. Release CTRL to halt scrolling)
 fi
-if test x$support_afterimage = xyes; then
-  AC_DEFINE(HAVE_AFTERIMAGE, 1, Define if you want to use libAfterImage for image processing)
-  AC_DEFINE(BG_IMAGE_FROM_FILE, 1, Define if you want to have sexy-looking background pixmaps. Needs libAfterImage)
-fi
 
 dnl if test x$support_afterstep = xyes; then
 dnl   AC_DEFINE(AFTERSTEP_INTEGRATION, 1, Define if you want to integrate with AfterStep window manager)
@@ -725,20 +745,6 @@
 AC_SUBST(IF_PERL)
 AC_SUBST(PERL_O)
 
-AC_SUBST(CFLAGS)
-AC_SUBST(CPPFLAGS)
-AC_SUBST(LDFLAGS)
-AC_SUBST(X_CFLAGS)
-
-dnl# Attack the libs
-AC_SUBST(LIBS)
-AC_SUBST(X_LIBS)
-AC_SUBST(X_EXTRA_LIBS)
-
-AC_SUBST(AFTERIMAGE_CFLAGS)
-AC_SUBST(AFTERIMAGE_LIBS)
-
-AC_ARG_PROGRAM
 
 AC_CONFIG_FILES([Makefile \
 doc/Makefile \