- up to 1.5rc1; usb patches questionable

[packages/cups.git] / cups-no-polluted-krb5config.patch

diff --git a/cups-no-polluted-krb5config.patch b/cups-no-polluted-krb5config.patch
index 87206f79232b675d712ba7663ebdf2313c70dc27..d038afa505ee3cbac8bcc92cf527d6e17edd046d 100644 (file)
--- a/cups-no-polluted-krb5config.patch
+++ b/cups-no-polluted-krb5config.patch
@@ -1,16 +1,15 @@
---- cups-1.3.4/config-scripts/cups-gssapi.m4~  2007-08-01 21:02:47.000000000 +0200
-+++ cups-1.3.4/config-scripts/cups-gssapi.m4   2007-12-06 23:18:40.000000000 +0100
-@@ -27,9 +27,9 @@
+--- cups-1.5rc1/config-scripts/cups-gssapi.m4~ 2011-05-12 07:21:56.000000000 +0200
++++ cups-1.5rc1/config-scripts/cups-gssapi.m4  2011-06-15 21:40:54.182690659 +0200
+@@ -46,9 +46,9 @@
                                ;;
                        *)
                                # Other platforms just ask for GSSAPI
--                              CFLAGS="`$KRB5CONFIG --cflags gssapi` $CFLAGS"          
--                              CPPFLAGS="`$KRB5CONFIG --cflags gssapi` $CPPFLAGS"              
+-                              CFLAGS="`$KRB5CONFIG --cflags gssapi` $CFLAGS"
+-                              CPPFLAGS="`$KRB5CONFIG --cflags gssapi` $CPPFLAGS"
 -                              LIBGSSAPI="`$KRB5CONFIG --libs gssapi`"
-+                              CFLAGS="`CFLAGS= LDFLAGS= $KRB5CONFIG --cflags gssapi` $CFLAGS"         
-+                              CPPFLAGS="`CFLAGS= LDFLAGS= $KRB5CONFIG --cflags gssapi` $CPPFLAGS"             
++                              CFLAGS="`CFLAGS= LDFLAGS= $KRB5CONFIG --cflags gssapi` $CFLAGS"
++                              CPPFLAGS="`CFLAGS= LDFLAGS= $KRB5CONFIG --cflags gssapi` $CPPFLAGS"
 +                              LIBGSSAPI="`CFLAGS= LDFLAGS= $KRB5CONFIG --libs gssapi`"
                                ;;
                esac
                AC_DEFINE(HAVE_GSSAPI, 1, [Whether GSSAPI is available])
-       else