Load cups into easysw/current.

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

diff --git a/config-scripts/cups-scripting.m4 b/config-scripts/cups-scripting.m4
index e0c6832c6291e0d9420cd5a5a2a842f64fcb6630..68221a91ed731ef8a154cd1efbedad815c90db8e 100644 (file)
--- a/config-scripts/cups-scripting.m4
+++ b/config-scripts/cups-scripting.m4
@@ -1,9 +1,9 @@
 dnl
-dnl "$Id: cups-scripting.m4 4494 2005-02-18 02:18:11Z mike $"
+dnl "$Id: cups-scripting.m4 5176 2006-02-25 18:14:10Z mike $"
 dnl
 dnl   Scripting configuration stuff for the Common UNIX Printing System (CUPS).
 dnl
-dnl   Copyright 1997-2005 by Easy Software Products, all rights reserved.
+dnl   Copyright 1997-2006 by Easy Software Products, all rights reserved.
 dnl
 dnl   These coded instructions, statements, and computer programs are the
 dnl   property of Easy Software Products and are protected by Federal
@@ -66,10 +66,23 @@ fi
 
 AC_DEFINE_UNQUOTED(CUPS_PHP, "$CUPS_PHP")
 
-if test "x$CUPS_PHP" != x; then
+if test "x$CUPS_PHP" = x; then
+       CUPS_PHP="no"
+else
        AC_DEFINE(HAVE_PHP)
 fi
 
+PHPDIR=""
+if test "x$CUPS_PHP" != xno; then
+       AC_PATH_PROG(PHPCONFIG, php-config)
+
+       if test "x$PHPCONFIG" != x; then
+               PHPDIR="scripting/php"
+       fi
+fi
+
+AC_SUBST(PHPDIR)
+
 dnl Do we have Python?
 AC_ARG_WITH(python, [  --with-python           set Python interpreter for web interfaces ],
        CUPS_PYTHON="$withval",
@@ -87,5 +100,5 @@ if test "x$CUPS_PYTHON" != x; then
 fi
 
 dnl
-dnl End of "$Id: cups-scripting.m4 4494 2005-02-18 02:18:11Z mike $".
+dnl End of "$Id: cups-scripting.m4 5176 2006-02-25 18:14:10Z mike $".
 dnl