Imported Upstream version 2.6.3

m4/ltoptions.m4

@@ -1,13 +1,14 @@
 # Helper functions for option handling.                    -*- Autoconf -*-
 #
-#   Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc.
+#   Copyright (C) 2004, 2005, 2007, 2008, 2009 Free Software Foundation,
+#   Inc.
 #   Written by Gary V. Vaughan, 2004
 #
 # This file is free software; the Free Software Foundation gives
 # unlimited permission to copy and/or distribute it, with or without
 # modifications, as long as this notice is preserved.
 
-# serial 6 ltoptions.m4
+# serial 7 ltoptions.m4
 
 # This is to help aclocal find these macros, as it can't see m4_define.
 AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])])
@@ -125,7 +126,7 @@ LT_OPTION_DEFINE([LT_INIT], [win32-dll],
 [enable_win32_dll=yes
 
 case $host in
-*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-cegcc*)
+*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*)
   AC_CHECK_TOOL(AS, as, false)
   AC_CHECK_TOOL(DLLTOOL, dlltool, false)
   AC_CHECK_TOOL(OBJDUMP, objdump, false)
@@ -133,13 +134,13 @@ case $host in
 esac
 
 test -z "$AS" && AS=as
-_LT_DECL([], [AS],      [0], [Assembler program])dnl
+_LT_DECL([], [AS],      [1], [Assembler program])dnl
 
 test -z "$DLLTOOL" && DLLTOOL=dlltool
-_LT_DECL([], [DLLTOOL], [0], [DLL creation program])dnl
+_LT_DECL([], [DLLTOOL], [1], [DLL creation program])dnl
 
 test -z "$OBJDUMP" && OBJDUMP=objdump
-_LT_DECL([], [OBJDUMP], [0], [Object dumper program])dnl
+_LT_DECL([], [OBJDUMP], [1], [Object dumper program])dnl
 ])# win32-dll
 
 AU_DEFUN([AC_LIBTOOL_WIN32_DLL],

m4/ltversion.m4

@@ -7,17 +7,17 @@
 # unlimited permission to copy and/or distribute it, with or without
 # modifications, as long as this notice is preserved.
 
-# Generated from ltversion.in.
+# @configure_input@
 
-# serial 3017 ltversion.m4
+# serial 3293 ltversion.m4
 # This file is part of GNU Libtool
 
-m4_define([LT_PACKAGE_VERSION], [2.2.6b])
-m4_define([LT_PACKAGE_REVISION], [1.3017])
+m4_define([LT_PACKAGE_VERSION], [2.4])
+m4_define([LT_PACKAGE_REVISION], [1.3293])
 
 AC_DEFUN([LTVERSION_VERSION],
-[macro_version='2.2.6b'
-macro_revision='1.3017'
+[macro_version='2.4'
+macro_revision='1.3293'
 _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
 _LT_DECL(, macro_revision, 0)
 ])

m4/lt~obsolete.m4

@@ -1,13 +1,13 @@
 # lt~obsolete.m4 -- aclocal satisfying obsolete definitions.    -*-Autoconf-*-
 #
-#   Copyright (C) 2004, 2005, 2007 Free Software Foundation, Inc.
+#   Copyright (C) 2004, 2005, 2007, 2009 Free Software Foundation, Inc.
 #   Written by Scott James Remnant, 2004.
 #
 # This file is free software; the Free Software Foundation gives
 # unlimited permission to copy and/or distribute it, with or without
 # modifications, as long as this notice is preserved.
 
-# serial 4 lt~obsolete.m4
+# serial 5 lt~obsolete.m4
 
 # These exist entirely to fool aclocal when bootstrapping libtool.
 #
@@ -77,7 +77,6 @@ m4_ifndef([AC_DISABLE_FAST_INSTALL],	[AC_DEFUN([AC_DISABLE_FAST_INSTALL])])
 m4_ifndef([_LT_AC_LANG_CXX],		[AC_DEFUN([_LT_AC_LANG_CXX])])
 m4_ifndef([_LT_AC_LANG_F77],		[AC_DEFUN([_LT_AC_LANG_F77])])
 m4_ifndef([_LT_AC_LANG_GCJ],		[AC_DEFUN([_LT_AC_LANG_GCJ])])
-m4_ifndef([AC_LIBTOOL_RC],		[AC_DEFUN([AC_LIBTOOL_RC])])
 m4_ifndef([AC_LIBTOOL_LANG_C_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG])])
 m4_ifndef([_LT_AC_LANG_C_CONFIG],	[AC_DEFUN([_LT_AC_LANG_C_CONFIG])])
 m4_ifndef([AC_LIBTOOL_LANG_CXX_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG])])
@@ -90,3 +89,10 @@ m4_ifndef([AC_LIBTOOL_LANG_RC_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG])])
 m4_ifndef([_LT_AC_LANG_RC_CONFIG],	[AC_DEFUN([_LT_AC_LANG_RC_CONFIG])])
 m4_ifndef([AC_LIBTOOL_CONFIG],		[AC_DEFUN([AC_LIBTOOL_CONFIG])])
 m4_ifndef([_LT_AC_FILE_LTDLL_C],	[AC_DEFUN([_LT_AC_FILE_LTDLL_C])])
+m4_ifndef([_LT_REQUIRED_DARWIN_CHECKS],	[AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS])])
+m4_ifndef([_LT_AC_PROG_CXXCPP],		[AC_DEFUN([_LT_AC_PROG_CXXCPP])])
+m4_ifndef([_LT_PREPARE_SED_QUOTE_VARS],	[AC_DEFUN([_LT_PREPARE_SED_QUOTE_VARS])])
+m4_ifndef([_LT_PROG_ECHO_BACKSLASH],	[AC_DEFUN([_LT_PROG_ECHO_BACKSLASH])])
+m4_ifndef([_LT_PROG_F77],		[AC_DEFUN([_LT_PROG_F77])])
+m4_ifndef([_LT_PROG_FC],		[AC_DEFUN([_LT_PROG_FC])])
+m4_ifndef([_LT_PROG_CXX],		[AC_DEFUN([_LT_PROG_CXX])])

m4/nut_check_libfreeipmi.m4

@@ -15,7 +15,8 @@ if test -z "${nut_have_libfreeipmi_seen}"; then
 
 	AC_MSG_CHECKING(for FreeIPMI version via pkg-config)
 	dnl pkg-config support requires Freeipmi 1.0.5, released on Thu Jun 30 2011
-	dnl but NUT should only require 0.8.5 or 1.0.1 (comment from upstream Al Chu)
+	dnl but NUT should only require 0.8.5 (for nut-scanner) and 1.0.1 (for
+	dnl nut-ipmipsu) (comment from upstream Al Chu)
 	FREEIPMI_VERSION="`pkg-config --silence-errors --modversion libfreeipmi 2>/dev/null`"
 	if test "$?" = "0" -a -n "${FREEIPMI_VERSION}"; then
 		CFLAGS="`pkg-config --silence-errors --cflags libfreeipmi libipmimonitoring 2>/dev/null`"
@@ -66,18 +67,23 @@ if test -z "${nut_have_libfreeipmi_seen}"; then
 	dnl we have to check for some specific functions
 	AC_SEARCH_LIBS([ipmi_ctx_find_inband], [freeipmi], [], [nut_have_freeipmi=no])
 	AC_SEARCH_LIBS([ipmi_fru_parse_ctx_create], [freeipmi], [], [nut_have_freeipmi=no])
-	AC_SEARCH_LIBS([ipmi_monitoring_init], [ipmimonitoring], [], [nut_have_freeipmi=no])
+
+	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])
 
 	if test "${nut_have_freeipmi}" = "yes"; then
 		nut_with_ipmi="yes"
 		nut_ipmi_lib="(FreeIPMI)"
 		nut_have_libipmi="yes"
-		AC_DEFINE(WITH_IPMI, 1, [Define to enable IPMI support])
-		AC_DEFINE(WITH_FREEIPMI, 1, [Define to enable IPMI support using FreeIPMI])
+		AC_DEFINE(HAVE_FREEIPMI, 1, [Define if FreeIPMI support is available])
 		LIBIPMI_CFLAGS="${CFLAGS}"
 		LIBIPMI_LIBS="${LIBS}"
 	fi
 
+	if test "${nut_have_freeipmi_monitoring}" = "yes"; then
+		AC_DEFINE(HAVE_FREEIPMI_MONITORING, 1, [Define if FreeIPMI monitoring support is available])
+	fi
+
 	dnl restore original CFLAGS and LIBS
 	CFLAGS="${CFLAGS_ORIG}"
 	LIBS="${LIBS_ORIG}"

m4/nut_check_libltdl.m4

@@ -0,0 +1,27 @@
+dnl Check for LIBLTDL compiler flags. On success, set nut_have_libltdl="yes"
+dnl and set LIBLTDL_CFLAGS and LIBLTDL_LIBS. On failure, set
+dnl nut_have_libltdl="no". This macro can be run multiple times, but will
+dnl do the checking only once. 
+
+AC_DEFUN([NUT_CHECK_LIBLTDL], 
+[
+if test -z "${nut_have_libltdl_seen}"; then
+	nut_have_libltdl_seen=yes
+
+	dnl save LIBS
+	LIBS_ORIG="${LIBS}"
+	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])
+
+	if test "${nut_have_libltdl}" = "yes"; then
+		AC_DEFINE(HAVE_LIBLTDL, 1, [Define to enable libltdl support])
+		LIBLTDL_CFLAGS=""
+		LIBLTDL_LIBS="${LIBS}"
+	fi
+
+	dnl restore original LIBS
+	LIBS="${LIBS_ORIG}"
+fi
+])

m4/nut_check_libwrap.m4

@@ -15,7 +15,7 @@ if test -z "${nut_have_libwrap_seen}"; then
 	AC_CHECK_HEADERS(tcpd.h, [nut_have_libwrap=yes], [nut_have_libwrap=no], [AC_INCLUDES_DEFAULT])
 	AC_SEARCH_LIBS(yp_get_default_domain, nsl, [], [nut_have_libwrap=no])
 
-	dnl The line below doesn't work on Solaris 10.
+	dnl The line below does not work on Solaris 10.
 	dnl AC_SEARCH_LIBS(request_init, wrap, [], [nut_have_libwrap=no])
 	AC_MSG_CHECKING(for library containing request_init)
 	AC_LINK_IFELSE([AC_LANG_PROGRAM([[

m4/nut_report_feature.m4

@@ -1,4 +1,8 @@
-dnl automated feature report at the end of configure script
+dnl automated feature report at the end of configure script.
+dnl it also AC_DEFINE() and AM_CONDITIONAL the matching variable.
+dnl for example, "usb" (--with-usb) will give
+dnl nut_with_usb and WITH_USB (both macros, and
+dnl AM_CONDITIONAL)
 
 AC_DEFUN([NUT_REPORT],
 [  if test -z "${nut_report_feature_flag}"; then
@@ -14,8 +18,13 @@ AC_DEFUN([NUT_REPORT],
 AC_DEFUN([NUT_REPORT_FEATURE],
 [
    AC_MSG_CHECKING([whether to $1])
-   AC_MSG_RESULT([$2])
-   NUT_REPORT([$1], [$2])
+   AC_MSG_RESULT([$2 $3])
+   NUT_REPORT([$1], [$2 $3])
+
+   AM_CONDITIONAL([$4], test "$2" = "yes")
+   if test "$2" = "yes"; then
+      AC_DEFINE_UNQUOTED($4, 1, $5)
+   fi
 ])
 
 AC_DEFUN([NUT_PRINT_FEATURE_REPORT],