diff options
| author | Michael R Sweet <michael.r.sweet@gmail.com> | 2019-03-21 18:20:40 -0400 |
|---|---|---|
| committer | Michael R Sweet <michael.r.sweet@gmail.com> | 2019-03-21 18:20:40 -0400 |
| commit | 3c2cb8228e5a90fe93b938f55cfbfa538e313d40 (patch) | |
| tree | cfa13aa707874dc3d70dc7e41996a139bf75a58a /config-scripts | |
| parent | f89270998d6656004f89085431591bb1b0b1326b (diff) | |
| download | cups-3c2cb8228e5a90fe93b938f55cfbfa538e313d40.tar.gz | |
Clean up some build issues on certain platforms.
Diffstat (limited to 'config-scripts')
| -rw-r--r-- | config-scripts/cups-common.m4 | 8 | ||||
| -rw-r--r-- | config-scripts/cups-dnssd.m4 | 6 |
2 files changed, 9 insertions, 5 deletions
diff --git a/config-scripts/cups-common.m4 b/config-scripts/cups-common.m4 index 6a457b508..665770544 100644 --- a/config-scripts/cups-common.m4 +++ b/config-scripts/cups-common.m4 @@ -339,14 +339,18 @@ case $host_os_name in darwin*) BACKLIBS="$BACKLIBS -framework IOKit" SERVERLIBS="$SERVERLIBS -framework IOKit -weak_framework ApplicationServices" - LIBS="-framework SystemConfiguration -framework CoreFoundation -framework Security $LIBS" + LIBS="-framework CoreFoundation -framework Security $LIBS" dnl Check for framework headers... AC_CHECK_HEADER(ApplicationServices/ApplicationServices.h,AC_DEFINE(HAVE_APPLICATIONSERVICES_H)) AC_CHECK_HEADER(CoreFoundation/CoreFoundation.h,AC_DEFINE(HAVE_COREFOUNDATION_H)) dnl Check for dynamic store function... - AC_CHECK_FUNCS(SCDynamicStoreCopyComputerName) + SAVELIBS="$LIBS" + LIBS="-framework SystemConfiguration $LIBS" + AC_CHECK_FUNCS(SCDynamicStoreCopyComputerName,[ + AC_DEFINE(HAVE_SCDYNAMICSTORECOPYCOMPUTERNAME)],[ + LIBS="$SAVELIBS"]) dnl Check for the new membership functions in MacOSX 10.4... AC_CHECK_HEADER(membership.h,AC_DEFINE(HAVE_MEMBERSHIP_H)) diff --git a/config-scripts/cups-dnssd.m4 b/config-scripts/cups-dnssd.m4 index 71f9f21eb..daa398fd7 100644 --- a/config-scripts/cups-dnssd.m4 +++ b/config-scripts/cups-dnssd.m4 @@ -1,9 +1,10 @@ dnl dnl DNS Service Discovery (aka Bonjour) stuff for CUPS. dnl -dnl Copyright 2007-2017 by Apple Inc. +dnl Copyright © 2007-2019 by Apple Inc. dnl -dnl Licensed under Apache License v2.0. See the file "LICENSE" for more information. +dnl Licensed under Apache License v2.0. See the file "LICENSE" for more +dnl information. dnl AC_ARG_ENABLE(avahi, [ --disable-avahi disable DNS Service Discovery support using Avahi]) @@ -41,7 +42,6 @@ if test "x$DNSSD_BACKEND" = x -a x$enable_dnssd != xno; then darwin*) # Darwin and macOS... AC_DEFINE(HAVE_DNSSD) - DNSSDLIBS="-framework CoreFoundation -framework SystemConfiguration" DNSSD_BACKEND="dnssd" IPPFIND_BIN="ippfind" IPPFIND_MAN="ippfind.\$(MAN1EXT)" |