Merge changes from CUPS 1.4svn-r7932.

[thirdparty/cups.git] / config-scripts / cups-scripting.m4

diff --git a/config-scripts/cups-scripting.m4 b/config-scripts/cups-scripting.m4
index 71a6707e94630b10f82b47ff831190cf1638afd2..f514221e239a97ab5445076c69262be9b97e9241 100644 (file)
--- a/config-scripts/cups-scripting.m4
+++ b/config-scripts/cups-scripting.m4
@@ -3,7 +3,7 @@ dnl "$Id: cups-scripting.m4 6649 2007-07-11 21:46:42Z mike $"
 dnl
 dnl   Scripting configuration stuff for the Common UNIX Printing System (CUPS).
 dnl
-dnl   Copyright 2007 by Apple Inc.
+dnl   Copyright 2007-2008 by Apple Inc.
 dnl   Copyright 1997-2006 by Easy Software Products, all rights reserved.
 dnl
 dnl   These coded instructions, statements, and computer programs are the
@@ -51,8 +51,13 @@ AC_ARG_WITH(php, [  --with-php              set PHP interpreter for web interfac
        CUPS_PHP="")
 
 if test "x$CUPS_PHP" = x; then
-       AC_PATH_PROG(PHP,php)
-       CUPS_PHP="$PHP"
+       AC_PATH_PROG(PHPCGI,php-cgi)
+       if test "x$PHPCGI" = x; then
+               AC_PATH_PROG(PHP,php)
+               CUPS_PHP="$PHP"
+       else
+               CUPS_PHP="$PHPCGI"
+       fi
 fi
 
 AC_DEFINE_UNQUOTED(CUPS_PHP, "$CUPS_PHP")