[Getdata-commits] SF.net SVN: getdata:[861] trunk/getdata/m4/php.m4

[<ket...@us...>]

Revision: 861
          http://sourceforge.net/p/getdata/code/861
Author:   ketiltrout
Date:     2013-10-25 22:23:34 +0000 (Fri, 25 Oct 2013)
Log Message:
-----------
Prevent false negatives in GD_PHP_CONFIG.

Modified Paths:
--------------
    trunk/getdata/m4/php.m4

Modified: trunk/getdata/m4/php.m4
===================================================================
--- trunk/getdata/m4/php.m4	2013-10-24 02:06:29 UTC (rev 860)
+++ trunk/getdata/m4/php.m4	2013-10-25 22:23:34 UTC (rev 861)
@@ -25,11 +25,13 @@
 AC_DEFUN([GD_PHP_CONFIG],
 [
   $1=`${PHP_CONFIG} --$2`
+ifelse(`x$3', `x',,[
   if test "x${$1}" = "x"; then
     $1="$3";
     have_php="no";
   fi
 ])
+])
 
 dnl GD_PHP
 dnl ---------------------------------------------------------------
@@ -91,17 +93,17 @@
   AC_SUBST([phpdir])
 
   AC_MSG_CHECKING([PHP CPPFLAGS])
-  GD_PHP_CONFIG([PHP_CPPFLAGS], [includes], [])
+  GD_PHP_CONFIG([PHP_CPPFLAGS], [includes])
   AC_MSG_RESULT([$PHP_CPPFLAGS])
   AC_SUBST([PHP_CPPFLAGS])
 
   AC_MSG_CHECKING([PHP LDFLAGS])
-  GD_PHP_CONFIG([PHP_LDFLAGS], [ldflags], [])
+  GD_PHP_CONFIG([PHP_LDFLAGS], [ldflags])
   AC_MSG_RESULT([$PHP_LDFLAGS])
   AC_SUBST([PHP_ldflags])
 
   AC_MSG_CHECKING([PHP LIBS])
-  GD_PHP_CONFIG([PHP_LIBS], [libs], [])
+  GD_PHP_CONFIG([PHP_LIBS], [libs])
   AC_MSG_RESULT([$PHP_LIBS])
   AC_SUBST([PHP_libs])
 fi

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.