diff options
| author | Michael R Sweet <michaelrsweet@gmail.com> | 2017-07-17 20:44:20 -0400 |
|---|---|---|
| committer | Michael R Sweet <michaelrsweet@gmail.com> | 2017-07-17 20:44:20 -0400 |
| commit | 07cb72471aee8750f1a3ea39c52b975cf8771528 (patch) | |
| tree | 8f60ac23cc6fac13a71d3af069675597576375a7 /config-scripts | |
| parent | b94f7488e861c3119037efdf08257749fcce06b8 (diff) | |
| download | cups-07cb72471aee8750f1a3ea39c52b975cf8771528.tar.gz | |
Fix builds without libtool.
Diffstat (limited to 'config-scripts')
| -rw-r--r-- | config-scripts/cups-libtool.m4 | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/config-scripts/cups-libtool.m4 b/config-scripts/cups-libtool.m4 index b16a7de64..8e1b9c743 100644 --- 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) |