Allow --with-bonjour to work with non-macOS implementations of Bonjour.

On macOS the relevant functions require no special library, but elsewhere
we need to pull in libdns_sd.

Back-patch to supported branches.  No docs change since the docs do not
suggest that this is a Mac-only feature.

Luke Lonergan

Discussion: https://postgr.es/m/2D8331C5-D64F-44C1-8717-63EDC6EAF7EB@brightforge.com

diff --git a/configure b/configure
index 185c207fde51a4a5fa9d5e8f47e3e73d207504e6..5464ee8a3f74bc72c8d4b33b56f5b3785c15e90f 100755 (executable)
--- a/configure
+++ b/configure
@@ -14775,6 +14775,97 @@ $as_echo "$as_me: error: header file  is required for Bonjour" >&2;}
 fi
 
 
+  { $as_echo "$as_me:$LINENO: checking for library containing DNSServiceRefSockFD" >&5
+$as_echo_n "checking for library containing DNSServiceRefSockFD... " >&6; }
+if test "${ac_cv_search_DNSServiceRefSockFD+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  ac_func_search_save_LIBS=$LIBS
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char DNSServiceRefSockFD ();
+int
+main ()
+{
+return DNSServiceRefSockFD ();
+  ;
+  return 0;
+}
+_ACEOF
+for ac_lib in '' dns_sd; do
+  if test -z "$ac_lib"; then
+    ac_res="none required"
+  else
+    ac_res=-l$ac_lib
+    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+  fi
+  rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+    test -z "$ac_c_werror_flag" ||
+    test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+    test "$cross_compiling" = yes ||
+    $as_test_x conftest$ac_exeext
+       }; then
+  ac_cv_search_DNSServiceRefSockFD=$ac_res
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext
+  if test "${ac_cv_search_DNSServiceRefSockFD+set}" = set; then
+  break
+fi
+done
+if test "${ac_cv_search_DNSServiceRefSockFD+set}" = set; then
+  :
+else
+  ac_cv_search_DNSServiceRefSockFD=no
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_DNSServiceRefSockFD" >&5
+$as_echo "$ac_cv_search_DNSServiceRefSockFD" >&6; }
+ac_res=$ac_cv_search_DNSServiceRefSockFD
+if test "$ac_res" != no; then
+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+
+else
+  { { $as_echo "$as_me:$LINENO: error: could not find function 'DNSServiceRefSockFD' required for Bonjour" >&5
+$as_echo "$as_me: error: could not find function 'DNSServiceRefSockFD' required for Bonjour" >&2;}
+   { (exit 1); exit 1; }; }
+fi
+
 fi
 
 # for contrib/uuid-ossp

diff --git a/configure.in b/configure.in
index cdcf1727033f9aa6405e862aa721700fcd8e482c..8355cc6c35fecafdaac9a153ff51faa812c3ffee 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -954,8 +954,8 @@ if test "$with_openssl" = yes ; then
      AC_CHECK_LIB(crypto, CRYPTO_new_ex_data, [], [AC_MSG_ERROR([library 'crypto' is required for OpenSSL])])
      AC_CHECK_LIB(ssl,    SSL_new, [], [AC_MSG_ERROR([library 'ssl' is required for OpenSSL])])
   else
-     AC_SEARCH_LIBS(CRYPTO_new_ex_data, eay32 crypto, [], [AC_MSG_ERROR([library 'eay32' or 'crypto' is required for OpenSSL])])
-     AC_SEARCH_LIBS(SSL_new, ssleay32 ssl, [], [AC_MSG_ERROR([library 'ssleay32' or 'ssl' is required for OpenSSL])])
+     AC_SEARCH_LIBS(CRYPTO_new_ex_data, [eay32 crypto], [], [AC_MSG_ERROR([library 'eay32' or 'crypto' is required for OpenSSL])])
+     AC_SEARCH_LIBS(SSL_new, [ssleay32 ssl], [], [AC_MSG_ERROR([library 'ssleay32' or 'ssl' is required for OpenSSL])])
   fi
   # Functions introduced in OpenSSL 1.1.0. We used to check for
   # OPENSSL_VERSION_NUMBER, but that didn't work with 1.1.0, because LibreSSL
@@ -1145,6 +1145,8 @@ fi
 
 if test "$with_bonjour" = yes ; then
   AC_CHECK_HEADER(dns_sd.h, [], [AC_MSG_ERROR([header file  is required for Bonjour])])
+  AC_SEARCH_LIBS(DNSServiceRefSockFD, dns_sd, [],
+    [AC_MSG_ERROR([could not find function 'DNSServiceRefSockFD' required for Bonjour])])
 fi
 
 # for contrib/uuid-ossp