Newsgroups: php.internals
Path: news.php.net
Xref: news.php.net php.internals:43872
Mailing-List: contact internals-help@lists.php.net; run by ezmlm
Received-SPF: pass (pb1.pair.com: domain gmail.com designates 209.85.220.220 as permitted sender)
DomainKey-Status: bad
DomainKey-Signature: a=rsa-sha1; c=nofws;
        d=gmail.com; s=gamma;
        h=sender:subject:from:to:cc:in-reply-to:references:content-type:date
         :message-id:mime-version:x-mailer;
        b=T6QiYNWgD1idhdmztJo3wwrQeSOhq7l54sf+b5pMj+RnoUBJbEzqC0Z7DSEBg3wgxU
         28lWpDD6BhgPdqJYHXPMysaZ+dw5mwQ/5nBstxEnLVOPNjSyHITNBasPUEy2Aj6X9RIl
         AV6JxAnMG03S4qkmakcnBz2mUhd1PapVzesgA=
Sender: Arnaud LB <arnaud.lb@gmail.com>
To: Paul Biggar <paul.biggar@gmail.com>
Cc: PHP Internals <internals@lists.php.net>, Johannes =?ISO-8859-1?Q?Schl=FCter?= <johannes@php.net>, Lukas Kahwe Smith <mls@pooteeweet.org>
In-Reply-To: <af54caaf0905061242p2f97b1f7s43494148bc7abe3e@mail.gmail.com>
References: <af54caaf0905061242p2f97b1f7s43494148bc7abe3e@mail.gmail.com>
Content-Type: multipart/mixed; boundary="=-ZL6ZdtkrNrmIKntsOt5L"
Date: Fri, 08 May 2009 15:11:59 +0200
Message-ID: <1241788319.7724.31.camel@localhost>
Mime-Version: 1.0
Subject: Re: [PHP-DEV] Bug 47468: enabling readline/libedit/pcntl/ncurses
 with  --enable-embed
From: lbarnaud@php.net (Arnaud Le Blanc)

--=-ZL6ZdtkrNrmIKntsOt5L
Content-Type: text/plain
Content-Transfer-Encoding: 7bit

Hi,

On Wed, 2009-05-06 at 20:42 +0100, Paul Biggar wrote:
> Hi folks,
> 
> Could I get someone to look at http://bugs.php.net/bug.php?id=47468?.
> It includes a patch which is confirmed to fix the problem.

Does the following patch works for you ? (use ./buildconf after
applying, then reconfigure). It does the same thing as yours, but moves
the decision of allowing "cli" extensions to SAPI's config.m4.

Lukas, Johannes, any objection ?

Regards,

Arnaud


--=-ZL6ZdtkrNrmIKntsOt5L
Content-Description: 
Content-Disposition: inline; filename="static-exts.diff.txt"
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: 7bit

Index: acinclude.m4
===================================================================
RCS file: /repository/php-src/acinclude.m4,v
retrieving revision 1.332.2.14.2.26.2.12
diff -u -p -r1.332.2.14.2.26.2.12 acinclude.m4
--- acinclude.m4	3 Dec 2008 19:53:45 -0000	1.332.2.14.2.26.2.12
+++ acinclude.m4	8 May 2009 12:38:11 -0000
@@ -877,15 +877,17 @@ EOF
 ])
 
 dnl
-dnl PHP_SELECT_SAPI(name, type[, sources [, extra-cflags [, build-target]]])
+dnl PHP_SELECT_SAPI(name, type[, sources [, extra-cflags [, build-target [, allow-static-exts]]]])
 dnl
 dnl Selects the SAPI name and type (static, shared, programm)
 dnl and optionally also the source-files for the SAPI-specific
 dnl objects.
 dnl
+dnl allow-static-exts: Whether SAPI allows any extension to be built statically ([yes], all)
+dnl
 AC_DEFUN([PHP_SELECT_SAPI],[
   PHP_SAPI=$1
-  
+
   case "$2" in
   static[)] PHP_BUILD_STATIC;;
   shared[)] PHP_BUILD_SHARED;;
@@ -894,6 +896,12 @@ AC_DEFUN([PHP_SELECT_SAPI],[
   esac
     
   ifelse($3,,,[PHP_ADD_SOURCES([sapi/$1],[$3],[$4],[sapi])])
+
+  case "$6" in
+  [yes|all)] PHP_SAPI_ALLOWS_STATIC_EXTS="$6";;
+  ["")] PHP_SAPI_ALLOWS_STATIC_EXTS=yes;;
+  esac
+  
 ])
 
 dnl deprecated
@@ -968,7 +976,7 @@ dnl ------------------------------------
   if test "$3" != "shared" && test "$3" != "yes" && test "$4" = "cli"; then
 dnl ---------------------------------------------- CLI static module
     [PHP_]translit($1,a-z_-,A-Z__)[_SHARED]=no
-    if test "$PHP_SAPI" = "cgi"; then
+    if test "$PHP_SAPI_ALLOWS_STATIC_EXTS" = "all"; then
       PHP_ADD_SOURCES(PHP_EXT_DIR($1),$2,$ac_extra,)
       EXT_STATIC="$EXT_STATIC $1"
     else
Index: sapi/cgi/config9.m4
===================================================================
RCS file: /repository/php-src/sapi/cgi/config9.m4,v
retrieving revision 1.17.2.2.2.6.2.2
diff -u -p -r1.17.2.2.2.6.2.2 config9.m4
--- sapi/cgi/config9.m4	1 Oct 2007 12:40:54 -0000	1.17.2.2.2.6.2.2
+++ sapi/cgi/config9.m4	8 May 2009 12:38:14 -0000
@@ -54,7 +54,7 @@ if test "$PHP_SAPI" = "default"; then
 
     dnl Set install target and select SAPI
     INSTALL_IT="@echo \"Installing PHP CGI binary: \$(INSTALL_ROOT)\$(bindir)/\"; \$(INSTALL) -m 0755 \$(SAPI_CGI_PATH) \$(INSTALL_ROOT)\$(bindir)/\$(program_prefix)php-cgi\$(program_suffix)\$(EXEEXT)"
-    PHP_SELECT_SAPI(cgi, program, cgi_main.c fastcgi.c,, '$(SAPI_CGI_PATH)')
+    PHP_SELECT_SAPI(cgi, program, cgi_main.c fastcgi.c,, '$(SAPI_CGI_PATH)', all)
 
     case $host_alias in
       *aix*)
Index: sapi/embed/config.m4
===================================================================
RCS file: /repository/php-src/sapi/embed/config.m4,v
retrieving revision 1.9.4.2
diff -u -p -r1.9.4.2 config.m4
--- sapi/embed/config.m4	11 Jul 2007 23:20:36 -0000	1.9.4.2
+++ sapi/embed/config.m4	8 May 2009 12:38:14 -0000
@@ -23,7 +23,7 @@ if test "$PHP_EMBED" != "no"; then
       ;;
   esac
   if test "$PHP_EMBED_TYPE" != "no"; then
-    PHP_SELECT_SAPI(embed, $PHP_EMBED_TYPE, php_embed.c)
+    PHP_SELECT_SAPI(embed, $PHP_EMBED_TYPE, php_embed.c, , , all)
     PHP_INSTALL_HEADERS([sapi/embed/php_embed.h])
   fi
   AC_MSG_RESULT([$PHP_EMBED_TYPE])

--=-ZL6ZdtkrNrmIKntsOt5L--