diff --git a/src/auto/configure b/src/auto/configure index bb59c1588b..1e3d8ec5a7 100755 --- a/src/auto/configure +++ b/src/auto/configure @@ -4014,7 +4014,7 @@ rm -f conftest.err conftest.$ac_objext \ LDFLAGS=$ldflags_save if test $perl_ok = yes; then if test "X$perlcppflags" != "X"; then - PERL_CFLAGS="$perlcppflags" + PERL_CFLAGS=`echo "$perlcppflags" | sed 's/-pipe //'` fi if test "X$perlldflags" != "X"; then LDFLAGS="$perlldflags $LDFLAGS" diff --git a/src/configure.in b/src/configure.in index 8c33500fb0..3e8bf34b74 100644 --- a/src/configure.in +++ b/src/configure.in @@ -508,7 +508,8 @@ if test "$enable_perlinterp" = "yes"; then LDFLAGS=$ldflags_save if test $perl_ok = yes; then if test "X$perlcppflags" != "X"; then - PERL_CFLAGS="$perlcppflags" + dnl remove -pipe, it confuses cproto + PERL_CFLAGS=`echo "$perlcppflags" | sed 's/-pipe //'` fi if test "X$perlldflags" != "X"; then LDFLAGS="$perlldflags $LDFLAGS" diff --git a/src/version.c b/src/version.c index 21a904aaf2..681d539339 100644 --- a/src/version.c +++ b/src/version.c @@ -666,6 +666,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 88, /**/ 87, /**/