--- rxvt-unicode/configure.ac	2007/12/10 23:41:15	1.90
+++ rxvt-unicode/configure.ac	2007/12/11 17:42:04	1.96
@@ -77,10 +77,6 @@
       ;;
 esac
 
-dnl if test x$GXX = xyes; then
-dnl    CXXFLAGS="$CXXFLAGS" dnl I once had -fno-exceptions, but I am using them now...
-dnl fi
-
 dnl# FreeBSD needs to link libxpg4
 AC_CHECK_FUNC(setlocale,     [], [AC_CHECK_LIB(xpg4,   setlocale,     [LIBS="$LIBS -lxpg4"])])
 
@@ -481,19 +477,10 @@
 dnl# CHECKING FOR HEADER FILES
 dnl# --------------------------------------------------------------------------
 AC_CHECK_HEADERS( \
-	assert.h \
-	fcntl.h \
-	stdarg.h \
-	stdlib.h \
-	string.h \
-	termios.h \
-	unistd.h \
 	sys/byteorder.h \
 	sys/ioctl.h \
-	sys/select.h \
 	sys/sockio.h \
 	sys/strredir.h \
-	sys/time.h \
 	stdint.h \
 	wchar.h \
 	cwchar \
@@ -504,9 +491,8 @@
 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>
-#ifdef HAVE_TERMIOS_H
 #include <termios.h>
-#endif]], [[int a = ECHO;]])],[rxvt_cv_header_sysioctl=yes],[rxvt_cv_header_sysioctl=no])])
+]], [[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])])
@@ -595,28 +581,6 @@
 dnl AC_SUBST(rxvt_int64_typedef)
 dnl RXVT_CHECK_SIZE(rxvt_cv_uint64_t, uint64_t, 8, unsigned, long long, rxvt_uint64_typedef)
 dnl AC_SUBST(rxvt_uint64_typedef)
-dnl#
-dnl# Now look for another we use
-dnl#
-if test "$ac_cv_sizeof_int_p" -eq 8; then
-  rxvt_intp_define="#define intp_t int64_t"
-  rxvt_u_intp_define="#define u_intp_t u_int64_t"
-else
-  if test "$ac_cv_sizeof_int_p" -eq 4; then
-    rxvt_intp_define="#define intp_t int32_t"
-    rxvt_u_intp_define="#define u_intp_t u_int32_t"
-  else
-    if test "$ac_cv_sizeof_int_p" -eq 2; then
-      rxvt_intp_define="#define intp_t int16_t"
-      rxvt_u_intp_define="#define u_intp_t u_int16_t"
-    else
-      rxvt_intp_define="#error set intp_t"
-      rxvt_u_intp_define="#error set u_intp_t"
-    fi
-  fi
-fi
-AC_SUBST(rxvt_intp_define)
-AC_SUBST(rxvt_u_intp_define)
 
 dnl# --------------------------------------------------------------------------
 dnl# CHECKING FOR LIBRARY FUNCTIONS
@@ -873,18 +837,8 @@
 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_stdarg_h, cstdarg, ac_cv_header_stdarg_h, yes, notset, dontmatch)
-RXVT_DEFINE_TO_INCLUDE(include_stdlib_h, cstdlib, ac_cv_header_stdlib_h, yes, notset, dontmatch)
-RXVT_DEFINE_TO_INCLUDE(include_unistd_h, unistd.h, ac_cv_header_unistd_h, yes, notset, dontmatch)
-RXVT_DEFINE_TO_INCLUDE(include_string_h, cstring, ac_cv_header_string_h, yes, notset, dontmatch)
-RXVT_DEFINE_TO_INCLUDE(include_fcntl_h, fcntl.h, ac_cv_header_fcntl_h, yes, notset, dontmatch)
-RXVT_DEFINE_TO_INCLUDE(include_util_h, util.h, ac_cv_header_util_h, yes, notset, dontmatch)
-RXVT_DEFINE_TO_INCLUDE(include_assert_h, assert.h, ac_cv_header_assert_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_select_h, sys/select.h, ac_cv_header_sys_select_h, yes, notset, dontmatch)
 RXVT_DEFINE_TO_INCLUDE(include_sys_strredir_h, sys/strredir.h, ac_cv_header_sys_strredir_h, yes, notset, dontmatch)
-RXVT_DEFINE_TO_INCLUDE(include_sys_time_h, sys/time.h, ac_cv_header_sys_time_h, yes, notset, dontmatch)
-RXVT_DEFINE_TO_INCLUDE(include_time_h, time.h, ac_cv_header_sys_time_h, no, ac_cv_header_time, yes)
 
 AC_CONFIG_FILES([Makefile \
 doc/Makefile \