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 b85e8b7c2dbf5d7170b5e38336cae9c7c83458d1..7dfd360ed07d696c94a7eba690b4f85bab5a6fa9 100644 (file)
--- a/config-scripts/cups-libtool.m4
+++ b/config-scripts/cups-libtool.m4
@@ -1,17 +1,13 @@
 dnl
 dnl Libtool stuff for CUPS.
 dnl
-dnl Copyright 2007-2011 by Apple Inc.
+dnl Copyright 2007-2018 by Apple Inc.
 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 Apple Inc. and are protected by Federal copyright
-dnl law.  Distribution and use rights are outlined in the file "LICENSE.txt"
-dnl which should have been included with this file.  If this file is
-dnl missing or damaged, see the license at "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
+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
@@ -25,12 +21,40 @@ AC_ARG_ENABLE(libtool_unsupported, [  --enable-libtool-unsupported
                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
+
+AC_SUBST(LD_CC)
+AC_SUBST(LD_CXX)
+
+AC_SUBST(LIBTOOL)
+AC_SUBST(LIBTOOL_CC)
+AC_SUBST(LIBTOOL_CXX)
+AC_SUBST(LIBTOOL_INSTALL)