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

tglsfdc · tglsfdc · commit 89df643c3b33 · 2017-11-09T11:00:36.000-05:00
Upon further review, our Bonjour code doesn't actually work with the Avahi not-too-compatible compatibility library. While you can get it to work on non-macOS platforms if you link to Apple's own mDNSResponder code, there don't seem to be many people who care about that. Leaving in the AC_SEARCH_LIBS call seems more likely to encourage people to build broken configurations than to do anything very useful. Hence, remove the AC_SEARCH_LIBS call and put in a warning comment instead. Discussion: https://postgr.es/m/2D8331C5-D64F-44C1-8717-63EDC6EAF7EB@brightforge.com
diff --git a/configure b/configure
@@ -14775,97 +14775,6 @@ $as_echo "$as_me: error: header file <dns_sd.h> 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
@@ -1145,8 +1145,12 @@ fi
 
 if test "$with_bonjour" = yes ; then
   AC_CHECK_HEADER(dns_sd.h, [], [AC_MSG_ERROR([header file <dns_sd.h> is required for Bonjour])])
-  AC_SEARCH_LIBS(DNSServiceRefSockFD, dns_sd, [],
-    [AC_MSG_ERROR([could not find function 'DNSServiceRefSockFD' required for Bonjour])])
+dnl At some point we might add something like
+dnl AC_SEARCH_LIBS(DNSServiceRegister, dns_sd)
+dnl but right now, what that would mainly accomplish is to encourage
+dnl people to try to use the avahi implementation, which does not work.
+dnl If you want to use Apple's own Bonjour code on another platform,
+dnl just add -ldns_sd to LIBS manually.
 fi
 
 # for contrib/uuid-ossp
