diff options
| author | Michael R Sweet <michaelrsweet@gmail.com> | 2019-01-22 12:38:24 -0500 |
|---|---|---|
| committer | Michael R Sweet <michaelrsweet@gmail.com> | 2019-01-23 12:15:38 -0500 |
| commit | ffbf1e61ffbb56b95018ef4301e4ddb230b88468 (patch) | |
| tree | 137cb9e8717bca0e3502f0c55ee2bca922228921 /config-scripts | |
| parent | e13e173f26a8fdfeaa2e326cbb678e1f3c316332 (diff) | |
| download | cups-ffbf1e61ffbb56b95018ef4301e4ddb230b88468.tar.gz | |
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.
Diffstat (limited to 'config-scripts')
| -rw-r--r-- | config-scripts/cups-common.m4 | 7 | ||||
| -rw-r--r-- | config-scripts/cups-ssl.m4 | 9 |
2 files changed, 8 insertions, 8 deletions
diff --git a/config-scripts/cups-common.m4 b/config-scripts/cups-common.m4 index d0d0d90d3..27dc33436 100644 --- a/config-scripts/cups-common.m4 +++ b/config-scripts/cups-common.m4 @@ -440,6 +440,9 @@ AC_ARG_WITH(components, [ --with-components set components to build: 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" @@ -458,6 +461,8 @@ case "$COMPONENTS" in BUILDDIRS="locale" cupsimagebase="" LIBCUPSOBJS="\$(COREOBJS)" + LIBHEADERS="\$(COREHEADERS)" + LIBHEADERSPRIV="\$(COREHEADERSPRIV)" ;; *) @@ -467,3 +472,5 @@ esac AC_SUBST(BUILDDIRS) AC_SUBST(LIBCUPSOBJS) +AC_SUBST(LIBHEADERS) +AC_SUBST(LIBHEADERSPRIV) diff --git a/config-scripts/cups-ssl.m4 b/config-scripts/cups-ssl.m4 index 957e0b08a..8446e3d15 100644 --- a/config-scripts/cups-ssl.m4 +++ b/config-scripts/cups-ssl.m4 @@ -43,14 +43,7 @@ if test x$enable_ssl != xno; then AC_CHECK_HEADER(Security/SecBasePriv.h, AC_DEFINE(HAVE_SECBASEPRIV_H)) AC_CHECK_HEADER(Security/SecIdentitySearchPriv.h, - AC_DEFINE(HAVE_SECIDENTITYSEARCHPRIV_H)) - - AC_DEFINE(HAVE_CSSMERRORSTRING) - AC_DEFINE(HAVE_SECKEYCHAINOPEN)]) - - if test $host_os_version -ge 150; then - AC_DEFINE(HAVE_SSLSETENABLEDCIPHERS) - fi + AC_DEFINE(HAVE_SECIDENTITYSEARCHPRIV_H))]) fi fi |