projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #1023 from ciomaire/write_kafka_ldflags
[collectd.git]
/
configure.ac
diff --git
a/configure.ac
b/configure.ac
index
e6b3693
..
448bb4a
100644
(file)
--- a/
configure.ac
+++ b/
configure.ac
@@
-1190,6
+1190,7
@@
FILE *fh;
struct mntent *me;
fh = setmntent ("/etc/mtab", "r");
me = getmntent (fh);
struct mntent *me;
fh = setmntent ("/etc/mtab", "r");
me = getmntent (fh);
+return(me->mnt_passno);
]]]
)],
[c_cv_have_one_getmntent="yes"],
]]]
)],
[c_cv_have_one_getmntent="yes"],
@@
-1209,6
+1210,7
@@
me = getmntent (fh);
int status;
fh = fopen ("/etc/mnttab", "r");
status = getmntent (fh, &mt);
int status;
fh = fopen ("/etc/mnttab", "r");
status = getmntent (fh, &mt);
+ return(status);
]]]
)],
[c_cv_have_two_getmntent="yes"],
]]]
)],
[c_cv_have_two_getmntent="yes"],
@@
-2084,6
+2086,10
@@
fi
# --with-java {{{
with_java_home="$JAVA_HOME"
# --with-java {{{
with_java_home="$JAVA_HOME"
+if test "x$with_java_home" = "x"
+then
+ with_java_home="/usr/lib/jvm"
+fi
with_java_vmtype="client"
with_java_cflags=""
with_java_libs=""
with_java_vmtype="client"
with_java_cflags=""
with_java_libs=""
@@
-2108,7
+2114,7
@@
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])
- TMPVAR=`find "$with_java_home" -name jni.h -type f -exec 'dirname' '{}' ';' 2>/dev/null | head -n 1`
+ TMPVAR=`find
-L
"$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 $TMPVAR])
if test "x$TMPVAR" != "x"
then
AC_MSG_RESULT([found in $TMPVAR])
@@
-2118,7
+2124,7
@@
then
fi
AC_MSG_CHECKING([for jni_md.h])
fi
AC_MSG_CHECKING([for jni_md.h])
- TMPVAR=`find "$with_java_home" -name jni_md.h -type f -exec 'dirname' '{}' ';' 2>/dev/null | head -n 1`
+ TMPVAR=`find
-L
"$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 $TMPVAR])
if test "x$TMPVAR" != "x"
then
AC_MSG_RESULT([found in $TMPVAR])
@@
-2128,7
+2134,7
@@
then
fi
AC_MSG_CHECKING([for libjvm.so])
fi
AC_MSG_CHECKING([for libjvm.so])
- TMPVAR=`find "$with_java_home" -name libjvm.so -type f -exec 'dirname' '{}' ';' 2>/dev/null | head -n 1`
+ TMPVAR=`find
-L
"$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 $TMPVAR])
if test "x$TMPVAR" != "x"
then
AC_MSG_RESULT([found in $TMPVAR])
@@
-2140,7
+2146,7
@@
then
if test "x$JAVAC" = "x"
then
AC_MSG_CHECKING([for javac])
if test "x$JAVAC" = "x"
then
AC_MSG_CHECKING([for javac])
- TMPVAR=`find "$with_java_home" -name javac -type f 2>/dev/null | head -n 1`
+ TMPVAR=`find
-L
"$with_java_home" -name javac -type f 2>/dev/null | head -n 1`
if test "x$TMPVAR" != "x"
then
JAVAC="$TMPVAR"
if test "x$TMPVAR" != "x"
then
JAVAC="$TMPVAR"
@@
-2152,7
+2158,7
@@
then
if test "x$JAR" = "x"
then
AC_MSG_CHECKING([for jar])
if test "x$JAR" = "x"
then
AC_MSG_CHECKING([for jar])
- TMPVAR=`find "$with_java_home" -name jar -type f 2>/dev/null | head -n 1`
+ TMPVAR=`find
-L
"$with_java_home" -name jar -type f 2>/dev/null | head -n 1`
if test "x$TMPVAR" != "x"
then
JAR="$TMPVAR"
if test "x$TMPVAR" != "x"
then
JAR="$TMPVAR"
@@
-3172,6
+3178,7
@@
then
]]],
[[[
int val = PCAP_ERROR_IFACE_NOT_UP;
]]],
[[[
int val = PCAP_ERROR_IFACE_NOT_UP;
+ return(val);
]]]
)],
[c_cv_libpcap_have_pcap_error_iface_not_up="yes"],
]]]
)],
[c_cv_libpcap_have_pcap_error_iface_not_up="yes"],