diff options
| author | Michael R Sweet <michael.r.sweet@gmail.com> | 2019-06-12 08:36:28 -0400 |
|---|---|---|
| committer | Michael R Sweet <michael.r.sweet@gmail.com> | 2019-06-12 08:36:28 -0400 |
| commit | 3001a140d6fcb98946b1303182dc935de7330126 (patch) | |
| tree | 52c0ff94a6c63c61e327bca7b30fc6fc68b5172a /config-scripts | |
| parent | 2614dc6385d93c8b58bba616082f358022518428 (diff) | |
| download | cups-3001a140d6fcb98946b1303182dc935de7330126.tar.gz | |
Use GZIPPROG instead of GZIP to avoid install issues (Issue #5595)
Diffstat (limited to 'config-scripts')
| -rw-r--r-- | config-scripts/cups-common.m4 | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/config-scripts/cups-common.m4 b/config-scripts/cups-common.m4 index 0d5a432e3..87264d850 100644 --- a/config-scripts/cups-common.m4 +++ b/config-scripts/cups-common.m4 @@ -39,7 +39,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) @@ -48,6 +52,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 @@ -55,11 +60,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 @@ -253,14 +253,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) |