From: Florian Forster <octo@collectd.org>
Date: Sun, 7 Apr 2013 03:54:24 +0000 (+0200)
Subject: Merge branch 'collectd-5.1' into collectd-5.2
X-Git-Tag: collectd-5.2.2~3
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=5efcb2fe5ca723225e4100314a8668d8abc9424a;p=collectd.git

Merge branch 'collectd-5.1' into collectd-5.2

Conflicts:
	configure.in
---

5efcb2fe5ca723225e4100314a8668d8abc9424a
diff --cc configure.in
index a20a25f4,b75386d0..7212f02f
--- a/configure.in
+++ b/configure.in
@@@ -1999,31 -1983,31 +1999,31 @@@ the
  	if test -d "$with_java_home"
  	then
  		AC_MSG_CHECKING([for jni.h])
- 		TMPDIR=`find "$with_java_home" -name jni.h -type f -exec 'dirname' '{}' ';' 2>/dev/null | head -n 1`
- 		if test "x$TMPDIR" != "x"
 -		TMPVAR=`find "$with_java_home" -name jni.h -type f -exec 'dirname' '{}' ';' | head -n 1`
++		TMPVAR=`find "$with_java_home" -name jni.h -type f -exec 'dirname' '{}' ';' 2>/dev/null | head -n 1`
+ 		if test "x$TMPVAR" != "x"
  		then
- 			AC_MSG_RESULT([found in $TMPDIR])
- 			JAVA_CPPFLAGS="$JAVA_CPPFLAGS -I$TMPDIR"
+ 			AC_MSG_RESULT([found in $TMPVAR])
+ 			JAVA_CPPFLAGS="$JAVA_CPPFLAGS -I$TMPVAR"
  		else
  			AC_MSG_RESULT([not found])
  		fi
  
  		AC_MSG_CHECKING([for jni_md.h])
- 		TMPDIR=`find "$with_java_home" -name jni_md.h -type f -exec 'dirname' '{}' ';' 2>/dev/null | head -n 1`
- 		if test "x$TMPDIR" != "x"
 -		TMPVAR=`find "$with_java_home" -name jni_md.h -type f -exec 'dirname' '{}' ';' | head -n 1`
++		TMPVAR=`find "$with_java_home" -name jni_md.h -type f -exec 'dirname' '{}' ';' 2>/dev/null | head -n 1`
+ 		if test "x$TMPVAR" != "x"
  		then
- 			AC_MSG_RESULT([found in $TMPDIR])
- 			JAVA_CPPFLAGS="$JAVA_CPPFLAGS -I$TMPDIR"
+ 			AC_MSG_RESULT([found in $TMPVAR])
+ 			JAVA_CPPFLAGS="$JAVA_CPPFLAGS -I$TMPVAR"
  		else
  			AC_MSG_RESULT([not found])
  		fi
  
  		AC_MSG_CHECKING([for libjvm.so])
- 		TMPDIR=`find "$with_java_home" -name libjvm.so -type f -exec 'dirname' '{}' ';' 2>/dev/null | head -n 1`
- 		if test "x$TMPDIR" != "x"
 -		TMPVAR=`find "$with_java_home" -name libjvm.so -type f -exec 'dirname' '{}' ';' | head -n 1`
++		TMPVAR=`find "$with_java_home" -name libjvm.so -type f -exec 'dirname' '{}' ';' 2>/dev/null | head -n 1`
+ 		if test "x$TMPVAR" != "x"
  		then
- 			AC_MSG_RESULT([found in $TMPDIR])
- 			JAVA_LDFLAGS="$JAVA_LDFLAGS -L$TMPDIR -Wl,-rpath -Wl,$TMPDIR"
+ 			AC_MSG_RESULT([found in $TMPVAR])
+ 			JAVA_LDFLAGS="$JAVA_LDFLAGS -L$TMPVAR -Wl,-rpath -Wl,$TMPVAR"
  		else
  			AC_MSG_RESULT([not found])
  		fi
@@@ -2031,10 -2015,10 +2031,10 @@@
  		if test "x$JAVAC" = "x"
  		then
  			AC_MSG_CHECKING([for javac])
- 			TMPDIR=`find "$with_java_home" -name javac -type f 2>/dev/null | head -n 1`
- 			if test "x$TMPDIR" != "x"
 -			TMPVAR=`find "$with_java_home" -name javac -type f | head -n 1`
++			TMPVAR=`find "$with_java_home" -name javac -type f 2>/dev/null | head -n 1`
+ 			if test "x$TMPVAR" != "x"
  			then
- 				JAVAC="$TMPDIR"
+ 				JAVAC="$TMPVAR"
  				AC_MSG_RESULT([$JAVAC])
  			else
  				AC_MSG_RESULT([not found])
@@@ -2043,10 -2027,10 +2043,10 @@@
  		if test "x$JAR" = "x"
  		then
  			AC_MSG_CHECKING([for jar])
- 			TMPDIR=`find "$with_java_home" -name jar -type f 2>/dev/null | head -n 1`
- 			if test "x$TMPDIR" != "x"
 -			TMPVAR=`find "$with_java_home" -name jar -type f | head -n 1`
++			TMPVAR=`find "$with_java_home" -name jar -type f 2>/dev/null | head -n 1`
+ 			if test "x$TMPVAR" != "x"
  			then
- 				JAR="$TMPDIR"
+ 				JAR="$TMPVAR"
  				AC_MSG_RESULT([$JAR])
  			else
  				AC_MSG_RESULT([not found])