projects
/
m6w6
/
ext-ares
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
|
github
raw
|
patch
|
inline
| side by side (parent:
c6304a3
)
this should finally do it
author
Michael Wallner
<mike@php.net>
Thu, 8 Jan 2009 13:35:36 +0000
(13:35 +0000)
committer
Michael Wallner
<mike@php.net>
Thu, 8 Jan 2009 13:35:36 +0000
(13:35 +0000)
config.m4
patch
|
blob
|
history
diff --git
a/config.m4
b/config.m4
index 1b96e73f4b561bedae8cfb5b19c92e7fbc9ccdfb..77c2592e51c339ec207d5d011ce7851a3207eb4a 100644
(file)
--- a/
config.m4
+++ b/
config.m4
@@
-18,21
+18,27
@@
if test "$PHP_ARES" != "no"; then
AC_MSG_ERROR(could not find ares.h)
fi
AC_MSG_ERROR(could not find ares.h)
fi
- PHP_ADD_LIBRARY(rt, ARES_SHARED_LIBADD)
+ dnl ##########
+ dnl newer versions of libcares need -lrt
+ dnl ##########
+ PHP_ADD_LIBRARY(rt, 1, ARES_SHARED_LIBADD)
+
PHP_ARES_LIB=
PHP_CHECK_LIBRARY(cares, ares_init, [
PHP_ARES_LIB=cares
PHP_ARES_LIB=
PHP_CHECK_LIBRARY(cares, ares_init, [
PHP_ARES_LIB=cares
+ echo $LDFLAGS
], [
], [
+ echo $LDFLAGS
PHP_CHECK_LIBRARY(ares, ares_init, [
PHP_ARES_LIB=ares
], [
PHP_ARES_LIB=unknown
], [
PHP_CHECK_LIBRARY(ares, ares_init, [
PHP_ARES_LIB=ares
], [
PHP_ARES_LIB=unknown
], [
- -L$PHP_ARES_DIR/$PHP_LIBDIR
+ -
lrt -
L$PHP_ARES_DIR/$PHP_LIBDIR
]
)
], [
]
)
], [
- -L$PHP_ARES_DIR/$PHP_LIBDIR
+ -
lrt -
L$PHP_ARES_DIR/$PHP_LIBDIR
]
)
AC_MSG_CHECKING(for libares/libcares)
]
)
AC_MSG_CHECKING(for libares/libcares)
@@
-51,28
+57,28
@@
if test "$PHP_ARES" != "no"; then
PHP_CHECK_LIBRARY($PHP_ARES_LIB, ares_cancel,
[AC_DEFINE([HAVE_ARES_CANCEL], [1], [ ])], [ ],
PHP_CHECK_LIBRARY($PHP_ARES_LIB, ares_cancel,
[AC_DEFINE([HAVE_ARES_CANCEL], [1], [ ])], [ ],
- [-L$PHP_ARES_DIR/$PHP_LIBDIR]
+ [-
lrt -
L$PHP_ARES_DIR/$PHP_LIBDIR]
)
PHP_CHECK_LIBRARY($PHP_ARES_LIB, ares_getnameinfo,
[AC_DEFINE([HAVE_ARES_GETNAMEINFO], [1], [ ])], [ ],
)
PHP_CHECK_LIBRARY($PHP_ARES_LIB, ares_getnameinfo,
[AC_DEFINE([HAVE_ARES_GETNAMEINFO], [1], [ ])], [ ],
- [-L$PHP_ARES_DIR/$PHP_LIBDIR]
+ [-
lrt -
L$PHP_ARES_DIR/$PHP_LIBDIR]
)
PHP_CHECK_LIBRARY($PHP_ARES_LIB, ares_getsock,
[AC_DEFINE([HAVE_ARES_GETSOCK], [1], [ ])], [ ],
)
PHP_CHECK_LIBRARY($PHP_ARES_LIB, ares_getsock,
[AC_DEFINE([HAVE_ARES_GETSOCK], [1], [ ])], [ ],
- [-L$PHP_ARES_DIR/$PHP_LIBDIR]
+ [-
lrt -
L$PHP_ARES_DIR/$PHP_LIBDIR]
)
PHP_CHECK_LIBRARY($PHP_ARES_LIB, ares_version,
[AC_DEFINE([HAVE_ARES_VERSION], [1], [ ])], [ ],
)
PHP_CHECK_LIBRARY($PHP_ARES_LIB, ares_version,
[AC_DEFINE([HAVE_ARES_VERSION], [1], [ ])], [ ],
- [-L$PHP_ARES_DIR/$PHP_LIBDIR]
+ [-
lrt -
L$PHP_ARES_DIR/$PHP_LIBDIR]
)
)
-
- dnl check new c-ares API
-
+ dnl ##########
+ dnl check new c-ares
callback
API
+ dnl ##########
save_LIBS=$LIBS
save_CFLAGS=$CFLAGS
save_LIBS=$LIBS
save_CFLAGS=$CFLAGS
- L
IBS="-L $PHP_ARES_DIR/$PHP_LIBDIR -l $PHP_ARES_LIB
"
- CFLAGS="-I$PHP_ARES_DIR/include -
pedantic-errors
"
+ L
DFLIBS="-L$PHP_ARES_DIR/$PHP_LIBDIR -l$PHP_ARES_LIB -lrt
"
+ CFLAGS="-I$PHP_ARES_DIR/include -
Werror
"
AC_MSG_CHECKING(for new c-ares callback API)
AC_TRY_COMPILE(
AC_MSG_CHECKING(for new c-ares callback API)
AC_TRY_COMPILE(