-- Leo's gemini proxy

-- Connecting to git.thebackupbox.net:1965...

-- Connected

-- Sending request

-- Meta line: 20 text/gemini

repo: rxvt-unicode-sixel
action: commit
revision:
path_from:
revision_from: 68902a760fd89f8e910f7e28326ffb802d0bef4f:
path_to:
revision_to:

commit 68902a760fd89f8e910f7e28326ffb802d0bef4f
Author: Emanuele Giaquinta <emanuele.giaquinta@gmail.com>
Date:   Tue Jun 16 12:00:07 2015 +0000

    Bail out if --disable-resources is given and either frills or perl is enabled.

diff --git a/configure.ac b/configure.ac

--- a/configure.ac
+++ b/configure.ac
@@ -295,10 +295,11 @@ AC_ARG_ENABLE(delete-key,
     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 +413,14 @@ AC_ARG_WITH(terminfo,
     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
diff --git a/src/rxvt.h b/src/rxvt.h

--- a/src/rxvt.h
+++ b/src/rxvt.h
@@ -102,12 +102,6 @@ typedef  int32_t tlen_t_; // specifically for use in the line_t structure

 #include "rxvtperl.h"

-// this must occur after the last (indirect) include of config.h,
-// otherwise it has no effect because config.h does not have include guards.
-#if defined (ISO_14755) || defined(ENABLE_PERL) || defined(KEYSYM_RESOURCE)
-# undef NO_RESOURCES
-#endif
-
 // try to avoid some macros to decrease code size, on some systems
 #if ENABLE_MINIMAL
 # define strcmp(a,b)   (strcmp)(a,b)

-- Response ended

-- Page fetched on Sun Jun 2 10:24:47 2024