--- rxvt-unicode/configure.ac	2015/06/16 11:56:37	1.152
+++ rxvt-unicode/configure.ac	2021/11/07 14:13:40	1.158
@@ -3,17 +3,13 @@
 dnl#
 
 AC_INIT
-AC_PREREQ(2.50)
+AC_PREREQ(2.71)
 AC_CONFIG_SRCDIR([src/feature.h])
-AC_CONFIG_HEADER(config.h:config.h.in)
-
-AC_CANONICAL_HOST
+AC_CONFIG_HEADERS(config.h:config.h.in)
 
 dnl RXVT version
-changequote(, )dnl
 VERSION=`sed -n -e 's/^.* VERSION.*"\(.*\)"$/\1/p' ${srcdir}/src/version.h`
 DATE=`sed -n -e 's/^.* DATE.*"\(.*\)"$/\1/p' ${srcdir}/src/version.h`
-changequote([, ])dnl
 AC_SUBST(VERSION)dnl
 AC_SUBST(DATE)dnl
 
@@ -28,11 +24,13 @@
 AC_PROG_CXX
 AC_PROG_INSTALL
 
-AC_AIX
-AC_GNU_SOURCE
-AC_ISC_POSIX
+AC_USE_SYSTEM_EXTENSIONS
 AC_LANG(C++)
 
+if test "$ac_prog_cxx_stdcxx" != cxx11; then
+  AC_MSG_ERROR([the compiler does not support C++11])
+fi
+
 LINKER="$CXX"
 dnl check whether we can link with gcc -lsupc++
 if test x$GCC = xyes && test x$GXX = xyes; then
@@ -113,7 +111,6 @@
        support_fading=no
        support_keepscrolling=no
        support_selectionscrolling=no
-       support_lastlog=no
        support_mousewheel=no
        support_mouseslipwheel=no
        support_text_blink=no
@@ -121,8 +118,6 @@
        support_scroll_rxvt=no
        support_scroll_next=no
        support_scroll_xterm=no
-       support_utmp=no
-       support_wtmp=no
        support_xim=no
        support_pixbuf=no
        support_startup_notification=no
@@ -141,7 +136,6 @@
        support_fading=yes
        support_keepscrolling=yes
        support_selectionscrolling=yes
-       support_lastlog=yes
        support_mousewheel=yes
        support_mouseslipwheel=yes
        support_text_blink=yes
@@ -149,8 +143,6 @@
        support_scroll_rxvt=yes
        support_scroll_next=yes
        support_scroll_xterm=yes
-       support_utmp=yes
-       support_wtmp=yes
        support_xim=yes
        support_pixbuf=yes
        support_startup_notification=yes
@@ -295,10 +287,11 @@
     AC_DEFINE(NO_DELETE_KEY, 1, Define if you don't want support for the (non-keypad) delete key)
   fi])
 
+support_resources=yes
 AC_ARG_ENABLE(resources,
   [  --disable-resources     disable all resource checking],
   [if test x$enableval = xno; then
-    AC_DEFINE(NO_RESOURCES, 1, Define if you don't want any resources read)
+    support_resources=no
   fi])
 
 AC_ARG_ENABLE(8bitctrls,
@@ -412,6 +405,14 @@
     AC_DEFINE_UNQUOTED(RXVT_TERMINFO, "$withval", Set TERMINFO value to the value given by configure) terminfo="$withval"
   fi])
 
+if test x$support_resources = xno; then
+  if test x$support_frills = xyes || test x$support_perl = xyes; then
+    AC_MSG_ERROR([--disable-resources requires --disable-frills --disable-perl])
+  fi
+
+  AC_DEFINE(NO_RESOURCES, 1, Define if you don't want any resources read)
+fi
+
 dnl# --------------------------------------------------------------------------
 
 LIBEV_M4_AVOID_LIBRT=1
@@ -425,6 +426,13 @@
 
 AC_PATH_TOOL(PKG_CONFIG, pkg-config, no)
 
+RXVT_CHECK_MODULES([PTYTTY], [libptytty], [:], [
+  AC_MSG_ERROR([unable to find libptytty])
+])
+
+AC_SUBST(PTYTTY_CFLAGS)
+AC_SUBST(PTYTTY_LIBS)
+
 image_lib=none
 
 PIXBUF_CFLAGS=
@@ -452,6 +460,14 @@
 AC_SUBST(STARTUP_NOTIFICATION_CFLAGS)
 AC_SUBST(STARTUP_NOTIFICATION_LIBS)
 
+if test x$support_frills = xyes; then
+  RXVT_CHECK_MODULES([XMU], [xmu], [
+    X_LIBS="$XMU_LIBS $X_LIBS"
+    CPPFLAGS="$CPPFLAGS $XMU_CFLAGS"
+    AC_DEFINE(HAVE_XMU, 1, Define to enable Xmu support)
+  ], [:])
+fi
+
 dnl# --------------------------------------------------------------------------
 dnl# CHECKING FOR HEADER FILES
 dnl# --------------------------------------------------------------------------
@@ -496,8 +512,6 @@
 dnl# --------------------------------------------------------------------------
 AC_CHECK_FUNCS(unsetenv)
 
-UTMP_CHECK
-
 dnl# --------------------------------------------------------------------------
 
 dnl# --------------------------------------------------------------------------
@@ -556,12 +570,6 @@
   AC_DEFINE(HAVE_NL_LANGINFO, 1, Define if nl_langinfo(CODESET) works)
 fi
 
-SCM_RIGHTS_CHECK
-
-PTY_CHECK
-
-TTY_GROUP_CHECK
-
 dnl# --------------------------------------------------------------------------
 dnl# now add and remove other stuff
 dnl# --------------------------------------------------------------------------