diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2006-04-24 18:00:46 +0000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2006-04-24 18:00:46 +0000 |
| commit | 8c3d2dbc934a65768d030539d083e2da6fdecbad (patch) | |
| tree | 2b347df1c819030ee2a55729597832c89b01de88 | |
| parent | 008377b0b93165f9f4e9c4de249e327eeb956463 (diff) | |
| download | samba-8c3d2dbc934a65768d030539d083e2da6fdecbad.tar.gz samba-8c3d2dbc934a65768d030539d083e2da6fdecbad.tar.xz samba-8c3d2dbc934a65768d030539d083e2da6fdecbad.zip | |
r15219: Look for gai_strerror in more places, so we don't conflict with the
system library.
This might help the build on proprietory unixes
Andrew Bartlett
| -rw-r--r-- | source/heimdal_build/config.m4 | 22 | ||||
| -rw-r--r-- | source/heimdal_build/config.mk | 2 |
2 files changed, 17 insertions, 7 deletions
diff --git a/source/heimdal_build/config.m4 b/source/heimdal_build/config.m4 index 92e38e42c25..4a3ad4d9474 100644 --- a/source/heimdal_build/config.m4 +++ b/source/heimdal_build/config.m4 @@ -239,15 +239,25 @@ fi # only add gai_strerror if needed SMB_ENABLE(HEIMDAL_ROKEN_GAI_STRERROR, NO) AC_CHECK_FUNC(gai_strerror) + if test t$ac_cv_func_gai_strerror != tyes; then - AC_SEARCH_LIBS_EXT(gai_strerror, [xnet], XNET_LIBS) - AC_CHECK_FUNC_EXT(gai_strerror, $XNET_LIBS) - if test t$ac_cv_func_ext_gai_strerror != tyes; then - SMB_ENABLE(HEIMDAL_ROKEN_GAI_STRERROR, YES) + AC_CHECK_LIB_EXT(nsl, GAI_LIBS, gai_strerror) + AC_CHECK_LIB_EXT(socket, GAI_LIBS, gai_strerror) + AC_CHECK_LIB_EXT(xnet, GAI_LIBS, gai_strerror) + + dnl We can't just call AC_CHECK_FUNCS(gai_strerror) here, because the value + dnl has been cached. + if test x"$ac_cv_lib_ext_nsl_gai_strerror" = x"yes" || + test x"$ac_cv_lib_ext_socket_gai_strerror" = x"yes" || + test x"$ac_cv_lib_ext_xnet_gai_strerror" = x"yes"; then + AC_DEFINE(HAVE_GAI_STRERROR,1,[Whether the system has gai_strerror()]) + SMB_EXT_LIB_ENABLE(GAI, YES) else - AC_DEFINE(HAVE_GAI_STRERROR,1,[Whether gai_strerror() is available]) + SMB_ENABLE(HEIMDAL_ROKEN_GAI_STRERROR, YES) fi + else AC_DEFINE(HAVE_GAI_STRERROR,1,[Whether gai_strerror() is available]) fi -SMB_EXT_LIB(XNET,[${XNET_LIBS}],[${XNET_CFLAGS}],[${XNET_CPPFLAGS}],[${XNET_LDFLAGS}]) + +SMB_EXT_LIB(GAI,[${GAI_LIBS}],[${GAI_CFLAGS}],[${GAI_CPPFLAGS}],[${GAI_LDFLAGS}]) diff --git a/source/heimdal_build/config.mk b/source/heimdal_build/config.mk index 5a13fd488a3..f38194ff27b 100644 --- a/source/heimdal_build/config.mk +++ b/source/heimdal_build/config.mk @@ -342,7 +342,7 @@ PUBLIC_DEPENDENCIES = \ HEIMDAL_ROKEN_ADDRINFO \ HEIMDAL_ROKEN_GAI_STRERROR \ HEIMDAL_ROKEN_INET_ATON \ - EXT_LIB_XNET + EXT_LIB_GAI # End SUBSYSTEM HEIMDAL_ROKEN ####################### |