diff --git a/configure.in b/configure.in
index 16ffe1ad71d433eb7aa939a4d3a155adccace7db..54d38d5882d3bc1c666c7f0e1d134b2fbb4f7ae4 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -770,7 +770,7 @@ AC_ARG_WITH(libcurl, [AS_HELP_STRING([--with-libcurl@<:@=PREFIX@:>@], [Path to l
then
with_libcurl="yes"
else
then
with_libcurl="yes"
else
- if test -x "$withval"
+ if test -f "$withval" && test -x "$withval"
then
with_curl_config="$withval"
with_libcurl="yes"
then
with_curl_config="$withval"
with_libcurl="yes"
@@ -779,6 +779,7 @@ AC_ARG_WITH(libcurl, [AS_HELP_STRING([--with-libcurl@<:@=PREFIX@:>@], [Path to l
with_curl_config="$withval/bin/curl-config"
with_libcurl="yes"
fi; fi
with_curl_config="$withval/bin/curl-config"
with_libcurl="yes"
fi; fi
+ with_libcurl="yes"
fi; fi
],
[
fi; fi
],
[
@@ -944,13 +945,14 @@ AC_ARG_WITH(libmysql, [AS_HELP_STRING([--with-libmysql@<:@=PREFIX@:>@], [Path to
then
with_libmysql="yes"
else
then
with_libmysql="yes"
else
- if test -x "$withval";
+ if test -f "$withval" && test -x "$withval";
then
with_mysql_config="$withval"
else if test -x "$withval/bin/mysql_config"
then
with_mysql_config="$withval/bin/mysql_config"
fi; fi
then
with_mysql_config="$withval"
else if test -x "$withval/bin/mysql_config"
then
with_mysql_config="$withval/bin/mysql_config"
fi; fi
+ with_libmysql="yes"
fi; fi
],
[
fi; fi
],
[
@@ -1250,7 +1252,7 @@ AC_ARG_WITH(libnetsnmp, [AS_HELP_STRING([--with-libnetsnmp@<:@=PREFIX@:>@], [Pat
[with_libnetsnmp="yes"])
if test "x$with_libnetsnmp" = "xyes"
then
[with_libnetsnmp="yes"])
if test "x$with_libnetsnmp" = "xyes"
then
- with_snmp_cflags=`$with_snmp_config --cflags >/dev/null`
+ with_snmp_cflags=`$with_snmp_config --cflags 2>/dev/null`
snmp_config_status=$?
if test $snmp_config_status -ne 0
snmp_config_status=$?
if test $snmp_config_status -ne 0
fi
if test "x$with_libnetsnmp" = "xyes"
then
fi
if test "x$with_libnetsnmp" = "xyes"
then
- with_snmp_libs=`$with_snmp_config --libs >/dev/null`
+ with_snmp_libs=`$with_snmp_config --libs 2>/dev/null`
snmp_config_status=$?
if test $snmp_config_status -ne 0
snmp_config_status=$?
if test $snmp_config_status -ne 0
[$with_snmp_libs])
fi
fi
[$with_snmp_libs])
fi
fi
-if test "x$with_libsnmp" = "xyes"
+if test "x$with_libnetsnmp" = "xyes"
then
BUILD_WITH_LIBSNMP_CFLAGS="$with_snmp_cflags"
BUILD_WITH_LIBSNMP_LIBS="$with_snmp_libs"
then
BUILD_WITH_LIBSNMP_CFLAGS="$with_snmp_cflags"
BUILD_WITH_LIBSNMP_LIBS="$with_snmp_libs"
@@ -1298,16 +1300,16 @@ AC_ARG_WITH(libupsclient, [AS_HELP_STRING([--with-libupsclient@<:@=PREFIX@:>@],
then
with_libupsclient="no"
else
then
with_libupsclient="no"
else
- with_libupsclient="yes"
if test "x$withval" != "xyes"
then
if test "x$withval" != "xyes"
then
- if test -x "$withval"
+ if test -f "$withval" && test -x "$withval";
then
with_upsclient_config="$withval"
else
with_upsclient_config="$withval/bin/libupsclient-config"
fi
fi
then
with_upsclient_config="$withval"
else
with_upsclient_config="$withval/bin/libupsclient-config"
fi
fi
+ with_libupsclient="yes"
fi
],
[
fi
],
[
@@ -1372,17 +1374,20 @@ AC_ARG_WITH(libxmms, [AS_HELP_STRING([--with-libxmms@<:@=PREFIX@:>@], [Path to l
[
if test "x$withval" != "xno" -a "x$withval" != "xyes"
then
[
if test "x$withval" != "xno" -a "x$withval" != "xyes"
then
- if test -x "$withval/bin/xmms-config"
+ if test -f "$withval" && test -x "$withval";
+ then
+ with_xmms_config="$withval"
+ else if test -x "$withval/bin/xmms-config"
then
with_xmms_config="$withval/bin/xmms-config"
then
with_xmms_config="$withval/bin/xmms-config"
- fi
- fi
- if test "x$withval" = "xno"
+ fi; fi
+ with_libxmms="yes"
+ else if test "x$withval" = "xno"
then
with_libxmms="no"
else
with_libxmms="yes"
then
with_libxmms="no"
else
with_libxmms="yes"
- fi
+ fi; fi
],
[
with_libxmms="yes"
],
[
with_libxmms="yes"