2016-01-21 23:40:00 +01:00

90 lines
2.5 KiB
Plaintext

$NetBSD: patch-ad,v 1.1 2014/06/17 13:17:13 wiz Exp $
libtoolize.
--- config-scripts/cups-sharedlibs.m4.orig 2010-06-16 00:48:25.000000000 +0000
+++ config-scripts/cups-sharedlibs.m4
@@ -22,6 +22,24 @@ cupsbase="cups"
LIBCUPSBASE="lib$cupsbase"
LIBCUPSSTATIC="lib$cupsbase.a"
+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*)
@@ -131,6 +149,15 @@ 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"
+ LIBCUPSCGI="libcupscgi.la"
+ LIBCUPSDRIVER="libcupsdriver.la"
+ LIBCUPSIMAGE="libcupsimage.la"
+ LIBCUPSMIME="libcupsmime.la"
+ LIBCUPSPPDC="libcupsppdc.la"
+ DSO="\$(CC)"
+ DSOXX="\$(CXX)"
else
PICFLAG=0
LIBCUPS="lib$cupsbase.a"
@@ -163,8 +190,13 @@ AC_SUBST(LIBCUPSPPDC)
AC_SUBST(LIBCUPSSTATIC)
if test x$enable_shared = xno; then
- LINKCUPS="../cups/lib$cupsbase.a"
- LINKCUPSIMAGE="../filter/libcupsimage.a"
+ if test x$enable_libtool = xno; then
+ LINKCUPS="../cups/lib$cupsbase.a"
+ LINKCUPSIMAGE="../filter/libcupsimage.a"
+ else
+ LINKCUPS="../cups/\$(LIBCUPS)"
+ LINKCUPSIMAGE="../filter/\$(LIBCUPSIMAGE)"
+ fi
EXTLINKCUPS="-lcups"
EXTLINKCUPSDRIVER="-lcupsdriver"
@@ -204,10 +236,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
@@ -255,7 +288,8 @@ if test "$DSO" != ":"; then
EXPORT_LDFLAGS="-Wl,-rpath,$libdir"
fi
;;
- esac
+ esac
+ fi
else
DSOLIBS=""
IMGLIBS="\$(LIBTIFF) \$(LIBPNG) \$(LIBJPEG) \$(LIBZ)"