From f376c469919beeb3e75d40879dcda4288983e897 Mon Sep 17 00:00:00 2001 From: Michael R Sweet Date: Wed, 12 Jun 2019 08:37:06 -0400 Subject: [PATCH] Use GZIPPROG instead of GZIP to avoid install issues (Issue #5595) (cherry picked from commit 3676fc318a458f71df76620a7e66f5c5807cf9b1) Signed-off-by: Sam Bobroff --- Makedefs.in | 4 +-- config-scripts/cups-common.m4 | 20 ++++++------ configure | 59 ++++++++++++++++++----------------- 3 files changed, 42 insertions(+), 41 deletions(-) diff --git a/Makedefs.in b/Makedefs.in index f614c0c1d..8541b4976 100644 --- a/Makedefs.in +++ b/Makedefs.in @@ -1,7 +1,7 @@ # # Common makefile definitions for CUPS. # -# Copyright 2007-2018 by Apple Inc. +# Copyright 2007-2019 by Apple Inc. # Copyright 1997-2007 by Easy Software Products, all rights reserved. # # These coded instructions, statements, and computer programs are the @@ -29,7 +29,7 @@ CHMOD = @CHMOD@ CXX = @LIBTOOL_CXX@ @CXX@ DSO = @DSO@ DSOXX = @DSOXX@ -GZIP = @GZIP@ +GZIPPROG = @GZIPPROG@ INSTALL = @INSTALL@ LD = @LD@ LD_CC = @LD_CC@ diff --git a/config-scripts/cups-common.m4 b/config-scripts/cups-common.m4 index a1185bccc..0859efe08 100644 --- a/config-scripts/cups-common.m4 +++ b/config-scripts/cups-common.m4 @@ -1,7 +1,7 @@ dnl dnl Common configuration stuff for CUPS. dnl -dnl Copyright 2007-2017 by Apple Inc. +dnl Copyright 2007-2019 by Apple Inc. dnl Copyright 1997-2007 by Easy Software Products, all rights reserved. dnl dnl These coded instructions, statements, and computer programs are the @@ -42,7 +42,11 @@ AC_PROG_CXX(clang++ c++ g++) AC_PROG_RANLIB AC_PATH_PROG(AR,ar) AC_PATH_PROG(CHMOD,chmod) -AC_PATH_PROG(GZIP,gzip) +AC_PATH_PROG(GZIPPROG,gzip) +AC_MSG_CHECKING(for install-sh script) +INSTALL="`pwd`/install-sh" +AC_SUBST(INSTALL) +AC_MSG_RESULT(using $INSTALL) AC_PATH_PROG(LD,ld) AC_PATH_PROG(LN,ln) AC_PATH_PROG(MKDIR,mkdir) @@ -51,6 +55,7 @@ AC_PATH_PROG(RM,rm) AC_PATH_PROG(RMDIR,rmdir) AC_PATH_PROG(SED,sed) AC_PATH_PROG(XDGOPEN,xdg-open) + if test "x$XDGOPEN" = x; then CUPS_HTMLVIEW="htmlview" else @@ -58,11 +63,6 @@ else fi AC_SUBST(CUPS_HTMLVIEW) -AC_MSG_CHECKING(for install-sh script) -INSTALL="`pwd`/install-sh" -AC_SUBST(INSTALL) -AC_MSG_RESULT(using $INSTALL) - if test "x$AR" = x; then AC_MSG_ERROR([Unable to find required library archive command.]) fi @@ -266,14 +266,14 @@ dnl ZLIB INSTALL_GZIP="" LIBZ="" AC_CHECK_HEADER(zlib.h, - AC_CHECK_LIB(z, gzgets, + AC_CHECK_LIB(z, gzgets,[ AC_DEFINE(HAVE_LIBZ) LIBZ="-lz" LIBS="$LIBS -lz" AC_CHECK_LIB(z, inflateCopy, AC_DEFINE(HAVE_INFLATECOPY)) - if test "x$GZIP" != z; then + if test "x$GZIPPROG" != x; then INSTALL_GZIP="-z" - fi)) + fi])) AC_SUBST(INSTALL_GZIP) AC_SUBST(LIBZ) diff --git a/configure b/configure index 368906141..629fdddba 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for CUPS 2.2.11. +# Generated by GNU Autoconf 2.69 for CUPS 2.2.12. # # Report bugs to . # @@ -580,8 +580,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='CUPS' PACKAGE_TARNAME='cups' -PACKAGE_VERSION='2.2.11' -PACKAGE_STRING='CUPS 2.2.11' +PACKAGE_VERSION='2.2.12' +PACKAGE_STRING='CUPS 2.2.12' PACKAGE_BUGREPORT='https://github.com/apple/cups/issues' PACKAGE_URL='https://www.cups.org/' @@ -762,7 +762,6 @@ LIBPAPER LIBMALLOC PKGCONFIG INSTALLSTATIC -INSTALL CUPS_HTMLVIEW XDGOPEN SED @@ -772,7 +771,8 @@ MV MKDIR LN LD -GZIP +INSTALL +GZIPPROG CHMOD AR RANLIB @@ -1480,7 +1480,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures CUPS 2.2.11 to adapt to many kinds of systems. +\`configure' configures CUPS 2.2.12 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1545,7 +1545,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of CUPS 2.2.11:";; + short | recursive ) echo "Configuration of CUPS 2.2.12:";; esac cat <<\_ACEOF @@ -1726,7 +1726,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -CUPS configure 2.2.11 +CUPS configure 2.2.12 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2190,7 +2190,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by CUPS $as_me 2.2.11, which was +It was created by CUPS $as_me 2.2.12, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2711,7 +2711,7 @@ done ac_config_headers="$ac_config_headers config.h" -CUPS_VERSION="2.2.11" +CUPS_VERSION="2.2.12" CUPS_REVISION="" CUPS_BUILD="cups-$CUPS_VERSION" @@ -3948,12 +3948,12 @@ fi set dummy gzip; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_GZIP+:} false; then : +if ${ac_cv_path_GZIPPROG+:} false; then : $as_echo_n "(cached) " >&6 else - case $GZIP in + case $GZIPPROG in [\\/]* | ?:[\\/]*) - ac_cv_path_GZIP="$GZIP" # Let the user override the test with a path. + ac_cv_path_GZIPPROG="$GZIPPROG" # Let the user override the test with a path. ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -3963,7 +3963,7 @@ do test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_GZIP="$as_dir/$ac_word$ac_exec_ext" + ac_cv_path_GZIPPROG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -3974,16 +3974,22 @@ IFS=$as_save_IFS ;; esac fi -GZIP=$ac_cv_path_GZIP -if test -n "$GZIP"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GZIP" >&5 -$as_echo "$GZIP" >&6; } +GZIPPROG=$ac_cv_path_GZIPPROG +if test -n "$GZIPPROG"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GZIPPROG" >&5 +$as_echo "$GZIPPROG" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for install-sh script" >&5 +$as_echo_n "checking for install-sh script... " >&6; } +INSTALL="`pwd`/install-sh" + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: using $INSTALL" >&5 +$as_echo "using $INSTALL" >&6; } # Extract the first word of "ld", so it can be a program name with args. set dummy ld; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 @@ -4304,6 +4310,7 @@ $as_echo "no" >&6; } fi + if test "x$XDGOPEN" = x; then CUPS_HTMLVIEW="htmlview" else @@ -4311,13 +4318,6 @@ else fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for install-sh script" >&5 -$as_echo_n "checking for install-sh script... " >&6; } -INSTALL="`pwd`/install-sh" - -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: using $INSTALL" >&5 -$as_echo "using $INSTALL" >&6; } - if test "x$AR" = x; then as_fn_error $? "Unable to find required library archive command." "$LINENO" 5 fi @@ -5718,7 +5718,8 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_z_gzgets" >&5 $as_echo "$ac_cv_lib_z_gzgets" >&6; } if test "x$ac_cv_lib_z_gzgets" = xyes; then : - $as_echo "#define HAVE_LIBZ 1" >>confdefs.h + + $as_echo "#define HAVE_LIBZ 1" >>confdefs.h LIBZ="-lz" LIBS="$LIBS -lz" @@ -5763,7 +5764,7 @@ if test "x$ac_cv_lib_z_inflateCopy" = xyes; then : fi - if test "x$GZIP" != z; then + if test "x$GZIPPROG" != x; then INSTALL_GZIP="-z" fi fi @@ -10832,7 +10833,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by CUPS $as_me 2.2.11, which was +This file was extended by CUPS $as_me 2.2.12, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -10895,7 +10896,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -CUPS config.status 2.2.11 +CUPS config.status 2.2.12 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" -- 2.21.0