[PHP-CVS] cvs: php-src /ext/json config.m4

2009-06-23 Thread Johannes Schlüter 
johannesTue Jun 23 13:09:21 2009 UTC

  Modified files:  
/php-src/ext/json   config.m4 
  Log:
  The json header should be installed so other exts can use it
  
http://cvs.php.net/viewvc.cgi/php-src/ext/json/config.m4?r1=1.7&r2=1.8&diff_format=u
Index: php-src/ext/json/config.m4
diff -u php-src/ext/json/config.m4:1.7 php-src/ext/json/config.m4:1.8
--- php-src/ext/json/config.m4:1.7  Tue Jul  3 17:24:36 2007
+++ php-src/ext/json/config.m4  Tue Jun 23 13:09:20 2009
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config.m4,v 1.7 2007/07/03 17:24:36 sniper Exp $
+dnl $Id: config.m4,v 1.8 2009/06/23 13:09:20 johannes Exp $
 dnl
 
 PHP_ARG_ENABLE(json, whether to enable JavaScript Object Serialization support,
@@ -10,5 +10,6 @@
   AC_HEADER_STDC
 
   PHP_NEW_EXTENSION(json, json.c utf8_to_utf16.c utf8_decode.c JSON_parser.c, 
$ext_shared)
+  PHP_INSTALL_HEADERS([ext/json], [php_json.h])
   PHP_SUBST(JSON_SHARED_LIBADD)
 fi



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src /ext/json config.m4

2006-07-20 Thread Antony Dovgal 
tony2001Thu Jul 20 10:47:26 2006 UTC

  Modified files:  
/php-src/ext/json   config.m4 
  Log:
  rephrase
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/json/config.m4?r1=1.5&r2=1.6&diff_format=u
Index: php-src/ext/json/config.m4
diff -u php-src/ext/json/config.m4:1.5 php-src/ext/json/config.m4:1.6
--- php-src/ext/json/config.m4:1.5  Thu Jul 20 10:11:02 2006
+++ php-src/ext/json/config.m4  Thu Jul 20 10:47:26 2006
@@ -1,12 +1,12 @@
 dnl
-dnl $Id: config.m4,v 1.5 2006/07/20 10:11:02 sniper Exp $
+dnl $Id: config.m4,v 1.6 2006/07/20 10:47:26 tony2001 Exp $
 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])
+  AC_DEFINE([HAVE_JSON],1 ,[whether to enable JavaScript Object Serialization 
support])
   AC_HEADER_STDC
 
   PHP_NEW_EXTENSION(json, json.c utf8_to_utf16.c utf8_decode.c JSON_parser.c, 
$ext_shared)

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src /ext/json config.m4

2006-07-20 Thread Jani Taskinen 
sniper  Thu Jul 20 10:11:02 2006 UTC

  Modified files:  
/php-src/ext/json   config.m4 
  Log:
  Simplify configure, no need to have dozen macros which have no use
  
http://cvs.php.net/viewvc.cgi/php-src/ext/json/config.m4?r1=1.4&r2=1.5&diff_format=u
Index: php-src/ext/json/config.m4
diff -u php-src/ext/json/config.m4:1.4 php-src/ext/json/config.m4:1.5
--- php-src/ext/json/config.m4:1.4  Wed Jul 19 16:17:56 2006
+++ php-src/ext/json/config.m4  Thu Jul 20 10:11:02 2006
@@ -1,88 +1,16 @@
 dnl
-dnl $Id: config.m4,v 1.4 2006/07/19 16:17:56 iliaa Exp $
-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