Update ipp documentation to reflect the behavior of configuring WiFi on IPP USB printers.

[thirdparty/cups.git] / config-scripts / cups-libtool.m4

diff --git a/config-scripts/cups-libtool.m4 b/config-scripts/cups-libtool.m4
index 5aba46b39c62ac81613e048ee3b9373e54688159..7dfd360ed07d696c94a7eba690b4f85bab5a6fa9 100644 (file)
--- a/config-scripts/cups-libtool.m4
+++ b/config-scripts/cups-libtool.m4
@@ -1,49 +1,60 @@
 dnl
-dnl "$Id: cups-libtool.m4 177 2006-06-21 00:20:03Z jlovell $"
+dnl Libtool stuff for CUPS.
 dnl
-dnl   Libtool stuff for the Common UNIX Printing System (CUPS).
+dnl Copyright 2007-2018 by Apple Inc.
+dnl Copyright 1997-2005 by Easy Software Products, all rights reserved.
 dnl
-dnl   Copyright 1997-2005 by Easy Software Products, all rights reserved.
-dnl
-dnl   These coded instructions, statements, and computer programs are the
-dnl   property of Easy Software Products and are protected by Federal
-dnl   copyright law.  Distribution and use rights are outlined in the file
-dnl   "LICENSE.txt" which should have been included with this file.  If this
-dnl   file is missing or damaged please contact Easy Software Products
-dnl   at:
-dnl
-dnl       Attn: CUPS Licensing Information
-dnl       Easy Software Products
-dnl       44141 Airport View Drive, Suite 204
-dnl       Hollywood, Maryland 20636 USA
-dnl
-dnl       Voice: (301) 373-9600
-dnl       EMail: cups-info@cups.org
-dnl         WWW: http://www.cups.org
+dnl Licensed under Apache License v2.0.  See the file "LICENSE" for more information.
 dnl
 
-AC_ARG_ENABLE(libtool_unsupported, [  --enable-libtool-unsupported=LIBTOOL_PATH
-                          turn on building with libtool (UNSUPPORTED!), default=no],
+AC_ARG_ENABLE(libtool_unsupported, [  --enable-libtool-unsupported=/path/to/libtool
+                          build with libtool (UNSUPPORTED!)],
        [if test x$enable_libtool_unsupported != xno; then
+               if test x$enable_libtool_unsupported == xyes; then
+                       AC_MSG_ERROR([Use --enable-libtool-unsupported=/path/to/libtool.])
+               fi
                LIBTOOL="$enable_libtool_unsupported"
                enable_shared=no
-               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)"
+               echo "WARNING: libtool is not supported or endorsed by Apple Inc."
+               echo "         WE DO NOT PROVIDE SUPPORT FOR LIBTOOL PROBLEMS."
        else
                LIBTOOL=""
        fi])
 
-AC_SUBST(LIBTOOL)
-
 if test x$LIBTOOL != x; then
+       DSO="\$(LIBTOOL) --mode=link --tag=CC ${CC}"
+       DSOXX="\$(LIBTOOL) --mode=link --tag=CXX ${CXX}"
+
+       LD_CC="\$(LIBTOOL) --mode=link --tag=CC ${CC}"
+       LD_CXX="\$(LIBTOOL) --mode=link --tag=CXX ${CXX}"
+
        LIBCUPS="libcups.la"
+       LIBCUPSSTATIC="libcups.la"
+       LIBCUPSCGI="libcupscgi.la"
        LIBCUPSIMAGE="libcupsimage.la"
+       LIBCUPSMIME="libcupsmime.la"
+       LIBCUPSPPDC="libcupsppdc.la"
+
+       LIBTOOL_CC="\$(LIBTOOL) --mode=compile --tag=CC"
+       LIBTOOL_CXX="\$(LIBTOOL) --mode=compile --tag=CXX"
+       LIBTOOL_INSTALL="\$(LIBTOOL) --mode=install"
+
        LINKCUPS="../cups/\$(LIBCUPS)"
-       LINKCUPSIMAGE="../filter/\$(LIBCUPSIMAGE)"
-       DSO="\$(CC)"
+       LINKCUPSIMAGE="../cups/\$(LIBCUPSIMAGE)"
+
+else
+       LD_CC="\$(CC)"
+       LD_CXX="\$(CXX)"
+
+       LIBTOOL_CC=""
+       LIBTOOL_CXX=""
+       LIBTOOL_INSTALL=""
 fi
 
-dnl
-dnl End of "$Id: cups-libtool.m4 177 2006-06-21 00:20:03Z jlovell $".
-dnl
+AC_SUBST(LD_CC)
+AC_SUBST(LD_CXX)
+
+AC_SUBST(LIBTOOL)
+AC_SUBST(LIBTOOL_CC)
+AC_SUBST(LIBTOOL_CXX)
+AC_SUBST(LIBTOOL_INSTALL)