lagertonne/nut
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Wiki Activity

Imported Upstream version 2.6.0

Browse source
This commit is contained in:
arnaud.quette@free.fr 2011-01-26 10:35:08 +01:00
parent 26fb71b504
commit 459aaf9392
510 changed files with 40508 additions and 18859 deletions
Download patch file Download diff file Expand all files Collapse all files

53
m4/nut_check_libneon.m4
View file

@ -1,5 +1,5 @@
dnl Check for LIBNEON compiler flags. On success, set nut_have_neon="yes"
dnl and set LIBNEON_CFLAGS and LIBNEON_LDFLAGS. On failure, set
dnl and set LIBNEON_CFLAGS and LIBNEON_LIBS. On failure, set
dnl nut_have_neon="no". This macro can be run multiple times, but will
dnl do the checking only once.
@ -8,30 +8,47 @@ AC_DEFUN([NUT_CHECK_LIBNEON],
if test -z "${nut_have_neon_seen}"; then
nut_have_neon_seen=yes
dnl save CFLAGS and LDFLAGS
dnl save CFLAGS and LIBS
CFLAGS_ORIG="${CFLAGS}"
LDFLAGS_ORIG="${LDFLAGS}"
LIBS_ORIG="${LIBS}"
dnl See which version of the neon library (if any) is installed
AC_MSG_CHECKING(for libneon version via pkg-config (0.25.0 minimum required))
NEON_VERSION=`pkg-config --silence-errors --modversion neon`
if test "$?" = "0"; then
AC_MSG_RESULT(${NEON_VERSION} found)
else
AC_MSG_RESULT(not found)
NEON_VERSION="`pkg-config --silence-errors --modversion neon 2>/dev/null`"
if test "$?" != "0" -o -z "${NEON_VERSION}"; then
NEON_VERSION="none"
fi
AC_MSG_RESULT(${NEON_VERSION} found)
AC_MSG_CHECKING(for libneon cflags)
AC_ARG_WITH(neon-includes, [
AC_HELP_STRING([--with-neon-includes=CFLAGS], [include flags for the neon library])
], [CFLAGS="${withval}"], [CFLAGS="`pkg-config --silence-errors --cflags neon`"])
AC_ARG_WITH(neon-includes,
AS_HELP_STRING([@<:@--with-neon-includes=CFLAGS@:>@], [include flags for the neon library]),
[
case "${withval}" in
yes|no)
AC_MSG_ERROR(invalid option --with(out)-neon-includes - see docs/configure.txt)
;;
*)
CFLAGS="${withval}"
;;
esac
], [CFLAGS="`pkg-config --silence-errors --cflags neon 2>/dev/null`"])
AC_MSG_RESULT([${CFLAGS}])
AC_MSG_CHECKING(for libneon ldflags)
AC_ARG_WITH(neon-libs, [
AC_HELP_STRING([--with-neon-libs=LDFLAGS], [linker flags for the neon library])
], [LDFLAGS="${withval}"], [LDFLAGS="`pkg-config --silence-errors --libs neon`"])
AC_MSG_RESULT([${LDFLAGS}])
AC_ARG_WITH(neon-libs,
AS_HELP_STRING([@<:@--with-neon-libs=LIBS@:>@], [linker flags for the neon library]),
[
case "${withval}" in
yes|no)
AC_MSG_ERROR(invalid option --with(out)-neon-libs - see docs/configure.txt)
;;
*)
LIBS="${withval}"
;;
esac
], [LIBS="`pkg-config --silence-errors --libs neon 2>/dev/null`"])
AC_MSG_RESULT([${LIBS}])
dnl check if neon is usable
AC_CHECK_HEADERS(ne_xmlreq.h, [nut_have_neon=yes], [nut_have_neon=no], [AC_INCLUDES_DEFAULT])
@ -41,11 +58,11 @@ if test -z "${nut_have_neon_seen}"; then
dnl Check for connect timeout support in library (optional)
AC_CHECK_FUNCS(ne_set_connect_timeout ne_sock_connect_timeout)
LIBNEON_CFLAGS="${CFLAGS}"
LIBNEON_LDFLAGS="${LDFLAGS}"
LIBNEON_LIBS="${LIBS}"
fi
dnl restore original CFLAGS and LDFLAGS
dnl restore original CFLAGS and LIBS
CFLAGS="${CFLAGS_ORIG}"
LDFLAGS="${LDFLAGS_ORIG}"
LIBS="${LIBS_ORIG}"
fi
])