projects
/
rrdtool.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
no infinite line width please
[rrdtool.git]
/
acinclude.m4
diff --git
a/acinclude.m4
b/acinclude.m4
index
329501d
..
7d7cc9e
100644
(file)
--- a/
acinclude.m4
+++ b/
acinclude.m4
@@
-9,8
+9,8
@@
dnl if this check fails set the environment variable EX_CHECK_ALL_ERR to YES
dnl and prints out a helful message
dnl
dnl
dnl and prints out a helful message
dnl
dnl
-dnl EX_CHECK_ALL(library, function, header, pkgconf name, tested-version, homepage)
-dnl $1 $2 $3 $4 $5 $6
+dnl EX_CHECK_ALL(library, function, header, pkgconf name, tested-version, homepage
, cppflags
)
+dnl $1 $2 $3 $4 $5 $6
$7
dnl
dnl
AC_DEFUN([EX_CHECK_ALL],
dnl
dnl
AC_DEFUN([EX_CHECK_ALL],
@@
-20,6
+20,9
@@
AC_DEFUN([EX_CHECK_ALL],
ex_check_save_LIBS=${LIBS}
ex_check_save_CPPFLAGS=${CPPFLAGS}
ex_check_save_LDFLAGS=${LDPFLAGS}
ex_check_save_LIBS=${LIBS}
ex_check_save_CPPFLAGS=${CPPFLAGS}
ex_check_save_LDFLAGS=${LDPFLAGS}
+ if test "x$7" != "x"; then
+ CPPFLAGS="-I$7 $CPPFLAGS"
+ fi
dnl try compiling naked first
AC_CHECK_LIB($1,$2, [
AC_CHECK_HEADER($3,[LIBS="-l$1 ${LIBS}";EX_CHECK_STATE=YES],[])],[])
dnl try compiling naked first
AC_CHECK_LIB($1,$2, [
AC_CHECK_HEADER($3,[LIBS="-l$1 ${LIBS}";EX_CHECK_STATE=YES],[])],[])
@@
-77,6
+80,7
@@
AC_DEFUN([EX_CHECK_ALL],
AC_LANG_POP(C)
]
)
AC_LANG_POP(C)
]
)
+
dnl
dnl Ptherad check from http://autoconf-archive.cryp.to/acx_pthread.m4
dnl
dnl
dnl Ptherad check from http://autoconf-archive.cryp.to/acx_pthread.m4
dnl
@@
-240,11
+244,9
@@
for flag in $acx_pthread_flags; do
# pthread_cleanup_push because it is one of the few pthread
# functions on Solaris that doesn't have a non-functional libc stub.
# We try pthread_create on general principles.
# pthread_cleanup_push because it is one of the few pthread
# functions on Solaris that doesn't have a non-functional libc stub.
# We try pthread_create on general principles.
- AC_TRY_LINK([#include <pthread.h>],
- [pthread_t th; pthread_join(th, 0);
+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <pthread.h>]], [[pthread_t th; pthread_join(th, 0);
pthread_attr_init(0); pthread_cleanup_push(0, 0);
pthread_attr_init(0); pthread_cleanup_push(0, 0);
- pthread_create(0,0,0,0); pthread_cleanup_pop(0); ],
- [acx_pthread_ok=yes])
+ pthread_create(0,0,0,0); pthread_cleanup_pop(0); ]])],[acx_pthread_ok=yes],[])
LIBS="$save_LIBS"
CFLAGS="$save_CFLAGS"
LIBS="$save_LIBS"
CFLAGS="$save_CFLAGS"
@@
-270,8
+272,7
@@
if test "x$acx_pthread_ok" = xyes; then
AC_MSG_CHECKING([for joinable pthread attribute])
attr_name=unknown
for attr in PTHREAD_CREATE_JOINABLE PTHREAD_CREATE_UNDETACHED; do
AC_MSG_CHECKING([for joinable pthread attribute])
attr_name=unknown
for attr in PTHREAD_CREATE_JOINABLE PTHREAD_CREATE_UNDETACHED; do
- AC_TRY_LINK([#include <pthread.h>], [int attr=$attr;],
- [attr_name=$attr; break])
+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <pthread.h>]], [[int attr=$attr;]])],[attr_name=$attr; break],[])
done
AC_MSG_RESULT($attr_name)
if test "$attr_name" != PTHREAD_CREATE_JOINABLE; then
done
AC_MSG_RESULT($attr_name)
if test "$attr_name" != PTHREAD_CREATE_JOINABLE; then
@@
-281,14
+282,14
@@
if test "x$acx_pthread_ok" = xyes; then
fi
AC_MSG_CHECKING([if more special flags are required for pthreads])
fi
AC_MSG_CHECKING([if more special flags are required for pthreads])
- flag=no
+
x_r
flag=no
case "${host_cpu}-${host_os}" in
case "${host_cpu}-${host_os}" in
- *-aix* | *-freebsd* | *-darwin*) flag="-D_THREAD_SAFE";;
- *solaris* | *-osf* | *-hpux*) flag="-D_REENTRANT";;
+ *-aix* | *-freebsd* | *-darwin*)
x_r
flag="-D_THREAD_SAFE";;
+ *solaris* | *-osf* | *-hpux*)
x_r
flag="-D_REENTRANT";;
esac
esac
- AC_MSG_RESULT(${flag})
- if test "x$flag" != xno; then
- PTHREAD_CFLAGS="$flag $PTHREAD_CFLAGS"
+ AC_MSG_RESULT(${
x_r
flag})
+ if test "x$
x_r
flag" != xno; then
+ PTHREAD_CFLAGS="$
x_r
flag $PTHREAD_CFLAGS"
fi
LIBS="$save_LIBS"
fi
LIBS="$save_LIBS"
@@
-322,6
+323,9
@@
dnl AC_IEEE(MESSAGE, set rd_cv_ieee_[var] variable, INCLUDES,
dnl FUNCTION-BODY, [ACTION-IF-FOUND [,ACTION-IF-NOT-FOUND]])
dnl
dnl FUNCTION-BODY, [ACTION-IF-FOUND [,ACTION-IF-NOT-FOUND]])
dnl
+dnl substitute them in all the files listed in AC_OUTPUT
+AC_SUBST(PERLFLAGS)
+
AC_DEFUN([AC_IEEE], [
AC_MSG_CHECKING([if IEEE math works $1])
AC_CACHE_VAL([rd_cv_ieee_$2],
AC_DEFUN([AC_IEEE], [
AC_MSG_CHECKING([if IEEE math works $1])
AC_CACHE_VAL([rd_cv_ieee_$2],