Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit28d177e

Browse files
committed
Revert "Allow --with-bonjour to work with non-macOS implementations of Bonjour."
Upon further review, our Bonjour code doesn't actually work with theAvahi not-too-compatible compatibility library. While you can get itto work on non-macOS platforms if you link to Apple's own mDNSRespondercode, there don't seem to be many people who care about that. Leaving inthe AC_SEARCH_LIBS call seems more likely to encourage people to buildbroken 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
1 parent08d440b commit28d177e

File tree

2 files changed

+6
-60
lines changed

2 files changed

+6
-60
lines changed

‎configure

Lines changed: 0 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -10736,64 +10736,6 @@ else
1073610736
fi
1073710737

1073810738

10739-
{$as_echo"$as_me:${as_lineno-$LINENO}: checking for library containing DNSServiceRefSockFD">&5
10740-
$as_echo_n"checking for library containing DNSServiceRefSockFD...">&6; }
10741-
if${ac_cv_search_DNSServiceRefSockFD+:}false;then:
10742-
$as_echo_n"(cached)">&6
10743-
else
10744-
ac_func_search_save_LIBS=$LIBS
10745-
cat confdefs.h -<<_ACEOF >conftest.$ac_ext
10746-
/* end confdefs.h. */
10747-
10748-
/* Override any GCC internal prototype to avoid an error.
10749-
Use char because int might match the return type of a GCC
10750-
builtin and then its argument prototype would still apply. */
10751-
#ifdef __cplusplus
10752-
extern "C"
10753-
#endif
10754-
char DNSServiceRefSockFD ();
10755-
int
10756-
main ()
10757-
{
10758-
return DNSServiceRefSockFD ();
10759-
;
10760-
return 0;
10761-
}
10762-
_ACEOF
10763-
forac_libin'' dns_sd;do
10764-
iftest -z"$ac_lib";then
10765-
ac_res="none required"
10766-
else
10767-
ac_res=-l$ac_lib
10768-
LIBS="-l$ac_lib$ac_func_search_save_LIBS"
10769-
fi
10770-
if ac_fn_c_try_link"$LINENO";then:
10771-
ac_cv_search_DNSServiceRefSockFD=$ac_res
10772-
fi
10773-
rm -f core conftest.err conftest.$ac_objext \
10774-
conftest$ac_exeext
10775-
if${ac_cv_search_DNSServiceRefSockFD+:}false;then:
10776-
break
10777-
fi
10778-
done
10779-
if${ac_cv_search_DNSServiceRefSockFD+:}false;then:
10780-
10781-
else
10782-
ac_cv_search_DNSServiceRefSockFD=no
10783-
fi
10784-
rm conftest.$ac_ext
10785-
LIBS=$ac_func_search_save_LIBS
10786-
fi
10787-
{$as_echo"$as_me:${as_lineno-$LINENO}: result:$ac_cv_search_DNSServiceRefSockFD">&5
10788-
$as_echo"$ac_cv_search_DNSServiceRefSockFD">&6; }
10789-
ac_res=$ac_cv_search_DNSServiceRefSockFD
10790-
iftest"$ac_res"!= no;then:
10791-
test"$ac_res" ="none required"|| LIBS="$ac_res$LIBS"
10792-
10793-
else
10794-
as_fn_error$?"could not find function 'DNSServiceRefSockFD' required for Bonjour""$LINENO" 5
10795-
fi
10796-
1079710739
fi
1079810740

1079910741
# for contrib/uuid-ossp

‎configure.in

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1322,8 +1322,12 @@ fi
13221322

13231323
if test "$with_bonjour" = yes ; then
13241324
AC_CHECK_HEADER(dns_sd.h, [], [AC_MSG_ERROR([header file <dns_sd.h> is required for Bonjour])])
1325-
AC_SEARCH_LIBS(DNSServiceRefSockFD, dns_sd, [],
1326-
[AC_MSG_ERROR([could not find function 'DNSServiceRefSockFD' required for Bonjour])])
1325+
dnl At some point we might add something like
1326+
dnl AC_SEARCH_LIBS(DNSServiceRegister, dns_sd)
1327+
dnl but right now, what that would mainly accomplish is to encourage
1328+
dnl people to try to use the avahi implementation, which does not work.
1329+
dnl If you want to use Apple's own Bonjour code on another platform,
1330+
dnl just add -ldns_sd to LIBS manually.
13271331
fi
13281332

13291333
# for contrib/uuid-ossp

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp