diff options
-rw-r--r-- | src/Makefile | 2 | ||||
-rwxr-xr-x | src/auto/configure | 9 | ||||
-rw-r--r-- | src/config.mk.in | 3 | ||||
-rw-r--r-- | src/configure.in | 8 | ||||
-rw-r--r-- | src/version.c | 2 |
5 files changed, 22 insertions, 2 deletions
diff --git a/src/Makefile b/src/Makefile index 772b15c7d6..64691a39bc 100644 --- a/src/Makefile +++ b/src/Makefile @@ -2477,7 +2477,7 @@ lintinstall: auto/if_perl.c: if_perl.xs $(PERL) -e 'unless ( $$] >= 5.005 ) { for (qw(na defgv errgv)) { print "#define PL_$$_ $$_\n" }}' > $@ - $(PERL) $(PERLLIB)/ExtUtils/xsubpp -prototypes -typemap \ + $(PERL) $(PERL_XSUBPP) -prototypes -typemap \ $(PERLLIB)/ExtUtils/typemap if_perl.xs >> $@ auto/osdef.h: auto/config.h osdef.sh osdef1.h.in osdef2.h.in diff --git a/src/auto/configure b/src/auto/configure index 30db8a022f..b0fba306e6 100755 --- a/src/auto/configure +++ b/src/auto/configure @@ -687,6 +687,7 @@ PERL_PRO PERL_OBJ PERL_SRC shrpenv +vi_cv_perl_xsubpp vi_cv_perllib vi_cv_path_perl MZSCHEME_MZC @@ -5604,6 +5605,14 @@ $as_echo "OK" >&6; } fi vi_cv_perllib=`$vi_cv_path_perl -MConfig -e 'print $Config{privlibexp}'` + vi_cv_perl_extutils=unknown_perl_extutils_path + for extutils_rel_path in ExtUtils vendor_perl/ExtUtils; do + xsubpp_path="$vi_cv_perllib/$extutils_rel_path/xsubpp" + if test -f "$xsubpp_path"; then + vi_cv_perl_xsubpp="$xsubpp_path" + fi + done + perlcppflags=`$vi_cv_path_perl -Mlib=$srcdir -MExtUtils::Embed \ -e 'ccflags;perl_inc;print"\n"' | sed -e 's/-fno[^ ]*//'` perllibs=`cd $srcdir; $vi_cv_path_perl -MExtUtils::Embed -e 'ldopts' | \ diff --git a/src/config.mk.in b/src/config.mk.in index bd5649e4d7..15b5a62390 100644 --- a/src/config.mk.in +++ b/src/config.mk.in @@ -48,11 +48,12 @@ MZSCHEME_SRC = @MZSCHEME_SRC@ MZSCHEME_OBJ = @MZSCHEME_OBJ@ MZSCHEME_CFLAGS = @MZSCHEME_CFLAGS@ MZSCHEME_PRO = @MZSCHEME_PRO@ -MZSCHEME_EXTRA = @MZSCHEME_EXTRA@ +MZSCHEME_EXTRA = @MZSCHEME_EXTRA@ MZSCHEME_MZC = @MZSCHEME_MZC@ PERL = @vi_cv_path_perl@ PERLLIB = @vi_cv_perllib@ +PERL_XSUBPP = @vi_cv_perl_xsubpp@ PERL_LIBS = @PERL_LIBS@ SHRPENV = @shrpenv@ PERL_SRC = @PERL_SRC@ diff --git a/src/configure.in b/src/configure.in index 1cee1e61d1..62785e171c 100644 --- a/src/configure.in +++ b/src/configure.in @@ -933,6 +933,14 @@ if test "$enable_perlinterp" = "yes" -o "$enable_perlinterp" = "dynamic"; then fi vi_cv_perllib=`$vi_cv_path_perl -MConfig -e 'print $Config{privlibexp}'` AC_SUBST(vi_cv_perllib) + vi_cv_perl_extutils=unknown_perl_extutils_path + for extutils_rel_path in ExtUtils vendor_perl/ExtUtils; do + xsubpp_path="$vi_cv_perllib/$extutils_rel_path/xsubpp" + if test -f "$xsubpp_path"; then + vi_cv_perl_xsubpp="$xsubpp_path" + fi + done + AC_SUBST(vi_cv_perl_xsubpp) dnl Remove "-fno-something", it breaks using cproto. perlcppflags=`$vi_cv_path_perl -Mlib=$srcdir -MExtUtils::Embed \ -e 'ccflags;perl_inc;print"\n"' | sed -e 's/-fno[[^ ]]*//'` diff --git a/src/version.c b/src/version.c index 4a876b5c72..f7084a7cd6 100644 --- a/src/version.c +++ b/src/version.c @@ -742,6 +742,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 409, +/**/ 408, /**/ 407, |