Fix builds without libtool.

diff --git a/Makedefs.in b/Makedefs.in
index de4f1459f51bbf8aeda3df4aee72faf09755d5df..f3ae6cd66bcdc099c878cb7fcdc164fe65f706fc 100644 (file)
--- a/Makedefs.in
+++ b/Makedefs.in
@@ -25,8 +25,8 @@ DSOXX         =       @DSOXX@
 GZIP           =       @GZIP@
 INSTALL                =       @INSTALL@
 LD             =       @LD@
-LD_CC          =       @LIBTOOL_LD_CC@
-LD_CXX         =       @LIBTOOL_LD_CXX@
+LD_CC          =       @LD_CC@
+LD_CXX         =       @LD_CXX@
 LIBTOOL                =       @LIBTOOL@
 LN             =       @LN@ -sf
 MV             =       @MV@

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)

diff --git a/configure b/configure
index f9c3658c32fe170a24a10300c774c90382134fd6..1366050bf20035fea4dd741d1970015ce6b1eb1d 100755 (executable)
--- a/configure
+++ b/configure
@@ -679,12 +679,12 @@ ARCHFLAGS
 UNITTESTS
 OPTIM
 INSTALL_STRIP
-LIBTOOL_LD_CXX
-LIBTOOL_LD_CC
 LIBTOOL_INSTALL
 LIBTOOL_CXX
 LIBTOOL_CC
 LIBTOOL
+LD_CXX
+LD_CC
 EXPORT_LDFLAGS
 IMGLIBS
 DSOLIBS
@@ -6673,6 +6673,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"
@@ -6683,18 +6686,17 @@ 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
 
 
@@ -6705,6 +6707,7 @@ fi
 
 
 
+
 INSTALL_STRIP=""
 OPTIM=""