X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=configure.in;h=982ae877d9895d778be183fbdce121fd8b0b9bad;hb=6ef3385ccec835c7efae1ff3d5895858003a6da7;hp=4f96b15054f77fb60445ea84d1b9ec4682b8c09e;hpb=912c9b3f7c4a57fbf9ddd16db13d2651932ddb65;p=collectd.git

diff --git a/configure.in b/configure.in
index 4f96b150..982ae877 100644
--- a/configure.in
+++ b/configure.in
@@ -598,7 +598,7 @@ AC_CACHE_CHECK([for strtok_r],
       saveptr = NULL;
       while ((token = strtok_r (dummy, ",", &saveptr)) != NULL)
       {
-	dummy = NULL;
+        dummy = NULL;
         printf ("token = %s;\n", token);
       }
 ]]]
@@ -631,7 +631,7 @@ then
         saveptr = NULL;
         while ((token = strtok_r (dummy, ",", &saveptr)) != NULL)
         {
-	  dummy = NULL;
+          dummy = NULL;
           printf ("token = %s;\n", token);
         }
 ]]]
@@ -1999,31 +1999,31 @@ then
 	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' '{}' ';' 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' '{}' ';' 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' '{}' ';' 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 +2031,10 @@ then
 		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 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 +2043,10 @@ then
 		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 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])
@@ -5084,6 +5084,7 @@ then
 fi
 
 dnl Perl bindings
+PERL_BINDINGS_OPTIONS="PREFIX=${prefix}"
 AC_ARG_WITH(perl-bindings, [AS_HELP_STRING([--with-perl-bindings@<:@=OPTIONS@:>@], [Options passed to "perl Makefile.PL".])],
 [
 	if test "x$withval" != "xno" && test "x$withval" != "xyes"
@@ -5091,12 +5092,10 @@ AC_ARG_WITH(perl-bindings, [AS_HELP_STRING([--with-perl-bindings@<:@=OPTIONS@:>@
 		PERL_BINDINGS_OPTIONS="$withval"
 		with_perl_bindings="yes"
 	else
-		PERL_BINDINGS_OPTIONS=""
 		with_perl_bindings="$withval"
 	fi
 ],
 [
-	PERL_BINDINGS_OPTIONS=""
 	if test -n "$perl_interpreter"
 	then
 		with_perl_bindings="yes"
@@ -5248,7 +5247,7 @@ Configuration:
     libvirt . . . . . . . $enable_libvirt
     load  . . . . . . . . $enable_load
     logfile . . . . . . . $enable_logfile
-    lpar... . . . . . . . $enable_lpar
+    lpar  . . . . . . . . $enable_lpar
     madwifi . . . . . . . $enable_madwifi
     match_empty_counter . $enable_match_empty_counter
     match_hashed  . . . . $enable_match_hashed