diff options
Diffstat (limited to 'ext/json')
| -rw-r--r-- | ext/json/config.m4 | 18 | ||||
| -rw-r--r-- | ext/json/config.w32 | 28 |
2 files changed, 17 insertions, 29 deletions
diff --git a/ext/json/config.m4 b/ext/json/config.m4 index 01328d57cc..35bb1bf9ce 100644 --- a/ext/json/config.m4 +++ b/ext/json/config.m4 @@ -1,19 +1,11 @@ -PHP_ARG_ENABLE([json], - [whether to enable JavaScript Object Serialization support], - [AS_HELP_STRING([--disable-json], - [Disable JavaScript Object Serialization support])], - [yes]) - -if test "$PHP_JSON" != "no"; then - AC_DEFINE([HAVE_JSON],1 ,[whether to enable JavaScript Object Serialization support]) - +dnl HAVE_JSON is always 1 as of php 8.0 and the constant will be removed in the future. +dnl Note that HAVE_JSON was never defined for Windows builds (see config.w32) +AC_DEFINE([HAVE_JSON],1 ,[whether to enable JavaScript Object Serialization support]) PHP_NEW_EXTENSION(json, json.c \ json_encoder.c \ json_parser.tab.c \ json_scanner.c, $ext_shared,, -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1) - PHP_INSTALL_HEADERS([ext/json], [php_json.h php_json_parser.h php_json_scanner.h]) - PHP_ADD_MAKEFILE_FRAGMENT() - PHP_SUBST(JSON_SHARED_LIBADD) -fi +PHP_INSTALL_HEADERS([ext/json], [php_json.h php_json_parser.h php_json_scanner.h]) +PHP_ADD_MAKEFILE_FRAGMENT() diff --git a/ext/json/config.w32 b/ext/json/config.w32 index 82e470f2ee..e54a9caaf5 100644 --- a/ext/json/config.w32 +++ b/ext/json/config.w32 @@ -1,22 +1,18 @@ // vim:ft=javascript -ARG_ENABLE("json", "JavaScript Object Serialization support", "yes"); +EXTENSION('json', 'json.c', false /* never shared */, "/DZEND_ENABLE_STATIC_TSRMLS_CACHE=1"); -if (PHP_JSON != "no") { - EXTENSION('json', 'json.c', PHP_JSON_SHARED, "/DZEND_ENABLE_STATIC_TSRMLS_CACHE=1"); - - if (!FSO.FileExists("ext/json/json_scanner.c")) { - STDOUT.WriteLine("Generating ext/json/json_scanner.c"); - STDOUT.WriteLine(execute(PATH_PROG("re2c") + " -t ext/json/php_json_scanner_defs.h --no-generation-date -bci -o ext/json/json_scanner.c ext/json/json_scanner.re")); - } - if (!FSO.FileExists("ext/json/json_parser.tab.c")) { - STDOUT.WriteLine("Generating ext/json/json_parser.tab.c"); - STDOUT.WriteLine(execute(PATH_PROG("bison") + " --defines -l ext/json/json_parser.y -o ext/json/json_parser.tab.c")); - } +if (!FSO.FileExists("ext/json/json_scanner.c")) { + STDOUT.WriteLine("Generating ext/json/json_scanner.c"); + STDOUT.WriteLine(execute(PATH_PROG("re2c") + " -t ext/json/php_json_scanner_defs.h --no-generation-date -bci -o ext/json/json_scanner.c ext/json/json_scanner.re")); +} +if (!FSO.FileExists("ext/json/json_parser.tab.c")) { + STDOUT.WriteLine("Generating ext/json/json_parser.tab.c"); + STDOUT.WriteLine(execute(PATH_PROG("bison") + " --defines -l ext/json/json_parser.y -o ext/json/json_parser.tab.c")); +} - ADD_SOURCES(configure_module_dirname, "json_encoder.c json_parser.tab.c json_scanner.c", "json"); +ADD_SOURCES(configure_module_dirname, "json_encoder.c json_parser.tab.c json_scanner.c", "json"); - ADD_MAKEFILE_FRAGMENT(); +ADD_MAKEFILE_FRAGMENT(); - PHP_INSTALL_HEADERS("ext/json/", "php_json.h php_json_parser.h php_json_scanner.h"); -} +PHP_INSTALL_HEADERS("ext/json/", "php_json.h php_json_parser.h php_json_scanner.h"); |