From: Michael R Sweet Date: Sat, 6 Mar 2021 23:13:19 +0000 (-0500) Subject: Modernize cups-network.m4. X-Git-Tag: v2.4b1~220 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9db030994215c982f04c2457fd678102e83c85ab;p=thirdparty%2Fcups.git Modernize cups-network.m4. --- diff --git a/config-scripts/cups-network.m4 b/config-scripts/cups-network.m4 index 2854708b5c..35f405648e 100644 --- a/config-scripts/cups-network.m4 +++ b/config-scripts/cups-network.m4 @@ -1,66 +1,87 @@ dnl dnl Networking stuff for CUPS. dnl -dnl Copyright 2007-2016 by Apple Inc. -dnl Copyright 1997-2005 by Easy Software Products, all rights reserved. +dnl Copyright © 2021 by OpenPrinting. +dnl Copyright © 2007-2016 by Apple Inc. +dnl Copyright © 1997-2005 by Easy Software Products, all rights reserved. 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_CHECK_HEADER(resolv.h,AC_DEFINE(HAVE_RESOLV_H),,[ -#include -#include -#include -#include -#include ]) -AC_SEARCH_LIBS(socket, socket) -AC_SEARCH_LIBS(gethostbyaddr, nsl) -AC_SEARCH_LIBS(getifaddrs, nsl, AC_DEFINE(HAVE_GETIFADDRS)) -AC_SEARCH_LIBS(hstrerror, nsl socket resolv, AC_DEFINE(HAVE_HSTRERROR)) -AC_SEARCH_LIBS(rresvport_af, nsl, AC_DEFINE(HAVE_RRESVPORT_AF)) -AC_SEARCH_LIBS(__res_init, resolv bind, AC_DEFINE(HAVE_RES_INIT), - AC_SEARCH_LIBS(res_9_init, resolv bind, AC_DEFINE(HAVE_RES_INIT), - AC_SEARCH_LIBS(res_init, resolv bind, AC_DEFINE(HAVE_RES_INIT)))) +AC_CHECK_HEADER([resolv.h], [ + AC_DEFINE([HAVE_RESOLV_H], [1], [Have the header?]) +], [ +]. [ + #include + #include + #include + #include + #include +]) +AC_SEARCH_LIBS([socket], [socket]) +AC_SEARCH_LIBS([gethostbyaddr], [nsl]) +AC_SEARCH_LIBS([getifaddrs], [nsl], [ + AC_DEFINE([HAVE_GETIFADDRS], [1], [Have the getifaddrs function?]) +]) +AC_SEARCH_LIBS([hstrerror], [nsl socket resolv], [ + AC_DEFINE([HAVE_HSTRERROR], [1], [Have the hstrerror function?]) +]) +AC_SEARCH_LIBS([rresvport_af], [nsl], [ + AC_DEFINE([HAVE_RRESVPORT_AF], [1], [Have the rresvport_af function?]) +]) +AC_SEARCH_LIBS([__res_init], [resolv bind], [ + AC_DEFINE([HAVE_RES_INIT], [1], [Have res_init function?]) +], [ + AC_SEARCH_LIBS([res_9_init], [resolv bind], [ + AC_DEFINE([HAVE_RES_INIT], [1], [Have res_init function?]) + ], [ + AC_SEARCH_LIBS([res_init], [resolv bind], [ + AC_DEFINE([HAVE_RES_INIT], [1], [Have res_init function?]) + ]) + ]) +]) -# Tru64 5.1b leaks file descriptors with these functions; disable until -# we can come up with a test for this... -if test "$host_os_name" != "osf1"; then - AC_SEARCH_LIBS(getaddrinfo, nsl, AC_DEFINE(HAVE_GETADDRINFO)) - AC_SEARCH_LIBS(getnameinfo, nsl, AC_DEFINE(HAVE_GETNAMEINFO)) -fi +AC_SEARCH_LIBS([getaddrinfo], [nsl], [ + AC_DEFINE([HAVE_GETADDRINFO], [1], [Have the getaddrinfo function?]) +]) +AC_SEARCH_LIBS([getnameinfo], [nsl], [ + AC_DEFINE([HAVE_GETNAMEINFO], [1], [Have the getnameinfo function?]) +]) -AC_CHECK_MEMBER(struct sockaddr.sa_len,,, [#include ]) -AC_CHECK_HEADER(sys/sockio.h, AC_DEFINE(HAVE_SYS_SOCKIO_H)) +AC_CHECK_MEMBER([struct sockaddr.sa_len],,, [#include ]) +AC_CHECK_HEADER([sys/sockio.h], [ + AC_DEFINE([HAVE_SYS_SOCKIO_H], [1], [Have header?]) +]) +dnl Domain socket support... CUPS_DEFAULT_DOMAINSOCKET="" -dnl Domain socket support... -AC_ARG_WITH(domainsocket, [ --with-domainsocket set unix domain socket name], - default_domainsocket="$withval", - default_domainsocket="") +AC_ARG_WITH([domainsocket], AS_HELP_STRING([--with-domainsocket], [set unix domain socket name]), [ + default_domainsocket="$withval" +], [ + default_domainsocket="" +]) -if test x$enable_domainsocket != xno -a x$default_domainsocket != xno; then - if test "x$default_domainsocket" = x; then - case "$host_os_name" in - darwin*) - # Darwin and macOS do their own thing... - CUPS_DEFAULT_DOMAINSOCKET="$localstatedir/run/cupsd" - ;; - *) - # All others use FHS standard... - CUPS_DEFAULT_DOMAINSOCKET="$CUPS_STATEDIR/cups.sock" - ;; - esac - else - CUPS_DEFAULT_DOMAINSOCKET="$default_domainsocket" - fi +AS_IF([test x$enable_domainsocket != xno -a x$default_domainsocket != xno], [ + AS_IF([test "x$default_domainsocket" = x], [ + AS_CASE(["$host_os_name"], [darwin*], [ + # Darwin and macOS do their own thing... + CUPS_DEFAULT_DOMAINSOCKET="$localstatedir/run/cupsd" + ], [*], [ + # All others use FHS standard... + CUPS_DEFAULT_DOMAINSOCKET="$CUPS_STATEDIR/cups.sock" + ]) + ], [ + CUPS_DEFAULT_DOMAINSOCKET="$default_domainsocket" + ]) - CUPS_LISTEN_DOMAINSOCKET="Listen $CUPS_DEFAULT_DOMAINSOCKET" + CUPS_LISTEN_DOMAINSOCKET="Listen $CUPS_DEFAULT_DOMAINSOCKET" - AC_DEFINE_UNQUOTED(CUPS_DEFAULT_DOMAINSOCKET, "$CUPS_DEFAULT_DOMAINSOCKET") -else - CUPS_LISTEN_DOMAINSOCKET="" -fi + AC_DEFINE_UNQUOTED([CUPS_DEFAULT_DOMAINSOCKET], ["$CUPS_DEFAULT_DOMAINSOCKET"], [Domain socket path.]) +], [ + CUPS_LISTEN_DOMAINSOCKET="" +]) -AC_SUBST(CUPS_DEFAULT_DOMAINSOCKET) -AC_SUBST(CUPS_LISTEN_DOMAINSOCKET) +AC_SUBST([CUPS_DEFAULT_DOMAINSOCKET]) +AC_SUBST([CUPS_LISTEN_DOMAINSOCKET]) diff --git a/configure b/configure index fcf0016753..1f473911da 100755 --- a/configure +++ b/configure @@ -8200,16 +8200,22 @@ fi esac -ac_fn_c_check_header_compile "$LINENO" "resolv.h" "ac_cv_header_resolv_h" " -#include -#include -#include -#include -#include -" +ac_fn_c_check_header_compile "$LINENO" "resolv.h" "ac_cv_header_resolv_h" "$ac_includes_default" if test "x$ac_cv_header_resolv_h" = xyes then : - printf "%s\n" "#define HAVE_RESOLV_H 1" >>confdefs.h + + +printf "%s\n" "#define HAVE_RESOLV_H 1" >>confdefs.h + + +else $as_nop + +. + #include + #include + #include + #include + #include fi @@ -8387,7 +8393,10 @@ ac_res=$ac_cv_search_getifaddrs if test "$ac_res" != no then : test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" - printf "%s\n" "#define HAVE_GETIFADDRS 1" >>confdefs.h + + +printf "%s\n" "#define HAVE_GETIFADDRS 1" >>confdefs.h + fi @@ -8447,7 +8456,10 @@ ac_res=$ac_cv_search_hstrerror if test "$ac_res" != no then : test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" - printf "%s\n" "#define HAVE_HSTRERROR 1" >>confdefs.h + + +printf "%s\n" "#define HAVE_HSTRERROR 1" >>confdefs.h + fi @@ -8507,7 +8519,10 @@ ac_res=$ac_cv_search_rresvport_af if test "$ac_res" != no then : test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" - printf "%s\n" "#define HAVE_RRESVPORT_AF 1" >>confdefs.h + + +printf "%s\n" "#define HAVE_RRESVPORT_AF 1" >>confdefs.h + fi @@ -8567,10 +8582,14 @@ ac_res=$ac_cv_search___res_init if test "$ac_res" != no then : test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" - printf "%s\n" "#define HAVE_RES_INIT 1" >>confdefs.h + + +printf "%s\n" "#define HAVE_RES_INIT 1" >>confdefs.h + else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing res_9_init" >&5 + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing res_9_init" >&5 printf %s "checking for library containing res_9_init... " >&6; } if test ${ac_cv_search_res_9_init+y} then : @@ -8626,10 +8645,14 @@ ac_res=$ac_cv_search_res_9_init if test "$ac_res" != no then : test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" - printf "%s\n" "#define HAVE_RES_INIT 1" >>confdefs.h + + +printf "%s\n" "#define HAVE_RES_INIT 1" >>confdefs.h + else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing res_init" >&5 + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing res_init" >&5 printf %s "checking for library containing res_init... " >&6; } if test ${ac_cv_search_res_init+y} then : @@ -8685,19 +8708,21 @@ ac_res=$ac_cv_search_res_init if test "$ac_res" != no then : test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" - printf "%s\n" "#define HAVE_RES_INIT 1" >>confdefs.h + + +printf "%s\n" "#define HAVE_RES_INIT 1" >>confdefs.h + fi + fi + fi -# Tru64 5.1b leaks file descriptors with these functions; disable until -# we can come up with a test for this... -if test "$host_os_name" != "osf1"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing getaddrinfo" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing getaddrinfo" >&5 printf %s "checking for library containing getaddrinfo... " >&6; } if test ${ac_cv_search_getaddrinfo+y} then : @@ -8753,11 +8778,14 @@ ac_res=$ac_cv_search_getaddrinfo if test "$ac_res" != no then : test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" - printf "%s\n" "#define HAVE_GETADDRINFO 1" >>confdefs.h + + +printf "%s\n" "#define HAVE_GETADDRINFO 1" >>confdefs.h + fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing getnameinfo" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing getnameinfo" >&5 printf %s "checking for library containing getnameinfo... " >&6; } if test ${ac_cv_search_getnameinfo+y} then : @@ -8813,12 +8841,14 @@ ac_res=$ac_cv_search_getnameinfo if test "$ac_res" != no then : test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" - printf "%s\n" "#define HAVE_GETNAMEINFO 1" >>confdefs.h -fi + +printf "%s\n" "#define HAVE_GETNAMEINFO 1" >>confdefs.h + fi + ac_fn_c_check_member "$LINENO" "struct sockaddr" "sa_len" "ac_cv_member_struct_sockaddr_sa_len" "#include " if test "x$ac_cv_member_struct_sockaddr_sa_len" = xyes @@ -8829,7 +8859,10 @@ fi ac_fn_c_check_header_compile "$LINENO" "sys/sockio.h" "ac_cv_header_sys_sockio_h" "$ac_includes_default" if test "x$ac_cv_header_sys_sockio_h" = xyes then : - printf "%s\n" "#define HAVE_SYS_SOCKIO_H 1" >>confdefs.h + + +printf "%s\n" "#define HAVE_SYS_SOCKIO_H 1" >>confdefs.h + fi @@ -8840,34 +8873,53 @@ CUPS_DEFAULT_DOMAINSOCKET="" # Check whether --with-domainsocket was given. if test ${with_domainsocket+y} then : - withval=$with_domainsocket; default_domainsocket="$withval" + withval=$with_domainsocket; + default_domainsocket="$withval" + else $as_nop - default_domainsocket="" + + default_domainsocket="" + fi -if test x$enable_domainsocket != xno -a x$default_domainsocket != xno; then - if test "x$default_domainsocket" = x; then - case "$host_os_name" in - darwin*) - # Darwin and macOS do their own thing... - CUPS_DEFAULT_DOMAINSOCKET="$localstatedir/run/cupsd" - ;; - *) - # All others use FHS standard... - CUPS_DEFAULT_DOMAINSOCKET="$CUPS_STATEDIR/cups.sock" - ;; - esac - else - CUPS_DEFAULT_DOMAINSOCKET="$default_domainsocket" - fi +if test x$enable_domainsocket != xno -a x$default_domainsocket != xno +then : + + if test "x$default_domainsocket" = x +then : - CUPS_LISTEN_DOMAINSOCKET="Listen $CUPS_DEFAULT_DOMAINSOCKET" + case "$host_os_name" in #( + darwin*) : - printf "%s\n" "#define CUPS_DEFAULT_DOMAINSOCKET \"$CUPS_DEFAULT_DOMAINSOCKET\"" >>confdefs.h + # Darwin and macOS do their own thing... + CUPS_DEFAULT_DOMAINSOCKET="$localstatedir/run/cupsd" + ;; #( + *) : + + # All others use FHS standard... + CUPS_DEFAULT_DOMAINSOCKET="$CUPS_STATEDIR/cups.sock" + ;; #( + *) : + ;; +esac + +else $as_nop + + CUPS_DEFAULT_DOMAINSOCKET="$default_domainsocket" + +fi + + CUPS_LISTEN_DOMAINSOCKET="Listen $CUPS_DEFAULT_DOMAINSOCKET" + + +printf "%s\n" "#define CUPS_DEFAULT_DOMAINSOCKET \"$CUPS_DEFAULT_DOMAINSOCKET\"" >>confdefs.h + + +else $as_nop + + CUPS_LISTEN_DOMAINSOCKET="" -else - CUPS_LISTEN_DOMAINSOCKET="" fi