projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'collectd-4.10' into collectd-5.1
[collectd.git]
/
configure.in
diff --git
a/configure.in
b/configure.in
index
5e812a1
..
b75386d
100644
(file)
--- a/
configure.in
+++ b/
configure.in
@@
-582,7
+582,7
@@
AC_CACHE_CHECK([for strtok_r],
saveptr = NULL;
while ((token = strtok_r (dummy, ",", &saveptr)) != NULL)
{
saveptr = NULL;
while ((token = strtok_r (dummy, ",", &saveptr)) != NULL)
{
- dummy = NULL;
+
dummy = NULL;
printf ("token = %s;\n", token);
}
]]]
printf ("token = %s;\n", token);
}
]]]
@@
-615,7
+615,7
@@
then
saveptr = NULL;
while ((token = strtok_r (dummy, ",", &saveptr)) != NULL)
{
saveptr = NULL;
while ((token = strtok_r (dummy, ",", &saveptr)) != NULL)
{
- dummy = NULL;
+
dummy = NULL;
printf ("token = %s;\n", token);
}
]]]
printf ("token = %s;\n", token);
}
]]]
@@
-1983,31
+1983,31
@@
then
if test -d "$with_java_home"
then
AC_MSG_CHECKING([for jni.h])
if test -d "$with_java_home"
then
AC_MSG_CHECKING([for jni.h])
- TMP
DI
R=`find "$with_java_home" -name jni.h -type f -exec 'dirname' '{}' ';' | head -n 1`
- if test "x$TMP
DI
R" != "x"
+ TMP
VA
R=`find "$with_java_home" -name jni.h -type f -exec 'dirname' '{}' ';' | head -n 1`
+ if test "x$TMP
VA
R" != "x"
then
then
- AC_MSG_RESULT([found in $TMP
DI
R])
- JAVA_CPPFLAGS="$JAVA_CPPFLAGS -I$TMP
DI
R"
+ AC_MSG_RESULT([found in $TMP
VA
R])
+ JAVA_CPPFLAGS="$JAVA_CPPFLAGS -I$TMP
VA
R"
else
AC_MSG_RESULT([not found])
fi
AC_MSG_CHECKING([for jni_md.h])
else
AC_MSG_RESULT([not found])
fi
AC_MSG_CHECKING([for jni_md.h])
- TMP
DI
R=`find "$with_java_home" -name jni_md.h -type f -exec 'dirname' '{}' ';' | head -n 1`
- if test "x$TMP
DI
R" != "x"
+ TMP
VA
R=`find "$with_java_home" -name jni_md.h -type f -exec 'dirname' '{}' ';' | head -n 1`
+ if test "x$TMP
VA
R" != "x"
then
then
- AC_MSG_RESULT([found in $TMP
DI
R])
- JAVA_CPPFLAGS="$JAVA_CPPFLAGS -I$TMP
DI
R"
+ AC_MSG_RESULT([found in $TMP
VA
R])
+ JAVA_CPPFLAGS="$JAVA_CPPFLAGS -I$TMP
VA
R"
else
AC_MSG_RESULT([not found])
fi
AC_MSG_CHECKING([for libjvm.so])
else
AC_MSG_RESULT([not found])
fi
AC_MSG_CHECKING([for libjvm.so])
- TMP
DI
R=`find "$with_java_home" -name libjvm.so -type f -exec 'dirname' '{}' ';' | head -n 1`
- if test "x$TMP
DI
R" != "x"
+ TMP
VA
R=`find "$with_java_home" -name libjvm.so -type f -exec 'dirname' '{}' ';' | head -n 1`
+ if test "x$TMP
VA
R" != "x"
then
then
- AC_MSG_RESULT([found in $TMP
DI
R])
- JAVA_LDFLAGS="$JAVA_LDFLAGS -L$TMP
DIR -Wl,-rpath -Wl,$TMPDI
R"
+ AC_MSG_RESULT([found in $TMP
VA
R])
+ JAVA_LDFLAGS="$JAVA_LDFLAGS -L$TMP
VAR -Wl,-rpath -Wl,$TMPVA
R"
else
AC_MSG_RESULT([not found])
fi
else
AC_MSG_RESULT([not found])
fi
@@
-2015,10
+2015,10
@@
then
if test "x$JAVAC" = "x"
then
AC_MSG_CHECKING([for javac])
if test "x$JAVAC" = "x"
then
AC_MSG_CHECKING([for javac])
- TMP
DI
R=`find "$with_java_home" -name javac -type f | head -n 1`
- if test "x$TMP
DI
R" != "x"
+ TMP
VA
R=`find "$with_java_home" -name javac -type f | head -n 1`
+ if test "x$TMP
VA
R" != "x"
then
then
- JAVAC="$TMP
DI
R"
+ JAVAC="$TMP
VA
R"
AC_MSG_RESULT([$JAVAC])
else
AC_MSG_RESULT([not found])
AC_MSG_RESULT([$JAVAC])
else
AC_MSG_RESULT([not found])
@@
-2027,10
+2027,10
@@
then
if test "x$JAR" = "x"
then
AC_MSG_CHECKING([for jar])
if test "x$JAR" = "x"
then
AC_MSG_CHECKING([for jar])
- TMP
DI
R=`find "$with_java_home" -name jar -type f | head -n 1`
- if test "x$TMP
DI
R" != "x"
+ TMP
VA
R=`find "$with_java_home" -name jar -type f | head -n 1`
+ if test "x$TMP
VA
R" != "x"
then
then
- JAR="$TMP
DI
R"
+ JAR="$TMP
VA
R"
AC_MSG_RESULT([$JAR])
else
AC_MSG_RESULT([not found])
AC_MSG_RESULT([$JAR])
else
AC_MSG_RESULT([not found])