From: Daniel Hahler <[email protected]>
Instead of silently enabling it in rxvt.h for ENABLE_PERL, it will
generate an error during the configure run.
(I wondered why the Arch package's --disable-frills still enabled it)
---
config.h.in | 2 +-
configure | 9 +++++++++
configure.ac | 12 +++++++++++-
src/rxvt.h | 5 -----
4 files changed, 21 insertions(+), 7 deletions(-)
diff --git a/config.h.in b/config.h.in
index 914d606..47f6646 100644
--- a/config.h.in
+++ b/config.h.in
@@ -284,7 +284,7 @@
/* Define if you don't want support for the (non-keypad) delete key */
#undef NO_DELETE_KEY
-/* Define if you don't want any resources read */
+/* Define if you do not want any resources read */
#undef NO_RESOURCES
/* Define for continual scrolling when you keep the scrollbar button pressed
diff --git a/configure b/configure
index 3e3f78b..86f49c5 100755
--- a/configure
+++ b/configure
@@ -5205,6 +5205,15 @@ $as_echo "#define NO_RESOURCES 1" >>confdefs.h
fi
+if test x$support_perl = xyes; then
+ if test x$support_frills = xno; then
+ as_fn_error $? "--disable-frills requires --disable-perl" "$LINENO" 5
+ fi
+ if test x$support_combining = xno; then
+ as_fn_error $? "--disable-combining requires --disable-perl" "$LINENO" 5
+ fi
+fi
+
LIBEV_M4_AVOID_LIBRT=1
diff --git a/configure.ac b/configure.ac
index 0da3b59..53c1b8f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -413,12 +413,22 @@ AC_ARG_WITH(terminfo,
AC_DEFINE_UNQUOTED(RXVT_TERMINFO, "$withval", Set TERMINFO value to the
value given by configure) terminfo="$withval"
fi])
+dnl# Checks for conflicting options.
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)
+ AC_DEFINE(NO_RESOURCES, 1, Define if you do not want any resources read)
+fi
+
+if test x$support_perl = xyes; then
+ if test x$support_frills = xno; then
+ AC_MSG_ERROR([--disable-frills requires --disable-perl])
+ fi
+ if test x$support_combining = xno; then
+ AC_MSG_ERROR([--disable-combining requires --disable-perl])
+ fi
fi
dnl# --------------------------------------------------------------------------
diff --git a/src/rxvt.h b/src/rxvt.h
index 5e5ee2d..ce9152f 100644
--- a/src/rxvt.h
+++ b/src/rxvt.h
@@ -49,11 +49,6 @@ typedef int32_t tlen_t_; // specifically for use in the
line_t structure
# define ENABLE_OVERLAY 1
#endif
-#if ENABLE_PERL
-# define ENABLE_FRILLS 1
-# define ENABLE_COMBINING 1
-#endif
-
#if ENABLE_FRILLS
# define ENABLE_XEMBED 1
# define ENABLE_EWMH 1
--
2.10.2
_______________________________________________
rxvt-unicode mailing list
[email protected]
http://lists.schmorp.de/mailman/listinfo/rxvt-unicode
