configure.ac (c-ares-1.17.1) | : | configure.ac (c-ares-1.17.2) | ||
---|---|---|---|---|
AC_PREREQ(2.57) | AC_PREREQ(2.57) | |||
AC_INIT([c-ares], [1.17.1], | AC_INIT([c-ares], [1.17.2], | |||
[c-ares mailing list: http://cool.haxx.se/mailman/listinfo/c-ares]) | [c-ares mailing list: http://cool.haxx.se/mailman/listinfo/c-ares]) | |||
CARES_VERSION_INFO="6:2:4" | CARES_VERSION_INFO="6:3:4" | |||
dnl This flag accepts an argument of the form current[:revision[:age]]. So, | dnl This flag accepts an argument of the form current[:revision[:age]]. So, | |||
dnl passing -version-info 3:12:1 sets current to 3, revision to 12, and age to | dnl passing -version-info 3:12:1 sets current to 3, revision to 12, and age to | |||
dnl 1. | dnl 1. | |||
dnl | dnl | |||
dnl If either revision or age are omitted, they default to 0. Also note that age | dnl If either revision or age are omitted, they default to 0. Also note that age | |||
dnl must be less than or equal to the current interface number. | dnl must be less than or equal to the current interface number. | |||
dnl | dnl | |||
dnl Here are a set of rules to help you update your library version information: | dnl Here are a set of rules to help you update your library version information: | |||
dnl | dnl | |||
dnl 1.Start with version information of 0:0:0 for each libtool library. | dnl 1.Start with version information of 0:0:0 for each libtool library. | |||
skipping to change at line 386 | skipping to change at line 386 | |||
dnl resolv lib for Apple (MacOS and iOS) | dnl resolv lib for Apple (MacOS and iOS) | |||
AS_IF([test "x$host_vendor" = "xapple"], [ | AS_IF([test "x$host_vendor" = "xapple"], [ | |||
AC_SEARCH_LIBS([res_servicename], [resolv], [ | AC_SEARCH_LIBS([res_servicename], [resolv], [ | |||
AC_DEFINE([CARES_USE_LIBRESOLV], [1], [Use resolver library to configure car es]) | AC_DEFINE([CARES_USE_LIBRESOLV], [1], [Use resolver library to configure car es]) | |||
], [ | ], [ | |||
AC_MSG_ERROR([Unable to find libresolv which is required for iPhone targets] ) | AC_MSG_ERROR([Unable to find libresolv which is required for iPhone targets] ) | |||
]) | ]) | |||
]) | ]) | |||
dnl resolv lib for z/OS | ||||
AS_IF([test "x$host_vendor" = "xibm" -a "x$host_os" = "xopenedition" ], [ | ||||
AC_SEARCH_LIBS([res_init], [resolv], [ | ||||
AC_DEFINE([CARES_USE_LIBRESOLV], [1], [Use resolver library to configure car | ||||
es]) | ||||
], [ | ||||
AC_MSG_ERROR([Unable to find libresolv which is required for z/OS]) | ||||
]) | ||||
]) | ||||
dnl resolve lib? | dnl resolve lib? | |||
AC_CHECK_FUNC(strcasecmp, , [ AC_CHECK_LIB(resolve, strcasecmp) ]) | AC_CHECK_FUNC(strcasecmp, , [ AC_CHECK_LIB(resolve, strcasecmp) ]) | |||
if test "$ac_cv_lib_resolve_strcasecmp" = "$ac_cv_func_strcasecmp"; then | if test "$ac_cv_lib_resolve_strcasecmp" = "$ac_cv_func_strcasecmp"; then | |||
AC_CHECK_LIB(resolve, strcasecmp, | AC_CHECK_LIB(resolve, strcasecmp, | |||
[LIBS="-lresolve $LIBS"], | [LIBS="-lresolve $LIBS"], | |||
, | , | |||
-lnsl) | -lnsl) | |||
fi | fi | |||
ac_cv_func_strcasecmp="no" | ac_cv_func_strcasecmp="no" | |||
skipping to change at line 833 | skipping to change at line 842 | |||
[AC_DEFINE(ARES_BIG_ENDIAN, 1, | [AC_DEFINE(ARES_BIG_ENDIAN, 1, | |||
[define this if ares is built for a big endian system])], | [define this if ares is built for a big endian system])], | |||
, | , | |||
[AC_MSG_WARN([couldn't figure out endianess, assuming little endian!])] | [AC_MSG_WARN([couldn't figure out endianess, assuming little endian!])] | |||
) | ) | |||
dnl Check for user-specified random device | dnl Check for user-specified random device | |||
AC_ARG_WITH(random, | AC_ARG_WITH(random, | |||
AC_HELP_STRING([--with-random=FILE], | AC_HELP_STRING([--with-random=FILE], | |||
[read randomness from FILE (default=/dev/urandom)]), | [read randomness from FILE (default=/dev/urandom)]), | |||
[ RANDOM_FILE="$withval" ], | [ CARES_RANDOM_FILE="$withval" ], | |||
[ | [ | |||
dnl Check for random device. If we're cross compiling, we can't | dnl Check for random device. If we're cross compiling, we can't | |||
dnl check, and it's better to assume it doesn't exist than it is | dnl check, and it's better to assume it doesn't exist than it is | |||
dnl to fail on AC_CHECK_FILE or later. | dnl to fail on AC_CHECK_FILE or later. | |||
if test "$cross_compiling" = "no"; then | if test "$cross_compiling" = "no"; then | |||
AC_CHECK_FILE("/dev/urandom", [ RANDOM_FILE="/dev/urandom"] ) | AC_CHECK_FILE("/dev/urandom", [ CARES_RANDOM_FILE="/dev/urandom"] ) | |||
else | else | |||
AC_MSG_WARN([cannot check for /dev/urandom while cross compiling; assu ming none]) | AC_MSG_WARN([cannot check for /dev/urandom while cross compiling; assu ming none]) | |||
fi | fi | |||
] | ] | |||
) | ) | |||
if test -n "$RANDOM_FILE" && test X"$RANDOM_FILE" != Xno ; then | if test -n "$CARES_RANDOM_FILE" && test X"$CARES_RANDOM_FILE" != Xno ; then | |||
AC_SUBST(RANDOM_FILE) | AC_SUBST(CARES_RANDOM_FILE) | |||
AC_DEFINE_UNQUOTED(RANDOM_FILE, "$RANDOM_FILE", | AC_DEFINE_UNQUOTED(CARES_RANDOM_FILE, "$CARES_RANDOM_FILE", | |||
[a suitable file/device to read random data from]) | [a suitable file/device to read random data from]) | |||
fi | fi | |||
CARES_CHECK_OPTION_NONBLOCKING | CARES_CHECK_OPTION_NONBLOCKING | |||
CARES_CHECK_NONBLOCKING_SOCKET | CARES_CHECK_NONBLOCKING_SOCKET | |||
CARES_CONFIGURE_SYMBOL_HIDING | CARES_CONFIGURE_SYMBOL_HIDING | |||
CARES_PRIVATE_LIBS="$LIBS" | CARES_PRIVATE_LIBS="$LIBS" | |||
AC_SUBST(CARES_PRIVATE_LIBS) | AC_SUBST(CARES_PRIVATE_LIBS) | |||
End of changes. 6 change blocks. | ||||
7 lines changed or deleted | 17 lines changed or added |