jani                                     Mon, 03 Aug 2009 11:21:44 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=286725

Log:
- Fixed bBug #48873 (Using both --with-libedit and --with-readline cause 
unknown option warning)

# This isn't worth of NEWS entry, it's just cosmetic

Bug: http://bugs.php.net/48873 (Assigned) Using both --with-libedit and 
--with-readline cause unknown option warning
      
Changed paths:
    U   php/php-src/branches/PHP_5_2/ext/readline/config.m4
    U   php/php-src/branches/PHP_5_3/ext/readline/config.m4
    U   php/php-src/trunk/ext/readline/config.m4

Modified: php/php-src/branches/PHP_5_2/ext/readline/config.m4
===================================================================
--- php/php-src/branches/PHP_5_2/ext/readline/config.m4 2009-08-03 10:23:23 UTC 
(rev 286724)
+++ php/php-src/branches/PHP_5_2/ext/readline/config.m4 2009-08-03 11:21:44 UTC 
(rev 286725)
@@ -8,6 +8,9 @@
 if test "$PHP_LIBEDIT" = "no"; then
   PHP_ARG_WITH(readline,for readline support,
   [  --with-readline[=DIR]   Include readline support (CLI/CGI only)])
+else
+  dnl "register" the --with-readline option to preven invalid "unknown 
configure option" warning
+  php_with_readline=no
 fi

 if test "$PHP_READLINE" && test "$PHP_READLINE" != "no"; then

Modified: php/php-src/branches/PHP_5_3/ext/readline/config.m4
===================================================================
--- php/php-src/branches/PHP_5_3/ext/readline/config.m4 2009-08-03 10:23:23 UTC 
(rev 286724)
+++ php/php-src/branches/PHP_5_3/ext/readline/config.m4 2009-08-03 11:21:44 UTC 
(rev 286725)
@@ -8,6 +8,9 @@
 if test "$PHP_LIBEDIT" = "no"; then
   PHP_ARG_WITH(readline,for readline support,
   [  --with-readline[=DIR]   Include readline support (CLI/CGI only)])
+else
+  dnl "register" the --with-readline option to preven invalid "unknown 
configure option" warning
+  php_with_readline=no
 fi

 if test "$PHP_READLINE" && test "$PHP_READLINE" != "no"; then

Modified: php/php-src/trunk/ext/readline/config.m4
===================================================================
--- php/php-src/trunk/ext/readline/config.m4    2009-08-03 10:23:23 UTC (rev 
286724)
+++ php/php-src/trunk/ext/readline/config.m4    2009-08-03 11:21:44 UTC (rev 
286725)
@@ -8,6 +8,9 @@
 if test "$PHP_LIBEDIT" = "no"; then
   PHP_ARG_WITH(readline,for readline support,
   [  --with-readline[=DIR]   Include readline support (CLI/CGI only)])
+else
+  dnl "register" the --with-readline option to preven invalid "unknown 
configure option" warning
+  php_with_readline=no
 fi

 if test "$PHP_READLINE" && test "$PHP_READLINE" != "no"; then

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

Reply via email to