--- rxvt-unicode/configure.ac	2007/12/23 05:03:52	1.100
+++ rxvt-unicode/configure.ac	2008/01/06 21:34:57	1.104
@@ -13,11 +13,9 @@
 changequote(, )dnl
 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`
-dnl LIBVERSION=`sed -n -e 's/^.*[ \t]LIBVERSION.*"\(.*\)"$/\1/p' ${srcdir}/src/version.h`
 changequote([, ])dnl
 AC_SUBST(VERSION)dnl
 AC_SUBST(DATE)dnl
-dnl AC_SUBST(LIBVERSION)dnl
 
 echo ""
 echo "configuring for rxvt $VERSION"
@@ -84,10 +82,6 @@
 AC_CHECK_FUNC(gethostbyname, [], [AC_CHECK_LIB(nsl,    gethostbyname, [LIBS="$LIBS -lnsl"])])
 AC_CHECK_FUNC(socket,        [], [AC_CHECK_LIB(socket, socket,        [LIBS="$LIBS -lsocket"])])
 
-dnl AC_ENABLE_SHARED(no)dnl#	libtool
-dnl AC_ENABLE_STATIC(yes)dnl#	libtool
-dnl AC_PROG_LIBTOOL()dnl#		libtool
-
 support_frills=yes
 support_inheritpixmap=yes
 support_fading=yes
@@ -117,15 +111,9 @@
 dnl# CHECKING COMMAND LINE OPTIONS
 dnl# --------------------------------------------------------------------------
 
-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: this option is order dependent],
   [
     if test x$enableval = xno; then
        support_frills=no
@@ -228,7 +216,7 @@
   fi])
 
 AC_ARG_ENABLE(afterimage,
-  [  --enable-afterimage enable integration with libAfterImage for background images],
+  [  --enable-afterimage     enable integration with libAfterImage for background images],
   [if test x$enableval = xyes -o x$enableval = xno; then
     support_afterimage=$enableval
   fi])
@@ -486,13 +474,6 @@
 	cwchar \
 )
 
-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>
-#include <sys/ioctl.h>
-#include <termios.h>
-]], [[int a = ECHO;]])],[rxvt_cv_header_sysioctl=yes],[rxvt_cv_header_sysioctl=no])])
-
 AC_CACHE_CHECK([for XPointer], rxvt_cv_xpointer,
 [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <X11/Xlib.h>]], [[XPointer dummy;]])],[rxvt_cv_xpointer=yes],[rxvt_cv_xpointer=no])])
 if test x$rxvt_cv_xpointer = xyes; then
@@ -769,25 +750,9 @@
 
 AC_ARG_PROGRAM
 
-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
-[if test "$$3" = "$4" -o "$$5" = "$6"; then
-  $1="#include <$2>"
-else
-  $1="/* #include <$2> */"
-fi dnl
-AC_SUBST($1)])
-
-RXVT_DEFINE_TO_INCLUDE(include_stdint_h, stdint.h, ac_cv_header_stdint_h, yes, notset, dontmatch)
-RXVT_DEFINE_TO_INCLUDE(include_sys_ioctl_h, sys/ioctl.h, rxvt_cv_header_sysioctl, yes, notset, dontmatch)
-RXVT_DEFINE_TO_INCLUDE(include_sys_strredir_h, sys/strredir.h, ac_cv_header_sys_strredir_h, yes, notset, dontmatch)
-
 AC_CONFIG_FILES([Makefile \
 doc/Makefile \
 src/Makefile \
-src/rxvtlib.h \
 ])
 AC_OUTPUT