Greatly simplify the man page handling.

[thirdparty/cups.git] / config-scripts / cups-dnssd.m4

diff --git a/config-scripts/cups-dnssd.m4 b/config-scripts/cups-dnssd.m4
index 86a8de088eec0e86bb1be6ef710dfc5d9406af8a..19832dc1609aa418717764225349a1b57c103c20 100644 (file)
--- a/config-scripts/cups-dnssd.m4
+++ b/config-scripts/cups-dnssd.m4
@@ -1,13 +1,10 @@
 dnl
 dnl DNS Service Discovery (aka Bonjour) stuff for CUPS.
 dnl
-dnl Copyright 2007-2015 by Apple Inc.
+dnl Copyright © 2007-2019 by Apple Inc.
 dnl
-dnl These coded instructions, statements, and computer programs are the
-dnl property of Apple Inc. and are protected by Federal copyright
-dnl law.  Distribution and use rights are outlined in the file "LICENSE.txt"
-dnl which should have been included with this file.  If this file is
-dnl file is missing or damaged, see the license at "http://www.cups.org/".
+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])
@@ -24,7 +21,7 @@ DNSSD_BACKEND=""
 IPPFIND_BIN=""
 IPPFIND_MAN=""
 
-if test "x$PKGCONFIG" != x -a x$enable_avahi != xno -a x$uname != xDarwin; then
+if test "x$PKGCONFIG" != x -a x$enable_avahi != xno -a x$host_os_name != xdarwin; then
        AC_MSG_CHECKING(for Avahi)
        if $PKGCONFIG --exists avahi-client; then
                AC_MSG_RESULT(yes)
@@ -32,7 +29,7 @@ if test "x$PKGCONFIG" != x -a x$enable_avahi != xno -a x$uname != xDarwin; then
                DNSSDLIBS="`$PKGCONFIG --libs avahi-client`"
                DNSSD_BACKEND="dnssd"
                IPPFIND_BIN="ippfind"
-               IPPFIND_MAN="ippfind.\$(MAN1EXT)"
+               IPPFIND_MAN="ippfind.1)"
                AC_DEFINE(HAVE_AVAHI)
        else
                AC_MSG_RESULT(no)
@@ -41,14 +38,13 @@ fi
 
 if test "x$DNSSD_BACKEND" = x -a x$enable_dnssd != xno; then
        AC_CHECK_HEADER(dns_sd.h, [
-               case "$uname" in
-                       Darwin*)
-                               # Darwin and MacOS X...
+               case "$host_os_name" in
+                       darwin*)
+                               # Darwin and macOS...
                                AC_DEFINE(HAVE_DNSSD)
-                               DNSSDLIBS="-framework CoreFoundation -framework SystemConfiguration"
                                DNSSD_BACKEND="dnssd"
                                IPPFIND_BIN="ippfind"
-                               IPPFIND_MAN="ippfind.\$(MAN1EXT)"
+                               IPPFIND_MAN="ippfind.1"
                                ;;
                        *)
                                # All others...
@@ -66,7 +62,7 @@ if test "x$DNSSD_BACKEND" = x -a x$enable_dnssd != xno; then
                                        DNSSDLIBS="-ldns_sd"
                                        DNSSD_BACKEND="dnssd",
                                        IPPFIND_BIN="ippfind"
-                                       IPPFIND_MAN="ippfind.\$(MAN1EXT)"
+                                       IPPFIND_MAN="ippfind.1"
                                        AC_MSG_RESULT(no))
                                LIBS="$SAVELIBS"
                                ;;