Attachment #316489 for bug #390975

View | Details | Raw Unified | Return to bug 390975
Collapse All | Expand All

Lines 434-442 Link Here

(-)icedtea-2.2.1/Makefile.am (-3 lines)
434	STATIC_CXX="false" \	434	STATIC_CXX="false" \
435	BUILD_GCC="$(CC)" \	435	BUILD_GCC="$(CC)" \
436	BUILD_CXX="$(CXX)" \	436	BUILD_CXX="$(CXX)" \
437	USE_SYSTEM_CUPS="true" \
438	CUPS_LIBS="${CUPS_LIBS}" \
439	CUPS_CFLAGS="${CUPS_CFLAGS}" \
440	ALT_STRIP_POLICY=no_strip	437	ALT_STRIP_POLICY=no_strip
441		438
442	if ENABLE_CACAO	439	if ENABLE_CACAO

Lines 239-245 Link Here

(-)icedtea-2.2.1/Makefile.in (-3 / +1 lines)
239	CPIO = @CPIO@	239	CPIO = @CPIO@
240	CPP = @CPP@	240	CPP = @CPP@
241	CPPFLAGS = @CPPFLAGS@	241	CPPFLAGS = @CPPFLAGS@
242	CUPS_LIBS = @CUPS_LIBS@
243	CXX = @CXX@	242	CXX = @CXX@
244	CXXDEPMODE = @CXXDEPMODE@	243	CXXDEPMODE = @CXXDEPMODE@
245	CXXFLAGS = @CXXFLAGS@	244	CXXFLAGS = @CXXFLAGS@
Lines 687-694 Link Here
687	DEBUG_BINARIES="true" DISABLE_INTREE_EC="true" \	686	DEBUG_BINARIES="true" DISABLE_INTREE_EC="true" \
688	ALT_OUTPUTDIR="$(BUILD_OUTPUT_DIR)" VERBOSE="$(VERBOSE)" \	687	ALT_OUTPUTDIR="$(BUILD_OUTPUT_DIR)" VERBOSE="$(VERBOSE)" \
689	STATIC_CXX="false" BUILD_GCC="$(CC)" BUILD_CXX="$(CXX)" \	688	STATIC_CXX="false" BUILD_GCC="$(CC)" BUILD_CXX="$(CXX)" \
690	USE_SYSTEM_CUPS="true" CUPS_LIBS="${CUPS_LIBS}" \	689	ALT_STRIP_POLICY=no_strip \
691	CUPS_CFLAGS="${CUPS_CFLAGS}" ALT_STRIP_POLICY=no_strip \
692	$(am__append_21) $(am__append_22) $(am__append_23) \	690	$(am__append_21) $(am__append_22) $(am__append_23) \
693	$(am__append_24) $(am__append_25) $(am__append_26) \	691	$(am__append_24) $(am__append_25) $(am__append_26) \
694	$(am__append_27) $(am__append_28) $(am__append_29) \	692	$(am__append_27) $(am__append_28) $(am__append_29) \




  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])

Lines 175-181 Link Here

(-)icedtea-2.2.1/configure.ac (-1 lines)
175	IT_CHECK_FOR_GTK	175	IT_CHECK_FOR_GTK
176	IT_CHECK_FOR_GIO	176	IT_CHECK_FOR_GIO
177	IT_CHECK_FOR_FONTCONFIG	177	IT_CHECK_FOR_FONTCONFIG
178	IT_CHECK_FOR_CUPS
179	IT_CHECK_FOR_SYSCALLS	178	IT_CHECK_FOR_SYSCALLS
180	AC_CONFIG_FILES([remove-intree-libraries.sh])	179	AC_CONFIG_FILES([remove-intree-libraries.sh])
181		180

Return to bug 390975

Lines 2075-2091 Link Here

(-)icedtea-2.2.1/acinclude.m4 (-11 lines)
2075	AC_SUBST(ENABLE_SYSTEM_FONTCONFIG)	2075	AC_SUBST(ENABLE_SYSTEM_FONTCONFIG)
2076	])	2076	])
2077		2077
2078	AC_DEFUN_ONCE([IT_CHECK_FOR_CUPS],
2079	[
2080	dnl Check for CUPS headers and libraries.
2081	AC_CHECK_LIB([cups], [cupsServer],
2082	, [AC_MSG_ERROR([Could not find CUPS library; install CUPS.])])
2083	AC_CHECK_HEADERS([cups/cups.h cups/ppd.h],
2084	, [AC_MSG_ERROR([Could not find CUPS headers; install CUPS (including cups-devel on binary distros).])])
2085	CUPS_LIBS="-lcups"
2086	AC_SUBST(CUPS_LIBS)
2087	])
2088
2089	AC_DEFUN_ONCE([IT_CHECK_FOR_SYSCALLS],	2078	AC_DEFUN_ONCE([IT_CHECK_FOR_SYSCALLS],
2090	[	2079	[
2091	AC_MSG_CHECKING([whether to build against the required syscalls])	2080	AC_MSG_CHECKING([whether to build against the required syscalls])