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

Commit20d9ada

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 parent9b9cb3c commit20d9ada

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
@@ -11124,64 +11124,6 @@ else
1112411124
fi
1112511125

1112611126

11127-
{$as_echo"$as_me:${as_lineno-$LINENO}: checking for library containing DNSServiceRefSockFD">&5
11128-
$as_echo_n"checking for library containing DNSServiceRefSockFD...">&6; }
11129-
if${ac_cv_search_DNSServiceRefSockFD+:}false;then:
11130-
$as_echo_n"(cached)">&6
11131-
else
11132-
ac_func_search_save_LIBS=$LIBS
11133-
cat confdefs.h -<<_ACEOF >conftest.$ac_ext
11134-
/* end confdefs.h. */
11135-
11136-
/* Override any GCC internal prototype to avoid an error.
11137-
Use char because int might match the return type of a GCC
11138-
builtin and then its argument prototype would still apply. */
11139-
#ifdef __cplusplus
11140-
extern "C"
11141-
#endif
11142-
char DNSServiceRefSockFD ();
11143-
int
11144-
main ()
11145-
{
11146-
return DNSServiceRefSockFD ();
11147-
;
11148-
return 0;
11149-
}
11150-
_ACEOF
11151-
forac_libin'' dns_sd;do
11152-
iftest -z"$ac_lib";then
11153-
ac_res="none required"
11154-
else
11155-
ac_res=-l$ac_lib
11156-
LIBS="-l$ac_lib$ac_func_search_save_LIBS"
11157-
fi
11158-
if ac_fn_c_try_link"$LINENO";then:
11159-
ac_cv_search_DNSServiceRefSockFD=$ac_res
11160-
fi
11161-
rm -f core conftest.err conftest.$ac_objext \
11162-
conftest$ac_exeext
11163-
if${ac_cv_search_DNSServiceRefSockFD+:}false;then:
11164-
break
11165-
fi
11166-
done
11167-
if${ac_cv_search_DNSServiceRefSockFD+:}false;then:
11168-
11169-
else
11170-
ac_cv_search_DNSServiceRefSockFD=no
11171-
fi
11172-
rm conftest.$ac_ext
11173-
LIBS=$ac_func_search_save_LIBS
11174-
fi
11175-
{$as_echo"$as_me:${as_lineno-$LINENO}: result:$ac_cv_search_DNSServiceRefSockFD">&5
11176-
$as_echo"$ac_cv_search_DNSServiceRefSockFD">&6; }
11177-
ac_res=$ac_cv_search_DNSServiceRefSockFD
11178-
iftest"$ac_res"!= no;then:
11179-
test"$ac_res" ="none required"|| LIBS="$ac_res$LIBS"
11180-
11181-
else
11182-
as_fn_error$?"could not find function 'DNSServiceRefSockFD' required for Bonjour""$LINENO" 5
11183-
fi
11184-
1118511127
fi
1118611128

1118711129
# for contrib/uuid-ossp

‎configure.in

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

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

12691273
# for contrib/uuid-ossp

0 commit comments

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