rasmus                                   Sun, 21 Aug 2011 22:57:13 +0000

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

Log:
Debian/Ubuntu don't have any special CFLAGS listed here for
gssapi which shouldn't break the build.

Changed paths:
    U   php/php-src/branches/PHP_5_3/acinclude.m4
    U   php/php-src/branches/PHP_5_4/acinclude.m4
    U   php/php-src/trunk/acinclude.m4

Modified: php/php-src/branches/PHP_5_3/acinclude.m4
===================================================================
--- php/php-src/branches/PHP_5_3/acinclude.m4   2011-08-21 14:31:11 UTC (rev 
315257)
+++ php/php-src/branches/PHP_5_3/acinclude.m4   2011-08-21 22:57:13 UTC (rev 
315258)
@@ -2256,7 +2256,7 @@
     KERBEROS_LIBS=`$KRB5_CONFIG --libs gssapi`
     KERBEROS_CFLAGS=`$KRB5_CONFIG --cflags gssapi`

-    if test -n "$KERBEROS_LIBS" && test -n "$KERBEROS_CFLAGS"; then
+    if test -n "$KERBEROS_LIBS"; then
       found_kerberos=yes
       PHP_EVAL_LIBLINE($KERBEROS_LIBS, $1)
       PHP_EVAL_INCLINE($KERBEROS_CFLAGS)

Modified: php/php-src/branches/PHP_5_4/acinclude.m4
===================================================================
--- php/php-src/branches/PHP_5_4/acinclude.m4   2011-08-21 14:31:11 UTC (rev 
315257)
+++ php/php-src/branches/PHP_5_4/acinclude.m4   2011-08-21 22:57:13 UTC (rev 
315258)
@@ -2271,7 +2271,7 @@
     KERBEROS_LIBS=`$KRB5_CONFIG --libs gssapi`
     KERBEROS_CFLAGS=`$KRB5_CONFIG --cflags gssapi`

-    if test -n "$KERBEROS_LIBS" && test -n "$KERBEROS_CFLAGS"; then
+    if test -n "$KERBEROS_LIBS"; then
       found_kerberos=yes
       PHP_EVAL_LIBLINE($KERBEROS_LIBS, $1)
       PHP_EVAL_INCLINE($KERBEROS_CFLAGS)

Modified: php/php-src/trunk/acinclude.m4
===================================================================
--- php/php-src/trunk/acinclude.m4      2011-08-21 14:31:11 UTC (rev 315257)
+++ php/php-src/trunk/acinclude.m4      2011-08-21 22:57:13 UTC (rev 315258)
@@ -2271,7 +2271,7 @@
     KERBEROS_LIBS=`$KRB5_CONFIG --libs gssapi`
     KERBEROS_CFLAGS=`$KRB5_CONFIG --cflags gssapi`

-    if test -n "$KERBEROS_LIBS" && test -n "$KERBEROS_CFLAGS"; then
+    if test -n "$KERBEROS_LIBS"; then
       found_kerberos=yes
       PHP_EVAL_LIBLINE($KERBEROS_LIBS, $1)
       PHP_EVAL_INCLINE($KERBEROS_CFLAGS)

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

Reply via email to