summaryrefslogtreecommitdiff
path: root/print/cups-base/files/patch-configure
blob: 08a2cb0ffd8729c7fa2af32655c358391c8ac2cd (plain) (blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
--- configure.orig	2015-02-09 19:38:35 UTC
+++ configure
@@ -586,6 +586,7 @@ ac_unique_file="cups/cups.h"
 # Factoring default headers for most tests.
 ac_includes_default="\
 #include <stdio.h>
+#include <netinet/in.h>
 #ifdef HAVE_SYS_TYPES_H
 # include <sys/types.h>
 #endif
@@ -5382,6 +5383,13 @@ $as_echo "yes" >&6; }
 			CFLAGS="$CFLAGS `$PKGCONFIG --cflags libusb-1.0`"
 			LIBUSB="`$PKGCONFIG --libs libusb-1.0`"
 			USBQUIRKS="\$(DATADIR)/usb"
+		elif test -f /usr/lib/libusb.so; then
+			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+			$as_echo "#define HAVE_LIBUSB 1" >>confdefs.h
+
+			LIBUSB="-lusb"
+			USBQUIRKS="\$(DATADIR)/usb"
 		else
 			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
@@ -5663,7 +5671,7 @@ $as_echo "yes" >&6; }
 		CFLAGS="$CFLAGS `$PKGCONFIG --cflags dbus-1` -DDBUS_API_SUBJECT_TO_CHANGE"
 		SERVERLIBS="$SERVERLIBS `$PKGCONFIG --libs dbus-1`"
 		DBUS_NOTIFIER="dbus"
-		DBUS_NOTIFIERLIBS="`$PKGCONFIG --libs dbus-1`"
+		DBUS_NOTIFIERLIBS="`$PKGCONFIG --libs dbus-1` -pthread"
 		SAVELIBS="$LIBS"
 		LIBS="$LIBS $DBUS_NOTIFIERLIBS"
 		ac_fn_c_check_func "$LINENO" "dbus_message_iter_init_append" "ac_cv_func_dbus_message_iter_init_append"
@@ -8646,7 +8654,7 @@ fi
 		fi
 
 		# Find the PAM configuration directory, if any...
-		for dir in /private/etc/pam.d /etc/pam.d; do
+		for dir in /usr/local/etc/pam.d /etc/pam.d; do
 			if test -d $dir; then
 				PAMDIR=$dir
 				break;
@@ -8899,7 +8907,7 @@ fi
 
 LARGEFILE=""
 if test x$enable_largefile != xno; then
-	LARGEFILE="-D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE"
+	LARGEFILE="-D_LARGEFILE_SOURCE "
 
 	if test x$ac_cv_sys_large_files = x1; then
 		LARGEFILE="$LARGEFILE -D_LARGE_FILES"