From ffbf1e61ffbb56b95018ef4301e4ddb230b88468 Mon Sep 17 00:00:00 2001
From: Michael R Sweet <michaelrsweet@gmail.com>
Date: Tue, 22 Jan 2019 12:38:24 -0500
Subject: Fix some build issues with the "core" component selection
 (rdar://47394086)

- Availability macros were incorrect.
- Some driver headers/definitions were installed even when the core library
  does not contain them.
- Fix up the macOS/iOS detection of keychain/API availability - just need to
  use the TARGET_OS_xxx macros instead.
- When installing private headers, install config.h so that the private
  headers actually work.
---
 configure | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

(limited to 'configure')

diff --git a/configure b/configure
index 626d78a77..7fb26fd18 100755
--- a/configure
+++ b/configure
@@ -717,6 +717,8 @@ CUPS_DATADIR
 CUPS_CACHEDIR
 PRIVATEINCLUDE
 privateinclude
+LIBHEADERSPRIV
+LIBHEADERS
 LIBCUPSOBJS
 BUILDDIRS
 INSTALLXPC
@@ -6106,6 +6108,9 @@ fi
 
 cupsimagebase="cupsimage"
 LIBCUPSOBJS="\$(COREOBJS) \$(DRIVEROBJS)"
+LIBHEADERS="\$(COREHEADERS) \$(DRIVERHEADERS)"
+LIBHEADERSPRIV="\$(COREHEADERSPRIV) \$(DRIVERHEADERSPRIV)"
+
 case "$COMPONENTS" in
 	all)
 		BUILDDIRS="test filter backend berkeley cgi-bin monitor notifier ppdc scheduler systemv conf data desktop locale man doc examples templates"
@@ -6124,6 +6129,8 @@ case "$COMPONENTS" in
 		BUILDDIRS="locale"
 		cupsimagebase=""
 		LIBCUPSOBJS="\$(COREOBJS)"
+		LIBHEADERS="\$(COREHEADERS)"
+		LIBHEADERSPRIV="\$(COREHEADERSPRIV)"
 		;;
 
 	*)
@@ -6137,6 +6144,8 @@ esac
 
 
 
+
+
 if test "$prefix" = "NONE"; then
 	prefix="/"
 fi
@@ -8353,19 +8362,9 @@ if test "x$ac_cv_header_Security_SecIdentitySearchPriv_h" = xyes; then :
 fi
 
 
-
-		$as_echo "#define HAVE_CSSMERRORSTRING 1" >>confdefs.h
-
-		$as_echo "#define HAVE_SECKEYCHAINOPEN 1" >>confdefs.h
-
 fi
 
 
-
-		if test $host_os_version -ge 150; then
-			$as_echo "#define HAVE_SSLSETENABLEDCIPHERS 1" >>confdefs.h
-
-		fi
 	fi
     fi
 
-- 
cgit v1.2.1