MFH: simplify

diff --git a/ext/json/config.m4 b/ext/json/config.m4
index 065d0411aa990a455925805c28016511ce30f9bb..675e0b9a8c89f6ceb0c2bc1731fd27a378fd4498 100644 (file)
--- a/ext/json/config.m4
+++ b/ext/json/config.m4
@@ -2,87 +2,15 @@ dnl
 dnl $Id$
 dnl
 
-AC_DEFUN([PHP_JSON_ADD_SOURCES], [
-  PHP_JSON_SOURCES="$PHP_JSON_SOURCES $1"
-])
-
-AC_DEFUN([PHP_JSON_ADD_BASE_SOURCES], [
-  PHP_JSON_BASE_SOURCES="$PHP_JSON_BASE_SOURCES $1"
-])
-
-AC_DEFUN([PHP_JSON_ADD_BUILD_DIR], [
-  PHP_JSON_EXTRA_BUILD_DIRS="$PHP_JSON_EXTRA_BUILD_DIRS $1"
-])
-
-AC_DEFUN([PHP_JSON_ADD_INCLUDE], [
-  PHP_JSON_EXTRA_INCLUDES="$PHP_JSON_EXTRA_INCLUDES $1"
-])
-
-AC_DEFUN([PHP_JSON_ADD_CONFIG_HEADER], [
-  PHP_JSON_EXTRA_CONFIG_HEADERS="$PHP_JSON_EXTRA_CONFIG_HEADERS $1"
-])
-
-AC_DEFUN([PHP_JSON_ADD_CFLAG], [
-  PHP_JSON_CFLAGS="$PHP_JSON_CFLAGS $1"
-])
-
-AC_DEFUN([PHP_JSON_EXTENSION], [
-  PHP_NEW_EXTENSION(json, $PHP_JSON_SOURCES, $ext_shared,, $PHP_JSON_CFLAGS)
-  PHP_SUBST(JSON_SHARED_LIBADD)
-
-  for dir in $PHP_JSON_EXTRA_BUILD_DIRS; do
-    PHP_ADD_BUILD_DIR([$ext_builddir/$dir], 1)
-  done
-  
-  for dir in $PHP_JSON_EXTRA_INCLUDES; do
-    PHP_ADD_INCLUDE([$ext_srcdir/$dir])
-    PHP_ADD_INCLUDE([$ext_builddir/$dir])
-  done
-
-  if test "$ext_shared" = "no"; then
-    PHP_ADD_SOURCES(PHP_EXT_DIR(json), $PHP_JSON_BASE_SOURCES,$PHP_JSON_CFLAGS)
-    out="php_config.h"
-  else
-    PHP_ADD_SOURCES_X(PHP_EXT_DIR(json),$PHP_JSON_BASE_SOURCES,$PHP_JSON_CFLAGS,shared_objects_json,yes)
-    if test -f "$ext_builddir/config.h.in"; then
-      out="$abs_builddir/config.h"
-    else
-      out="php_config.h"
-    fi
-  fi
-  
-  for cfg in $PHP_JSON_EXTRA_CONFIG_HEADERS; do
-    cat > $ext_builddir/$cfg <<EOF
-#include "$out"
-EOF
-  done
-])
-
-AC_DEFUN([PHP_JSON_SETUP_JSON_CHECKER], [
-  PHP_JSON_ADD_SOURCES([
-    utf8_to_utf16.c
-    utf8_decode.c
-    JSON_parser.c
-  ])
-])
-
-dnl
-dnl Main config
-dnl
-
 PHP_ARG_ENABLE(json, whether to enable JavaScript Object Serialization support,
 [  --disable-json       Disable JavaScript Object Serialization support], yes)
 
-if test "$PHP_JSON" != "no"; then  
-  AC_DEFINE([HAVE_JSON],1,[whether to have JavaScript Object Serialization support])
+if test "$PHP_JSON" != "no"; then
+  AC_DEFINE([HAVE_JSON],1 ,[whether to have JavaScript Object Serialization support])
   AC_HEADER_STDC
 
-  PHP_JSON_ADD_BASE_SOURCES([json.c])
-
-  dnl json_c is required
-  PHP_JSON_SETUP_JSON_CHECKER
-  PHP_JSON_EXTENSION
-  dnl PHP_INSTALL_HEADERS([ext/json], [json_c])
+  PHP_NEW_EXTENSION(json, json.c utf8_to_utf16.c utf8_decode.c JSON_parser.c, $ext_shared)
+  PHP_SUBST(JSON_SHARED_LIBADD)
 fi
 
 # vim600: sts=2 sw=2 et