ruby/ruby-2.1.0-Allow-to-specify-additional-preludes-by-configuratio.patch

59 lines
1.9 KiB
Diff
Raw Normal View History

2013-10-07 10:30:18 +00:00
From 996012f6abe0ce4d68a2de9f249935c6d5b467bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=ADt=20Ondruch?= <vondruch@redhat.com>
Date: Fri, 4 Oct 2013 22:13:11 +0200
Subject: [PATCH] Allow to specify addition preludes by configuration option.
---
Makefile.in | 2 ++
2013-10-07 10:30:18 +00:00
common.mk | 2 +-
configure.in | 7 +++++++
3 files changed, 10 insertions(+), 1 deletion(-)
2013-10-07 10:30:18 +00:00
2013-06-24 12:14:13 +00:00
diff --git a/Makefile.in b/Makefile.in
2013-10-07 10:30:18 +00:00
index 7e8ed82..7916993 100644
2013-06-24 12:14:13 +00:00
--- a/Makefile.in
+++ b/Makefile.in
@@ -114,6 +114,8 @@ XRUBY_LIBDIR = @XRUBY_LIBDIR@
XRUBY_RUBYLIBDIR = @XRUBY_RUBYLIBDIR@
2013-06-24 12:14:13 +00:00
XRUBY_RUBYHDRDIR = @XRUBY_RUBYHDRDIR@
+OPTIONAL_PRELUDES = @OPTIONAL_PRELUDES@
+
2013-06-24 12:14:13 +00:00
#### End of system configuration section. ####
MAJOR= @MAJOR@
2013-06-24 12:14:13 +00:00
diff --git a/common.mk b/common.mk
2013-10-07 10:30:18 +00:00
index 5cfbc3d..3f0a82e 100644
2013-06-24 12:14:13 +00:00
--- a/common.mk
+++ b/common.mk
2015-09-01 12:24:51 +00:00
@@ -117,7 +117,7 @@ ALLOBJS = $(NORMALMAINOBJ) $(MINIOBJS) $(COMMONOBJS) $(INITOBJS)
2013-06-24 12:14:13 +00:00
GOLFOBJS = goruby.$(OBJEXT) golf_prelude.$(OBJEXT)
DEFAULT_PRELUDES = $(GEM_PRELUDE)
2013-06-24 12:14:13 +00:00
-PRELUDE_SCRIPTS = $(srcdir)/prelude.rb $(srcdir)/enc/prelude.rb $(DEFAULT_PRELUDES)
+PRELUDE_SCRIPTS = $(srcdir)/prelude.rb $(srcdir)/enc/prelude.rb $(DEFAULT_PRELUDES) $(OPTIONAL_PRELUDES)
GEM_PRELUDE = $(srcdir)/gem_prelude.rb
PRELUDES = {$(srcdir)}prelude.c {$(srcdir)}miniprelude.c
GOLFPRELUDES = {$(srcdir)}golf_prelude.c
2013-06-24 12:14:13 +00:00
diff --git a/configure.in b/configure.in
2013-10-07 10:30:18 +00:00
index 0e371e2..d4f1dcb 100644
2013-06-24 12:14:13 +00:00
--- a/configure.in
+++ b/configure.in
2015-09-01 12:24:51 +00:00
@@ -4169,6 +4169,13 @@ AC_SUBST(rubyarchhdrdir)dnl
2013-06-24 12:14:13 +00:00
AC_SUBST(sitearchhdrdir)dnl
AC_SUBST(vendorarchhdrdir)dnl
+AC_ARG_WITH(prelude,
+ AS_HELP_STRING([--with-prelude=FILE-LIST], [specify additional preludes separated by space]),
+ [prelude=$withval])
+if test "$prelude" != ""; then
+ AC_SUBST(OPTIONAL_PRELUDES, $prelude)
+fi
+
AC_ARG_WITH(mantype,
AS_HELP_STRING([--with-mantype=TYPE], [specify man page type; TYPE is one of man and doc]),
[
2013-10-07 10:30:18 +00:00
--
1.8.3.1