Mirror 1.1.x changes.

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/branches/branch-1.2@3738 7a7537e8-13f0-0310-91df-b6672ffda945

diff --git a/CHANGES-1.1.txt b/CHANGES-1.1.txt
index 6e0a89c1a0ff068ff40dbe09665e5d721cf94c56..0ca247d3870881c82d104c51dfd857c846296e47 100644 (file)
--- a/CHANGES-1.1.txt
+++ b/CHANGES-1.1.txt
@@ -3,6 +3,9 @@ CHANGES-1.1.txt
 
 CHANGES IN CUPS V1.1.19
 
+       - The configure script didn't specify the static
+         libraries properly when configuring with the
+         --disable-shared option (STR #104)
        - The cups.list file used file dependencies for package
          formats other than portable, RPM, and Debian (STR #98)
        - cupsLangGet() didn't use its language cache (STR #97)

diff --git a/config-scripts/cups-sharedlibs.m4 b/config-scripts/cups-sharedlibs.m4
index c571de3823f26a0271ff7c129eec54cde570550b..8f6cab536368292709effcb291eec6cc5ea9dfc6 100644 (file)
--- a/config-scripts/cups-sharedlibs.m4
+++ b/config-scripts/cups-sharedlibs.m4
@@ -1,5 +1,5 @@
 dnl
-dnl "$Id: cups-sharedlibs.m4,v 1.6.2.14 2003/01/28 15:32:57 mike Exp $"
+dnl "$Id: cups-sharedlibs.m4,v 1.6.2.15 2003/05/16 19:07:37 mike Exp $"
 dnl
 dnl   Shared library support for the Common UNIX Printing System (CUPS).
 dnl
@@ -87,8 +87,8 @@ AC_SUBST(LIBCUPS)
 AC_SUBST(LIBCUPSIMAGE)
 
 if test x$enable_shared = xno; then
-       LINKCUPS="-lcups \$(SSLLIBS)"
-       LINKCUPSIMAGE="-lcupsimage"
+       LINKCUPS="../cups/libcups.a \$(SSLLIBS)"
+       LINKCUPSIMAGE="../filter/libcupsimage.a"
 else
        if test $uname = AIX; then
                LINKCUPS="-lcups_s"
@@ -152,5 +152,5 @@ AC_SUBST(IMGLIBS)
 AC_SUBST(EXPORT_LDFLAGS)
 
 dnl
-dnl End of "$Id: cups-sharedlibs.m4,v 1.6.2.14 2003/01/28 15:32:57 mike Exp $".
+dnl End of "$Id: cups-sharedlibs.m4,v 1.6.2.15 2003/05/16 19:07:37 mike Exp $".
 dnl