diff options
| author | Michael Sweet <michael.r.sweet@gmail.com> | 2017-10-12 10:43:35 -0400 |
|---|---|---|
| committer | Michael Sweet <michael.r.sweet@gmail.com> | 2017-10-12 10:43:35 -0400 |
| commit | b889560c05bea474d8d12d1cd9e151b846d176eb (patch) | |
| tree | 2be5374ac65bec8bd60da09bc6709914bdf945bf /config-scripts | |
| parent | c9e9d0e810417cae038b7a984cd424b3d331e99a (diff) | |
| download | cups-b889560c05bea474d8d12d1cd9e151b846d176eb.tar.gz | |
Fixed the script interpreter detection in the configure script (Issue #5122)
Diffstat (limited to 'config-scripts')
| -rw-r--r-- | config-scripts/cups-scripting.m4 | 26 |
1 files changed, 17 insertions, 9 deletions
diff --git a/config-scripts/cups-scripting.m4 b/config-scripts/cups-scripting.m4 index bff3e9a05..d2e1f294b 100644 --- a/config-scripts/cups-scripting.m4 +++ b/config-scripts/cups-scripting.m4 @@ -1,7 +1,7 @@ dnl dnl Scripting configuration stuff for CUPS. dnl -dnl Copyright 2007-2010 by Apple Inc. +dnl Copyright 2007-2017 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 @@ -14,11 +14,13 @@ dnl dnl Do we have Java? AC_ARG_WITH(java, [ --with-java set Java interpreter for web interfaces ], CUPS_JAVA="$withval", - CUPS_JAVA="") + CUPS_JAVA="auto") -if test "x$CUPS_JAVA" = x; then +if test "x$CUPS_JAVA" = xauto; then AC_PATH_PROG(JAVA,java) CUPS_JAVA="$JAVA" +elif test "x$CUPS_JAVA" = xno; then + CUPS_JAVA="" fi AC_DEFINE_UNQUOTED(CUPS_JAVA, "$CUPS_JAVA") @@ -30,11 +32,13 @@ fi dnl Do we have Perl? AC_ARG_WITH(perl, [ --with-perl set Perl interpreter for web interfaces ], CUPS_PERL="$withval", - CUPS_PERL="") + CUPS_PERL="auto") -if test "x$CUPS_PERL" = x; then +if test "x$CUPS_PERL" = xauto; then AC_PATH_PROG(PERL,perl) CUPS_PERL="$PERL" +elif test "x$CUPS_PERL" = xno; then + CUPS_PERL="" fi AC_DEFINE_UNQUOTED(CUPS_PERL, "$CUPS_PERL") @@ -46,9 +50,9 @@ fi dnl Do we have PHP? AC_ARG_WITH(php, [ --with-php set PHP interpreter for web interfaces ], CUPS_PHP="$withval", - CUPS_PHP="") + CUPS_PHP="auto") -if test "x$CUPS_PHP" = x; then +if test "x$CUPS_PHP" = xauto; then AC_PATH_PROG(PHPCGI,php-cgi) if test "x$PHPCGI" = x; then AC_PATH_PROG(PHP,php) @@ -56,6 +60,8 @@ if test "x$CUPS_PHP" = x; then else CUPS_PHP="$PHPCGI" fi +elif test "x$CUPS_PHP" = xno; then + CUPS_PHP="" fi AC_DEFINE_UNQUOTED(CUPS_PHP, "$CUPS_PHP") @@ -69,11 +75,13 @@ fi dnl Do we have Python? AC_ARG_WITH(python, [ --with-python set Python interpreter for web interfaces ], CUPS_PYTHON="$withval", - CUPS_PYTHON="") + CUPS_PYTHON="auto") -if test "x$CUPS_PYTHON" = x; then +if test "x$CUPS_PYTHON" = xauto; then AC_PATH_PROG(PYTHON,python) CUPS_PYTHON="$PYTHON" +elif test "x$CUPS_PYTHON" = xno; then + CUPS_PYTHON="" fi AC_DEFINE_UNQUOTED(CUPS_PYTHON, "$CUPS_PYTHON") |