[patch] icedtea-7-no_cups.patch

nocups.patch (text/plain), 2.38 KB, created by Kent Fredric (IRC: kent\n) (RETIRED) on 2012-06-28 00:34:44 UTC

diff -Naur icedtea-2.2.1/Makefile.am icedtea-2.2.1_b/Makefile.am
--- icedtea-2.2.1/Makefile.am	2012-06-13 01:30:30.108670450 +0000
+++ icedtea-2.2.1_b/Makefile.am	2012-06-28 12:22:08.184236181 +0000
@@ -434,9 +434,6 @@
 	STATIC_CXX="false" \
 	BUILD_GCC="$(CC)" \
 	BUILD_CXX="$(CXX)" \
-	USE_SYSTEM_CUPS="true" \
-	CUPS_LIBS="${CUPS_LIBS}" \
-	CUPS_CFLAGS="${CUPS_CFLAGS}" \
 	ALT_STRIP_POLICY=no_strip
 
 if ENABLE_CACAO
diff -Naur icedtea-2.2.1/Makefile.in icedtea-2.2.1_b/Makefile.in
--- icedtea-2.2.1/Makefile.in	2012-06-13 01:32:24.334292504 +0000
+++ icedtea-2.2.1_b/Makefile.in	2012-06-28 12:23:20.017236823 +0000
@@ -239,7 +239,6 @@
 CPIO = @CPIO@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
-CUPS_LIBS = @CUPS_LIBS@
 CXX = @CXX@
 CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
@@ -687,8 +686,7 @@
 	DEBUG_BINARIES="true" DISABLE_INTREE_EC="true" \
 	ALT_OUTPUTDIR="$(BUILD_OUTPUT_DIR)" VERBOSE="$(VERBOSE)" \
 	STATIC_CXX="false" BUILD_GCC="$(CC)" BUILD_CXX="$(CXX)" \
-	USE_SYSTEM_CUPS="true" CUPS_LIBS="${CUPS_LIBS}" \
-	CUPS_CFLAGS="${CUPS_CFLAGS}" ALT_STRIP_POLICY=no_strip \
+	ALT_STRIP_POLICY=no_strip \
 	$(am__append_21) $(am__append_22) $(am__append_23) \
 	$(am__append_24) $(am__append_25) $(am__append_26) \
 	$(am__append_27) $(am__append_28) $(am__append_29) \
diff -Naur icedtea-2.2.1/acinclude.m4 icedtea-2.2.1_b/acinclude.m4
--- icedtea-2.2.1/acinclude.m4	2012-06-13 01:30:30.112670507 +0000
+++ icedtea-2.2.1_b/acinclude.m4	2012-06-28 12:22:36.956236438 +0000
@@ -2075,17 +2075,6 @@
   AC_SUBST(ENABLE_SYSTEM_FONTCONFIG)
 ])
 
-AC_DEFUN_ONCE([IT_CHECK_FOR_CUPS],
-[
-  dnl Check for CUPS headers and libraries.
-  AC_CHECK_LIB([cups], [cupsServer],
-      , [AC_MSG_ERROR([Could not find CUPS library; install CUPS.])])
-  AC_CHECK_HEADERS([cups/cups.h cups/ppd.h],
-      , [AC_MSG_ERROR([Could not find CUPS headers; install CUPS (including cups-devel on binary distros).])])
-  CUPS_LIBS="-lcups"
-  AC_SUBST(CUPS_LIBS)
-])
-
 AC_DEFUN_ONCE([IT_CHECK_FOR_SYSCALLS],
 [
   AC_MSG_CHECKING([whether to build against the required syscalls])
diff -Naur icedtea-2.2.1/configure.ac icedtea-2.2.1_b/configure.ac
--- icedtea-2.2.1/configure.ac	2012-06-13 01:30:30.116670564 +0000
+++ icedtea-2.2.1_b/configure.ac	2012-06-28 12:21:37.900235919 +0000
@@ -175,7 +175,6 @@
 IT_CHECK_FOR_GTK
 IT_CHECK_FOR_GIO
 IT_CHECK_FOR_FONTCONFIG
-IT_CHECK_FOR_CUPS
 IT_CHECK_FOR_SYSCALLS
 AC_CONFIG_FILES([remove-intree-libraries.sh])