From: Michael Wallner <mike@php.net>
Date: Wed, 7 Jun 2006 21:05:34 +0000 (+0000)
Subject: - SPL cannot be built shared, so no need to check
X-Git-Tag: RELEASE_1_0_0~4
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=1ec34f462819d4a10badd83d8493403b6c0c6e68;p=m6w6%2Fext-http

- SPL cannot be built shared, so no need to check
- fix grepping for shared extensions
- re-add config.m4 stub for phpize/pear
---

diff --git a/config.m4 b/config.m4
new file mode 100644
index 0000000..4b14343
--- /dev/null
+++ b/config.m4
@@ -0,0 +1,5 @@
+dnl phpize stub of config9.m4 for pecl/http
+dnl $Id$
+dnl vim: noet ts=1 sw=1
+
+sinclude(config9.m4)
diff --git a/config9.m4 b/config9.m4
index 648cc5b..bba07d0 100644
--- a/config9.m4
+++ b/config9.m4
@@ -13,9 +13,9 @@ PHP_ARG_WITH([http-zlib-compression], [whether to enable zlib encodings support]
 PHP_ARG_WITH([http-magic-mime], [whether to enable response content type guessing],
 [  --with-http-magic-mime[=LIBMAGICDIR]
                            HTTP: with magic mime response content type guessing], "no", "no")
-PHP_ARG_WITH([http-shared-deps], [whether to depend on shared extensions],
-[  --with-http-shared-deps HTTP: disable to not depend on shared extensions
-                           like SPL, hash, iconv and session], $PHP_HTTP, $PHP_HTTP)
+PHP_ARG_WITH([http-shared-deps], [whether to depend on extensions which have been built shared],
+[  --with-http-shared-deps HTTP: disable to not depend on extensions like hash,
+                                 iconv and session (when built shared)], $PHP_HTTP, $PHP_HTTP)
 
 if test "$PHP_HTTP" != "no"; then
 
@@ -72,7 +72,7 @@ if test "$PHP_HTTP" != "no"; then
 		
 		AC_MSG_CHECKING([for ext/$extname support])
 		if test -x "$PHP_EXECUTABLE"; then
-			if test "`$PHP_EXECUTABLE -m | $EGREP '^$extname$'`" = "$extname"; then
+			if test "`$PHP_EXECUTABLE -m | $EGREP ^$extname\$`" = "$extname"; then
 				[HTTP_HAVE_EXT_]translit($1,a-z_-,A-Z__)=1
 				AC_MSG_RESULT([yes])
 				$2
@@ -284,11 +284,6 @@ dnl SESSION
 dnl ----
 	HTTP_HAVE_PHP_EXT([session])
 
-dnl ----
-dnl SPL
-dnl ----
-	HTTP_HAVE_PHP_EXT([spl])
-
 dnl ----
 dnl DONE
 dnl ----
@@ -308,7 +303,6 @@ dnl ----
 	HTTP_SHARED_DEP([hash])
 	HTTP_SHARED_DEP([iconv])
 	HTTP_SHARED_DEP([session])
-	HTTP_SHARED_DEP([spl])
 	
 	PHP_ADD_BUILD_DIR($ext_builddir/phpstr, 1)
 	PHP_SUBST([HTTP_SHARED_LIBADD])
diff --git a/package2.xml b/package2.xml
index 08348ff..f3552fa 100644
--- a/package2.xml
+++ b/package2.xml
@@ -30,7 +30,7 @@ support. Parallel requests are available for PHP 5 and greater.
  </lead>
  <date>2006-00-00</date>
  <version>
-  <release>1.0.0-dev</release>
+  <release>1.0.0dev</release>
   <api>1.0.0</api>
  </version>
  <stability>
@@ -57,6 +57,7 @@ support. Parallel requests are available for PHP 5 and greater.
    
    <file role="src" name="http.dsp"/>
    <file role="src" name="config.w32"/>
+   <file role="src" name="config.m4"/>
    <file role="src" name="config9.m4"/>
    <file role="src" name="Makefile.frag"/>
    
@@ -290,14 +291,19 @@ support. Parallel requests are available for PHP 5 and greater.
    prompt="whether to enable cURL HTTP requests; specify libcurl directory"
    default="yes"
   />
+  <configureoption
+   name="with-http-zlib-compression"
+   prompt="whether to enable support for gzencoded/deflated message bodies; specify zlib directory"
+   default="yes"
+  />
   <configureoption
    name="with-http-magic-mime"
    prompt="whether to enable response content type guessing; specify libmagic directory"
    default="no"
   />
   <configureoption
-   name="with-http-zlib-compression"
-   prompt="whether to enable support for gzencoded/deflated message bodies; specify zlib directory"
+   name="with-http-shared-deps"
+   prompt="whether to depend on extensions which have been built shared"
    default="yes"
   />
   <filelist>