Cleanup more networking library stuff (simpler)

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

diff --git a/Makedefs.in b/Makedefs.in
index 8e02d22c96cdd1f51d70bf5ea55422d6d7a6c2ee..e6b5a3ce71bce2d2916d9b2c57d970a8a89276ca 100644 (file)
--- a/Makedefs.in
+++ b/Makedefs.in
@@ -97,8 +97,7 @@ IMGLIBS               =       @IMGLIBS@ -lm
 LDFLAGS                =       -L../cups -L../filter $(RC_CFLAGS) @LDFLAGS@ $(OPTIM)
 LINKCUPS       =       @LINKCUPS@ $(SSLLIBS)
 LINKCUPSIMAGE  =       @LINKCUPSIMAGE@
-LIBS           =       $(LINKCUPS) $(NETLIBS) @LIBS@ $(COMMONLIBS)
-NETLIBS                =       @NETLIBS@
+LIBS           =       $(LINKCUPS) @LIBS@ $(COMMONLIBS)
 OPTIM          =       @OPTIM@
 OPTIONS                =
 PAMLIBS                =       @PAMLIBS@

diff --git a/backend/Dependencies b/backend/Dependencies
index 01851cc18dfb8941a5465e2f9763445ab96bf89b..e22c409d3fbce0939253dcc4f0a84605b383b216 100644 (file)
--- a/backend/Dependencies
+++ b/backend/Dependencies
@@ -1,12 +1,12 @@
 # DO NOT DELETE
 
 betest.o: ../cups/string.h ../config.h
-ipp.o: ../cups/backend.h ../cups/http-private.h ../config.h ../cups/http.h
-ipp.o: ../cups/md5.h ../cups/cups.h ../cups/ipp.h ../cups/ppd.h
+ipp.o: ../cups/http-private.h ../config.h ../cups/http.h ../cups/md5.h
+ipp.o: ../cups/backend.h ../cups/cups.h ../cups/ipp.h ../cups/ppd.h
 ipp.o: ../cups/file.h ../cups/language.h ../cups/string.h
-lpd.o: ../cups/backend.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
-lpd.o: ../cups/md5.h ../cups/ppd.h ../cups/file.h ../cups/http-private.h
-lpd.o: ../config.h ../cups/string.h
+lpd.o: ../cups/backend.h ../cups/http-private.h ../config.h ../cups/http.h
+lpd.o: ../cups/md5.h ../cups/cups.h ../cups/ipp.h ../cups/ppd.h
+lpd.o: ../cups/file.h ../cups/string.h
 parallel.o: ../cups/backend.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
 parallel.o: ../cups/md5.h ../cups/ppd.h ../cups/file.h ../cups/string.h
 parallel.o: ../config.h
@@ -16,9 +16,9 @@ scsi.o: ../config.h
 serial.o: ../cups/backend.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
 serial.o: ../cups/md5.h ../cups/ppd.h ../cups/file.h ../cups/string.h
 serial.o: ../config.h
-socket.o: ../cups/backend.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
-socket.o: ../cups/md5.h ../cups/ppd.h ../cups/file.h ../cups/http-private.h
-socket.o: ../config.h ../cups/string.h
+socket.o: ../cups/backend.h ../cups/http-private.h ../config.h ../cups/http.h
+socket.o: ../cups/md5.h ../cups/cups.h ../cups/ipp.h ../cups/ppd.h
+socket.o: ../cups/file.h ../cups/string.h
 usb.o: ../cups/backend.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
 usb.o: ../cups/md5.h ../cups/ppd.h ../cups/file.h ../cups/string.h
 usb.o: ../config.h

diff --git a/config-scripts/cups-network.m4 b/config-scripts/cups-network.m4
index 46aa3f8be270a787b49e9e0421b722ed09877bea..a1d72215c181d7a870bfba7a407f1b93dc6bb82e 100644 (file)
--- a/config-scripts/cups-network.m4
+++ b/config-scripts/cups-network.m4
@@ -22,23 +22,16 @@ dnl       EMail: cups-info@cups.org
 dnl         WWW: http://www.cups.org
 dnl
 
-NETLIBS=""
+AC_SEARCH_LIBS(socket, socket)
+AC_SEARCH_LIBS(gethostbyaddr, nsl)
+AC_SEARCH_LIBS(getaddrinfo, nsl, AC_DEFINE(HAVE_GETADDRINFO))
+AC_SEARCH_LIBS(getifaddrs, nsl, AC_DEFINE(HAVE_GETIFADDRS))
+AC_SEARCH_LIBS(getnameinfo, nsl, AC_DEFINE(HAVE_GETNAMEINFO))
+AC_SEARCH_LIBS(hstrerror, nsl socket resolv, AC_DEFINE(HAVE_HSTRERROR))
+AC_SEARCH_LIBS(rresvport_af, nsl, AC_DEFINE(HAVE_RRESVPORT_AF))
 
-if test "$uname" != "IRIX"; then
-       AC_CHECK_LIB(socket,socket,NETLIBS="-lsocket")
-       AC_CHECK_LIB(nsl,gethostbyaddr,NETLIBS="$NETLIBS -lnsl")
-fi
-
-AC_SEARCH_LIBS(getaddrinfo, nsl, AC_DEFINE(HAVE_GETADDRINFO),, $NETLIBS)
-AC_SEARCH_LIBS(getifaddrs, nsl, AC_DEFINE(HAVE_GETIFADDRS),, $NETLIBS)
-AC_SEARCH_LIBS(getnameinfo, nsl, AC_DEFINE(HAVE_GETNAMEINFO),, $NETLIBS)
-AC_SEARCH_LIBS(hstrerror, nsl socket resolv, AC_DEFINE(HAVE_HSTRERROR),, $NETLIBS)
-AC_SEARCH_LIBS(rresvport_af, nsl, AC_DEFINE(HAVE_RRESVPORT_AF),, $NETLIBS)
-
-AC_CHECK_MEMBER(struct sockaddr.sa_len,,,[#include <sys/socket.h>])
-AC_CHECK_HEADER(sys/sockio.h,AC_DEFINE(HAVE_SYS_SOCKIO_H))
-
-AC_SUBST(NETLIBS)
+AC_CHECK_MEMBER(struct sockaddr.sa_len,,, [#include <sys/socket.h>])
+AC_CHECK_HEADER(sys/sockio.h, AC_DEFINE(HAVE_SYS_SOCKIO_H))
 
 if test "$uname" = "SunOS"; then
        case "$uversion" in

diff --git a/cups/Dependencies b/cups/Dependencies
index ea99ab1a7b5096bde88eecac473ea1c7b820e849..19167518a2f824205ad7e7ab4067919fd119e58b 100644 (file)
--- a/cups/Dependencies
+++ b/cups/Dependencies
@@ -10,23 +10,23 @@ dest.o: language.h
 dir.o: dir.h string.h ../config.h debug.h
 emit.o: ppd.h file.h string.h ../config.h
 encode.o: cups.h ipp.h http.h string.h ../config.h md5.h ppd.h file.h debug.h
-file.o: string.h ../config.h ../cups/debug.h file.h http-private.h http.h
-file.o: md5.h
+file.o: http-private.h ../config.h http.h string.h md5.h ../cups/debug.h
+file.o: file.h
 getputfile.o: cups.h ipp.h http.h string.h ../config.h md5.h ppd.h file.h
 getputfile.o: language.h debug.h
-globals.o: globals.h string.h ../config.h cups.h ipp.h http.h md5.h ppd.h
-globals.o: file.h language.h normalize.h transcode.h http-private.h
+globals.o: http-private.h ../config.h http.h string.h md5.h globals.h cups.h
+globals.o: ipp.h ppd.h file.h language.h normalize.h transcode.h
 http.o: http-private.h ../config.h http.h string.h md5.h globals.h cups.h
 http.o: ipp.h ppd.h file.h language.h normalize.h transcode.h debug.h
 http-addr.o: globals.h string.h ../config.h cups.h ipp.h http.h md5.h ppd.h
 http-addr.o: file.h language.h normalize.h transcode.h debug.h
-http-addrlist.o: globals.h string.h ../config.h cups.h ipp.h http.h md5.h
-http-addrlist.o: ppd.h file.h language.h normalize.h transcode.h debug.h
-http-addrlist.o: http-private.h
+http-addrlist.o: http-private.h ../config.h http.h string.h md5.h globals.h
+http-addrlist.o: cups.h ipp.h ppd.h file.h language.h normalize.h transcode.h
+http-addrlist.o: debug.h
 http-support.o: debug.h globals.h string.h ../config.h cups.h ipp.h http.h
 http-support.o: md5.h ppd.h file.h language.h normalize.h transcode.h
-ipp.o: globals.h string.h ../config.h cups.h ipp.h http.h md5.h ppd.h file.h
-ipp.o: language.h normalize.h transcode.h debug.h
+ipp.o: http-private.h ../config.h http.h string.h md5.h globals.h cups.h
+ipp.o: ipp.h ppd.h file.h language.h normalize.h transcode.h debug.h
 ipp-support.o: globals.h string.h ../config.h cups.h ipp.h http.h md5.h ppd.h
 ipp-support.o: file.h language.h normalize.h transcode.h debug.h
 langprintf.o: string.h ../config.h language.h transcode.h

diff --git a/cups/Makefile b/cups/Makefile
index acbabb8b0c37fc650f330c5064c7d28be8e25b67..cbf1d86cf976c02f020e5a181e5f69fc3acd28e5 100644 (file)
--- a/cups/Makefile
+++ b/cups/Makefile
@@ -260,7 +260,7 @@ cups_C.h:   ../locale/C/cups_C
 testarray:     testarray.o libcups.a
        echo Linking $@...
        $(CC) $(LDFLAGS) -o $@ testarray.o libcups.a \
-               $(NETLIBS) $(SSLLIBS) $(COMMONLIBS) $(LIBZ)
+               $(SSLLIBS) $(COMMONLIBS) $(LIBZ)
 
 
 #
@@ -270,7 +270,7 @@ testarray:  testarray.o libcups.a
 testfile:      testfile.o libcups.a
        echo Linking $@...
        $(CC) $(LDFLAGS) -o $@ testfile.o libcups.a \
-               $(NETLIBS) $(SSLLIBS) $(COMMONLIBS) $(LIBZ)
+               $(SSLLIBS) $(COMMONLIBS) $(LIBZ)
 
 
 #
@@ -280,7 +280,7 @@ testfile:   testfile.o libcups.a
 testhttp:      testhttp.o libcups.a
        echo Linking $@...
        $(CC) $(LDFLAGS) -o $@ testhttp.o libcups.a \
-               $(NETLIBS) $(SSLLIBS) $(COMMONLIBS) $(LIBZ)
+               $(SSLLIBS) $(COMMONLIBS) $(LIBZ)
 
 
 #
@@ -290,7 +290,7 @@ testhttp:   testhttp.o libcups.a
 testipp:       testipp.o libcups.a
        echo Linking $@...
        $(CC) $(LDFLAGS) -o $@ testipp.o libcups.a \
-               $(NETLIBS) $(SSLLIBS) $(COMMONLIBS) $(LIBZ)
+               $(SSLLIBS) $(COMMONLIBS) $(LIBZ)
 
 
 #
@@ -300,7 +300,7 @@ testipp:    testipp.o libcups.a
 testi18n:      testi18n.o libcups.a
        echo Linking $@...
        $(CC) $(LDFLAGS) -o $@ testi18n.o libcups.a \
-               $(NETLIBS) $(SSLLIBS) $(COMMONLIBS) $(LIBZ)
+               $(SSLLIBS) $(COMMONLIBS) $(LIBZ)
 
 
 #
@@ -310,7 +310,7 @@ testi18n:   testi18n.o libcups.a
 testlang:      testlang.o libcups.a
        echo Linking $@...
        $(CC) $(LDFLAGS) -o $@ testlang.o libcups.a \
-               $(NETLIBS) $(SSLLIBS) $(COMMONLIBS) $(LIBZ)
+               $(SSLLIBS) $(COMMONLIBS) $(LIBZ)
 
 
 #

diff --git a/pdftops/Dependencies b/pdftops/Dependencies
index ba5723230e74fb02d4fb297bf808f43875a514eb..4a983f076eccb88bfdac8067825bf8b63c3d628a 100644 (file)
--- a/pdftops/Dependencies
+++ b/pdftops/Dependencies
@@ -86,7 +86,7 @@ PSOutputDev.o: ../config.h GString.h GList.h gtypes.h GlobalParams.h
 PSOutputDev.o: CharTypes.h Object.h gmem.h Array.h Dict.h Stream.h Error.h
 PSOutputDev.o: Function.h Gfx.h GfxState.h GfxFont.h UnicodeMap.h
 PSOutputDev.o: FoFiType1C.h FoFiBase.h FoFiTrueType.h Catalog.h Page.h
-PSOutputDev.o: Annot.h PSOutputDev.h OutputDev.h
+PSOutputDev.o: Annot.h XRef.h PSOutputDev.h OutputDev.h
 PSTokenizer.o: ../config.h PSTokenizer.h gtypes.h
 SecurityHandler.o: ../config.h GString.h PDFDoc.h XRef.h gtypes.h Object.h
 SecurityHandler.o: gmem.h Array.h Dict.h Stream.h Catalog.h Page.h Decrypt.h

diff --git a/scheduler/Dependencies b/scheduler/Dependencies
index b9862c8df32743b5fd8548d1fa27eeecc6aeab81..cbd112e00a71b33aa0a46ebdabca2f589f1047b0 100644 (file)
--- a/scheduler/Dependencies
+++ b/scheduler/Dependencies
@@ -146,6 +146,8 @@ cups-lpd.o: ../cups/language.h
 cups-polld.o: ../cups/http-private.h ../config.h ../cups/http.h ../cups/md5.h
 cups-polld.o: ../cups/cups.h ../cups/ipp.h ../cups/ppd.h ../cups/file.h
 cups-polld.o: ../cups/language.h ../cups/string.h
+testdirsvc.o: ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/md5.h
+testdirsvc.o: ../cups/ppd.h ../cups/file.h ../cups/string.h ../config.h
 testmime.o: ../cups/string.h ../config.h mime.h ../cups/ipp.h ../cups/file.h
 testspeed.o: ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/md5.h
 testspeed.o: ../cups/ppd.h ../cups/file.h ../cups/language.h ../cups/debug.h

diff --git a/scheduler/Makefile b/scheduler/Makefile
index cf54736aa3c69c890fcf75a323949020befe855f..9c148704665cd12701d106d896f03b6fef9d6ba4 100644 (file)
--- a/scheduler/Makefile
+++ b/scheduler/Makefile
@@ -219,7 +219,7 @@ testdirsvc: testdirsvc.o
 testmime:      testmime.o libmime.a
        echo Linking $@...
        $(CC) $(LDFLAGS) -o $@ testmime.o libmime.a ../cups/libcups.a \
-               $(COMMONLIBS) $(NETLIBS) $(LIBZ)
+               $(COMMONLIBS) $(LIBZ)
 
 
 #