pkgsrc/print/cups/patches/patch-ad
markd cfbeb37e2b Update cups to 1.2.8
ok'ed jlam a while back.

CUPS 1.2.8 adds a French localization, updates the Japanese and Spanish
localizations, and fixes several web interface, printing, and networking
bugs.

CUPS 1.2.7 adds several Mac OS X improvements, implements timeouts in the
SSL negotiation code, and fixes the bounding box generated by the PostScript
filter, bidirectional support in the USB backend, and another case where the
lpstat command could hang.

CUPS 1.2.6 fixes some compile errors, localization of the web interface on
Mac OS X, bugs in the lpc and lpstat commands, and backchannel support in
the parallel backend.

CUPS 1.2.5 fixes minor printing, networking, and documentation issues and
adds support for older versions of DBUS and a translation for Estonian.

CUPS 1.2.4 fixes a number of web interface, scheduler, and CUPS API
issues.

CUPS 1.2.3 fixes a number of web interface, networking, remote printing,
and CUPS API issues.

CUPS 1.2.2 fixes several build, platform, notification, and printing bugs.

CUPS 1.2.1 fixes several build, platform, and printing bugs.

CUPS 1.2.0 is the first stable feature release in the 1.2.x series and
includes over 90 new features and changes since CUPS 1.1.23, including a
greatly improved web interface and "plug-and-print" support for many local
and network printers.
2007-03-14 12:29:03 +00:00

82 lines
2.4 KiB
Text

$NetBSD: patch-ad,v 1.13 2007/03/14 12:29:03 markd Exp $
--- config-scripts/cups-sharedlibs.m4.orig 2006-12-07 09:10:16.000000000 +1300
+++ config-scripts/cups-sharedlibs.m4
@@ -27,6 +27,24 @@ DSOFLAGS="${DSOFLAGS:=}"
AC_ARG_ENABLE(shared, [ --enable-shared turn on shared libraries, default=yes])
+AC_ARG_ENABLE(libtool, [ --enable-libtool[=LIBTOOL_PATH]
+ turn on building with libtool (UNSUPPORTED!), default=no])
+
+if test x$enable_libtool != xno; then
+ echo "WARNING: libtool is not supported or endorsed by Easy Software Products."
+ echo " WE DO NOT PROVIDE TECHNICAL SUPPORT FOR LIBTOOL PROBLEMS."
+ echo " (even if you have a support contract)"
+ enable_shared=no
+ if test x$enable_libtool = xyes; then
+ LIBTOOL=libtool
+ else
+ LIBTOOL=$enable_libtool
+ fi
+else
+ LIBTOOL=
+fi
+AC_SUBST(LIBTOOL)
+
if test x$enable_shared != xno; then
case "$uname" in
SunOS* | UNIX_S*)
@@ -84,6 +102,10 @@ if test x$enable_shared != xno; then
DSOFLAGS="$DSOFLAGS -Wl,-soname,\`basename \$@\` -shared \$(OPTIM)"
;;
esac
+elif test x$enable_libtool != xno; then
+ LIBCUPS="libcups.la"
+ LIBCUPSIMAGE="libcupsimage.la"
+ DSO="\$(CC)"
else
PICFLAG=0
LIBCUPS="libcups.a"
@@ -104,8 +126,13 @@ AC_SUBST(LIBCUPS)
AC_SUBST(LIBCUPSIMAGE)
if test x$enable_shared = xno; then
- LINKCUPS="../cups/libcups.a"
- LINKCUPSIMAGE="../filter/libcupsimage.a"
+ if test x$enable_libtool = xno; then
+ LINKCUPS="../cups/libcups.a"
+ LINKCUPSIMAGE="../filter/libcupsimage.a"
+ else
+ LINKCUPS="../cups/\$(LIBCUPS)"
+ LINKCUPSIMAGE="../filter/\$(LIBCUPSIMAGE)"
+ fi
else
if test $uname = AIX; then
LINKCUPS="-lcups_s"
@@ -130,10 +157,11 @@ if test "$DSO" != ":"; then
DSOLIBS="\$(LIBTIFF) \$(LIBPNG) \$(LIBJPEG) \$(LIBZ)"
IMGLIBS=""
- # Tell the run-time linkers where to find a DSO. Some platforms
- # need this option, even when the library is installed in a
- # standard location...
- case $uname in
+ if test x$enable_libtool = xno; then
+ # Tell the run-time linkers where to find a DSO. Some platforms
+ # need this option, even when the library is installed in a
+ # standard location...
+ case $uname in
HP-UX*)
# HP-UX needs the path, even for /usr/lib...
case "$uarch" in
@@ -181,7 +209,8 @@ if test "$DSO" != ":"; then
EXPORT_LDFLAGS="-Wl,-rpath,$libdir"
fi
;;
- esac
+ esac
+ fi
else
DSOLIBS=""
IMGLIBS="\$(LIBTIFF) \$(LIBPNG) \$(LIBJPEG) \$(LIBZ)"