Imported Upstream version 2.6.5

This commit is contained in:
Laurent Bigonville 2012-08-12 23:39:31 +02:00
parent fefe62b2bd
commit a1fa151fc7
201 changed files with 7974 additions and 709 deletions

View file

@ -71,6 +71,10 @@ if test -z "${nut_have_libfreeipmi_seen}"; then
AC_SEARCH_LIBS([ipmi_monitoring_init], [ipmimonitoring], [nut_have_freeipmi_monitoring=yes], [nut_have_freeipmi_monitoring=no])
AC_SEARCH_LIBS([ipmi_monitoring_sensor_read_record_id], [ipmimonitoring], [], [nut_have_freeipmi_monitoring=no])
dnl Check for FreeIPMI 1.1.X / 1.2.X which implies API changes!
AC_SEARCH_LIBS([ipmi_sdr_cache_ctx_destroy], [freeipmi], [nut_have_freeipmi_11x_12x=no], [])
AC_SEARCH_LIBS([ipmi_sdr_ctx_destroy], [freeipmi], [nut_have_freeipmi_11x_12x=yes], [nut_have_freeipmi_11x_12x=no])
if test "${nut_have_freeipmi}" = "yes"; then
nut_with_ipmi="yes"
nut_ipmi_lib="(FreeIPMI)"
@ -80,6 +84,10 @@ if test -z "${nut_have_libfreeipmi_seen}"; then
LIBIPMI_LIBS="${LIBS}"
fi
if test "${nut_have_freeipmi_11x_12x}" = "yes"; then
AC_DEFINE(HAVE_FREEIPMI_11X_12X, 1, [Define if FreeIPMI 1.1.X / 1.2.X support is available])
fi
if test "${nut_have_freeipmi_monitoring}" = "yes"; then
AC_DEFINE(HAVE_FREEIPMI_MONITORING, 1, [Define if FreeIPMI monitoring support is available])
fi

View file

@ -12,6 +12,36 @@ if test -z "${nut_have_libltdl_seen}"; then
LIBS_ORIG="${LIBS}"
LIBS=""
AC_MSG_CHECKING(for libltdl cflags)
AC_ARG_WITH(libltdl-includes,
AS_HELP_STRING([@<:@--with-libltdl-includes=CFLAGS@:>@], [include flags for the libltdl library]),
[
case "${withval}" in
yes|no)
AC_MSG_ERROR(invalid option --with(out)-libltdl-includes - see docs/configure.txt)
;;
*)
CFLAGS="${withval}"
;;
esac
], [])
AC_MSG_RESULT([${CFLAGS}])
AC_MSG_CHECKING(for libltdl ldflags)
AC_ARG_WITH(libltdl-libs,
AS_HELP_STRING([@<:@--with-libltdl-libs=LIBS@:>@], [linker flags for the libltdl library]),
[
case "${withval}" in
yes|no)
AC_MSG_ERROR(invalid option --with(out)-libltdl-libs - see docs/configure.txt)
;;
*)
LIBS="${withval}"
;;
esac
], [])
AC_MSG_RESULT([${LIBS}])
AC_CHECK_HEADERS(ltdl.h, [nut_have_libltdl=yes], [nut_have_libltdl=no], [AC_INCLUDES_DEFAULT])
AC_SEARCH_LIBS(lt_dlinit, ltdl, [], [nut_have_libltdl=no])