updated for version 7.4.409

Problem:    Can't build with Perl on Fedora 20.
Solution:   Find xsubpp in another directory. (Michael Henry)

diff --git a/src/Makefile b/src/Makefile
index 772b15c7d6dff55afc3391771bccf04187cb8bfc..64691a39bc3259b92611d9e15f73901899df5a8a 100644 (file)
--- 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 30db8a022f4bfe7ce9281a0c86f62b4382a05690..b0fba306e62d6ca04eb2528d25f998960be6375a 100755 (executable)
--- 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 bd5649e4d72df1a5f237a3546dbc9ee15d4c6551..15b5a623909aa43f08cecd8ddb049c37e799220f 100644 (file)
--- 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 1cee1e61d180c93d9080a86638ae78c37dbb9bbb..62785e171c520e4731fd511875724deac4d17e56 100644 (file)
--- 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 4a876b5c7292bc78a38a71400d1e96dfec320c03..f7084a7cd684d57ad2f46f4ad73d8c6cba6a6347 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -741,6 +741,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    409,
 /**/
     408,
 /**/