summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
Diffstat (limited to 'scripts')
-rw-r--r--scripts/Makefile.frag1
-rwxr-xr-x[-rw-r--r--]scripts/dev/check_parameters.php1
-rwxr-xr-xscripts/dev/credits2
-rwxr-xr-x[-rw-r--r--]scripts/dev/find_tested.php1
-rwxr-xr-xscripts/dev/search_underscores.php2
-rw-r--r--scripts/phpize.in2
-rw-r--r--scripts/phpize.m42
7 files changed, 7 insertions, 4 deletions
diff --git a/scripts/Makefile.frag b/scripts/Makefile.frag
index 05659d81bf..fdf67f0438 100644
--- a/scripts/Makefile.frag
+++ b/scripts/Makefile.frag
@@ -12,6 +12,7 @@ BUILD_FILES = \
build/libtool.m4 \
build/ax_check_compile_flag.m4 \
build/ax_gcc_func_attribute.m4 \
+ build/php_cxx_compile_stdcxx.m4 \
Makefile.global \
acinclude.m4 \
ltmain.sh \
diff --git a/scripts/dev/check_parameters.php b/scripts/dev/check_parameters.php
index a9c58f8c00..bab7ed9a3f 100644..100755
--- a/scripts/dev/check_parameters.php
+++ b/scripts/dev/check_parameters.php
@@ -1,3 +1,4 @@
+#!/usr/bin/env php
<?php
/*
+----------------------------------------------------------------------+
diff --git a/scripts/dev/credits b/scripts/dev/credits
index 0683f59882..df94e08aea 100755
--- a/scripts/dev/credits
+++ b/scripts/dev/credits
@@ -10,7 +10,7 @@ do
/*
DO NOT EDIT THIS FILE!
- it has been automaticaly created by php7/scripts/credits from
+ it has been automatically created by php7/scripts/credits from
the information found in the various php7/ext/.../CREDITS and
php7/sapi/.../CREDITS files
diff --git a/scripts/dev/find_tested.php b/scripts/dev/find_tested.php
index 7331bd26c4..9368ad3796 100644..100755
--- a/scripts/dev/find_tested.php
+++ b/scripts/dev/find_tested.php
@@ -1,3 +1,4 @@
+#!/usr/bin/env php
<?php
diff --git a/scripts/dev/search_underscores.php b/scripts/dev/search_underscores.php
index 23db7dd7b3..cac1a5d9db 100755
--- a/scripts/dev/search_underscores.php
+++ b/scripts/dev/search_underscores.php
@@ -1,4 +1,4 @@
-#! /usr/local/bin/php -n
+#!/usr/bin/env php
<?php
/*
diff --git a/scripts/phpize.in b/scripts/phpize.in
index 3e81ad4f5a..26ecfc6f65 100644
--- a/scripts/phpize.in
+++ b/scripts/phpize.in
@@ -9,7 +9,7 @@ includedir="`eval echo @includedir@`/php"
builddir="`pwd`"
SED="@SED@"
-FILES_BUILD="mkdep.awk scan_makefile_in.awk shtool libtool.m4 ax_check_compile_flag.m4 ax_gcc_func_attribute.m4"
+FILES_BUILD="mkdep.awk scan_makefile_in.awk shtool libtool.m4 ax_check_compile_flag.m4 ax_gcc_func_attribute.m4 php_cxx_compile_stdcxx.m4"
FILES="acinclude.m4 Makefile.global config.sub config.guess ltmain.sh run-tests*.php"
CLEAN_FILES="$FILES *.o *.lo *.la .deps .libs/ build/ modules/ install-sh \
mkinstalldirs missing config.nice config.sub config.guess configure configure.ac \
diff --git a/scripts/phpize.m4 b/scripts/phpize.m4
index 55fa08d7c4..43cae33c2f 100644
--- a/scripts/phpize.m4
+++ b/scripts/phpize.m4
@@ -2,7 +2,7 @@ dnl This file becomes configure.ac for self-contained extensions.
AC_PREREQ([2.68])
AC_INIT(config.m4)
-ifdef([AC_PRESERVE_HELP_ORDER], [AC_PRESERVE_HELP_ORDER], [])
+AC_PRESERVE_HELP_ORDER
PHP_CONFIG_NICE(config.nice)