Fix builds without libtool.

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

diff --git a/config-scripts/cups-libtool.m4 b/config-scripts/cups-libtool.m4
index b16a7de644cc71f98f9fc3d268d9a7fd3c87e7ff..8e1b9c743aa89802f23bbc99731c7330599f39e1 100644 (file)
--- a/config-scripts/cups-libtool.m4
+++ b/config-scripts/cups-libtool.m4
@@ -29,6 +29,9 @@ 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"
@@ -39,23 +42,23 @@ if test x$LIBTOOL != x; then
        LIBTOOL_CC="\$(LIBTOOL) --mode=compile --tag=CC"
        LIBTOOL_CXX="\$(LIBTOOL) --mode=compile --tag=CXX"
        LIBTOOL_INSTALL="\$(LIBTOOL) --mode=install"
-       LIBTOOL_LD_CC="\$(LIBTOOL) --mode=link --tag=CC ${CC}"
-       LIBTOOL_LD_CXX="\$(LIBTOOL) --mode=link --tag=CXX ${CXX}"
 
        LINKCUPS="../cups/\$(LIBCUPS)"
        LINKCUPSIMAGE="../filter/\$(LIBCUPSIMAGE)"
 
 else
+       LD_CC="\$(CC)"
+       LD_CXX="\$(CXX)"
+
        LIBTOOL_CC=""
        LIBTOOL_CXX=""
        LIBTOOL_INSTALL=""
-       LIBTOOL_LD_CC="\$(CC)"
-       LIBTOOL_LD_CC="\$(CXX)"
 fi
 
+AC_SUBST(LD_CC)
+AC_SUBST(LD_CXX)
+
 AC_SUBST(LIBTOOL)
 AC_SUBST(LIBTOOL_CC)
 AC_SUBST(LIBTOOL_CXX)
 AC_SUBST(LIBTOOL_INSTALL)
-AC_SUBST(LIBTOOL_LD_CC)
-AC_SUBST(LIBTOOL_LD_CXX)