OSX needs CoreFoundation framework for locale stuff.

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@3454 7a7537e8-13f0-0310-91df-b6672ffda945

diff --git a/Makedefs.in b/Makedefs.in
index db65c2d4e6f2e9374e3bf93a0b02dafd4e9bc7d4..7eea3407649d4fa0e4de77777f2c8c28ea39751a 100644 (file)
--- a/Makedefs.in
+++ b/Makedefs.in
@@ -1,5 +1,5 @@
 #
-# "$Id: Makedefs.in,v 1.56 2003/01/15 20:32:24 mike Exp $"
+# "$Id: Makedefs.in,v 1.57 2003/03/12 20:35:41 mike Exp $"
 #
 #   Common makefile definitions for the Common UNIX Printing System (CUPS).
 #
@@ -85,15 +85,16 @@ LIBZ        =       @LIBZ@
 ARFLAGS        =       @ARFLAGS@
 BACKLIBS =     @BACKLIBS@
 CFLAGS =       $(RC_CFLAGS) @CFLAGS@ -I.. $(OPTIONS)
+COMMONLIBS =   @COMMONLIBS@
 CXXFLAGS =     $(RC_CFLAGS) @CXXFLAGS@ -I.. $(OPTIONS)
 CXXLIBS        =       @CXXLIBS@
 DSOFLAGS =     @DSOFLAGS@
-DSOLIBS        =       @DSOLIBS@
+DSOLIBS        =       @DSOLIBS@ $(COMMONLIBS)
 IMGLIBS        =       @IMGLIBS@ -lm
 LDFLAGS        =       -L../cups -L../filter $(RC_CFLAGS) @LDFLAGS@ $(OPTIM)
 LINKCUPS =     @LINKCUPS@
 LINKCUPSIMAGE =        @LINKCUPSIMAGE@
-LIBS   =       $(LINKCUPS) $(NETLIBS) @LIBS@
+LIBS   =       $(LINKCUPS) $(NETLIBS) @LIBS@ $(COMMONLIBS)
 NETLIBS        =       @NETLIBS@
 OPTIM  =       @OPTIM@
 OPTIONS        =
@@ -181,5 +182,5 @@ MAN8DIR             =       @MAN8DIR@
 
 
 #
-# End of "$Id: Makedefs.in,v 1.56 2003/01/15 20:32:24 mike Exp $"
+# End of "$Id: Makedefs.in,v 1.57 2003/03/12 20:35:41 mike Exp $"
 #

diff --git a/config-scripts/cups-common.m4 b/config-scripts/cups-common.m4
index cce9124b275c0a68c66b2670dccd621093610e2b..b0a4a6ee44a7a1040b288309638d3357e137073e 100644 (file)
--- a/config-scripts/cups-common.m4
+++ b/config-scripts/cups-common.m4
@@ -1,5 +1,5 @@
 dnl
-dnl "$Id: cups-common.m4,v 1.21 2002/12/17 18:56:39 swdev Exp $"
+dnl "$Id: cups-common.m4,v 1.22 2003/03/12 20:35:42 mike Exp $"
 dnl
 dnl   Common configuration stuff for the Common UNIX Printing System (CUPS).
 dnl
@@ -157,18 +157,21 @@ esac
 
 AC_SUBST(ARFLAGS)
 
-dnl Libraries for the backends...
+dnl Extra platform-specific libraries...
 case $uname in
         Darwin*)
-                BACKLIBS="-framework CoreFoundation -framework IOKit"
+                BACKLIBS="-framework IOKit"
+                COMMONLIBS="-framework CoreFoundation"
                 ;;
         *)
                 BACKLIBS=""
+               COMMONLIBS=""
                 ;;
 esac
 
 AC_SUBST(BACKLIBS)
+AC_SUBST(COMMONLIBS)
 
 dnl
-dnl End of "$Id: cups-common.m4,v 1.21 2002/12/17 18:56:39 swdev Exp $".
+dnl End of "$Id: cups-common.m4,v 1.22 2003/03/12 20:35:42 mike Exp $".
 dnl

diff --git a/cups/Makefile b/cups/Makefile
index 80f3a546fe0e3f55e5ab0bf888cdad58796614fe..ca0ae58699914d6b89a15cc82241396202f6e9f0 100644 (file)
--- a/cups/Makefile
+++ b/cups/Makefile
@@ -1,5 +1,5 @@
 #
-# "$Id: Makefile,v 1.81 2003/01/29 17:03:37 mike Exp $"
+# "$Id: Makefile,v 1.82 2003/03/12 20:35:43 mike Exp $"
 #
 #   Support library Makefile for the Common UNIX Printing System (CUPS).
 #
@@ -108,7 +108,7 @@ installhdrs:
 
 libcups.so.2 libcups.sl.2:     $(LIBOBJS) ../Makedefs
        echo Linking $@...
-       $(DSO) $(DSOFLAGS) -o $@ $(LIBOBJS) $(SSLLIBS)
+       $(DSO) $(DSOFLAGS) -o $@ $(LIBOBJS) $(SSLLIBS) $(COMMONLIBS)
        $(RM) `basename $@ .2`
        $(LN) $@ `basename $@ .2`
 
@@ -123,7 +123,7 @@ libcups.2.dylib:    $(LIBOBJS) ../Makedefs
                -install_name $(libdir)/$@ \
                -current_version 2.5.0 \
                -compatibility_version 2.0.0 \
-               $(LIBOBJS) $(SSLLIBS)
+               $(LIBOBJS) $(SSLLIBS) $(COMMONLIBS)
        $(RM) libcups.dylib
        $(LN) $@ libcups.dylib
 
@@ -136,7 +136,7 @@ libcups_s.a:        $(LIBOBJS) ../Makedefs
        echo Creating $@...
        $(RM) libcups_s.exp
        (echo _ipp_add_attr; echo _ipp_free_attr) >libcups_s.exp
-       $(DSO) $(DSOFLAGS) -Wl,-bexport:libcups_s.exp -o libcups_s.o $(LIBOBJS) $(SSLLIBS) -lm
+       $(DSO) $(DSOFLAGS) -Wl,-bexport:libcups_s.exp -o libcups_s.o $(LIBOBJS) $(SSLLIBS) $(COMMONLIBS) -lm
        $(RM) $@
        $(AR) $(ARFLAGS) $@ libcups_s.o
 
@@ -148,7 +148,7 @@ libcups_s.a:        $(LIBOBJS) ../Makedefs
 libcups.la:    $(LIBOBJS) ../Makedefs
        echo Linking $@...
        $(DSO) $(DSOFLAGS) -o $@ $(LIBOBJS:.o=.lo) -rpath $(LIBDIR) \
-               -version-info 2:5 $(SSLLIBS)
+               -version-info 2:5 $(SSLLIBS) $(COMMONLIBS)
 
 
 #
@@ -178,7 +178,7 @@ cups_C.h:   ../locale/C/cups_C
 
 testhttp:      testhttp.o libcups.a
        echo Linking $@...
-       $(CC) $(LDFLAGS) -o $@ testhttp.o libcups.a $(NETLIBS) $(SSLLIBS)
+       $(CC) $(LDFLAGS) -o $@ testhttp.o libcups.a $(NETLIBS) $(SSLLIBS) $(COMMONLIBS)
 
 
 #
@@ -187,7 +187,7 @@ testhttp:   testhttp.o libcups.a
 
 testlang:      testlang.o libcups.a
        echo Linking $@...
-       $(CC) $(LDFLAGS) -o $@ testlang.o libcups.a $(NETLIBS) $(SSLLIBS)
+       $(CC) $(LDFLAGS) -o $@ testlang.o libcups.a $(NETLIBS) $(SSLLIBS) $(COMMONLIBS)
 
 
 #
@@ -198,5 +198,5 @@ include Dependencies
 
 
 #
-# End of "$Id: Makefile,v 1.81 2003/01/29 17:03:37 mike Exp $".
+# End of "$Id: Makefile,v 1.82 2003/03/12 20:35:43 mike Exp $".
 #