Changes to support building against the LSB - check for inflateCopy.

Also, update --enable-dbus help to reflect the current default (now show
--disable-dbus).

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@10842 7a7537e8-13f0-0310-91df-b6672ffda945

diff --git a/config-scripts/cups-common.m4 b/config-scripts/cups-common.m4
index fe51c2b9949b0a1b166eb74bb5f81ce874cfc278..6c6a0d0cd761f9639833fb4664edcde9eabd3307 100644 (file)
--- a/config-scripts/cups-common.m4
+++ b/config-scripts/cups-common.m4
@@ -3,7 +3,7 @@ dnl "$Id$"
 dnl
 dnl   Common configuration stuff for CUPS.
 dnl
-dnl   Copyright 2007-2012 by Apple Inc.
+dnl   Copyright 2007-2013 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
@@ -264,6 +264,7 @@ AC_CHECK_HEADER(zlib.h,
        AC_DEFINE(HAVE_LIBZ)
        LIBZ="-lz"
        LIBS="$LIBS -lz"
+       AC_CHECK_LIB(z, inflateCopy, AC_DEFINE(HAVE_INFLATECOPY))
        if test "x$GZIP" != z; then
                INSTALL_GZIP="-z"
        fi))
@@ -305,7 +306,7 @@ else
        DBUSDIR=""
 fi
 
-AC_ARG_ENABLE(dbus, [  --enable-dbus           build with DBUS support])
+AC_ARG_ENABLE(dbus, [  --disable-dbus           build without DBUS support])
 AC_ARG_WITH(dbusdir, [  --with-dbusdir          set DBUS configuration directory ],
        DBUSDIR="$withval")
 

diff --git a/config.h.in b/config.h.in
index cbe612b7c3770bbfbbf334364a5642813c2974e8..1408ca9db60a7cc15c27374a817aa7222bba0b60 100644 (file)
--- a/config.h.in
+++ b/config.h.in
@@ -135,6 +135,7 @@
  */
 
 #undef HAVE_LIBZ
+#undef HAVE_INFLATECOPY
 
 
 /*

diff --git a/cups/http.c b/cups/http.c
index efd6d807ee19b435c9eca06301f5bd93a79b6e16..3c7fc99f623bdbee45361698093df15839ea092a 100644 (file)
--- a/cups/http.c
+++ b/cups/http.c
@@ -1962,6 +1962,7 @@ httpPeek(http_t *http,                    /* I - Connection to server */
 #ifdef HAVE_LIBZ
   if (http->coding)
   {
+#  ifdef HAVE_INFLATECOPY
     int                zerr;                   /* Decompressor error */
     z_stream   stream;                 /* Copy of decompressor stream */
 
@@ -2023,6 +2024,12 @@ httpPeek(http_t *http,                   /* I - Connection to server */
     }
 
     bytes = length - http->stream.avail_out;
+
+#  else
+    DEBUG_puts("2httpPeek: No inflateCopy on this platform, httpPeek does not "
+               "work with compressed streams.");
+    return (-1);
+#  endif /* HAVE_INFLATECOPY */
   }
   else
 #endif /* HAVE_LIBZ */

diff --git a/cups/request.c b/cups/request.c
index 191a536fcc58266007c8620f3baf9bd3c3c5703d..8fcb61971616efe6445f336bf6f260dc35ae9527 100644 (file)
--- a/cups/request.c
+++ b/cups/request.c
@@ -3,7 +3,7 @@
  *
  *   IPP utilities for CUPS.
  *
- *   Copyright 2007-2012 by Apple Inc.
+ *   Copyright 2007-2013 by Apple Inc.
  *   Copyright 1997-2007 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -46,6 +46,9 @@
 #ifndef O_BINARY
 #  define O_BINARY 0
 #endif /* O_BINARY */
+#ifndef MSG_DONTWAIT
+#  define MSG_DONTWAIT 0
+#endif /* !MSG_DONTWAIT */
 
 
 /*

diff --git a/vcnet/config.h b/vcnet/config.h
index 80d7f5707405772065898fb26db5e02daa53cbe8..537cf4c9eb27d30425c16fd8c6bdb7e91342262c 100644 (file)
--- a/vcnet/config.h
+++ b/vcnet/config.h
@@ -201,6 +201,7 @@
  */
 
 #define HAVE_LIBZ 1
+#define HAVE_INFLATECOPY 1
 
 
 /*

diff --git a/xcode/config.h b/xcode/config.h
index f86b269495c1a817e7b9c7610c0b45a47fab468b..86fc301f6b66a9eb94032f4e9490f26710a0032f 100644 (file)
--- a/xcode/config.h
+++ b/xcode/config.h
@@ -136,6 +136,7 @@
  */
 
 #define HAVE_LIBZ 1
+#define HAVE_INFLATECOPY 1
 
 
 /*