From: msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>
Date: Fri, 21 Mar 2014 18:17:50 +0000 (+0000)
Subject: Fix builds on Linux.
X-Git-Tag: v2.2b1~703
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e7f455a5b39f6716835b083be5ba49a5cd795675;p=thirdparty%2Fcups.git

Fix builds on Linux.


git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@11720 a1ca3aef-8c08-0410-bb20-df032aa958be
---

diff --git a/man/Makefile b/man/Makefile
index 1987acbb0f..38e309f87d 100644
--- a/man/Makefile
+++ b/man/Makefile
@@ -1,16 +1,16 @@
 #
 # "$Id$"
 #
-#   Man page makefile for CUPS.
+# Man page makefile for CUPS.
 #
-#   Copyright 2007-2013 by Apple Inc.
-#   Copyright 1993-2006 by Easy Software Products.
+# Copyright 2007-2014 by Apple Inc.
+# Copyright 1993-2006 by Easy Software Products.
 #
-#   These coded instructions, statements, and computer programs are the
-#   property of Apple Inc. and are protected by Federal copyright
-#   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
-#   which should have been included with this file.  If this file is
-#   file is missing or damaged, see the license at "http://www.cups.org/".
+# These coded instructions, statements, and computer programs are the
+# property of Apple Inc. and are protected by Federal copyright
+# law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+# which should have been included with this file.  If this file is
+# file is missing or damaged, see the license at "http://www.cups.org/".
 #
 
 include ../Makedefs
@@ -217,8 +217,10 @@ html:	$(MAN1) $(MAN5) $(MAN7) $(MAN8) mantohtml
 		./mantohtml `basename $$file .$(MAN8EXT)`.man >../doc/help/man-`basename $$file .$(MAN8EXT)`.html; \
 	done
 
-mantohtml:	mantohtml.o
-	$(CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ mantohtml.o
+mantohtml:	mantohtml.o ../cups/$(LIBCUPSSTATIC)
+	$(CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ mantohtml.o \
+		../cups/$(LIBCUPSSTATIC) $(LIBGSSAPI) $(SSLLIBS) \
+		$(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
 
 
 #
diff --git a/scheduler/main.c b/scheduler/main.c
index 555b6d6d81..cb7d4e3017 100644
--- a/scheduler/main.c
+++ b/scheduler/main.c
@@ -47,6 +47,10 @@ extern int launch_activate_socket(const char *name, int **fds, size_t *cnt);
 #  include <notify.h>
 #endif /* HAVE_NOTIFY_H */
 
+#ifdef HAVE_DBUS
+#  include <dbus/dbus.h>
+#endif /* HAVE_DBUS */
+
 #ifdef HAVE_SYS_PARAM_H
 #  include <sys/param.h>
 #endif /* HAVE_SYS_PARAM_H */
@@ -487,7 +491,7 @@ main(int  argc,				/* I - Number of command-line args */
   * Enable threading support for D-BUS...
   */
 
-  dbus_threads_init();
+  dbus_threads_init_default();
 #endif /* HAVE_DBUS_THREADS_INIT */
 
  /*