--- rxvt-unicode/configure.ac	2007/11/26 20:07:49	1.85
+++ rxvt-unicode/configure.ac	2007/12/10 23:41:15	1.90
@@ -17,8 +17,7 @@
 changequote([, ])dnl
 AC_SUBST(VERSION)dnl
 AC_SUBST(DATE)dnl
-AC_SUBST(LSMDATE)dnl
-AC_SUBST(LIBVERSION)dnl
+dnl AC_SUBST(LIBVERSION)dnl
 
 echo ""
 echo "configuring for rxvt $VERSION"
@@ -27,14 +26,13 @@
 orig_CXXFLAGS="$CXXFLAGS"
 
 dnl# Checks for programs.
-dnl AC_MAKE_SET
-
 AC_PROG_CC
 AC_PROG_CXX
 AC_PROG_CPP
 AC_PROG_INSTALL
 
 AC_AIX
+AC_GNU_SOURCE
 AC_ISC_POSIX
 AC_LANG(C++)
 
@@ -73,8 +71,6 @@
   CFLAGS="$CXXFLAGS"
 fi
 
-AC_DEFINE(_GNU_SOURCE, 1, Use all glibc features.)
-
 case $host in
    *-*-solaris* )
       AC_DEFINE(_XOPEN_SOURCE, 500, Needed to get declarations for msg_control and msg_controllen on Solaris)
@@ -125,16 +121,15 @@
 dnl# CHECKING COMMAND LINE OPTIONS
 dnl# --------------------------------------------------------------------------
 
-if test "x$enable_shared" = xyes; then
-    AC_DEFINE(LIBRXVT, 1, Build shared library version - specify via configure only)
-    INSTALL_LIBRXVT=yes
-fi
-AC_SUBST(INSTALL_LIBRXVT)
+dnl if test "x$enable_shared" = xyes; then
+dnl     AC_DEFINE(LIBRXVT, 1, Build shared library version - specify via configure only)
+dnl     INSTALL_LIBRXVT=yes
+dnl fi
+dnl AC_SUBST(INSTALL_LIBRXVT)
 
 AC_ARG_ENABLE(everything,
   [  --enable-everything     enable standard non-multichoice features
-                     NOTE: this option is order dependent
-                     NOTE: automatically enabled with --enable-shared],
+                     NOTE: this option is order dependent],
   [
     if test x$enableval = xno; then
        support_frills=no
@@ -284,18 +279,18 @@
     support_scroll_xterm=$enableval
   fi])
 
-AC_ARG_ENABLE(perl,
-  [  --enable-perl           enable embedded perl interpreter],
-  [if test x$enableval = xyes -o x$enableval = xno; then
-    support_perl=$enableval
-  fi])
-
 AC_ARG_ENABLE(plain-scroll,
   [  --enable-plain-scroll   enable plain style scrollbar],
   [if test x$enableval = xyes -o x$enableval = xno; then
     support_scroll_plain=$enableval
   fi])
 
+AC_ARG_ENABLE(perl,
+  [  --enable-perl           enable embedded perl interpreter],
+  [if test x$enableval = xyes -o x$enableval = xno; then
+    support_perl=$enableval
+  fi])
+
 AC_ARG_WITH(codesets,
   [  --with-codesets=CS,...  compile in additional codesets (jp,jp_ext,kr,zh,zh_ext,all)],
   [codesets="$withval"])
@@ -445,19 +440,6 @@
 
 AC_PATH_PROG(TIC, tic, :)
 
-dnl# need a neat way to detect SVR4 or its features
-dnl# in src/command.c we use these functions:
-dnl# grantpt(), unlockpt(), ptsname(), which are defined in <sys/ptms.h>
-dnl# - but are these also defined for other systems?
-
-dnl# hack to find if this is SVR4 -- who knows?
-dnl## AC_MSG_CHECKING(for SVR4)
-dnl## AC_EGREP_CPP(yes,
-dnl## [#if defined (SVR4) || defined (_SVR4) || defined (__svr4__)
-dnl##   yes;
-dnl## #endif
-dnl## ], [AC_MSG_RESULT(yes); AC_DEFINE(PERHAPS_SVR4)], AC_MSG_RESULT(perhaps not?))
-
 AC_PATH_XTRA
 
 AFTERIMAGE_CFLAGS=
@@ -498,7 +480,6 @@
 dnl# --------------------------------------------------------------------------
 dnl# CHECKING FOR HEADER FILES
 dnl# --------------------------------------------------------------------------
-AC_HEADER_SYS_WAIT
 AC_CHECK_HEADERS( \
 	assert.h \
 	fcntl.h \
@@ -519,8 +500,6 @@
 	clocale \
 )
 
-AC_HEADER_TIME
-
 dnl# check to allow both <termios.h> and <sys/ioctl.h>
 AC_CACHE_CHECK(whether termios.h and sys/ioctl.h may both be included, rxvt_cv_header_sysioctl,
 [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stdio.h>
@@ -550,11 +529,6 @@
    AC_DEFINE(XLIB_ILLEGAL_ACCESS, 1, Define ONLY iff Xlib.h supports it)
 fi
 
-AC_C_CONST
-AC_C_INLINE
-
-dnl> AC_HEADER_STDC	 dnl# skip this test, Sun always fails anyhow.
-
 dnl# --------------------------------------------------------------------------
 dnl# CHECKING FOR MISSING TYPEDEFS
 dnl# --------------------------------------------------------------------------
@@ -647,9 +621,6 @@
 dnl# --------------------------------------------------------------------------
 dnl# CHECKING FOR LIBRARY FUNCTIONS
 dnl# --------------------------------------------------------------------------
-AC_TYPE_SIGNAL
-dnl> AC_FUNC_VPRINTF
-
 AC_CHECK_FUNCS(unsetenv)
 
 UTMP_CHECK