diff -Nru nut-2.4.3/debian/changelog nut-2.4.3/debian/changelog --- nut-2.4.3/debian/changelog 2010-12-24 11:46:41.000000000 +0100 +++ nut-2.4.3/debian/changelog 2011-01-11 00:36:18.000000000 +0100 @@ -1,3 +1,27 @@ +nut (2.4.3-2ubuntu1) natty; urgency=low + + * Merge from debian unstable. Remaining changes (LP: #701182): + + debian/control: + - Update maintainer as per spec. + - Bump Breaks on nut-hal-drivers to ensure we have correct udev version. + - Drop libpowerman0-dev from the Build-Depends (currently in universe) + + debian/{nut-cgi,nut}.postinst: add nut to the dialout and nut groups + unconditonally to hanle the upgrade from hardy release. + + debian/nut-powerman-pdu.install, debian/nut-powerman-pdu.manpages: + Dropped for now. + + debian/nut.postinst: Update udevadm trigger. + + debian/source_nut.py, debian/nut.install, debian/rules: + Install apport hook. + + debian/patches/netvision-improvements-lp-600950.patch: + Add improvements for netvision UPSes + * debian/patches/0002-fix_udev_action.patch: + Change BUS to SUBSYSTEMS, since the former is deprecated. (LP: #692171) + * Add debian/patches/0005-fix-nut-m4.patch: AC_CHECK_FUNCS uses LIBS instead + of LDFLAGS when linking a library, should fix FTBFS on natty (LP: #687985) + * Add 9999-autoconf.patch: Run autoreconf + + -- Laurent Bigonville Tue, 11 Jan 2011 00:36:09 +0100 + nut (2.4.3-2) unstable; urgency=medium * debian/control: @@ -39,6 +63,58 @@ -- Tim Retout Fri, 15 Oct 2010 19:31:39 +0100 +nut (2.4.3-1ubuntu5) maverick; urgency=low + + * debian/patches/netvision-improvements-lp-600950.patch: Add improvements for netvision UPSes + (LP: #600950) + + -- Chuck Short Fri, 13 Aug 2010 13:28:10 -0500 + +nut (2.4.3-1ubuntu4) maverick; urgency=low + + * debian/source_nut.py, debian/nut.install, debian/rules: Install apport hook. + + -- Chuck Short Thu, 08 Jul 2010 11:06:30 -0400 + +nut (2.4.3-1ubuntu3.1) lucid-proposed; urgency=low + + * debian/patches/04_nut-small-buffers.dpatch: Fix "libusb_get_report: error sending control message: + Operation not permitted" error on some UPS devices. (LP: #572262) + + -- Chuck Short Mon, 03 May 2010 13:38:37 -0400 + +nut (2.4.3-1ubuntu3) lucid; urgency=low + + * debian/nut.postinst: Revert dropping of --action=change. "add" events must + not ever be triggered automatically. + * Add 03_udev_rules_change.dpatch: Run udev rules on change events, too. + + -- Martin Pitt Tue, 23 Mar 2010 08:00:53 +0100 + +nut (2.4.3-1ubuntu2) lucid; urgency=low + + * debian/control: grr...fix ftbfs. + + -- Chuck Short Mon, 22 Mar 2010 11:48:02 -0400 + +nut (2.4.3-1ubuntu1) lucid; urgency=low + + * Merge from debian testing. Remaining changes (LP: #535152): + + debian/control: + - Update maintainer as per spec. + - Add Breaks on nut-hal-drivers to ensure we have correct udev version. + - Drop libpowerman0-dev from the Build-Depends (currently in universe) + + debian/{nut-cgi,nut}.postinst: add nut to the dialout and nut groups + unconditonally to hanle the upgrade from hardy release. + + debian/nut-powerman-pdu.install, debian/nut-powerman-pdu.manpages: dropped for now. + + debian/nut.links: must create the init script link, used if the upse needs to be powered down + (LP: #357583) + + debian/nut.postinst: Update udevadm trigger. + + Dropped: + - debian/patches/02-fix-trust-pw4130m.dpatch: No longer needed. + + -- Chuck Short Tue, 16 Mar 2010 06:22:26 +0000 + nut (2.4.3-1) unstable; urgency=low * New upstream release (Closes: #544390, #528222, #539747, #526811, @@ -83,6 +159,57 @@ -- Arnaud Quette Wed, 24 Feb 2010 22:58:53 +0100 +nut (2.4.1-3.2ubuntu2) lucid; urgency=low + + * debian/patches/02-fix-trust-pw4130m.dpatch: Fix issues with Trust + PW-4130M UPS. (LP: #447586) + + -- Chuck Short Thu, 04 Feb 2010 13:26:33 -0500 + +nut (2.4.1-3.2ubuntu1) lucid; urgency=low + + * Resynchronize with debian, remaining changes: + + debian/control: + - Update maintainer field as per spec. + - Add Breaks on nut-hal-drivers to ensure we have correct udev version. + - Drop libpowerman0-dev from the Build-Depends (currently in universe). + - Remove the nut-powerman-pdu package for now. + + debian/{nut-cgi,nut}.postinst: add nut to the dialout and nut groups + unconditionally, to handle the upgrade from hardy release. + + debian/nut-powerman-pdu.install, debian/nut-powerman-pdu.manpages: dropped + for now. + + debian/nut.links: must create the init script link, used if the ups + needs to be powered down. (LP: #357583) + + debian/nut.init: Fix status_of_proc messages not to lie to the user (LP: #416182) + + -- Chuck Short Fri, 18 Dec 2009 09:00:45 -0500 + +nut (2.4.1-3.2) unstable; urgency=low + + * Non-maintainer upload. + * nut.postinst: fix post-processing of nut.conf to avoid overriding + user settings (Closes: #531220) + + -- Stefano Zacchiroli Thu, 26 Nov 2009 09:30:45 +0100 + +nut (2.4.1-3.1ubuntu1) lucid; urgency=low + + * Merge from debian testing, remaining changes: + + debian/control: + - Update maintainer field as per spec. + - Add Breaks on nut-hal-drivers to ensure we have correct udev version. + - Drop libpowerman0-dev from the Build-Depends (currently in universe) + - remove the nut-powerman-pdu package for now + + debian/{nut-cgi,nut}.postinst: add nut to the dialout and nut groups + unconditionally, to handle the upgrade from hardy release. + + debian/nut-powerman-pdu.install, debian/nut-powerman-pdu.manpages: dropped + for now + + debian/nut.links: must create the init script link, used if the ups + needs to be powered down (LP: #357583) + + debian/nut.init: Fix status_of_proc messages not to lie to the user (LP: #416182) + + -- Chuck Short Fri, 06 Nov 2009 01:34:44 +0000 + nut (2.4.1-3.2) unstable; urgency=low * Non-maintainer upload. @@ -103,6 +230,30 @@ -- Christian Perrier Tue, 20 Oct 2009 21:45:21 +0200 +nut (2.4.1-3ubuntu2) karmic; urgency=low + + * debian/nut.init: Fix status_of_proc messages not to lie to + the user. (LP: #416182) + + -- Chuck Short Wed, 23 Sep 2009 09:37:16 -0400 + +nut (2.4.1-3ubuntu1) karmic; urgency=low + + * Merge from debian unstable, remaining changes: + + debian/control: + - Update maintainer field as per spec. + - Add Breaks on nut-hal-drivers to ensure we have correct udev version. + - Drop libpowerman0-dev from the Build-Depends (currently in universe) + - remove the nut-powerman-pdu package for now + + debian/{nut-cgi,nut}.postinst: add nut to the dialout and nut groups + unconditionally, to handle the upgrade from hardy release. + + debian/nut-powerman-pdu.install, debian/nut-powerman-pdu.manpages: dropped + for now. + + debian/nut.links: must create the init script link, used if the ups + needs to be powered down (LP: #357583) + + -- Chuck Short Thu, 28 May 2009 06:55:21 +0100 + nut (2.4.1-3) unstable; urgency=low * Debconf templates and debian/control reviewed by the debian-l10n- @@ -121,6 +272,52 @@ -- Christian Perrier Sat, 21 Mar 2009 08:08:59 +0100 +nut (2.4.1-2ubuntu4) jaunty; urgency=low + + * debian/nut.links: must create the init script link, used if the ups + needs to be powered down, LP: #357583 + + -- Dustin Kirkland Thu, 09 Apr 2009 14:01:54 -0700 + +nut (2.4.1-2ubuntu3) jaunty; urgency=low + + Fixes for LP: #348454 + * debian/control: add dpatch to Build-Depends, + * debian/patches/*: back for the below fix + * debian/patches/01_epdu_fix.dpatch: fix an upstream problem with Eaton PDUs + vs untested PDUs from Raritan + * debian/rules: reactivate again dpatch rules + + -- Arnaud Quette Wed, 25 Mar 2009 13:17:21 +0100 + +nut (2.4.1-2ubuntu2) jaunty; urgency=low + + [ Arnaud Quette ] + * Fix FTBFS + * debian/control: + - drop libpowerman0-dev from the Build-Depends (currently in universe) + - remove the nut-powerman-pdu package for now + * debian/nut-powerman-pdu.install, debian/nut-powerman-pdu.manpages: dropped + for now + + -- Dustin Kirkland Thu, 05 Mar 2009 14:34:06 -0600 + +nut (2.4.1-2ubuntu1) jaunty; urgency=low + + * Acknowledge closed bugs in upstream and Debian: LP: #1568, LP: #221737, + LP: #239025, LP: #278495, LP: #332030, LP: #332032 + * Merge from debian unstable, remaining changes: + + debian/control: + - Update maintainer field as per spec. + - Add Breaks on nut-hal-drivers to ensure we have correct udev version. + + debian/{nut-cgi,nut}.postinst: add nut to the dialout and nut groups + unconditionally, to handle the upgrade from the hardy release (simply + uncommented). + + debian/rules: pre merge the changes for Ubuntu (udev path and version), + (simply uncommented). + + -- Arnaud Quette Fri, 27 Feb 2009 12:49:24 +0100 + nut (2.4.1-2) unstable; urgency=low * debian/control: @@ -210,6 +407,50 @@ -- Arnaud Quette Tue, 17 Feb 2009 14:15:24 +0100 +nut (2.2.2-10ubuntu3) jaunty; urgency=low + + * debian/{nut-cgi,nut}.preinst: don't call adduser or addgroup *at + all*, these operations should be handled in the postinst. Since + this is the only custom action at all for nut-cgi, remove that + preinst completely. + * debian/{nut-cgi,nut}.postinst: add nut to the dialout + and nut groups unconditionally, to handle the upgrade from the hardy + release. LP: #222761, LP: #287781. + * debian/control: nut needs Pre-Depends: debconf instead of Depends:, + because we use debconf unconditionally in the preinst. + * reinstate debian/nut-hal-drivers.postinst, which was lost in a + merge; and fix it up to use udevadm trigger --action=change, the + safe way to install udev rules. + * have nut-hal-drivers Depend: on udev so it can use the above. + * fix up nut postinst to also use 'udevadm trigger --action=change' + + -- Steve Langasek Fri, 30 Jan 2009 01:06:53 +0000 + +nut (2.2.2-10ubuntu2) jaunty; urgency=low + + * debian/rules: Install udev rules into /lib/udev/rules, bump versioned + dependency on udev. + * debian/nut.install, debian/nut-hal-drivers.install: Update path + * debian/patches/04-ubuntu-udev-rules-name.dpatch: Use a dash to + separate the name, not an underscore. + * debian/nut.preinst, debian/nut-hal-drivers.preinst: Remove previous + rules if unchanged, otherwise move to new filename. + * debian/control: Add Breaks to ensure we have correct udev version. + + -- Scott James Remnant Tue, 13 Jan 2009 02:50:14 +0000 + +nut (2.2.2-10ubuntu1) jaunty; urgency=low + + * Merge from debian unstable, remaining changes: + + debian/control: + - Update maintainer field as per spec. + + debian/nut{-cgi,-hal-drivers}.preinst: + - Add nut user to dialout group. + + debian/nut.install + - Install the configuration files in /etc/nut. + + -- Chuck Short Fri, 28 Nov 2008 23:01:47 +0000 + nut (2.2.2-10) unstable; urgency=low * Merge from Ubuntu (Morten Kjeldgaard): @@ -250,6 +491,18 @@ -- Arnaud Quette Wed, 15 Oct 2008 17:20:29 +0200 +nut (2.2.2-8ubuntu1) jaunty; urgency=low + + * Merge from debian unstable, remaining changes: + + debian/control: + - Update maintainer field as per spec. + + debian/nut{-cgi,-hal-drivers}.preinst: + - Add nut user to dialout group. + + debian/rules: + - Move the configuration files to /etc/nut from examples. + + -- Chuck Short Wed, 05 Nov 2008 02:59:59 -0400 + nut (2.2.2-8) unstable; urgency=high * debian/nut.links: restored since it's now handled by insserv (Closes: @@ -273,6 +526,18 @@ -- Arnaud Quette Mon, 15 Sep 2008 17:18:28 +0200 +nut (2.2.2-6ubuntu1) intrepid; urgency=low + + * Merge from debian unstable, remaining changes: + + debian/control: + - Update maintainer field as per spec. + + debian/nut{-cgi,-hal-drivers}.preinst: + - Add nut user to dialout group. + + debian/rules: + - Move the configuration files to /etc/nut from examples. + + -- Chuck Short Mon, 14 Jul 2008 00:54:42 +0100 + nut (2.2.2-6) unstable; urgency=low * tag this bug as closed by the 2.2.2 release (Closes: #490048) @@ -315,7 +580,19 @@ anymore (Closes: #486783) -- Arnaud Quette Sat, 05 Jul 2008 22:56:35 +0200 - + +nut (2.2.2-3ubuntu1) intrepid; urgency=low + + * Merge from debian unstable, remaining changes: + + debian/control: + - Update maintainer field as per spec. + + debian/nut{-cgi,-hal-drivers}.preinst: + - Add nut to user to dialout group. + + debian/rules: + - Move the configuation files to /etc/nut from examples. + + -- Chuck Short Tue, 01 Jul 2008 11:57:01 +0100 + nut (2.2.2-3) unstable; urgency=low * debian/rules: reactivate dpatch support @@ -345,6 +622,20 @@ -- Arnaud Quette Fri, 20 Jun 2008 21:29:31 +0200 +nut (2.2.2-1ubuntu1) intrepid; urgency=low + + * Merge from debian unstable, remaining changes: + + debian/control: + - Update maintainer field as per spec. + + debian/nut{-cgi,-hal-drivers}.preinst: + - Add nut to user to dialout group. + + debian/rules: + - Move the configuration files to /etc/nut from examples + + debian/patches/01_fix_megatec_regression.dpatch. + - Dropped no longer since its fixed in this version. + + -- Chuck Short Wed, 18 Jun 2008 11:30:10 -0500 + nut (2.2.2-1) unstable; urgency=low * New upstream release (Closes: #471828, #462468, #334105, #463150) @@ -371,7 +662,60 @@ * debian/*.template: minor rework of the Debconf templates (Closes: 444151) -- Arnaud Quette Wed, 04 Jun 2008 13:35:41 +0200 - + +nut (2.2.1-2.1ubuntu7) hardy; urgency=low + + * debian/patches/01_fix_megatec_regression.dpatch + - Fix more megatec_usb driver regressions. (LP: #215389) + + -- Chuck Short Mon, 14 Apr 2008 14:25:48 -0400 + +nut (2.2.1-2.1ubuntu6) hardy; urgency=low + + * debian/patches/01_fix_megatec_regression.dpatch + - Updated patch thanks to Alexander I. Gordeev . (LP: #209001) + + -- Chuck Short Thu, 10 Apr 2008 09:33:53 -0400 + +nut (2.2.1-2.1ubuntu5) hardy; urgency=low + + * debian/patches/01_fix_megatec_regression.dpatch + - Readded support for various USB devices. (LP: #209001) + + -- Chuck Short Mon, 07 Apr 2008 08:46:46 -0400 + +nut (2.2.1-2.1ubuntu4) hardy; urgency=low + + * Use udevtrigger to restart udev. (LP: #204612) + + -- Chuck Short Wed, 26 Mar 2008 13:30:24 -0400 + +nut (2.2.1-2.1ubuntu3) hardy; urgency=low + + * Fix FTBFS. + + -- Chuck Short Sat, 22 Mar 2008 10:00:06 -0400 + +nut (2.2.1-2.1ubuntu2) hardy; urgency=low + + * Fix udev rules. (LP: #204612). + * Cleaned up debian/control. + + -- Chuck Short Fri, 21 Mar 2008 20:30:44 -0400 + +nut (2.2.1-2.1ubuntu1) hardy; urgency=low + + * Merge from debian unstable (LP: #203366), remaining Ubuntu changes: + + debian/rules: + - Move the configuration files to /etc/nut from examples. + + debian/nut{,-cgi,-hal-drivers}.preinst + - Add nut user to dialout group. + + debian/control: + - Updated Maintainer field as per spec. + + -- Luca Falavigna Mon, 17 Mar 2008 23:59:38 +0100 + nut (2.2.1-2.1) unstable; urgency=low * Non-maintainer upload. @@ -379,6 +723,14 @@ -- Joe Nahmias Sun, 09 Mar 2008 13:12:12 -0400 +nut (2.2.1-2ubuntu1) hardy; urgency=low + + * Move the configuration files to /etc/nut from examples. (LP: #85598) + * Add nut user to dialout group. (LP: #157079) + * Updated Maintainer according to specs. + + -- Chuck Short Thu, 28 Feb 2008 10:10:24 -0500 + nut (2.2.1-2) unstable; urgency=low * debian/po/de.po: update the German po-debconf translation (Closes: @@ -391,7 +743,7 @@ * debian/nut.README.Debian: completed a bit more for #334105 -- Arnaud Quette Fri, 8 Feb 2008 13:48:23 +0100 - + nut (2.2.1-1) unstable; urgency=low * New upstream release (Closes: #439986) @@ -486,7 +838,7 @@ upsmon (Closes: #420020, #434503) -- Arnaud Quette Tue, 17 Jul 2007 09:14:11 +0200 - + nut (2.0.5-3) unstable; urgency=low * debian/patches/01_udev_rules_subsystem_usb.dpatch: rework that @@ -559,7 +911,7 @@ * not removing nut user on purge (Closes: #389350) -- Florian M. Weps Thu, 12 Oct 2006 11:19:37 +0200 - + nut (2.0.4-2) unstable; urgency=low * debian/rules: replace $PWD by CURDIR to satisfy buildd @@ -597,7 +949,7 @@ with hotplug and udev styles -- Arnaud Quette Mon, 13 Mar 2006 08:52:25 +0100 - + nut (2.0.3-3) unstable; urgency=low * debian/rules: @@ -605,7 +957,7 @@ - add a temporary workaround to clean drivers/tripplite_usb -- Arnaud Quette Mon, 27 Feb 2006 15:35:32 +0100 - + nut (2.0.3-2) unstable; urgency=low * debian/nut.init: fix the creation of the PID directory, as /var is now volative. @@ -709,14 +1061,14 @@ #301060) -- Arnaud Quette Fri, 15 Apr 2005 13:52:32 +0100 - + nut (2.0.1-2.1) unstable; urgency=low * Non-maintainer upload * NUT nows powersdown Closes: #302189 -- Craig Small Thu, 7 Apr 2005 11:47:58 +1000 - + nut (2.0.1-2) unstable; urgency=low * debian/control: add missing Build-Depends for dpatch, thanks to Kurt @@ -793,7 +1145,7 @@ * debian/nut.README.Debian: minor change -- Arnaud Quette Fri, 28 May 2004 13:10:01 +0200 - + nut (1.4.2-2) unstable; urgency=low * debian/control: add libusb-dev to Build-Depends (closes: #240586) @@ -801,7 +1153,7 @@ the above) -- Arnaud Quette Sun, 28 Mar 2004 18:30:01 +0100 - + nut (1.4.2-1) unstable; urgency=low * New upstream release @@ -880,7 +1232,7 @@ manpages installed two times) that prevent from installing nut-snmp package -- Arnaud Quette Mon, 10 Nov 2003 12:59:23 +0100 - + nut (1.4.1-pre3-1) unstable; urgency=low * New upstream release diff -Nru nut-2.4.3/debian/control nut-2.4.3/debian/control --- nut-2.4.3/debian/control 2010-12-24 11:46:41.000000000 +0100 +++ nut-2.4.3/debian/control 2011-01-10 23:50:52.000000000 +0100 @@ -1,9 +1,10 @@ Source: nut Section: admin Priority: optional -Maintainer: Arnaud Quette +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Arnaud Quette Uploaders: Laurent Bigonville -Build-Depends: debhelper (>= 8), autoconf, automake, libtool, libgd2-xpm-dev | libgd2-noxpm-dev, libsnmp-dev | libsnmp9-dev, libusb-dev (>= 0.1.8), libhal-dev (>= 0.5.8), hal, libdbus-1-dev, libdbus-glib-1-dev, libglib2.0-dev, libneon27-gnutls-dev | libneon26-gnutls-dev | libneon-dev | libneon27-dev | libneon26-dev, libpowerman0-dev (>= 2.3.3), libwrap0-dev (>= 7.6) +Build-Depends: debhelper (>= 8), autoconf, automake, libtool, libgd2-xpm-dev | libgd2-noxpm-dev, libsnmp-dev | libsnmp9-dev, libusb-dev (>= 0.1.8), libhal-dev (>= 0.5.8), hal, libdbus-1-dev, libdbus-glib-1-dev, libglib2.0-dev, libneon27-gnutls-dev | libneon26-gnutls-dev | libneon-dev | libneon27-dev | libneon26-dev, libwrap0-dev (>= 7.6) Standards-Version: 3.9.1 Homepage: http://www.networkupstools.org Vcs-Browser: http://git.debian.org/?p=collab-maint/nut.git;a=summary @@ -64,7 +65,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ${udev} Conflicts: nut Provides: hal-ups-support -Breaks: udev (<< 124-1) +Breaks: udev (<< 136-1) Description: network UPS tools - HAL interface Network UPS Tools (NUT) is a client/server monitoring system that allows computers to share uninterruptible power supply (UPS) and @@ -90,19 +91,6 @@ Eaton or MGE that use an XML/HTTP-based Network Management Card or Proxy. -Package: nut-powerman-pdu -Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, nut (>= 2.4.0), powerman (>= 2.3.3) -Description: network UPS tools - PowerMan PDU driver - Network UPS Tools (NUT) is a client/server monitoring system that - allows computers to share uninterruptible power supply (UPS) and - power distribution unit (PDU) hardware. Clients access the hardware - through the server, and are notified whenever the power status - changes. - . - This package provides powerman-pdu, which allows NUT clients to communicate - with the PowerMan daemon to support PDUs. - Package: libupsclient1 Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} diff -Nru nut-2.4.3/debian/nut-cgi.postinst nut-2.4.3/debian/nut-cgi.postinst --- nut-2.4.3/debian/nut-cgi.postinst 2010-12-24 11:46:41.000000000 +0100 +++ nut-2.4.3/debian/nut-cgi.postinst 2011-01-10 19:47:12.000000000 +0100 @@ -14,9 +14,9 @@ adduser nut nut fi # for Ubuntu, while waiting for a proper debconf -# if ! groups nut | grep -qw dialout; then -# adduser nut dialout -# fi + if ! groups nut | grep -qw dialout; then + adduser nut dialout + fi # Ensure /etc/nut is readable/crossable for others if [ -d /etc/nut/ ] ; then diff -Nru nut-2.4.3/debian/nut.install nut-2.4.3/debian/nut.install --- nut-2.4.3/debian/nut.install 2010-12-24 11:46:41.000000000 +0100 +++ nut-2.4.3/debian/nut.install 2011-01-10 19:47:12.000000000 +0100 @@ -54,3 +54,4 @@ debian/tmp/lib/nut/megatec debian/tmp/lib/nut/everups debian/tmp/lib/nut/dummy-ups +debian/tmp/usr/share/apport/package-hooks/source_nut.py diff -Nru nut-2.4.3/debian/nut.postinst nut-2.4.3/debian/nut.postinst --- nut-2.4.3/debian/nut.postinst 2010-12-24 11:46:41.000000000 +0100 +++ nut-2.4.3/debian/nut.postinst 2011-01-10 20:14:42.000000000 +0100 @@ -14,9 +14,9 @@ adduser nut nut fi # for Ubuntu, while waiting for a proper debconf -# if ! groups nut | grep -qw dialout; then -# adduser nut dialout -# fi + if ! groups nut | grep -qw dialout; then + adduser nut dialout + fi # make sure that conffiles are secured and have the correct ownerships if [ -d /etc/nut/ ] ; then @@ -46,7 +46,7 @@ # ask udev to check for new udev rules [ -x /etc/init.d/udev ] && pidof udevd > /dev/null \ - && udevadm trigger --action=change + && udevadm trigger --subsystem-match=usb --action=change # 557178 udevadm trigger --subsystem-match=usb diff -Nru nut-2.4.3/debian/nut-powerman-pdu.install nut-2.4.3/debian/nut-powerman-pdu.install --- nut-2.4.3/debian/nut-powerman-pdu.install 2010-12-24 11:46:41.000000000 +0100 +++ nut-2.4.3/debian/nut-powerman-pdu.install 2011-01-10 19:47:12.000000000 +0100 @@ -1 +0,0 @@ -debian/tmp/lib/nut/powerman-pdu diff -Nru nut-2.4.3/debian/nut-powerman-pdu.manpages nut-2.4.3/debian/nut-powerman-pdu.manpages --- nut-2.4.3/debian/nut-powerman-pdu.manpages 2010-12-24 11:46:41.000000000 +0100 +++ nut-2.4.3/debian/nut-powerman-pdu.manpages 2011-01-10 19:47:12.000000000 +0100 @@ -1 +0,0 @@ -debian/tmp/usr/share/man/man8/powerman-pdu.8 diff -Nru nut-2.4.3/debian/patches/0002-fix_udev_action.patch nut-2.4.3/debian/patches/0002-fix_udev_action.patch --- nut-2.4.3/debian/patches/0002-fix_udev_action.patch 2010-12-24 11:46:41.000000000 +0100 +++ nut-2.4.3/debian/patches/0002-fix_udev_action.patch 2011-01-10 20:49:11.000000000 +0100 @@ -1,10 +1,14 @@ ---- nut-2.4.3.orig/scripts/udev/nut-usbups.rules.in -+++ nut-2.4.3/scripts/udev/nut-usbups.rules.in -@@ -1,6 +1,6 @@ +--- a/scripts/udev/nut-usbups.rules.in ++++ b/scripts/udev/nut-usbups.rules.in +@@ -1,9 +1,9 @@ # This file is generated and installed by the Network UPS Tools package. -ACTION!="add", GOTO="nut-usbups_rules_end" +ACTION!="add|change", GOTO="nut-usbups_rules_end" SUBSYSTEM=="usb_device", GOTO="nut-usbups_rules_real" SUBSYSTEM=="usb", GOTO="nut-usbups_rules_real" - BUS!="usb", GOTO="nut-usbups_rules_end" +-BUS!="usb", GOTO="nut-usbups_rules_end" ++SUBSYSTEM!="usb", GOTO="nut-usbups_rules_end" + + LABEL="nut-usbups_rules_real" + # Krauler UP-M500VA - blazer_usb diff -Nru nut-2.4.3/debian/patches/0004-netvision-improvements-lp-600950.patch nut-2.4.3/debian/patches/0004-netvision-improvements-lp-600950.patch --- nut-2.4.3/debian/patches/0004-netvision-improvements-lp-600950.patch 1970-01-01 01:00:00.000000000 +0100 +++ nut-2.4.3/debian/patches/0004-netvision-improvements-lp-600950.patch 2011-01-10 20:02:52.000000000 +0100 @@ -0,0 +1,42 @@ +diff -Naurp nut-2.4.3.orig//drivers/netvision-mib.c nut-2.4.3//drivers/netvision-mib.c +--- nut-2.4.3.orig//drivers/netvision-mib.c 2010-02-11 15:43:23.000000000 -0600 ++++ nut-2.4.3//drivers/netvision-mib.c 2010-08-13 13:14:35.737395109 -0500 +@@ -38,7 +38,7 @@ static info_lkp_t netvision_batt_info[] + { 2, "" }, /* battery normal */ + { 3, "LB" }, /* battery low */ + { 4, "LB" }, /* battery depleted */ +- { 5, "" }, /* battery discharging */ ++ { 5, "DISCHRG" }, /* battery discharging */ + { 6, "RB" }, /* battery failure */ + { 0, "NULL" } + }; +@@ -74,15 +74,16 @@ static info_lkp_t netvision_batt_info[] + #define NETVISION_OID_OUTPUT_SOURCE ".1.3.6.1.4.1.4555.1.1.1.1.4.1.0" + + static info_lkp_t netvision_output_info[] = { +- { 1, "NULL" }, /* output source other */ +- { 2, "NULL" }, /* output source none */ ++ { 1, "" }, /* output source other */ ++ { 2, "" }, /* output source none */ + { 3, "OL" }, /* output source normal */ + { 4, "OL BYPASS" }, /* output source bypass */ + { 5, "OB" }, /* output source battery */ + { 6, "OL BOOST" }, /* output source booster */ + { 7, "OL TRIM" }, /* output source reducer */ +- { 8, "NULL" }, /* output source standby */ +- { 9, "NULL" }, /* output source ecomode */ ++ { 8, "" }, /* output source standby */ ++ { 9, "" }, /* output source ecomode */ ++ { 0, "NULL" } + }; + + /* Snmp2NUT lookup table */ +@@ -95,7 +96,7 @@ static snmp_info_t netvision_mib[] = { + SU_FLAG_STATIC | SU_FLAG_OK, NULL }, + { "ups.firmware.aux", ST_FLAG_STRING, SU_INFOSIZE, NETVISION_OID_UPSIDENTFWVERSION, "", + SU_FLAG_STATIC | SU_FLAG_OK, NULL }, +- { "ups.status", ST_FLAG_STRING, SU_INFOSIZE, NETVISION_OID_BATTERYSTATUS, "", ++ { "ups.status", ST_FLAG_STRING, SU_INFOSIZE, NETVISION_OID_OUTPUT_SOURCE, "", + SU_FLAG_OK | SU_STATUS_BATT, &netvision_batt_info[0] }, + { "ups.status", ST_FLAG_STRING, SU_INFOSIZE, NETVISION_OID_BATTERYSTATUS, "", + SU_FLAG_OK | SU_STATUS_PWR, &netvision_output_info[0] }, diff -Nru nut-2.4.3/debian/patches/0005-fix-nut-m4.patch nut-2.4.3/debian/patches/0005-fix-nut-m4.patch --- nut-2.4.3/debian/patches/0005-fix-nut-m4.patch 1970-01-01 01:00:00.000000000 +0100 +++ nut-2.4.3/debian/patches/0005-fix-nut-m4.patch 2011-01-11 00:13:53.000000000 +0100 @@ -0,0 +1,514 @@ +--- a/m4/nut_check_libneon.m4 ++++ b/m4/nut_check_libneon.m4 +@@ -1,5 +1,5 @@ + dnl Check for LIBNEON compiler flags. On success, set nut_have_neon="yes" +-dnl and set LIBNEON_CFLAGS and LIBNEON_LDFLAGS. On failure, set ++dnl and set LIBNEON_CFLAGS and LIBNEON_LIBS. On failure, set + dnl nut_have_neon="no". This macro can be run multiple times, but will + dnl do the checking only once. + +@@ -8,9 +8,9 @@ + if test -z "${nut_have_neon_seen}"; then + nut_have_neon_seen=yes + +- dnl save CFLAGS and LDFLAGS ++ dnl save CFLAGS and LIBS + CFLAGS_ORIG="${CFLAGS}" +- LDFLAGS_ORIG="${LDFLAGS}" ++ LIBS_ORIG="${LIBS}" + + dnl See which version of the neon library (if any) is installed + AC_MSG_CHECKING(for libneon version via pkg-config (0.25.0 minimum required)) +@@ -29,9 +29,9 @@ + + AC_MSG_CHECKING(for libneon ldflags) + AC_ARG_WITH(neon-libs, [ +- AC_HELP_STRING([--with-neon-libs=LDFLAGS], [linker flags for the neon library]) +- ], [LDFLAGS="${withval}"], [LDFLAGS="`pkg-config --silence-errors --libs neon`"]) +- AC_MSG_RESULT([${LDFLAGS}]) ++ AC_HELP_STRING([--with-neon-libs=LIBS], [linker flags for the neon library]) ++ ], [LIBS="${withval}"], [LIBS="`pkg-config --silence-errors --libs neon`"]) ++ AC_MSG_RESULT([${LIBS}]) + + dnl check if neon is usable + AC_CHECK_HEADERS(ne_xmlreq.h, [nut_have_neon=yes], [nut_have_neon=no], [AC_INCLUDES_DEFAULT]) +@@ -41,11 +41,11 @@ + dnl Check for connect timeout support in library (optional) + AC_CHECK_FUNCS(ne_set_connect_timeout ne_sock_connect_timeout) + LIBNEON_CFLAGS="${CFLAGS}" +- LIBNEON_LDFLAGS="${LDFLAGS}" ++ LIBNEON_LIBS="${LIBS}" + fi + +- dnl restore original CFLAGS and LDFLAGS ++ dnl restore original CFLAGS and LIBS + CFLAGS="${CFLAGS_ORIG}" +- LDFLAGS="${LDFLAGS_ORIG}" ++ LIBS="${LIBS_ORIG}" + fi + ]) +--- a/m4/nut_check_libnetsnmp.m4 ++++ b/m4/nut_check_libnetsnmp.m4 +@@ -1,6 +1,6 @@ + dnl Check for LIBNETSNMP compiler flags. On success, set + dnl nut_have_libnetsnmp="yes" and set LIBNETSNMP_CFLAGS and +-dnl LIBNETSNMP_LDFLAGS. On failure, set nut_have_libnetsnmp="no". ++dnl LIBNETSNMP_LIBS. On failure, set nut_have_libnetsnmp="no". + dnl This macro can be run multiple times, but will do the checking only + dnl once. + +@@ -9,9 +9,9 @@ + if test -z "${nut_have_libnetsnmp_seen}"; then + nut_have_libnetsnmp_seen=yes + +- dnl save CFLAGS and LDFLAGS ++ dnl save CFLAGS and LIBS + CFLAGS_ORIG="${CFLAGS}" +- LDFLAGS_ORIG="${LDFLAGS}" ++ LIBS_ORIG="${LIBS}" + + dnl See which version of the Net-SNMP library (if any) is installed + AC_MSG_CHECKING(for Net-SNMP version via net-snmp-config) +@@ -30,9 +30,9 @@ + + AC_MSG_CHECKING(for Net-SNMP libs) + AC_ARG_WITH(snmp-libs, [ +- AC_HELP_STRING([--with-snmp-libs=LDFLAGS], [linker flags for the Net-SNMP library]) +- ], [LDFLAGS="${withval}"], [LDFLAGS="`net-snmp-config --libs 2>/dev/null`"]) +- AC_MSG_RESULT([${LDFLAGS}]) ++ AC_HELP_STRING([--with-snmp-libs=LIBS], [linker flags for the Net-SNMP library]) ++ ], [LIBS="${withval}"], [LIBS="`net-snmp-config --libs 2>/dev/null`"]) ++ AC_MSG_RESULT([${LIBS}]) + + dnl Check if the Net-SNMP library is usable + AC_CHECK_HEADERS(net-snmp/net-snmp-config.h, [nut_have_libnetsnmp=yes], [nut_have_libnetsnmp=no], [AC_INCLUDES_DEFAULT]) +@@ -40,11 +40,11 @@ + + if test "${nut_have_libnetsnmp}" = "yes"; then + LIBNETSNMP_CFLAGS="${CFLAGS}" +- LIBNETSNMP_LDFLAGS="${LDFLAGS}" ++ LIBNETSNMP_LIBS="${LIBS}" + fi + +- dnl restore original CFLAGS and LDFLAGS ++ dnl restore original CFLAGS and LIBS + CFLAGS="${CFLAGS_ORIG}" +- LDFLAGS="${LDFLAGS_ORIG}" ++ LIBS="${LIBS_ORIG}" + fi + ]) +--- a/m4/nut_check_libpowerman.m4 ++++ b/m4/nut_check_libpowerman.m4 +@@ -1,5 +1,5 @@ + dnl Check for LIBPOWERMAN compiler flags. On success, set nut_have_libpowerman="yes" +-dnl and set LIBPOWERMAN_CFLAGS and LIBPOWERMAN_LDFLAGS. On failure, set ++dnl and set LIBPOWERMAN_CFLAGS and LIBPOWERMAN_LIBS. On failure, set + dnl nut_have_libpowerman="no". This macro can be run multiple times, but will + dnl do the checking only once. + +@@ -8,9 +8,9 @@ + if test -z "${nut_have_libpowerman_seen}"; then + nut_have_libpowerman_seen=yes + +- dnl save CFLAGS and LDFLAGS ++ dnl save CFLAGS and LIBS + CFLAGS_ORIG="${CFLAGS}" +- LDFLAGS_ORIG="${LDFLAGS}" ++ LIBS_ORIG="${LIBS}" + + AC_MSG_CHECKING(for libpowerman cflags) + AC_ARG_WITH(powerman-includes, [ +@@ -20,9 +20,9 @@ + + AC_MSG_CHECKING(for libpowerman libs) + AC_ARG_WITH(powerman-libs, [ +- AC_HELP_STRING([--with-powerman-libs=LDFLAGS], [linker flags for the libpowerman library]) +- ], [LDFLAGS="${withval}"], [LDFLAGS="`pkg-config --silence-errors --libs libpowerman`"]) +- AC_MSG_RESULT([${LDFLAGS}]) ++ AC_HELP_STRING([--with-powerman-libs=LIBS], [linker flags for the libpowerman library]) ++ ], [LIBS="${withval}"], [LIBS="`pkg-config --silence-errors --libs libpowerman`"]) ++ AC_MSG_RESULT([${LIBS}]) + + dnl check if libpowerman is usable + AC_CHECK_HEADERS(libpowerman.h, [nut_have_libpowerman=yes], [nut_have_libpowerman=no], [AC_INCLUDES_DEFAULT]) +@@ -30,12 +30,12 @@ + + if test "${nut_have_libpowerman}" = "yes"; then + LIBPOWERMAN_CFLAGS="${CFLAGS}" +- LIBPOWERMAN_LDFLAGS="${LDFLAGS}" ++ LIBPOWERMAN_LIBS="${LIBS}" + fi + +- dnl restore original CFLAGS and LDFLAGS ++ dnl restore original CFLAGS and LIBS + CFLAGS="${CFLAGS_ORIG}" +- LDFLAGS="${LDFLAGS_ORIG}" ++ LIBS="${LIBS_ORIG}" + + fi + ]) +--- a/m4/nut_check_libssl.m4 ++++ b/m4/nut_check_libssl.m4 +@@ -1,5 +1,5 @@ + dnl Check for LIBSSL compiler flags. On success, set nut_have_libssl="yes" +-dnl and set LIBSSL_CFLAGS and LIBSSL_LDFLAGS. On failure, set ++dnl and set LIBSSL_CFLAGS and LIBSSL_LIBS. On failure, set + dnl nut_have_libssl="no". This macro can be run multiple times, but will + dnl do the checking only once. + +@@ -8,20 +8,20 @@ + if test -z "${nut_have_libssl_seen}"; then + nut_have_libssl_seen=yes + +- dnl save CFLAGS and LDFLAGS ++ dnl save CFLAGS and LIBS + CFLAGS_ORIG="${CFLAGS}" +- LDFLAGS_ORIG="${LDFLAGS}" ++ LIBS_ORIG="${LIBS}" + + AC_MSG_CHECKING(for openssl version via pkg-config) + OPENSSL_VERSION=`pkg-config --silence-errors --modversion openssl` + if test "$?" = "0"; then + AC_MSG_RESULT(${OPENSSL_VERSION} found) + CFLAGS="`pkg-config --silence-errors --cflags openssl`" +- LDFLAGS="`pkg-config --silence-errors --libs openssl`" ++ LIBS="`pkg-config --silence-errors --libs openssl`" + else + AC_MSG_RESULT(not found) + CFLAGS="" +- LDFLAGS="-lssl -lcrypto" ++ LIBS="-lssl -lcrypto" + fi + + dnl allow overriding openssl settings if the user knows best +@@ -33,9 +33,9 @@ + + AC_MSG_CHECKING(for openssl ldflags) + AC_ARG_WITH(ssl-libs, [ +- AC_HELP_STRING([--with-ssl-libs=LDFLAGS], [linker flags for the OpenSSL library]) +- ], [LDFLAGS="${withval}"], []) +- AC_MSG_RESULT([${LDFLAGS}]) ++ AC_HELP_STRING([--with-ssl-libs=LIBS], [linker flags for the OpenSSL library]) ++ ], [LIBS="${withval}"], []) ++ AC_MSG_RESULT([${LIBS}]) + + dnl check if openssl is usable + AC_CHECK_HEADERS(openssl/ssl.h, [nut_have_libssl=yes], [nut_have_libssl=no], [AC_INCLUDES_DEFAULT]) +@@ -44,11 +44,11 @@ + if test "${nut_have_libssl}" = "yes"; then + AC_DEFINE(HAVE_SSL, 1, [Define to enable SSL development code]) + LIBSSL_CFLAGS="${CFLAGS}" +- LIBSSL_LDFLAGS="${LDFLAGS}" ++ LIBSSL_LIBS="${LIBS}" + fi + +- dnl restore original CFLAGS and LDFLAGS ++ dnl restore original CFLAGS and LIBS + CFLAGS="${CFLAGS_ORIG}" +- LDFLAGS="${LDFLAGS_ORIG}" ++ LIBS="${LIBS_ORIG}" + fi + ]) +--- a/m4/nut_check_libusb.m4 ++++ b/m4/nut_check_libusb.m4 +@@ -1,5 +1,5 @@ + dnl Check for LIBUSB compiler flags. On success, set nut_have_libusb="yes" +-dnl and set LIBUSB_CFLAGS and LIBUSB_LDFLAGS. On failure, set ++dnl and set LIBUSB_CFLAGS and LIBUSB_LIBS. On failure, set + dnl nut_have_libusb="no". This macro can be run multiple times, but will + dnl do the checking only once. + +@@ -8,27 +8,27 @@ + if test -z "${nut_have_libusb_seen}"; then + nut_have_libusb_seen=yes + +- dnl save CFLAGS and LDFLAGS ++ dnl save CFLAGS and LIBS + CFLAGS_ORIG="${CFLAGS}" +- LDFLAGS_ORIG="${LDFLAGS}" ++ LIBS_ORIG="${LIBS}" + + AC_MSG_CHECKING(for libusb version via pkg-config) + LIBUSB_VERSION=`pkg-config --silence-errors --modversion libusb` + if test "$?" = "0"; then + AC_MSG_RESULT(${LIBUSB_VERSION} found) + CFLAGS="`pkg-config --silence-errors --cflags libusb`" +- LDFLAGS="`pkg-config --silence-errors --libs libusb`" ++ LIBS="`pkg-config --silence-errors --libs libusb`" + else + AC_MSG_CHECKING(via libusb-config) + LIBUSB_VERSION=`libusb-config --version 2>/dev/null` + if test "$?" = "0"; then + AC_MSG_RESULT(${LIBUSB_VERSION} found) + CFLAGS="`libusb-config --cflags 2>/dev/null`" +- LDFLAGS="`libusb-config --libs 2>/dev/null`" ++ LIBS="`libusb-config --libs 2>/dev/null`" + else + AC_MSG_RESULT(not found) + CFLAGS="" +- LDFLAGS="-lusb" ++ LIBS="-lusb" + fi + fi + +@@ -40,9 +40,9 @@ + + AC_MSG_CHECKING(for libusb ldflags) + AC_ARG_WITH(usb-libs, [ +- AC_HELP_STRING([--with-usb-libs=LDFLAGS], [linker flags for the libusb library]) +- ], [LDFLAGS="${withval}"], []) +- AC_MSG_RESULT([${LDFLAGS}]) ++ AC_HELP_STRING([--with-usb-libs=LIBS], [linker flags for the libusb library]) ++ ], [LIBS="${withval}"], []) ++ AC_MSG_RESULT([${LIBS}]) + + dnl check if libusb is usable + AC_CHECK_HEADERS(usb.h, [nut_have_libusb=yes], [nut_have_libusb=no], [AC_INCLUDES_DEFAULT]) +@@ -52,11 +52,11 @@ + dnl Check for libusb "force driver unbind" availability + AC_CHECK_FUNCS(usb_detach_kernel_driver_np) + LIBUSB_CFLAGS="${CFLAGS}" +- LIBUSB_LDFLAGS="${LDFLAGS}" ++ LIBUSB_LIBS="${LIBS}" + fi + +- dnl restore original CFLAGS and LDFLAGS ++ dnl restore original CFLAGS and LIBS + CFLAGS="${CFLAGS_ORIG}" +- LDFLAGS="${LDFLAGS_ORIG}" ++ LIBS="${LIBS_ORIG}" + fi + ]) +--- a/drivers/Makefile.am ++++ b/drivers/Makefile.am +@@ -134,7 +134,7 @@ + dummy_ups_LDADD = $(LDADD_DRIVERS) ../clients/libupsclient.la + if WITH_SSL + dummy_ups_CFLAGS += $(LIBSSL_CFLAGS) +- dummy_ups_LDADD += $(LIBSSL_LDFLAGS) ++ dummy_ups_LDADD += $(LIBSSL_LIBS) + endif + + # Clone drivers +@@ -151,23 +151,23 @@ + liebert-hid.c mge-hid.c powercom-hid.c tripplite-hid.c + usbhid_ups_SOURCES = usbhid-ups.c libhid.c libusb.c hidparser.c \ + usb-common.c $(USBHID_UPS_SUBDRIVERS) +-usbhid_ups_LDADD = $(LDADD_DRIVERS) $(LIBUSB_LDFLAGS) ++usbhid_ups_LDADD = $(LDADD_DRIVERS) $(LIBUSB_LIBS) + + tripplite_usb_SOURCES = tripplite_usb.c libusb.c usb-common.c +-tripplite_usb_LDADD = $(LDADD_DRIVERS) $(LIBUSB_LDFLAGS) -lm ++tripplite_usb_LDADD = $(LDADD_DRIVERS) $(LIBUSB_LIBS) -lm + + bcmxcp_usb_SOURCES = bcmxcp_usb.c bcmxcp.c usb-common.c +-bcmxcp_usb_LDADD = $(LDADD_DRIVERS) $(LIBUSB_LDFLAGS) ++bcmxcp_usb_LDADD = $(LDADD_DRIVERS) $(LIBUSB_LIBS) + + megatec_usb_SOURCES = megatec.c megatec_usb.c libusb.c usb-common.c + megatec_usb_CFLAGS = $(AM_CFLAGS) -DMEGATEC_SUBDRV +-megatec_usb_LDADD = $(LDADD_DRIVERS) $(LIBUSB_LDFLAGS) ++megatec_usb_LDADD = $(LDADD_DRIVERS) $(LIBUSB_LIBS) + + blazer_usb_SOURCES = blazer.c blazer_usb.c libusb.c usb-common.c +-blazer_usb_LDADD = $(LDADD_DRIVERS) $(LIBUSB_LDFLAGS) -lm ++blazer_usb_LDADD = $(LDADD_DRIVERS) $(LIBUSB_LIBS) -lm + + richcomm_usb_SOURCES = richcomm_usb.c usb-common.c +-richcomm_usb_LDADD = $(LDADD_DRIVERS) $(LIBUSB_LDFLAGS) ++richcomm_usb_LDADD = $(LDADD_DRIVERS) $(LIBUSB_LIBS) + + # HID-over-serial + newmge_shut_SOURCES = usbhid-ups.c libshut.c libhid.c hidparser.c mge-hid.c +@@ -178,30 +178,30 @@ + # SNMP + snmp_ups_SOURCES = snmp-ups.c apc-mib.c baytech-mib.c compaq-mib.c eaton-mib.c \ + ietf-mib.c mge-mib.c netvision-mib.c powerware-mib.c raritan-pdu-mib.c +-snmp_ups_LDADD = $(LDADD_DRIVERS) $(LIBNETSNMP_LDFLAGS) ++snmp_ups_LDADD = $(LDADD_DRIVERS) $(LIBNETSNMP_LIBS) + + # HAL + hald_addon_usbhid_ups_SOURCES = usbhid-ups.c libhid.c libusb.c hidparser.c \ + $(USBHID_UPS_SUBDRIVERS) +-hald_addon_usbhid_ups_LDADD = $(LDADD_HAL_DRIVERS) $(LIBUSB_LDFLAGS) $(LIBHAL_LDFLAGS) ++hald_addon_usbhid_ups_LDADD = $(LDADD_HAL_DRIVERS) $(LIBUSB_LIBS) $(LIBHAL_LIBS) + + hald_addon_tripplite_usb_SOURCES = tripplite_usb.c libusb.c +-hald_addon_tripplite_usb_LDADD = $(LDADD_HAL_DRIVERS) $(LIBUSB_LDFLAGS) $(LIBHAL_LDFLAGS) -lm ++hald_addon_tripplite_usb_LDADD = $(LDADD_HAL_DRIVERS) $(LIBUSB_LIBS) $(LIBHAL_LIBS) -lm + + hald_addon_bcmxcp_usb_SOURCES = bcmxcp_usb.c bcmxcp.c +-hald_addon_bcmxcp_usb_LDADD = $(LDADD_HAL_DRIVERS) $(LIBUSB_LDFLAGS) $(LIBHAL_LDFLAGS) ++hald_addon_bcmxcp_usb_LDADD = $(LDADD_HAL_DRIVERS) $(LIBUSB_LIBS) $(LIBHAL_LIBS) + + hald_addon_megatec_usb_SOURCES = megatec.c megatec_usb.c libusb.c + hald_addon_megatec_usb_CFLAGS = $(AM_CFLAGS) -DMEGATEC_SUBDRV +-hald_addon_megatec_usb_LDADD = $(LDADD_HAL_DRIVERS) $(LIBUSB_LDFLAGS) $(LIBHAL_LDFLAGS) ++hald_addon_megatec_usb_LDADD = $(LDADD_HAL_DRIVERS) $(LIBUSB_LIBS) $(LIBHAL_LIBS) + + # NEON XML/HTTP + netxml_ups_SOURCES = netxml-ups.c mge-xml.c +-netxml_ups_LDADD = $(LDADD_DRIVERS) $(LIBNEON_LDFLAGS) ++netxml_ups_LDADD = $(LDADD_DRIVERS) $(LIBNEON_LIBS) + + # Powerman + powerman_pdu_SOURCES = powerman-pdu.c +-powerman_pdu_LDADD = $(LDADD) $(LIBPOWERMAN_LDFLAGS) ++powerman_pdu_LDADD = $(LDADD) $(LIBPOWERMAN_LIBS) + + # ---------------------------------------------------------------------- + # List of header files. The purpose of this list is not dependency +--- a/m4/nut_check_libhal.m4 ++++ b/m4/nut_check_libhal.m4 +@@ -1,5 +1,5 @@ + dnl Check for LIBHAL compiler flags. On success, set nut_have_libhal="yes" +-dnl and set LIBHAL_CFLAGS and LIBHAL_LDFLAGS. On failure, set ++dnl and set LIBHAL_CFLAGS and LIBHAL_LIBS. On failure, set + dnl nut_have_libhal="no". This macro can be run multiple times, but will + dnl do the checking only once. + dnl NUT requires HAL version 0.5.8 at least +@@ -10,7 +10,7 @@ + nut_have_libhal_seen=yes + + CFLAGS_ORIG="${CFLAGS}" +- LDFLAGS_ORIG="${LDFLAGS}" ++ LIBS_ORIG="${LIBS}" + + AC_MSG_CHECKING(for libhal version via pkg-config (0.5.8 minimum required)) + HAL_VERSION=`pkg-config --silence-errors --modversion hal` +@@ -31,9 +31,9 @@ + + dnl also get libs from glib-2.0 to workaround a bug in dbus-glib + AC_MSG_CHECKING(for libhal ldflags via pkg-config) +- LDFLAGS=`pkg-config --silence-errors --libs hal dbus-glib-1` ++ LIBS=`pkg-config --silence-errors --libs hal dbus-glib-1` + if test "$?" = "0"; then +- AC_MSG_RESULT(${LDFLAGS}) ++ AC_MSG_RESULT(${LIBS}) + else + AC_MSG_RESULT(not found) + nut_have_libhal=no +@@ -50,7 +50,7 @@ + dnl try again using defaults if pkg-config is not available + if test "${nut_have_libhal}" = "check"; then + CFLAGS="-DDBUS_API_SUBJECT_TO_CHANGE -I/usr/include/hal -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include" +- LDFLAGS="-lhal -ldbus-1 -lpthread" ++ LIBS="-lhal -ldbus-1 -lpthread" + + AC_CHECK_HEADERS(libhal.h, [nut_have_libhal=yes], [nut_have_libhal=no], [AC_INCLUDES_DEFAULT]) + AC_CHECK_FUNCS(libhal_device_new_changeset, [], [nut_have_libhal=no]) +@@ -58,7 +58,7 @@ + + if test "${nut_have_libhal}" = "yes"; then + LIBHAL_CFLAGS="${CFLAGS}" +- LIBHAL_LDFLAGS="${LDFLAGS}" ++ LIBHAL_LIBS="${LIBS}" + + dnl this will only work as of HAL 0.5.9 + AC_MSG_CHECKING(for libhal user via pkg-config) +@@ -124,7 +124,7 @@ + fi + + CFLAGS="${CFLAGS_ORIG}" +- LDFLAGS="${LDFLAGS_ORIG}" ++ LIBS="${LIBS_ORIG}" + + dnl - test for g_timeout_add_seconds availability + AC_MSG_CHECKING([if GLib is version 2.14.0 or newer]) +--- a/m4/nut_check_libwrap.m4 ++++ b/m4/nut_check_libwrap.m4 +@@ -1,5 +1,5 @@ + dnl Check for LIBWRAP compiler flags. On success, set nut_have_libwrap="yes" +-dnl and set LIBWRAP_CFLAGS and LIBWRAP_LDFLAGS. On failure, set ++dnl and set LIBWRAP_CFLAGS and LIBWRAP_LIBS. On failure, set + dnl nut_have_libwrap="no". This macro can be run multiple times, but will + dnl do the checking only once. + +@@ -39,7 +39,7 @@ + if test "${nut_have_libwrap}" = "yes"; then + AC_DEFINE(HAVE_WRAP, 1, [Define to enable libwrap support]) + LIBWRAP_CFLAGS="" +- LIBWRAP_LDFLAGS="${LIBS}" ++ LIBWRAP_LIBS="${LIBS}" + fi + + dnl restore original LIBS +--- a/server/Makefile.am ++++ b/server/Makefile.am +@@ -12,10 +12,10 @@ + endif + LDADD = ../common/libcommon.a ../common/libparseconf.la $(NETLIBS) + if WITH_WRAP +- LDADD += $(LIBWRAP_LDFLAGS) ++ LDADD += $(LIBWRAP_LIBS) + endif + if WITH_SSL +- LDADD += $(LIBSSL_LDFLAGS) ++ LDADD += $(LIBSSL_LIBS) + endif + + sbin_PROGRAMS = upsd +--- a/clients/Makefile.am ++++ b/clients/Makefile.am +@@ -3,7 +3,7 @@ + # by default, link programs in this directory with libcommon.a + LDADD = ../common/libcommon.a libupsclient.la $(NETLIBS) + if WITH_SSL +- LDADD += $(LIBSSL_LDFLAGS) ++ LDADD += $(LIBSSL_LIBS) + endif + + # Avoid per-target CFLAGS, because this will prevent re-use of object +@@ -48,6 +48,6 @@ + libupsclient_la_SOURCES = upsclient.c upsclient.h + libupsclient_la_LIBADD = ../common/libparseconf.la + if WITH_SSL +- libupsclient_la_LIBADD += $(LIBSSL_LDFLAGS) ++ libupsclient_la_LIBADD += $(LIBSSL_LIBS) + endif + libupsclient_la_LDFLAGS = -version-info 1:0:0 +--- a/configure.in ++++ b/configure.in +@@ -194,7 +194,7 @@ + solaris2.1* ) + echo Checking for Solaris 10 / 11 specific configuration for usb drivers + AC_SEARCH_LIBS(nanosleep, rt) +- LIBUSB_LDFLAGS="-R/usr/sfw/lib ${LIBUSB_LDFLAGS}" ++ LIBUSB_LIBS="-R/usr/sfw/lib ${LIBUSB_LIBS}" + dnl FIXME: Sun's libusb doesn't support timeout (so blocks notification) + dnl and need to call libusb close upon reconnexion + AC_DEFINE(SUN_LIBUSB, 1, [Define to 1 for Sun version of the libusb.]) +@@ -742,26 +742,26 @@ + + AC_SUBST(OS_NAME) + AC_SUBST(LIBSSL_CFLAGS) +-AC_SUBST(LIBSSL_LDFLAGS) ++AC_SUBST(LIBSSL_LIBS) + AC_SUBST(LIBGD_CFLAGS) + AC_SUBST(LIBGD_LDFLAGS) + AC_SUBST(LIBNETSNMP_CFLAGS) +-AC_SUBST(LIBNETSNMP_LDFLAGS) ++AC_SUBST(LIBNETSNMP_LIBS) + AC_SUBST(LIBUSB_CFLAGS) +-AC_SUBST(LIBUSB_LDFLAGS) ++AC_SUBST(LIBUSB_LIBS) + AC_SUBST(LIBNEON_CFLAGS) +-AC_SUBST(LIBNEON_LDFLAGS) ++AC_SUBST(LIBNEON_LIBS) + AC_SUBST(LIBPOWERMAN_CFLAGS) +-AC_SUBST(LIBPOWERMAN_LDFLAGS) ++AC_SUBST(LIBPOWERMAN_LIBS) + AC_SUBST(LIBWRAP_CFLAGS) +-AC_SUBST(LIBWRAP_LDFLAGS) ++AC_SUBST(LIBWRAP_LIBS) + AC_SUBST(HAL_USER) + AC_SUBST(HAL_DEVICE_MATCH_KEY) + AC_SUBST(HAL_FDI_PATH) + AC_SUBST(HAL_CALLOUTS_PATH) + AC_SUBST(HAVE_GLIB_2_14) + AC_SUBST(LIBHAL_CFLAGS) +-AC_SUBST(LIBHAL_LDFLAGS) ++AC_SUBST(LIBHAL_LIBS) + AC_SUBST(DRIVER_BUILD_LIST) + AC_SUBST(DRIVER_MAN_LIST) + AC_SUBST(DRIVER_INSTALL_TARGET) diff -Nru nut-2.4.3/debian/patches/9999-autoconf.patch nut-2.4.3/debian/patches/9999-autoconf.patch --- nut-2.4.3/debian/patches/9999-autoconf.patch 1970-01-01 01:00:00.000000000 +0100 +++ nut-2.4.3/debian/patches/9999-autoconf.patch 2011-01-11 00:14:16.000000000 +0100 @@ -0,0 +1,3548 @@ +--- a/configure ++++ b/configure +@@ -1,11 +1,13 @@ + #! /bin/sh + # Guess values for system-dependent variables and create Makefiles. +-# Generated by GNU Autoconf 2.64 for nut 2.4.3. ++# Generated by GNU Autoconf 2.67 for nut 2.4.3. ++# + # + # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, +-# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software ++# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software + # Foundation, Inc. + # ++# + # This configure script is free software; the Free Software Foundation + # gives unlimited permission to copy, distribute and modify it. + ## -------------------- ## +@@ -314,7 +316,7 @@ + test -d "$as_dir" && break + done + test -z "$as_dirs" || eval "mkdir $as_dirs" +- } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir" ++ } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" + + + } # as_fn_mkdir_p +@@ -354,19 +356,19 @@ + fi # as_fn_arith + + +-# as_fn_error ERROR [LINENO LOG_FD] +-# --------------------------------- ++# as_fn_error STATUS ERROR [LINENO LOG_FD] ++# ---------------------------------------- + # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are + # provided, also output the error to LOG_FD, referencing LINENO. Then exit the +-# script with status $?, using 1 if that was 0. ++# script with STATUS, using 1 if that was 0. + as_fn_error () + { +- as_status=$?; test $as_status -eq 0 && as_status=1 +- if test "$3"; then +- as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack +- $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3 ++ as_status=$1; test $as_status -eq 0 && as_status=1 ++ if test "$4"; then ++ as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack ++ $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 + fi +- $as_echo "$as_me: error: $1" >&2 ++ $as_echo "$as_me: error: $2" >&2 + as_fn_exit $as_status + } # as_fn_error + +@@ -673,10 +675,11 @@ + + + +-exec 7<&0 &1 ++test -n "$DJDIR" || exec 7<&0 &1 + + # Name of the host. +-# hostname on some systems (SVR3.2, Linux) returns a bogus exit status, ++# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status, + # so uname gets run too. + ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` + +@@ -759,26 +762,26 @@ + DRIVER_INSTALL_TARGET + DRIVER_MAN_LIST + DRIVER_BUILD_LIST +-LIBHAL_LDFLAGS ++LIBHAL_LIBS + LIBHAL_CFLAGS + HAVE_GLIB_2_14 + HAL_CALLOUTS_PATH + HAL_FDI_PATH + HAL_DEVICE_MATCH_KEY + HAL_USER +-LIBWRAP_LDFLAGS ++LIBWRAP_LIBS + LIBWRAP_CFLAGS +-LIBPOWERMAN_LDFLAGS ++LIBPOWERMAN_LIBS + LIBPOWERMAN_CFLAGS +-LIBNEON_LDFLAGS ++LIBNEON_LIBS + LIBNEON_CFLAGS +-LIBUSB_LDFLAGS ++LIBUSB_LIBS + LIBUSB_CFLAGS +-LIBNETSNMP_LDFLAGS ++LIBNETSNMP_LIBS + LIBNETSNMP_CFLAGS + LIBGD_LDFLAGS + LIBGD_CFLAGS +-LIBSSL_LDFLAGS ++LIBSSL_LIBS + LIBSSL_CFLAGS + OS_NAME + WITH_UDEV_FALSE +@@ -1044,8 +1047,9 @@ + fi + + case $ac_option in +- *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; +- *) ac_optarg=yes ;; ++ *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; ++ *=) ac_optarg= ;; ++ *) ac_optarg=yes ;; + esac + + # Accept the important Cygnus configure options, so we can diagnose typos. +@@ -1090,7 +1094,7 @@ + ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'` + # Reject names that are not valid shell variable names. + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && +- as_fn_error "invalid feature name: $ac_useropt" ++ as_fn_error $? "invalid feature name: $ac_useropt" + ac_useropt_orig=$ac_useropt + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + case $ac_user_opts in +@@ -1116,7 +1120,7 @@ + ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` + # Reject names that are not valid shell variable names. + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && +- as_fn_error "invalid feature name: $ac_useropt" ++ as_fn_error $? "invalid feature name: $ac_useropt" + ac_useropt_orig=$ac_useropt + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + case $ac_user_opts in +@@ -1320,7 +1324,7 @@ + ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` + # Reject names that are not valid shell variable names. + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && +- as_fn_error "invalid package name: $ac_useropt" ++ as_fn_error $? "invalid package name: $ac_useropt" + ac_useropt_orig=$ac_useropt + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + case $ac_user_opts in +@@ -1336,7 +1340,7 @@ + ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'` + # Reject names that are not valid shell variable names. + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && +- as_fn_error "invalid package name: $ac_useropt" ++ as_fn_error $? "invalid package name: $ac_useropt" + ac_useropt_orig=$ac_useropt + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + case $ac_user_opts in +@@ -1366,8 +1370,8 @@ + | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) + x_libraries=$ac_optarg ;; + +- -*) as_fn_error "unrecognized option: \`$ac_option' +-Try \`$0 --help' for more information." ++ -*) as_fn_error $? "unrecognized option: \`$ac_option' ++Try \`$0 --help' for more information" + ;; + + *=*) +@@ -1375,7 +1379,7 @@ + # Reject names that are not valid shell variable names. + case $ac_envvar in #( + '' | [0-9]* | *[!_$as_cr_alnum]* ) +- as_fn_error "invalid variable name: \`$ac_envvar'" ;; ++ as_fn_error $? "invalid variable name: \`$ac_envvar'" ;; + esac + eval $ac_envvar=\$ac_optarg + export $ac_envvar ;; +@@ -1393,13 +1397,13 @@ + + if test -n "$ac_prev"; then + ac_option=--`echo $ac_prev | sed 's/_/-/g'` +- as_fn_error "missing argument to $ac_option" ++ as_fn_error $? "missing argument to $ac_option" + fi + + if test -n "$ac_unrecognized_opts"; then + case $enable_option_checking in + no) ;; +- fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;; ++ fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;; + *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; + esac + fi +@@ -1422,7 +1426,7 @@ + [\\/$]* | ?:[\\/]* ) continue;; + NONE | '' ) case $ac_var in *prefix ) continue;; esac;; + esac +- as_fn_error "expected an absolute directory name for --$ac_var: $ac_val" ++ as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val" + done + + # There might be people who depend on the old broken behavior: `$host' +@@ -1436,8 +1440,8 @@ + if test "x$host_alias" != x; then + if test "x$build_alias" = x; then + cross_compiling=maybe +- $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. +- If a cross compiler is detected then cross compile mode will be used." >&2 ++ $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host. ++ If a cross compiler is detected then cross compile mode will be used" >&2 + elif test "x$build_alias" != "x$host_alias"; then + cross_compiling=yes + fi +@@ -1452,9 +1456,9 @@ + ac_pwd=`pwd` && test -n "$ac_pwd" && + ac_ls_di=`ls -di .` && + ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || +- as_fn_error "working directory cannot be determined" ++ as_fn_error $? "working directory cannot be determined" + test "X$ac_ls_di" = "X$ac_pwd_ls_di" || +- as_fn_error "pwd does not report name of working directory" ++ as_fn_error $? "pwd does not report name of working directory" + + + # Find the source files, if location was not specified. +@@ -1493,11 +1497,11 @@ + fi + if test ! -r "$srcdir/$ac_unique_file"; then + test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." +- as_fn_error "cannot find sources ($ac_unique_file) in $srcdir" ++ as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir" + fi + ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" + ac_abs_confdir=`( +- cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg" ++ cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg" + pwd)` + # When building in place, set srcdir=. + if test "$ac_abs_confdir" = "$ac_pwd"; then +@@ -1537,7 +1541,7 @@ + --help=short display options specific to this package + --help=recursive display the short help of all the included packages + -V, --version display version information and exit +- -q, --quiet, --silent do not print \`checking...' messages ++ -q, --quiet, --silent do not print \`checking ...' messages + --cache-file=FILE cache test results in FILE [disabled] + -C, --config-cache alias for \`--cache-file=config.cache' + -n, --no-create do not create output files +@@ -1626,7 +1630,7 @@ + include flags for the libusb library + + +- --with-usb-libs=LDFLAGS linker flags for the libusb library ++ --with-usb-libs=LIBS linker flags for the libusb library + + --with-hal build and install HAL support (no) + --with-snmp build and install SNMP drivers (auto) +@@ -1635,8 +1639,7 @@ + include flags for the Net-SNMP library + + +- --with-snmp-libs=LDFLAGS +- linker flags for the Net-SNMP library ++ --with-snmp-libs=LIBS linker flags for the Net-SNMP library + + --with-neon build and install neon based XML/HTTP driver (auto) + +@@ -1644,8 +1647,7 @@ + include flags for the neon library + + +- --with-neon-libs=LDFLAGS +- linker flags for the neon library ++ --with-neon-libs=LIBS linker flags for the neon library + + --with-powerman build and install Powerman PDU client driver (auto) + +@@ -1653,7 +1655,7 @@ + include flags for the libpowerman library + + +- --with-powerman-libs=LDFLAGS ++ --with-powerman-libs=LIBS + linker flags for the libpowerman library + + --with-ssl enable SSL development code (auto) +@@ -1662,7 +1664,7 @@ + include flags for the OpenSSL library + + +- --with-ssl-libs=LDFLAGS linker flags for the OpenSSL library ++ --with-ssl-libs=LIBS linker flags for the OpenSSL library + + --with-wrap enable libwrap (tcp-wrappers) support (auto) + --with-ipv6 enable IPv6 support (auto) +@@ -1703,7 +1705,7 @@ + LDFLAGS linker flags, e.g. -L if you have libraries in a + nonstandard directory + LIBS libraries to pass to the linker, e.g. -l +- CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I if ++ CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I if + you have headers in a nonstandard directory + CPP C preprocessor + +@@ -1774,9 +1776,9 @@ + if $ac_init_version; then + cat <<\_ACEOF + nut configure 2.4.3 +-generated by GNU Autoconf 2.64 ++generated by GNU Autoconf 2.67 + +-Copyright (C) 2009 Free Software Foundation, Inc. ++Copyright (C) 2010 Free Software Foundation, Inc. + This configure script is free software; the Free Software Foundation + gives unlimited permission to copy, distribute and modify it. + _ACEOF +@@ -1821,7 +1823,7 @@ + ac_retval=1 + fi + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} +- return $ac_retval ++ as_fn_set_status $ac_retval + + } # ac_fn_c_try_compile + +@@ -1846,7 +1848,7 @@ + mv -f conftest.er1 conftest.err + fi + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 +- test $ac_status = 0; } >/dev/null && { ++ test $ac_status = 0; } > conftest.i && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then : +@@ -1858,7 +1860,7 @@ + ac_retval=1 + fi + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} +- return $ac_retval ++ as_fn_set_status $ac_retval + + } # ac_fn_c_try_cpp + +@@ -1870,10 +1872,10 @@ + ac_fn_c_check_header_mongrel () + { + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack +- if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : ++ if eval "test \"\${$3+set}\"" = set; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 + $as_echo_n "checking for $2... " >&6; } +-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : ++if eval "test \"\${$3+set}\"" = set; then : + $as_echo_n "(cached) " >&6 + fi + eval ac_res=\$$3 +@@ -1909,7 +1911,7 @@ + else + ac_header_preproc=no + fi +-rm -f conftest.err conftest.$ac_ext ++rm -f conftest.err conftest.i conftest.$ac_ext + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5 + $as_echo "$ac_header_preproc" >&6; } + +@@ -1936,7 +1938,7 @@ + esac + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 + $as_echo_n "checking for $2... " >&6; } +-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : ++if eval "test \"\${$3+set}\"" = set; then : + $as_echo_n "(cached) " >&6 + else + eval "$3=\$ac_header_compiler" +@@ -1987,7 +1989,7 @@ + fi + rm -rf conftest.dSYM conftest_ipa8_conftest.oo + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} +- return $ac_retval ++ as_fn_set_status $ac_retval + + } # ac_fn_c_try_run + +@@ -2000,7 +2002,7 @@ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 + $as_echo_n "checking for $2... " >&6; } +-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : ++if eval "test \"\${$3+set}\"" = set; then : + $as_echo_n "(cached) " >&6 + else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +@@ -2064,7 +2066,7 @@ + # left behind by Apple's compiler. We do this before executing the actions. + rm -rf conftest.dSYM conftest_ipa8_conftest.oo + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} +- return $ac_retval ++ as_fn_set_status $ac_retval + + } # ac_fn_c_try_link + +@@ -2076,7 +2078,7 @@ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 + $as_echo_n "checking for $2... " >&6; } +-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : ++if eval "test \"\${$3+set}\"" = set; then : + $as_echo_n "(cached) " >&6 + else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +@@ -2135,15 +2137,18 @@ + + } # ac_fn_c_check_func + +-# ac_fn_c_check_decl LINENO SYMBOL VAR +-# ------------------------------------ +-# Tests whether SYMBOL is declared, setting cache variable VAR accordingly. ++# ac_fn_c_check_decl LINENO SYMBOL VAR INCLUDES ++# --------------------------------------------- ++# Tests whether SYMBOL is declared in INCLUDES, setting cache variable VAR ++# accordingly. + ac_fn_c_check_decl () + { + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $2 is declared" >&5 +-$as_echo_n "checking whether $2 is declared... " >&6; } +-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : ++ as_decl_name=`echo $2|sed 's/ *(.*//'` ++ as_decl_use=`echo $2|sed -e 's/(/((/' -e 's/)/) 0&/' -e 's/,/) 0& (/g'` ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $as_decl_name is declared" >&5 ++$as_echo_n "checking whether $as_decl_name is declared... " >&6; } ++if eval "test \"\${$3+set}\"" = set; then : + $as_echo_n "(cached) " >&6 + else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +@@ -2152,8 +2157,12 @@ + int + main () + { +-#ifndef $2 +- (void) $2; ++#ifndef $as_decl_name ++#ifdef __cplusplus ++ (void) $as_decl_use; ++#else ++ (void) $as_decl_name; ++#endif + #endif + + ; +@@ -2183,7 +2192,7 @@ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 + $as_echo_n "checking for $2... " >&6; } +-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : ++if eval "test \"\${$3+set}\"" = set; then : + $as_echo_n "(cached) " >&6 + else + eval "$3=no" +@@ -2402,7 +2411,7 @@ + + fi + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} +- return $ac_retval ++ as_fn_set_status $ac_retval + + } # ac_fn_c_compute_int + cat >config.log <<_ACEOF +@@ -2410,7 +2419,7 @@ + running configure, to aid debugging if configure makes a mistake. + + It was created by nut $as_me 2.4.3, which was +-generated by GNU Autoconf 2.64. Invocation command line was ++generated by GNU Autoconf 2.67. Invocation command line was + + $ $0 $@ + +@@ -2520,11 +2529,9 @@ + { + echo + +- cat <<\_ASBOX +-## ---------------- ## ++ $as_echo "## ---------------- ## + ## Cache variables. ## +-## ---------------- ## +-_ASBOX ++## ---------------- ##" + echo + # The following way of writing the cache mishandles newlines in values, + ( +@@ -2558,11 +2565,9 @@ + ) + echo + +- cat <<\_ASBOX +-## ----------------- ## ++ $as_echo "## ----------------- ## + ## Output variables. ## +-## ----------------- ## +-_ASBOX ++## ----------------- ##" + echo + for ac_var in $ac_subst_vars + do +@@ -2575,11 +2580,9 @@ + echo + + if test -n "$ac_subst_files"; then +- cat <<\_ASBOX +-## ------------------- ## ++ $as_echo "## ------------------- ## + ## File substitutions. ## +-## ------------------- ## +-_ASBOX ++## ------------------- ##" + echo + for ac_var in $ac_subst_files + do +@@ -2593,11 +2596,9 @@ + fi + + if test -s confdefs.h; then +- cat <<\_ASBOX +-## ----------- ## ++ $as_echo "## ----------- ## + ## confdefs.h. ## +-## ----------- ## +-_ASBOX ++## ----------- ##" + echo + cat confdefs.h + echo +@@ -2652,7 +2653,12 @@ + ac_site_file1=NONE + ac_site_file2=NONE + if test -n "$CONFIG_SITE"; then +- ac_site_file1=$CONFIG_SITE ++ # We do not want a PATH search for config.site. ++ case $CONFIG_SITE in #(( ++ -*) ac_site_file1=./$CONFIG_SITE;; ++ */*) ac_site_file1=$CONFIG_SITE;; ++ *) ac_site_file1=./$CONFIG_SITE;; ++ esac + elif test "x$prefix" != xNONE; then + ac_site_file1=$prefix/share/config.site + ac_site_file2=$prefix/etc/config.site +@@ -2663,18 +2669,22 @@ + for ac_site_file in "$ac_site_file1" "$ac_site_file2" + do + test "x$ac_site_file" = xNONE && continue +- if test -r "$ac_site_file"; then ++ if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5 + $as_echo "$as_me: loading site script $ac_site_file" >&6;} + sed 's/^/| /' "$ac_site_file" >&5 +- . "$ac_site_file" ++ . "$ac_site_file" \ ++ || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 ++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} ++as_fn_error $? "failed to load site script $ac_site_file ++See \`config.log' for more details" "$LINENO" 5 ; } + fi + done + + if test -r "$cache_file"; then +- # Some versions of bash will fail to source /dev/null (special +- # files actually), so we avoid doing that. +- if test -f "$cache_file"; then ++ # Some versions of bash will fail to source /dev/null (special files ++ # actually), so we avoid doing that. DJGPP emulates it as a regular file. ++ if test /dev/null != "$cache_file" && test -f "$cache_file"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5 + $as_echo "$as_me: loading cache $cache_file" >&6;} + case $cache_file in +@@ -2743,7 +2753,7 @@ + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 + $as_echo "$as_me: error: changes in the environment can compromise the build" >&2;} +- as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 ++ as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 + fi + ## -------------------- ## + ## Main body of script. ## +@@ -2761,16 +2771,22 @@ + echo "Network UPS Tools version ${PACKAGE_VERSION}" + ac_aux_dir= + for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do +- for ac_t in install-sh install.sh shtool; do +- if test -f "$ac_dir/$ac_t"; then +- ac_aux_dir=$ac_dir +- ac_install_sh="$ac_aux_dir/$ac_t -c" +- break 2 +- fi +- done ++ if test -f "$ac_dir/install-sh"; then ++ ac_aux_dir=$ac_dir ++ ac_install_sh="$ac_aux_dir/install-sh -c" ++ break ++ elif test -f "$ac_dir/install.sh"; then ++ ac_aux_dir=$ac_dir ++ ac_install_sh="$ac_aux_dir/install.sh -c" ++ break ++ elif test -f "$ac_dir/shtool"; then ++ ac_aux_dir=$ac_dir ++ ac_install_sh="$ac_aux_dir/shtool install -c" ++ break ++ fi + done + if test -z "$ac_aux_dir"; then +- as_fn_error "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5 ++ as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5 + fi + + # These three variables are undocumented and unsupported, +@@ -2784,7 +2800,7 @@ + + # Make sure we can run config.sub. + $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || +- as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 ++ as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 + $as_echo_n "checking build system type... " >&6; } +@@ -2795,16 +2811,16 @@ + test "x$ac_build_alias" = x && + ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` + test "x$ac_build_alias" = x && +- as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5 ++ as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5 + ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || +- as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5 ++ as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5 + + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5 + $as_echo "$ac_cv_build" >&6; } + case $ac_cv_build in + *-*-*) ;; +-*) as_fn_error "invalid value of canonical build" "$LINENO" 5;; ++*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5 ;; + esac + build=$ac_cv_build + ac_save_IFS=$IFS; IFS='-' +@@ -2829,7 +2845,7 @@ + ac_cv_host=$ac_cv_build + else + ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || +- as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5 ++ as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5 + fi + + fi +@@ -2837,7 +2853,7 @@ + $as_echo "$ac_cv_host" >&6; } + case $ac_cv_host in + *-*-*) ;; +-*) as_fn_error "invalid value of canonical host" "$LINENO" 5;; ++*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5 ;; + esac + host=$ac_cv_host + ac_save_IFS=$IFS; IFS='-' +@@ -2862,7 +2878,7 @@ + ac_cv_target=$ac_cv_host + else + ac_cv_target=`$SHELL "$ac_aux_dir/config.sub" $target_alias` || +- as_fn_error "$SHELL $ac_aux_dir/config.sub $target_alias failed" "$LINENO" 5 ++ as_fn_error $? "$SHELL $ac_aux_dir/config.sub $target_alias failed" "$LINENO" 5 + fi + + fi +@@ -2870,7 +2886,7 @@ + $as_echo "$ac_cv_target" >&6; } + case $ac_cv_target in + *-*-*) ;; +-*) as_fn_error "invalid value of canonical target" "$LINENO" 5;; ++*) as_fn_error $? "invalid value of canonical target" "$LINENO" 5 ;; + esac + target=$ac_cv_target + ac_save_IFS=$IFS; IFS='-' +@@ -3139,11 +3155,11 @@ + ' + case `pwd` in + *[\\\"\#\$\&\'\`$am_lf]*) +- as_fn_error "unsafe absolute working directory name" "$LINENO" 5;; ++ as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5 ;; + esac + case $srcdir in + *[\\\"\#\$\&\'\`$am_lf\ \ ]*) +- as_fn_error "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;; ++ as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5 ;; + esac + + # Do `set' in a subshell so we don't clobber the current shell's +@@ -3165,7 +3181,7 @@ + # if, for instance, CONFIG_SHELL is bash and it inherits a + # broken ls alias from the environment. This has actually + # happened. Such a system could not be considered "sane". +- as_fn_error "ls -t appears to fail. Make sure there is not a broken ++ as_fn_error $? "ls -t appears to fail. Make sure there is not a broken + alias in your environment" "$LINENO" 5 + fi + +@@ -3175,7 +3191,7 @@ + # Ok. + : + else +- as_fn_error "newly created file is older than distributed files! ++ as_fn_error $? "newly created file is older than distributed files! + Check your system clock" "$LINENO" 5 + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +@@ -3347,6 +3363,7 @@ + + fi + ++ test -d ./--version && rmdir ./--version + if test "${ac_cv_path_mkdir+set}" = set; then + MKDIR_P="$ac_cv_path_mkdir -p" + else +@@ -3354,7 +3371,6 @@ + # value for MKDIR_P within a source directory, because that will + # break other packages using the cache if that directory is + # removed, or if the value is a relative name. +- test -d ./--version && rmdir ./--version + MKDIR_P="$ac_install_sh -d" + fi + fi +@@ -3413,7 +3429,7 @@ + $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } + set x ${MAKE-make} + ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` +-if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then : ++if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\"" = set; then : + $as_echo_n "(cached) " >&6 + else + cat >conftest.make <<\_ACEOF +@@ -3421,7 +3437,7 @@ + all: + @echo '@@@%%%=$(MAKE)=@@@%%%' + _ACEOF +-# GNU make sometimes prints "make[1]: Entering...", which would confuse us. ++# GNU make sometimes prints "make[1]: Entering ...", which would confuse us. + case `${MAKE-make} -f conftest.make 2>/dev/null` in + *@@@%%%=?*=@@@%%%*) + eval ac_cv_prog_make_${ac_make}_set=yes;; +@@ -3455,7 +3471,7 @@ + am__isrc=' -I$(srcdir)' + # test to see if srcdir already configured + if test -f $srcdir/config.status; then +- as_fn_error "source directory already configured; run \"make distclean\" there first" "$LINENO" 5 ++ as_fn_error $? "source directory already configured; run \"make distclean\" there first" "$LINENO" 5 + fi + fi + +@@ -3875,8 +3891,8 @@ + + test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-as_fn_error "no acceptable C compiler found in \$PATH +-See \`config.log' for more details." "$LINENO" 5; } ++as_fn_error $? "no acceptable C compiler found in \$PATH ++See \`config.log' for more details" "$LINENO" 5 ; } + + # Provide some information about the compiler. + $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 +@@ -3897,32 +3913,30 @@ + ... rest of stderr output deleted ... + 10q' conftest.err >conftest.er1 + cat conftest.er1 >&5 +- rm -f conftest.er1 conftest.err + fi ++ rm -f conftest.er1 conftest.err + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + done + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ +-#include ++ + int + main () + { +-FILE *f = fopen ("conftest.out", "w"); +- return ferror (f) || fclose (f) != 0; + + ; + return 0; + } + _ACEOF + ac_clean_files_save=$ac_clean_files +-ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out conftest.out" ++ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out" + # Try to create an executable without -o first, disregard a.out. + # It will help us diagnose broken compilers, and finding out an intuition + # of exeext. +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5 +-$as_echo_n "checking for C compiler default output file name... " >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5 ++$as_echo_n "checking whether the C compiler works... " >&6; } + ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` + + # The possible output files: +@@ -3984,62 +3998,28 @@ + else + ac_file='' + fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5 +-$as_echo "$ac_file" >&6; } + if test -z "$ac_file"; then : +- $as_echo "$as_me: failed program was:" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++$as_echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-{ as_fn_set_status 77 +-as_fn_error "C compiler cannot create executables +-See \`config.log' for more details." "$LINENO" 5; }; } ++as_fn_error 77 "C compiler cannot create executables ++See \`config.log' for more details" "$LINENO" 5 ; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 ++$as_echo "yes" >&6; } + fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5 ++$as_echo_n "checking for C compiler default output file name... " >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5 ++$as_echo "$ac_file" >&6; } + ac_exeext=$ac_cv_exeext + +-# Check that the compiler produces executables we can run. If not, either +-# the compiler is broken, or we cross compile. +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5 +-$as_echo_n "checking whether the C compiler works... " >&6; } +-# If not cross compiling, check that we can run a simple program. +-if test "$cross_compiling" != yes; then +- if { ac_try='./$ac_file' +- { { case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +-$as_echo "$ac_try_echo"; } >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 +- test $ac_status = 0; }; }; then +- cross_compiling=no +- else +- if test "$cross_compiling" = maybe; then +- cross_compiling=yes +- else +- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-as_fn_error "cannot run C compiled programs. +-If you meant to cross compile, use \`--host'. +-See \`config.log' for more details." "$LINENO" 5; } +- fi +- fi +-fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +-$as_echo "yes" >&6; } +- +-rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out conftest.out ++rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out + ac_clean_files=$ac_clean_files_save +-# Check that the compiler produces executables we can run. If not, either +-# the compiler is broken, or we cross compile. +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5 +-$as_echo_n "checking whether we are cross compiling... " >&6; } +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 +-$as_echo "$cross_compiling" >&6; } +- + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5 + $as_echo_n "checking for suffix of executables... " >&6; } + if { { ac_try="$ac_link" +@@ -4069,16 +4049,75 @@ + else + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-as_fn_error "cannot compute suffix of executables: cannot compile and link +-See \`config.log' for more details." "$LINENO" 5; } ++as_fn_error $? "cannot compute suffix of executables: cannot compile and link ++See \`config.log' for more details" "$LINENO" 5 ; } + fi +-rm -f conftest$ac_cv_exeext ++rm -f conftest conftest$ac_cv_exeext + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 + $as_echo "$ac_cv_exeext" >&6; } + + rm -f conftest.$ac_ext + EXEEXT=$ac_cv_exeext + ac_exeext=$EXEEXT ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++#include ++int ++main () ++{ ++FILE *f = fopen ("conftest.out", "w"); ++ return ferror (f) || fclose (f) != 0; ++ ++ ; ++ return 0; ++} ++_ACEOF ++ac_clean_files="$ac_clean_files conftest.out" ++# Check that the compiler produces executables we can run. If not, either ++# the compiler is broken, or we cross compile. ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5 ++$as_echo_n "checking whether we are cross compiling... " >&6; } ++if test "$cross_compiling" != yes; then ++ { { ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" ++$as_echo "$ac_try_echo"; } >&5 ++ (eval "$ac_link") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; } ++ if { ac_try='./conftest$ac_cv_exeext' ++ { { case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" ++$as_echo "$ac_try_echo"; } >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; }; then ++ cross_compiling=no ++ else ++ if test "$cross_compiling" = maybe; then ++ cross_compiling=yes ++ else ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 ++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} ++as_fn_error $? "cannot run C compiled programs. ++If you meant to cross compile, use \`--host'. ++See \`config.log' for more details" "$LINENO" 5 ; } ++ fi ++ fi ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 ++$as_echo "$cross_compiling" >&6; } ++ ++rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out ++ac_clean_files=$ac_clean_files_save + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 + $as_echo_n "checking for suffix of object files... " >&6; } + if test "${ac_cv_objext+set}" = set; then : +@@ -4121,8 +4160,8 @@ + + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-as_fn_error "cannot compute suffix of object files: cannot compile +-See \`config.log' for more details." "$LINENO" 5; } ++as_fn_error $? "cannot compute suffix of object files: cannot compile ++See \`config.log' for more details" "$LINENO" 5 ; } + fi + rm -f conftest.$ac_cv_objext conftest.$ac_ext + fi +@@ -4512,7 +4551,7 @@ + # Broken: fails on valid input. + continue + fi +-rm -f conftest.err conftest.$ac_ext ++rm -f conftest.err conftest.i conftest.$ac_ext + + # OK, works on sane cases. Now check whether nonexistent headers + # can be detected and how. +@@ -4528,11 +4567,11 @@ + ac_preproc_ok=: + break + fi +-rm -f conftest.err conftest.$ac_ext ++rm -f conftest.err conftest.i conftest.$ac_ext + + done + # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. +-rm -f conftest.err conftest.$ac_ext ++rm -f conftest.i conftest.err conftest.$ac_ext + if $ac_preproc_ok; then : + break + fi +@@ -4571,7 +4610,7 @@ + # Broken: fails on valid input. + continue + fi +-rm -f conftest.err conftest.$ac_ext ++rm -f conftest.err conftest.i conftest.$ac_ext + + # OK, works on sane cases. Now check whether nonexistent headers + # can be detected and how. +@@ -4587,18 +4626,18 @@ + ac_preproc_ok=: + break + fi +-rm -f conftest.err conftest.$ac_ext ++rm -f conftest.err conftest.i conftest.$ac_ext + + done + # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. +-rm -f conftest.err conftest.$ac_ext ++rm -f conftest.i conftest.err conftest.$ac_ext + if $ac_preproc_ok; then : + + else + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-as_fn_error "C preprocessor \"$CPP\" fails sanity check +-See \`config.log' for more details." "$LINENO" 5; } ++as_fn_error $? "C preprocessor \"$CPP\" fails sanity check ++See \`config.log' for more details" "$LINENO" 5 ; } + fi + + ac_ext=c +@@ -4659,7 +4698,7 @@ + done + IFS=$as_save_IFS + if test -z "$ac_cv_path_GREP"; then +- as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 ++ as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 + fi + else + ac_cv_path_GREP=$GREP +@@ -4725,7 +4764,7 @@ + done + IFS=$as_save_IFS + if test -z "$ac_cv_path_EGREP"; then +- as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 ++ as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 + fi + else + ac_cv_path_EGREP=$EGREP +@@ -4857,8 +4896,7 @@ + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` + ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default + " +-eval as_val=\$$as_ac_Header +- if test "x$as_val" = x""yes; then : ++if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF + #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 + _ACEOF +@@ -5287,8 +5325,8 @@ + + test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-as_fn_error "no acceptable C compiler found in \$PATH +-See \`config.log' for more details." "$LINENO" 5; } ++as_fn_error $? "no acceptable C compiler found in \$PATH ++See \`config.log' for more details" "$LINENO" 5 ; } + + # Provide some information about the compiler. + $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 +@@ -5309,8 +5347,8 @@ + ... rest of stderr output deleted ... + 10q' conftest.err >conftest.er1 + cat conftest.er1 >&5 +- rm -f conftest.er1 conftest.err + fi ++ rm -f conftest.er1 conftest.err + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + done +@@ -5663,7 +5701,7 @@ + fi + set dummy $CC; ac_cc=`$as_echo "$2" | + sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'` +-if { as_var=ac_cv_prog_cc_${ac_cc}_c_o; eval "test \"\${$as_var+set}\" = set"; }; then : ++if eval "test \"\${ac_cv_prog_cc_${ac_cc}_c_o+set}\"" = set; then : + $as_echo_n "(cached) " >&6 + else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +@@ -5822,7 +5860,7 @@ + # Broken: fails on valid input. + continue + fi +-rm -f conftest.err conftest.$ac_ext ++rm -f conftest.err conftest.i conftest.$ac_ext + + # OK, works on sane cases. Now check whether nonexistent headers + # can be detected and how. +@@ -5838,11 +5876,11 @@ + ac_preproc_ok=: + break + fi +-rm -f conftest.err conftest.$ac_ext ++rm -f conftest.err conftest.i conftest.$ac_ext + + done + # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. +-rm -f conftest.err conftest.$ac_ext ++rm -f conftest.i conftest.err conftest.$ac_ext + if $ac_preproc_ok; then : + break + fi +@@ -5881,7 +5919,7 @@ + # Broken: fails on valid input. + continue + fi +-rm -f conftest.err conftest.$ac_ext ++rm -f conftest.err conftest.i conftest.$ac_ext + + # OK, works on sane cases. Now check whether nonexistent headers + # can be detected and how. +@@ -5897,18 +5935,18 @@ + ac_preproc_ok=: + break + fi +-rm -f conftest.err conftest.$ac_ext ++rm -f conftest.err conftest.i conftest.$ac_ext + + done + # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. +-rm -f conftest.err conftest.$ac_ext ++rm -f conftest.i conftest.err conftest.$ac_ext + if $ac_preproc_ok; then : + + else + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-as_fn_error "C preprocessor \"$CPP\" fails sanity check +-See \`config.log' for more details." "$LINENO" 5; } ++as_fn_error $? "C preprocessor \"$CPP\" fails sanity check ++See \`config.log' for more details" "$LINENO" 5 ; } + fi + + ac_ext=c +@@ -5972,7 +6010,7 @@ + done + IFS=$as_save_IFS + if test -z "$ac_cv_path_EGREP"; then +- as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 ++ as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 + fi + else + ac_cv_path_EGREP=$EGREP +@@ -6337,8 +6375,8 @@ + + ;; #( + *) +- as_fn_error "unknown endianness +- presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;; ++ as_fn_error $? "unknown endianness ++ presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;; + esac + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for inline" >&5 +@@ -6461,8 +6499,7 @@ + do : + as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` + ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" +-eval as_val=\$$as_ac_var +- if test "x$as_val" = x""yes; then : ++if eval test \"x\$"$as_ac_var"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF + #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 + _ACEOF +@@ -6474,8 +6511,7 @@ + do : + as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` + ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" +-eval as_val=\$$as_ac_var +- if test "x$as_val" = x""yes; then : ++if eval test \"x\$"$as_ac_var"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF + #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 + _ACEOF +@@ -6487,8 +6523,7 @@ + do : + as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` + ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" +-eval as_val=\$$as_ac_var +- if test "x$as_val" = x""yes; then : ++if eval test \"x\$"$as_ac_var"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF + #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 + _ACEOF +@@ -6500,8 +6535,7 @@ + do : + as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` + ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" +-eval as_val=\$$as_ac_var +- if test "x$as_val" = x""yes; then : ++if eval test \"x\$"$as_ac_var"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF + #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 + _ACEOF +@@ -6514,8 +6548,7 @@ + do : + as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` + ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" +-eval as_val=\$$as_ac_var +- if test "x$as_val" = x""yes; then : ++if eval test \"x\$"$as_ac_var"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF + #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 + _ACEOF +@@ -6578,22 +6611,19 @@ + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + +- /* Test preprocessor. */ +- #if ! (-9223372036854775807LL < 0 && 0 < 9223372036854775807ll) +- error in preprocessor; +- #endif +- #if ! (18446744073709551615ULL <= -1ull) +- error in preprocessor; +- #endif ++ /* For now, do not test the preprocessor; as of 2007 there are too many ++ implementations with broken preprocessors. Perhaps this can ++ be revisited in 2012. In the meantime, code should not expect ++ #if to work with literals wider than 32 bits. */ + /* Test literals. */ + long long int ll = 9223372036854775807ll; + long long int nll = -9223372036854775807LL; + unsigned long long int ull = 18446744073709551615ULL; + /* Test constant expressions. */ + typedef int a[((-9223372036854775807LL < 0 && 0 < 9223372036854775807ll) +- ? 1 : -1)]; ++ ? 1 : -1)]; + typedef int b[(18446744073709551615ULL <= (unsigned long long int) -1 +- ? 1 : -1)]; ++ ? 1 : -1)]; + int i = 63; + int + main () +@@ -6602,40 +6632,40 @@ + long long int llmax = 9223372036854775807ll; + unsigned long long int ullmax = 18446744073709551615ull; + return ((ll << 63) | (ll >> 63) | (ll < i) | (ll > i) +- | (llmax / ll) | (llmax % ll) +- | (ull << 63) | (ull >> 63) | (ull << i) | (ull >> i) +- | (ullmax / ull) | (ullmax % ull)); ++ | (llmax / ll) | (llmax % ll) ++ | (ull << 63) | (ull >> 63) | (ull << i) | (ull >> i) ++ | (ullmax / ull) | (ullmax % ull)); + ; + return 0; + } + + _ACEOF + if ac_fn_c_try_link "$LINENO"; then : +- if test "$cross_compiling" = yes; then : ++ if test "$cross_compiling" = yes; then : + ac_cv_type_long_long_int=yes + else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #include +- #ifndef LLONG_MAX +- # define HALF \ +- (1LL << (sizeof (long long int) * CHAR_BIT - 2)) +- # define LLONG_MAX (HALF - 1 + HALF) +- #endif ++ #ifndef LLONG_MAX ++ # define HALF \ ++ (1LL << (sizeof (long long int) * CHAR_BIT - 2)) ++ # define LLONG_MAX (HALF - 1 + HALF) ++ #endif + int + main () + { + long long int n = 1; +- int i; +- for (i = 0; ; i++) +- { +- long long int m = n << i; +- if (m >> i != n) +- return 1; +- if (LLONG_MAX / 2 < m) +- break; +- } +- return 0; ++ int i; ++ for (i = 0; ; i++) ++ { ++ long long int m = n << i; ++ if (m >> i != n) ++ return 1; ++ if (LLONG_MAX / 2 < m) ++ break; ++ } ++ return 0; + ; + return 0; + } +@@ -6668,25 +6698,57 @@ + done + + +-for ac_func in setenv inet_aton strerror atexit +-do : +- as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +-ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" +-eval as_val=\$$as_ac_var +- if test "x$as_val" = x""yes; then : +- cat >>confdefs.h <<_ACEOF +-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +-_ACEOF ++ac_fn_c_check_func "$LINENO" "setenv" "ac_cv_func_setenv" ++if test "x$ac_cv_func_setenv" = x""yes; then : ++ $as_echo "#define HAVE_SETENV 1" >>confdefs.h + + else + case " $LIBOBJS " in +- *" $ac_func.$ac_objext "* ) ;; +- *) LIBOBJS="$LIBOBJS $ac_func.$ac_objext" ++ *" setenv.$ac_objext "* ) ;; ++ *) LIBOBJS="$LIBOBJS setenv.$ac_objext" ++ ;; ++esac ++ ++fi ++ ++ac_fn_c_check_func "$LINENO" "inet_aton" "ac_cv_func_inet_aton" ++if test "x$ac_cv_func_inet_aton" = x""yes; then : ++ $as_echo "#define HAVE_INET_ATON 1" >>confdefs.h ++ ++else ++ case " $LIBOBJS " in ++ *" inet_aton.$ac_objext "* ) ;; ++ *) LIBOBJS="$LIBOBJS inet_aton.$ac_objext" ++ ;; ++esac ++ ++fi ++ ++ac_fn_c_check_func "$LINENO" "strerror" "ac_cv_func_strerror" ++if test "x$ac_cv_func_strerror" = x""yes; then : ++ $as_echo "#define HAVE_STRERROR 1" >>confdefs.h ++ ++else ++ case " $LIBOBJS " in ++ *" strerror.$ac_objext "* ) ;; ++ *) LIBOBJS="$LIBOBJS strerror.$ac_objext" ++ ;; ++esac ++ ++fi ++ ++ac_fn_c_check_func "$LINENO" "atexit" "ac_cv_func_atexit" ++if test "x$ac_cv_func_atexit" = x""yes; then : ++ $as_echo "#define HAVE_ATEXIT 1" >>confdefs.h ++ ++else ++ case " $LIBOBJS " in ++ *" atexit.$ac_objext "* ) ;; ++ *) LIBOBJS="$LIBOBJS atexit.$ac_objext" + ;; + esac + + fi +-done + + + +@@ -6963,8 +7025,7 @@ + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` + ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default + " +-eval as_val=\$$as_ac_Header +- if test "x$as_val" = x""yes; then : ++if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF + #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 + _ACEOF +@@ -7202,9 +7263,8 @@ + if test "$ac_cv_type_char" = yes; then + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-{ as_fn_set_status 77 +-as_fn_error "cannot compute sizeof (char) +-See \`config.log' for more details." "$LINENO" 5; }; } ++as_fn_error 77 "cannot compute sizeof (char) ++See \`config.log' for more details" "$LINENO" 5 ; } + else + ac_cv_sizeof_char=0 + fi +@@ -7236,9 +7296,8 @@ + if test "$ac_cv_type_short" = yes; then + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-{ as_fn_set_status 77 +-as_fn_error "cannot compute sizeof (short) +-See \`config.log' for more details." "$LINENO" 5; }; } ++as_fn_error 77 "cannot compute sizeof (short) ++See \`config.log' for more details" "$LINENO" 5 ; } + else + ac_cv_sizeof_short=0 + fi +@@ -7270,9 +7329,8 @@ + if test "$ac_cv_type_int" = yes; then + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-{ as_fn_set_status 77 +-as_fn_error "cannot compute sizeof (int) +-See \`config.log' for more details." "$LINENO" 5; }; } ++as_fn_error 77 "cannot compute sizeof (int) ++See \`config.log' for more details" "$LINENO" 5 ; } + else + ac_cv_sizeof_int=0 + fi +@@ -7304,9 +7362,8 @@ + if test "$ac_cv_type_long" = yes; then + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-{ as_fn_set_status 77 +-as_fn_error "cannot compute sizeof (long) +-See \`config.log' for more details." "$LINENO" 5; }; } ++as_fn_error 77 "cannot compute sizeof (long) ++See \`config.log' for more details" "$LINENO" 5 ; } + else + ac_cv_sizeof_long=0 + fi +@@ -7338,9 +7395,8 @@ + if test "$ac_cv_type_voidp" = yes; then + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-{ as_fn_set_status 77 +-as_fn_error "cannot compute sizeof (void*) +-See \`config.log' for more details." "$LINENO" 5; }; } ++as_fn_error 77 "cannot compute sizeof (void*) ++See \`config.log' for more details" "$LINENO" 5 ; } + else + ac_cv_sizeof_voidp=0 + fi +@@ -7490,7 +7546,7 @@ + done + + if test "x$nut_cv_socklen_t_equiv" = x; then +- as_fn_error "Cannot find a type to use in place of socklen_t" "$LINENO" 5 ++ as_fn_error $? "Cannot find a type to use in place of socklen_t" "$LINENO" 5 + fi + + fi +@@ -7571,7 +7627,7 @@ + nut_have_libusb_seen=yes + + CFLAGS_ORIG="${CFLAGS}" +- LDFLAGS_ORIG="${LDFLAGS}" ++ LIBS_ORIG="${LIBS}" + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libusb version via pkg-config" >&5 + $as_echo_n "checking for libusb version via pkg-config... " >&6; } +@@ -7580,7 +7636,7 @@ + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${LIBUSB_VERSION} found" >&5 + $as_echo "${LIBUSB_VERSION} found" >&6; } + CFLAGS="`pkg-config --silence-errors --cflags libusb`" +- LDFLAGS="`pkg-config --silence-errors --libs libusb`" ++ LIBS="`pkg-config --silence-errors --libs libusb`" + else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking via libusb-config" >&5 + $as_echo_n "checking via libusb-config... " >&6; } +@@ -7589,12 +7645,12 @@ + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${LIBUSB_VERSION} found" >&5 + $as_echo "${LIBUSB_VERSION} found" >&6; } + CFLAGS="`libusb-config --cflags 2>/dev/null`" +- LDFLAGS="`libusb-config --libs 2>/dev/null`" ++ LIBS="`libusb-config --libs 2>/dev/null`" + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 + $as_echo "not found" >&6; } + CFLAGS="" +- LDFLAGS="-lusb" ++ LIBS="-lusb" + fi + fi + +@@ -7614,11 +7670,11 @@ + + # Check whether --with-usb-libs was given. + if test "${with_usb_libs+set}" = set; then : +- withval=$with_usb_libs; LDFLAGS="${withval}" ++ withval=$with_usb_libs; LIBS="${withval}" + fi + +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${LDFLAGS}" >&5 +-$as_echo "${LDFLAGS}" >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${LIBS}" >&5 ++$as_echo "${LIBS}" >&6; } + + for ac_header in usb.h + do : +@@ -7662,11 +7718,11 @@ + done + + LIBUSB_CFLAGS="${CFLAGS}" +- LIBUSB_LDFLAGS="${LDFLAGS}" ++ LIBUSB_LIBS="${LIBS}" + fi + + CFLAGS="${CFLAGS_ORIG}" +- LDFLAGS="${LDFLAGS_ORIG}" ++ LIBS="${LIBS_ORIG}" + fi + + +@@ -7684,7 +7740,7 @@ + nut_have_libhal_seen=yes + + CFLAGS_ORIG="${CFLAGS}" +- LDFLAGS_ORIG="${LDFLAGS}" ++ LIBS_ORIG="${LIBS}" + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libhal version via pkg-config (0.5.8 minimum required)" >&5 + $as_echo_n "checking for libhal version via pkg-config (0.5.8 minimum required)... " >&6; } +@@ -7709,10 +7765,10 @@ + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libhal ldflags via pkg-config" >&5 + $as_echo_n "checking for libhal ldflags via pkg-config... " >&6; } +- LDFLAGS=`pkg-config --silence-errors --libs hal dbus-glib-1` ++ LIBS=`pkg-config --silence-errors --libs hal dbus-glib-1` + if test "$?" = "0"; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${LDFLAGS}" >&5 +-$as_echo "${LDFLAGS}" >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${LIBS}" >&5 ++$as_echo "${LIBS}" >&6; } + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 + $as_echo "not found" >&6; } +@@ -7731,7 +7787,7 @@ + + if test "${nut_have_libhal}" = "check"; then + CFLAGS="-DDBUS_API_SUBJECT_TO_CHANGE -I/usr/include/hal -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include" +- LDFLAGS="-lhal -ldbus-1 -lpthread" ++ LIBS="-lhal -ldbus-1 -lpthread" + + for ac_header in libhal.h + do : +@@ -7765,7 +7821,7 @@ + + if test "${nut_have_libhal}" = "yes"; then + LIBHAL_CFLAGS="${CFLAGS}" +- LIBHAL_LDFLAGS="${LDFLAGS}" ++ LIBHAL_LIBS="${LIBS}" + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libhal user via pkg-config" >&5 + $as_echo_n "checking for libhal user via pkg-config... " >&6; } +@@ -7847,7 +7903,7 @@ + fi + + CFLAGS="${CFLAGS_ORIG}" +- LDFLAGS="${LDFLAGS_ORIG}" ++ LIBS="${LIBS_ORIG}" + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if GLib is version 2.14.0 or newer" >&5 + $as_echo_n "checking if GLib is version 2.14.0 or newer... " >&6; } +@@ -7878,7 +7934,7 @@ + nut_have_libnetsnmp_seen=yes + + CFLAGS_ORIG="${CFLAGS}" +- LDFLAGS_ORIG="${LDFLAGS}" ++ LIBS_ORIG="${LIBS}" + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Net-SNMP version via net-snmp-config" >&5 + $as_echo_n "checking for Net-SNMP version via net-snmp-config... " >&6; } +@@ -7909,13 +7965,13 @@ + + # Check whether --with-snmp-libs was given. + if test "${with_snmp_libs+set}" = set; then : +- withval=$with_snmp_libs; LDFLAGS="${withval}" ++ withval=$with_snmp_libs; LIBS="${withval}" + else +- LDFLAGS="`net-snmp-config --libs 2>/dev/null`" ++ LIBS="`net-snmp-config --libs 2>/dev/null`" + fi + +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${LDFLAGS}" >&5 +-$as_echo "${LDFLAGS}" >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${LIBS}" >&5 ++$as_echo "${LIBS}" >&6; } + + for ac_header in net-snmp/net-snmp-config.h + do : +@@ -7948,11 +8004,11 @@ + + if test "${nut_have_libnetsnmp}" = "yes"; then + LIBNETSNMP_CFLAGS="${CFLAGS}" +- LIBNETSNMP_LDFLAGS="${LDFLAGS}" ++ LIBNETSNMP_LIBS="${LIBS}" + fi + + CFLAGS="${CFLAGS_ORIG}" +- LDFLAGS="${LDFLAGS_ORIG}" ++ LIBS="${LIBS_ORIG}" + fi + + +@@ -7970,7 +8026,7 @@ + nut_have_neon_seen=yes + + CFLAGS_ORIG="${CFLAGS}" +- LDFLAGS_ORIG="${LDFLAGS}" ++ LIBS_ORIG="${LIBS}" + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libneon version via pkg-config (0.25.0 minimum required)" >&5 + $as_echo_n "checking for libneon version via pkg-config (0.25.0 minimum required)... " >&6; } +@@ -8001,13 +8057,13 @@ + + # Check whether --with-neon-libs was given. + if test "${with_neon_libs+set}" = set; then : +- withval=$with_neon_libs; LDFLAGS="${withval}" ++ withval=$with_neon_libs; LIBS="${withval}" + else +- LDFLAGS="`pkg-config --silence-errors --libs neon`" ++ LIBS="`pkg-config --silence-errors --libs neon`" + fi + +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${LDFLAGS}" >&5 +-$as_echo "${LDFLAGS}" >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${LIBS}" >&5 ++$as_echo "${LIBS}" >&6; } + + for ac_header in ne_xmlreq.h + do : +@@ -8043,8 +8099,7 @@ + do : + as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` + ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" +-eval as_val=\$$as_ac_var +- if test "x$as_val" = x""yes; then : ++if eval test \"x\$"$as_ac_var"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF + #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 + _ACEOF +@@ -8053,11 +8108,11 @@ + done + + LIBNEON_CFLAGS="${CFLAGS}" +- LIBNEON_LDFLAGS="${LDFLAGS}" ++ LIBNEON_LIBS="${LIBS}" + fi + + CFLAGS="${CFLAGS_ORIG}" +- LDFLAGS="${LDFLAGS_ORIG}" ++ LIBS="${LIBS_ORIG}" + fi + + +@@ -8075,7 +8130,7 @@ + nut_have_libpowerman_seen=yes + + CFLAGS_ORIG="${CFLAGS}" +- LDFLAGS_ORIG="${LDFLAGS}" ++ LIBS_ORIG="${LIBS}" + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libpowerman cflags" >&5 + $as_echo_n "checking for libpowerman cflags... " >&6; } +@@ -8095,13 +8150,13 @@ + + # Check whether --with-powerman-libs was given. + if test "${with_powerman_libs+set}" = set; then : +- withval=$with_powerman_libs; LDFLAGS="${withval}" ++ withval=$with_powerman_libs; LIBS="${withval}" + else +- LDFLAGS="`pkg-config --silence-errors --libs libpowerman`" ++ LIBS="`pkg-config --silence-errors --libs libpowerman`" + fi + +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${LDFLAGS}" >&5 +-$as_echo "${LDFLAGS}" >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${LIBS}" >&5 ++$as_echo "${LIBS}" >&6; } + + for ac_header in libpowerman.h + do : +@@ -8134,11 +8189,11 @@ + + if test "${nut_have_libpowerman}" = "yes"; then + LIBPOWERMAN_CFLAGS="${CFLAGS}" +- LIBPOWERMAN_LDFLAGS="${LDFLAGS}" ++ LIBPOWERMAN_LIBS="${LIBS}" + fi + + CFLAGS="${CFLAGS_ORIG}" +- LDFLAGS="${LDFLAGS_ORIG}" ++ LIBS="${LIBS_ORIG}" + + fi + +@@ -8203,7 +8258,7 @@ + + fi + +- LIBUSB_LDFLAGS="-R/usr/sfw/lib ${LIBUSB_LDFLAGS}" ++ LIBUSB_LIBS="-R/usr/sfw/lib ${LIBUSB_LIBS}" + + $as_echo "#define SUN_LIBUSB 1" >>confdefs.h + +@@ -8229,7 +8284,7 @@ + nut_have_libssl_seen=yes + + CFLAGS_ORIG="${CFLAGS}" +- LDFLAGS_ORIG="${LDFLAGS}" ++ LIBS_ORIG="${LIBS}" + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for openssl version via pkg-config" >&5 + $as_echo_n "checking for openssl version via pkg-config... " >&6; } +@@ -8238,12 +8293,12 @@ + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${OPENSSL_VERSION} found" >&5 + $as_echo "${OPENSSL_VERSION} found" >&6; } + CFLAGS="`pkg-config --silence-errors --cflags openssl`" +- LDFLAGS="`pkg-config --silence-errors --libs openssl`" ++ LIBS="`pkg-config --silence-errors --libs openssl`" + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 + $as_echo "not found" >&6; } + CFLAGS="" +- LDFLAGS="-lssl -lcrypto" ++ LIBS="-lssl -lcrypto" + fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for openssl cflags" >&5 +@@ -8262,11 +8317,11 @@ + + # Check whether --with-ssl-libs was given. + if test "${with_ssl_libs+set}" = set; then : +- withval=$with_ssl_libs; LDFLAGS="${withval}" ++ withval=$with_ssl_libs; LIBS="${withval}" + fi + +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${LDFLAGS}" >&5 +-$as_echo "${LDFLAGS}" >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${LIBS}" >&5 ++$as_echo "${LIBS}" >&6; } + + for ac_header in openssl/ssl.h + do : +@@ -8302,17 +8357,17 @@ + $as_echo "#define HAVE_SSL 1" >>confdefs.h + + LIBSSL_CFLAGS="${CFLAGS}" +- LIBSSL_LDFLAGS="${LDFLAGS}" ++ LIBSSL_LIBS="${LIBS}" + fi + + CFLAGS="${CFLAGS_ORIG}" +- LDFLAGS="${LDFLAGS_ORIG}" ++ LIBS="${LIBS_ORIG}" + fi + + fi + + if test "${nut_with_ssl}" = "yes" -a "${nut_have_libssl}" != "yes"; then +- as_fn_error "\"OpenSSL not found, required for SSL support\"" "$LINENO" 5 ++ as_fn_error $? "\"OpenSSL not found, required for SSL support\"" "$LINENO" 5 + fi + + if test "${nut_with_ssl}" != "no"; then +@@ -8498,7 +8553,7 @@ + $as_echo "#define HAVE_WRAP 1" >>confdefs.h + + LIBWRAP_CFLAGS="" +- LIBWRAP_LDFLAGS="${LIBS}" ++ LIBWRAP_LIBS="${LIBS}" + fi + + LIBS="${LIBS_ORIG}" +@@ -8507,7 +8562,7 @@ + fi + + if test "${nut_with_wrap}" = "yes" -a "${nut_have_libwrap}" != "yes"; then +- as_fn_error "\"libwrap not found\"" "$LINENO" 5 ++ as_fn_error $? "\"libwrap not found\"" "$LINENO" 5 + fi + + if test "${nut_with_wrap}" != "no"; then +@@ -8558,8 +8613,7 @@ + do : + as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` + ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" +-eval as_val=\$$as_ac_var +- if test "x$as_val" = x""yes; then : ++if eval test \"x\$"$as_ac_var"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF + #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 + _ACEOF +@@ -8634,7 +8688,7 @@ + fi + + if test "${nut_with_ipv6}" = "yes" -a "${nut_have_ipv6}" != "yes"; then +- as_fn_error "\"Some feature required for IPv6 support is missing\"" "$LINENO" 5 ++ as_fn_error $? "\"Some feature required for IPv6 support is missing\"" "$LINENO" 5 + fi + + if test "${nut_with_ipv6}" != "no"; then +@@ -8736,8 +8790,7 @@ + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` + ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default + " +-eval as_val=\$$as_ac_Header +- if test "x$as_val" = x""yes; then : ++if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF + #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 + _ACEOF +@@ -8823,7 +8876,7 @@ + fi + + if test "${nut_with_cgi}" = "yes" -a "${nut_have_libgd}" != "yes"; then +- as_fn_error "libgd not found, required for CGI build" "$LINENO" 5 ++ as_fn_error $? "libgd not found, required for CGI build" "$LINENO" 5 + fi + + if test "${nut_with_cgi}" != "no"; then +@@ -8920,8 +8973,8 @@ + + + +-macro_version='2.2.6' +-macro_revision='1.3012' ++macro_version='2.2.6b' ++macro_revision='1.3017' + + + +@@ -8994,7 +9047,7 @@ + done + IFS=$as_save_IFS + if test -z "$ac_cv_path_SED"; then +- as_fn_error "no acceptable sed could be found in \$PATH" "$LINENO" 5 ++ as_fn_error $? "no acceptable sed could be found in \$PATH" "$LINENO" 5 + fi + else + ac_cv_path_SED=$SED +@@ -9073,7 +9126,7 @@ + done + IFS=$as_save_IFS + if test -z "$ac_cv_path_FGREP"; then +- as_fn_error "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 ++ as_fn_error $? "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 + fi + else + ac_cv_path_FGREP=$FGREP +@@ -9189,7 +9242,7 @@ + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi +-test -z "$LD" && as_fn_error "no acceptable ld found in \$PATH" "$LINENO" 5 ++test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5 + $as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; } + if test "${lt_cv_prog_gnu_ld+set}" = set; then : +@@ -9391,13 +9444,13 @@ + else + lt_cv_nm_interface="BSD nm" + echo "int some_variable = 0;" > conftest.$ac_ext +- (eval echo "\"\$as_me:9394: $ac_compile\"" >&5) ++ (eval echo "\"\$as_me:9447: $ac_compile\"" >&5) + (eval "$ac_compile" 2>conftest.err) + cat conftest.err >&5 +- (eval echo "\"\$as_me:9397: $NM \\\"conftest.$ac_objext\\\"\"" >&5) ++ (eval echo "\"\$as_me:9450: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) + cat conftest.err >&5 +- (eval echo "\"\$as_me:9400: output\"" >&5) ++ (eval echo "\"\$as_me:9453: output\"" >&5) + cat conftest.out >&5 + if $GREP 'External.*some_variable' conftest.out > /dev/null; then + lt_cv_nm_interface="MS dumpbin" +@@ -10602,7 +10655,7 @@ + ;; + *-*-irix6*) + # Find out which ABI we are using. +- echo '#line 10605 "configure"' > conftest.$ac_ext ++ echo '#line 10658 "configure"' > conftest.$ac_ext + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +@@ -11834,11 +11887,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:11837: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:11890: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:11841: \$? = $ac_status" >&5 ++ echo "$as_me:11894: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. +@@ -12173,11 +12226,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:12176: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:12229: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:12180: \$? = $ac_status" >&5 ++ echo "$as_me:12233: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. +@@ -12278,11 +12331,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:12281: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:12334: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:12285: \$? = $ac_status" >&5 ++ echo "$as_me:12338: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s out/conftest2.$ac_objext + then + # The compiler can only warn and ignore the option if not recognized +@@ -12333,11 +12386,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:12336: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:12389: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:12340: \$? = $ac_status" >&5 ++ echo "$as_me:12393: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s out/conftest2.$ac_objext + then + # The compiler can only warn and ignore the option if not recognized +@@ -14716,7 +14769,7 @@ + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<_LT_EOF +-#line 14719 "configure" ++#line 14772 "configure" + #include "confdefs.h" + + #if HAVE_DLFCN_H +@@ -14812,7 +14865,7 @@ + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<_LT_EOF +-#line 14815 "configure" ++#line 14868 "configure" + #include "confdefs.h" + + #if HAVE_DLFCN_H +@@ -15069,7 +15122,7 @@ + + + if test "${nut_with_snmp}" = "yes" -a "${nut_have_libnetsnmp}" != "yes"; then +- as_fn_error "\"Net-SNMP libraries not found, required for SNMP drivers\"" "$LINENO" 5 ++ as_fn_error $? "\"Net-SNMP libraries not found, required for SNMP drivers\"" "$LINENO" 5 + fi + + if test "${nut_with_snmp}" != "no"; then +@@ -15101,7 +15154,7 @@ + + + if test "${nut_with_usb}" = "yes" -a "${nut_have_libusb}" != "yes"; then +- as_fn_error "\"USB drivers requested, but libusb not found.\"" "$LINENO" 5 ++ as_fn_error $? "\"USB drivers requested, but libusb not found.\"" "$LINENO" 5 + fi + + if test "${nut_with_usb}" != "no"; then +@@ -15133,11 +15186,11 @@ + + + if test "${nut_with_hal}" = "yes" -a "${nut_have_libhal}" != "yes"; then +- as_fn_error "\"libhal not found, required for HAL support\"" "$LINENO" 5 ++ as_fn_error $? "\"libhal not found, required for HAL support\"" "$LINENO" 5 + fi + + if test "${nut_with_hal}" = "yes" -a "${nut_have_libusb}" != "yes"; then +- as_fn_error "\"libusb not found, required for HAL support\"" "$LINENO" 5 ++ as_fn_error $? "\"libusb not found, required for HAL support\"" "$LINENO" 5 + fi + + if test "${nut_with_hal}" != "no"; then +@@ -15173,7 +15226,7 @@ + + + if test "${nut_with_neon}" = "yes" -a "${nut_have_neon}" != "yes"; then +- as_fn_error "\"neon libraries not found, required for neon based XML/HTTP driver\"" "$LINENO" 5 ++ as_fn_error $? "\"neon libraries not found, required for neon based XML/HTTP driver\"" "$LINENO" 5 + fi + + if test "${nut_with_neon}" != "no"; then +@@ -15206,7 +15259,7 @@ + + + if test "${nut_with_powerman}" = "yes" -a "${nut_have_libpowerman}" != "yes"; then +- as_fn_error "\"Powerman client libraries not found, required for Powerman PDU client driver\"" "$LINENO" 5 ++ as_fn_error $? "\"Powerman client libraries not found, required for Powerman PDU client driver\"" "$LINENO" 5 + fi + + if test "${nut_with_powerman}" != "no"; then +@@ -15458,9 +15511,9 @@ + $as_echo "${RUN_AS_GROUP}" >&6; } + + if test -n "$nut_user_given" -a -z "$nut_group_given"; then +- as_fn_error "\"If you specify --with-user, you also must specify --with-group\"" "$LINENO" 5 ++ as_fn_error $? "\"If you specify --with-user, you also must specify --with-group\"" "$LINENO" 5 + elif test -z "$nut_user_given" -a -n "$nut_group_given"; then +- as_fn_error "\"If you specify --with-group, you also must specify --with-user\"" "$LINENO" 5 ++ as_fn_error $? "\"If you specify --with-group, you also must specify --with-user\"" "$LINENO" 5 + fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking facility for syslog" >&5 +@@ -15625,7 +15678,7 @@ + if test -z "${hotplugdir}"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } +- as_fn_error "\"hotplug directory requested but not found" "$LINENO" 5 ++ as_fn_error $? "\"hotplug directory requested but not found" "$LINENO" 5 + fi + ;; + auto) +@@ -15667,7 +15720,7 @@ + if test -z "${udevdir}"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } +- as_fn_error "\"udev directory requested but not found" "$LINENO" 5 ++ as_fn_error $? "\"udev directory requested but not found" "$LINENO" 5 + fi + ;; + auto) +@@ -15852,6 +15905,7 @@ + + ac_libobjs= + ac_ltlibobjs= ++U= + for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue + # 1. Remove the extension, and $U if already installed. + ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' +@@ -15875,76 +15929,76 @@ + fi + + if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then +- as_fn_error "conditional \"AMDEP\" was never defined. ++ as_fn_error $? "conditional \"AMDEP\" was never defined. + Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then +- as_fn_error "conditional \"am__fastdepCC\" was never defined. ++ as_fn_error $? "conditional \"am__fastdepCC\" was never defined. + Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then +- as_fn_error "conditional \"MAINTAINER_MODE\" was never defined. ++ as_fn_error $? "conditional \"MAINTAINER_MODE\" was never defined. + Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then +- as_fn_error "conditional \"am__fastdepCC\" was never defined. ++ as_fn_error $? "conditional \"am__fastdepCC\" was never defined. + Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + + if test -z "${WITH_SSL_TRUE}" && test -z "${WITH_SSL_FALSE}"; then +- as_fn_error "conditional \"WITH_SSL\" was never defined. ++ as_fn_error $? "conditional \"WITH_SSL\" was never defined. + Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + if test -z "${WITH_WRAP_TRUE}" && test -z "${WITH_WRAP_FALSE}"; then +- as_fn_error "conditional \"WITH_WRAP\" was never defined. ++ as_fn_error $? "conditional \"WITH_WRAP\" was never defined. + Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + if test -z "${WITH_CGI_TRUE}" && test -z "${WITH_CGI_FALSE}"; then +- as_fn_error "conditional \"WITH_CGI\" was never defined. ++ as_fn_error $? "conditional \"WITH_CGI\" was never defined. + Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + if test -z "${WITH_DEV_TRUE}" && test -z "${WITH_DEV_FALSE}"; then +- as_fn_error "conditional \"WITH_DEV\" was never defined. ++ as_fn_error $? "conditional \"WITH_DEV\" was never defined. + Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + if test -z "${WITH_SERIAL_TRUE}" && test -z "${WITH_SERIAL_FALSE}"; then +- as_fn_error "conditional \"WITH_SERIAL\" was never defined. ++ as_fn_error $? "conditional \"WITH_SERIAL\" was never defined. + Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + if test -z "${WITH_SNMP_TRUE}" && test -z "${WITH_SNMP_FALSE}"; then +- as_fn_error "conditional \"WITH_SNMP\" was never defined. ++ as_fn_error $? "conditional \"WITH_SNMP\" was never defined. + Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + if test -z "${WITH_USB_TRUE}" && test -z "${WITH_USB_FALSE}"; then +- as_fn_error "conditional \"WITH_USB\" was never defined. ++ as_fn_error $? "conditional \"WITH_USB\" was never defined. + Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + if test -z "${WITH_HAL_TRUE}" && test -z "${WITH_HAL_FALSE}"; then +- as_fn_error "conditional \"WITH_HAL\" was never defined. ++ as_fn_error $? "conditional \"WITH_HAL\" was never defined. + Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + if test -z "${WITH_NEONXML_TRUE}" && test -z "${WITH_NEONXML_FALSE}"; then +- as_fn_error "conditional \"WITH_NEONXML\" was never defined. ++ as_fn_error $? "conditional \"WITH_NEONXML\" was never defined. + Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + if test -z "${WITH_LIBPOWERMAN_TRUE}" && test -z "${WITH_LIBPOWERMAN_FALSE}"; then +- as_fn_error "conditional \"WITH_LIBPOWERMAN\" was never defined. ++ as_fn_error $? "conditional \"WITH_LIBPOWERMAN\" was never defined. + Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + if test -z "${SOME_DRIVERS_TRUE}" && test -z "${SOME_DRIVERS_FALSE}"; then +- as_fn_error "conditional \"SOME_DRIVERS\" was never defined. ++ as_fn_error $? "conditional \"SOME_DRIVERS\" was never defined. + Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + if test -z "${WITH_PKG_CONFIG_TRUE}" && test -z "${WITH_PKG_CONFIG_FALSE}"; then +- as_fn_error "conditional \"WITH_PKG_CONFIG\" was never defined. ++ as_fn_error $? "conditional \"WITH_PKG_CONFIG\" was never defined. + Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + if test -z "${WITH_HOTPLUG_TRUE}" && test -z "${WITH_HOTPLUG_FALSE}"; then +- as_fn_error "conditional \"WITH_HOTPLUG\" was never defined. ++ as_fn_error $? "conditional \"WITH_HOTPLUG\" was never defined. + Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + if test -z "${WITH_UDEV_TRUE}" && test -z "${WITH_UDEV_FALSE}"; then +- as_fn_error "conditional \"WITH_UDEV\" was never defined. ++ as_fn_error $? "conditional \"WITH_UDEV\" was never defined. + Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + +@@ -16094,19 +16148,19 @@ + (unset CDPATH) >/dev/null 2>&1 && unset CDPATH + + +-# as_fn_error ERROR [LINENO LOG_FD] +-# --------------------------------- ++# as_fn_error STATUS ERROR [LINENO LOG_FD] ++# ---------------------------------------- + # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are + # provided, also output the error to LOG_FD, referencing LINENO. Then exit the +-# script with status $?, using 1 if that was 0. ++# script with STATUS, using 1 if that was 0. + as_fn_error () + { +- as_status=$?; test $as_status -eq 0 && as_status=1 +- if test "$3"; then +- as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack +- $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3 ++ as_status=$1; test $as_status -eq 0 && as_status=1 ++ if test "$4"; then ++ as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack ++ $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 + fi +- $as_echo "$as_me: error: $1" >&2 ++ $as_echo "$as_me: error: $2" >&2 + as_fn_exit $as_status + } # as_fn_error + +@@ -16302,7 +16356,7 @@ + test -d "$as_dir" && break + done + test -z "$as_dirs" || eval "mkdir $as_dirs" +- } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir" ++ } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" + + + } # as_fn_mkdir_p +@@ -16356,7 +16410,7 @@ + # values after options handling. + ac_log=" + This file was extended by nut $as_me 2.4.3, which was +-generated by GNU Autoconf 2.64. Invocation command line was ++generated by GNU Autoconf 2.67. Invocation command line was + + CONFIG_FILES = $CONFIG_FILES + CONFIG_HEADERS = $CONFIG_HEADERS +@@ -16396,6 +16450,7 @@ + + -h, --help print this help, then exit + -V, --version print version number and configuration settings, then exit ++ --config print configuration, then exit + -q, --quiet, --silent + do not print progress messages + -d, --debug don't remove temporary files +@@ -16418,12 +16473,13 @@ + + _ACEOF + cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ++ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" + ac_cs_version="\\ + nut config.status 2.4.3 +-configured by $0, generated by GNU Autoconf 2.64, +- with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" ++configured by $0, generated by GNU Autoconf 2.67, ++ with options \\"\$ac_cs_config\\" + +-Copyright (C) 2009 Free Software Foundation, Inc. ++Copyright (C) 2010 Free Software Foundation, Inc. + This config.status script is free software; the Free Software Foundation + gives unlimited permission to copy, distribute and modify it." + +@@ -16441,11 +16497,16 @@ + while test $# != 0 + do + case $1 in +- --*=*) ++ --*=?*) + ac_option=`expr "X$1" : 'X\([^=]*\)='` + ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'` + ac_shift=: + ;; ++ --*=) ++ ac_option=`expr "X$1" : 'X\([^=]*\)='` ++ ac_optarg= ++ ac_shift=: ++ ;; + *) + ac_option=$1 + ac_optarg=$2 +@@ -16459,12 +16520,15 @@ + ac_cs_recheck=: ;; + --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) + $as_echo "$ac_cs_version"; exit ;; ++ --config | --confi | --conf | --con | --co | --c ) ++ $as_echo "$ac_cs_config"; exit ;; + --debug | --debu | --deb | --de | --d | -d ) + debug=: ;; + --file | --fil | --fi | --f ) + $ac_shift + case $ac_optarg in + *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; ++ '') as_fn_error $? "missing file argument" ;; + esac + as_fn_append CONFIG_FILES " '$ac_optarg'" + ac_need_defaults=false;; +@@ -16477,7 +16541,7 @@ + ac_need_defaults=false;; + --he | --h) + # Conflict between --help and --header +- as_fn_error "ambiguous option: \`$1' ++ as_fn_error $? "ambiguous option: \`$1' + Try \`$0 --help' for more information.";; + --help | --hel | -h ) + $as_echo "$ac_cs_usage"; exit ;; +@@ -16486,7 +16550,7 @@ + ac_cs_silent=: ;; + + # This is an error. +- -*) as_fn_error "unrecognized option: \`$1' ++ -*) as_fn_error $? "unrecognized option: \`$1' + Try \`$0 --help' for more information." ;; + + *) as_fn_append ac_config_targets " $1" +@@ -16843,7 +16907,7 @@ + "tools/Makefile") CONFIG_FILES="$CONFIG_FILES tools/Makefile" ;; + "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; + +- *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;; ++ *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;; + esac + done + +@@ -16881,7 +16945,7 @@ + { + tmp=./conf$$-$RANDOM + (umask 077 && mkdir "$tmp") +-} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5 ++} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5 + + # Set up the scripts for CONFIG_FILES section. + # No need to generate them if there are no CONFIG_FILES. +@@ -16898,7 +16962,7 @@ + fi + ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' /dev/null` + if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then +- ac_cs_awk_cr='\r' ++ ac_cs_awk_cr='\\r' + else + ac_cs_awk_cr=$ac_cr + fi +@@ -16912,18 +16976,18 @@ + echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' && + echo "_ACEOF" + } >conf$$subs.sh || +- as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 +-ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'` ++ as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 ++ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'` + ac_delim='%!_!# ' + for ac_last_try in false false false false false :; do + . ./conf$$subs.sh || +- as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 ++ as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 + + ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` + if test $ac_delim_n = $ac_delim_num; then + break + elif $ac_last_try; then +- as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 ++ as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 + else + ac_delim="$ac_delim!$ac_delim _$ac_delim!! " + fi +@@ -16945,7 +17009,7 @@ + t delim + :nl + h +-s/\(.\{148\}\).*/\1/ ++s/\(.\{148\}\)..*/\1/ + t more1 + s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/ + p +@@ -16959,7 +17023,7 @@ + t nl + :delim + h +-s/\(.\{148\}\).*/\1/ ++s/\(.\{148\}\)..*/\1/ + t more2 + s/["\\]/\\&/g; s/^/"/; s/$/"/ + p +@@ -17012,20 +17076,28 @@ + else + cat + fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \ +- || as_fn_error "could not setup config files machinery" "$LINENO" 5 ++ || as_fn_error $? "could not setup config files machinery" "$LINENO" 5 + _ACEOF + +-# VPATH may cause trouble with some makes, so we remove $(srcdir), +-# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and ++# VPATH may cause trouble with some makes, so we remove sole $(srcdir), ++# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and + # trailing colons and then remove the whole line if VPATH becomes empty + # (actually we leave an empty line to preserve line numbers). + if test "x$srcdir" = x.; then +- ac_vpsub='/^[ ]*VPATH[ ]*=/{ +-s/:*\$(srcdir):*/:/ +-s/:*\${srcdir}:*/:/ +-s/:*@srcdir@:*/:/ +-s/^\([^=]*=[ ]*\):*/\1/ ++ ac_vpsub='/^[ ]*VPATH[ ]*=[ ]*/{ ++h ++s/// ++s/^/:/ ++s/[ ]*$/:/ ++s/:\$(srcdir):/:/g ++s/:\${srcdir}:/:/g ++s/:@srcdir@:/:/g ++s/^:*// + s/:*$// ++x ++s/\(=[ ]*\).*/\1/ ++G ++s/\n// + s/^[^=]*=[ ]*$// + }' + fi +@@ -17053,7 +17125,7 @@ + if test -z "$ac_t"; then + break + elif $ac_last_try; then +- as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5 ++ as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5 + else + ac_delim="$ac_delim!$ac_delim _$ac_delim!! " + fi +@@ -17138,7 +17210,7 @@ + _ACAWK + _ACEOF + cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +- as_fn_error "could not setup config headers machinery" "$LINENO" 5 ++ as_fn_error $? "could not setup config headers machinery" "$LINENO" 5 + fi # test -n "$CONFIG_HEADERS" + + +@@ -17151,7 +17223,7 @@ + esac + case $ac_mode$ac_tag in + :[FHL]*:*);; +- :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;; ++ :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5 ;; + :[FH]-) ac_tag=-:-;; + :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; + esac +@@ -17179,7 +17251,7 @@ + [\\/$]*) false;; + *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; + esac || +- as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;; ++ as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5 ;; + esac + case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac + as_fn_append ac_file_inputs " '$ac_f'" +@@ -17206,7 +17278,7 @@ + + case $ac_tag in + *:-:* | *:-) cat >"$tmp/stdin" \ +- || as_fn_error "could not create $ac_file" "$LINENO" 5 ;; ++ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; + esac + ;; + esac +@@ -17343,22 +17415,22 @@ + $ac_datarootdir_hack + " + eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \ +- || as_fn_error "could not create $ac_file" "$LINENO" 5 ++ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 + + test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && + { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && + { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } && + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' +-which seems to be undefined. Please make sure it is defined." >&5 ++which seems to be undefined. Please make sure it is defined" >&5 + $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' +-which seems to be undefined. Please make sure it is defined." >&2;} ++which seems to be undefined. Please make sure it is defined" >&2;} + + rm -f "$tmp/stdin" + case $ac_file in + -) cat "$tmp/out" && rm -f "$tmp/out";; + *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";; + esac \ +- || as_fn_error "could not create $ac_file" "$LINENO" 5 ++ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 + ;; + :H) + # +@@ -17369,19 +17441,19 @@ + $as_echo "/* $configure_input */" \ + && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" + } >"$tmp/config.h" \ +- || as_fn_error "could not create $ac_file" "$LINENO" 5 ++ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 + if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then + { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5 + $as_echo "$as_me: $ac_file is unchanged" >&6;} + else + rm -f "$ac_file" + mv "$tmp/config.h" "$ac_file" \ +- || as_fn_error "could not create $ac_file" "$LINENO" 5 ++ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 + fi + else + $as_echo "/* $configure_input */" \ + && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \ +- || as_fn_error "could not create -" "$LINENO" 5 ++ || as_fn_error $? "could not create -" "$LINENO" 5 + fi + # Compute "$ac_file"'s index in $config_headers. + _am_arg="$ac_file" +@@ -18630,7 +18702,7 @@ + ac_clean_files=$ac_clean_files_save + + test $ac_write_fail = 0 || +- as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5 ++ as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5 + + + # configure is writing to config.log, and then calls config.status. +@@ -18651,7 +18723,7 @@ + exec 5>>config.log + # Use ||, not &&, to avoid exiting from the if with $? = 1, which + # would make configure fail if this is the last instruction. +- $ac_cs_success || as_fn_exit $? ++ $ac_cs_success || as_fn_exit 1 + fi + if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 +--- a/Makefile.in ++++ b/Makefile.in +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.11 from Makefile.am. ++# Makefile.in generated by automake 1.11.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +@@ -164,22 +164,22 @@ + LIBGD_CFLAGS = @LIBGD_CFLAGS@ + LIBGD_LDFLAGS = @LIBGD_LDFLAGS@ + LIBHAL_CFLAGS = @LIBHAL_CFLAGS@ +-LIBHAL_LDFLAGS = @LIBHAL_LDFLAGS@ ++LIBHAL_LIBS = @LIBHAL_LIBS@ + LIBNEON_CFLAGS = @LIBNEON_CFLAGS@ +-LIBNEON_LDFLAGS = @LIBNEON_LDFLAGS@ ++LIBNEON_LIBS = @LIBNEON_LIBS@ + LIBNETSNMP_CFLAGS = @LIBNETSNMP_CFLAGS@ +-LIBNETSNMP_LDFLAGS = @LIBNETSNMP_LDFLAGS@ ++LIBNETSNMP_LIBS = @LIBNETSNMP_LIBS@ + LIBOBJS = @LIBOBJS@ + LIBPOWERMAN_CFLAGS = @LIBPOWERMAN_CFLAGS@ +-LIBPOWERMAN_LDFLAGS = @LIBPOWERMAN_LDFLAGS@ ++LIBPOWERMAN_LIBS = @LIBPOWERMAN_LIBS@ + LIBS = @LIBS@ + LIBSSL_CFLAGS = @LIBSSL_CFLAGS@ +-LIBSSL_LDFLAGS = @LIBSSL_LDFLAGS@ ++LIBSSL_LIBS = @LIBSSL_LIBS@ + LIBTOOL = @LIBTOOL@ + LIBUSB_CFLAGS = @LIBUSB_CFLAGS@ +-LIBUSB_LDFLAGS = @LIBUSB_LDFLAGS@ ++LIBUSB_LIBS = @LIBUSB_LIBS@ + LIBWRAP_CFLAGS = @LIBWRAP_CFLAGS@ +-LIBWRAP_LDFLAGS = @LIBWRAP_LDFLAGS@ ++LIBWRAP_LIBS = @LIBWRAP_LIBS@ + LIPO = @LIPO@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ +@@ -361,7 +361,7 @@ + # (which will cause the Makefiles to be regenerated when you run `make'); + # (2) otherwise, pass the desired values on the `make' command line. + $(RECURSIVE_TARGETS): +- @failcom='exit 1'; \ ++ @fail= failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ +@@ -386,7 +386,7 @@ + fi; test -z "$$fail" + + $(RECURSIVE_CLEAN_TARGETS): +- @failcom='exit 1'; \ ++ @fail= failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ +@@ -550,7 +550,8 @@ + fi; \ + done + -test -n "$(am__skip_mode_fix)" \ +- || find "$(distdir)" -type d ! -perm -777 -exec chmod a+rwx {} \; -o \ ++ || find "$(distdir)" -type d ! -perm -755 \ ++ -exec chmod u+rwx,go+rx {} \; -o \ + ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ + ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ + ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \ +@@ -594,17 +595,17 @@ + distcheck: dist + case '$(DIST_ARCHIVES)' in \ + *.tar.gz*) \ +- GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\ ++ GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\ + *.tar.bz2*) \ +- bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\ ++ bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\ + *.tar.lzma*) \ +- unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\ ++ lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\ + *.tar.xz*) \ + xz -dc $(distdir).tar.xz | $(am__untar) ;;\ + *.tar.Z*) \ + uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ + *.shar.gz*) \ +- GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\ ++ GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\ + *.zip*) \ + unzip $(distdir).zip ;;\ + esac +--- a/aclocal.m4 ++++ b/aclocal.m4 +@@ -1,4 +1,4 @@ +-# generated automatically by aclocal 1.11 -*- Autoconf -*- ++# generated automatically by aclocal 1.11.1 -*- Autoconf -*- + + # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, + # 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. +@@ -13,14 +13,14 @@ + + m4_ifndef([AC_AUTOCONF_VERSION], + [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl +-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.64],, +-[m4_warning([this file was generated for autoconf 2.64. ++m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.67],, ++[m4_warning([this file was generated for autoconf 2.67. + You have another version of autoconf. It may work, but is not guaranteed to. + If you have problems, you may need to regenerate the build system entirely. + To do so, use the procedure documented by the package, typically `autoreconf'.])]) + +-# longlong.m4 serial 13 +-dnl Copyright (C) 1999-2007 Free Software Foundation, Inc. ++# longlong.m4 serial 14 ++dnl Copyright (C) 1999-2007, 2009-2010 Free Software Foundation, Inc. + dnl This file is free software; the Free Software Foundation + dnl gives unlimited permission to copy and/or distribute it, + dnl with or without modifications, as long as this notice is preserved. +@@ -41,33 +41,33 @@ + [AC_LINK_IFELSE( + [_AC_TYPE_LONG_LONG_SNIPPET], + [dnl This catches a bug in Tandem NonStop Kernel (OSS) cc -O circa 2004. +- dnl If cross compiling, assume the bug isn't important, since +- dnl nobody cross compiles for this platform as far as we know. +- AC_RUN_IFELSE( +- [AC_LANG_PROGRAM( +- [[@%:@include +- @%:@ifndef LLONG_MAX +- @%:@ define HALF \ +- (1LL << (sizeof (long long int) * CHAR_BIT - 2)) +- @%:@ define LLONG_MAX (HALF - 1 + HALF) +- @%:@endif]], +- [[long long int n = 1; +- int i; +- for (i = 0; ; i++) +- { +- long long int m = n << i; +- if (m >> i != n) +- return 1; +- if (LLONG_MAX / 2 < m) +- break; +- } +- return 0;]])], +- [ac_cv_type_long_long_int=yes], +- [ac_cv_type_long_long_int=no], +- [ac_cv_type_long_long_int=yes])], ++ dnl If cross compiling, assume the bug isn't important, since ++ dnl nobody cross compiles for this platform as far as we know. ++ AC_RUN_IFELSE( ++ [AC_LANG_PROGRAM( ++ [[@%:@include ++ @%:@ifndef LLONG_MAX ++ @%:@ define HALF \ ++ (1LL << (sizeof (long long int) * CHAR_BIT - 2)) ++ @%:@ define LLONG_MAX (HALF - 1 + HALF) ++ @%:@endif]], ++ [[long long int n = 1; ++ int i; ++ for (i = 0; ; i++) ++ { ++ long long int m = n << i; ++ if (m >> i != n) ++ return 1; ++ if (LLONG_MAX / 2 < m) ++ break; ++ } ++ return 0;]])], ++ [ac_cv_type_long_long_int=yes], ++ [ac_cv_type_long_long_int=no], ++ [ac_cv_type_long_long_int=yes])], + [ac_cv_type_long_long_int=no])]) + if test $ac_cv_type_long_long_int = yes; then +- AC_DEFINE([HAVE_LONG_LONG_INT], 1, ++ AC_DEFINE([HAVE_LONG_LONG_INT], [1], + [Define to 1 if the system has the type `long long int'.]) + fi + ]) +@@ -90,7 +90,7 @@ + [ac_cv_type_unsigned_long_long_int=yes], + [ac_cv_type_unsigned_long_long_int=no])]) + if test $ac_cv_type_unsigned_long_long_int = yes; then +- AC_DEFINE([HAVE_UNSIGNED_LONG_LONG_INT], 1, ++ AC_DEFINE([HAVE_UNSIGNED_LONG_LONG_INT], [1], + [Define to 1 if the system has the type `unsigned long long int'.]) + fi + ]) +@@ -103,30 +103,27 @@ + AC_DEFUN([_AC_TYPE_LONG_LONG_SNIPPET], + [ + AC_LANG_PROGRAM( +- [[/* Test preprocessor. */ +- #if ! (-9223372036854775807LL < 0 && 0 < 9223372036854775807ll) +- error in preprocessor; +- #endif +- #if ! (18446744073709551615ULL <= -1ull) +- error in preprocessor; +- #endif ++ [[/* For now, do not test the preprocessor; as of 2007 there are too many ++ implementations with broken preprocessors. Perhaps this can ++ be revisited in 2012. In the meantime, code should not expect ++ #if to work with literals wider than 32 bits. */ + /* Test literals. */ + long long int ll = 9223372036854775807ll; + long long int nll = -9223372036854775807LL; + unsigned long long int ull = 18446744073709551615ULL; + /* Test constant expressions. */ + typedef int a[((-9223372036854775807LL < 0 && 0 < 9223372036854775807ll) +- ? 1 : -1)]; ++ ? 1 : -1)]; + typedef int b[(18446744073709551615ULL <= (unsigned long long int) -1 +- ? 1 : -1)]; ++ ? 1 : -1)]; + int i = 63;]], + [[/* Test availability of runtime routines for shift and division. */ + long long int llmax = 9223372036854775807ll; + unsigned long long int ullmax = 18446744073709551615ull; + return ((ll << 63) | (ll >> 63) | (ll < i) | (ll > i) +- | (llmax / ll) | (llmax % ll) +- | (ull << 63) | (ull >> 63) | (ull << i) | (ull >> i) +- | (ullmax / ull) | (ullmax % ull));]]) ++ | (llmax / ll) | (llmax % ll) ++ | (ull << 63) | (ull >> 63) | (ull << i) | (ull >> i) ++ | (ullmax / ull) | (ullmax % ull));]]) + ]) + + # Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +@@ -144,7 +141,7 @@ + [am__api_version='1.11' + dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to + dnl require some minimum version. Point them to the right macro. +-m4_if([$1], [1.11], [], ++m4_if([$1], [1.11.1], [], + [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl + ]) + +@@ -160,7 +157,7 @@ + # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. + # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. + AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], +-[AM_AUTOMAKE_VERSION([1.11])dnl ++[AM_AUTOMAKE_VERSION([1.11.1])dnl + m4_ifndef([AC_AUTOCONF_VERSION], + [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl + _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) +--- a/clients/Makefile.in ++++ b/clients/Makefile.in +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.11 from Makefile.am. ++# Makefile.in generated by automake 1.11.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +@@ -40,7 +40,7 @@ + build_triplet = @build@ + host_triplet = @host@ + target_triplet = @target@ +-@WITH_SSL_TRUE@am__append_1 = $(LIBSSL_LDFLAGS) ++@WITH_SSL_TRUE@am__append_1 = $(LIBSSL_LIBS) + @WITH_SSL_TRUE@am__append_2 = $(LIBSSL_CFLAGS) + @WITH_CGI_TRUE@am__append_3 = $(LIBGD_CFLAGS) + bin_PROGRAMS = upsc$(EXEEXT) upslog$(EXEEXT) upsrw$(EXEEXT) \ +@@ -48,7 +48,7 @@ + sbin_PROGRAMS = upsmon$(EXEEXT) upssched$(EXEEXT) + @WITH_CGI_TRUE@cgiexec_PROGRAMS = upsstats.cgi$(EXEEXT) \ + @WITH_CGI_TRUE@ upsimage.cgi$(EXEEXT) upsset.cgi$(EXEEXT) +-@WITH_SSL_TRUE@am__append_4 = $(LIBSSL_LDFLAGS) ++@WITH_SSL_TRUE@am__append_4 = $(LIBSSL_LIBS) + subdir = clients + DIST_COMMON = $(am__include_HEADERS_DIST) $(dist_bin_SCRIPTS) \ + $(srcdir)/Makefile.am $(srcdir)/Makefile.in +@@ -228,22 +228,22 @@ + LIBGD_CFLAGS = @LIBGD_CFLAGS@ + LIBGD_LDFLAGS = @LIBGD_LDFLAGS@ + LIBHAL_CFLAGS = @LIBHAL_CFLAGS@ +-LIBHAL_LDFLAGS = @LIBHAL_LDFLAGS@ ++LIBHAL_LIBS = @LIBHAL_LIBS@ + LIBNEON_CFLAGS = @LIBNEON_CFLAGS@ +-LIBNEON_LDFLAGS = @LIBNEON_LDFLAGS@ ++LIBNEON_LIBS = @LIBNEON_LIBS@ + LIBNETSNMP_CFLAGS = @LIBNETSNMP_CFLAGS@ +-LIBNETSNMP_LDFLAGS = @LIBNETSNMP_LDFLAGS@ ++LIBNETSNMP_LIBS = @LIBNETSNMP_LIBS@ + LIBOBJS = @LIBOBJS@ + LIBPOWERMAN_CFLAGS = @LIBPOWERMAN_CFLAGS@ +-LIBPOWERMAN_LDFLAGS = @LIBPOWERMAN_LDFLAGS@ ++LIBPOWERMAN_LIBS = @LIBPOWERMAN_LIBS@ + LIBS = @LIBS@ + LIBSSL_CFLAGS = @LIBSSL_CFLAGS@ +-LIBSSL_LDFLAGS = @LIBSSL_LDFLAGS@ ++LIBSSL_LIBS = @LIBSSL_LIBS@ + LIBTOOL = @LIBTOOL@ + LIBUSB_CFLAGS = @LIBUSB_CFLAGS@ +-LIBUSB_LDFLAGS = @LIBUSB_LDFLAGS@ ++LIBUSB_LIBS = @LIBUSB_LIBS@ + LIBWRAP_CFLAGS = @LIBWRAP_CFLAGS@ +-LIBWRAP_LDFLAGS = @LIBWRAP_LDFLAGS@ ++LIBWRAP_LIBS = @LIBWRAP_LIBS@ + LIPO = @LIPO@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ +--- a/common/Makefile.in ++++ b/common/Makefile.in +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.11 from Makefile.am. ++# Makefile.in generated by automake 1.11.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +@@ -138,22 +138,22 @@ + LIBGD_CFLAGS = @LIBGD_CFLAGS@ + LIBGD_LDFLAGS = @LIBGD_LDFLAGS@ + LIBHAL_CFLAGS = @LIBHAL_CFLAGS@ +-LIBHAL_LDFLAGS = @LIBHAL_LDFLAGS@ ++LIBHAL_LIBS = @LIBHAL_LIBS@ + LIBNEON_CFLAGS = @LIBNEON_CFLAGS@ +-LIBNEON_LDFLAGS = @LIBNEON_LDFLAGS@ ++LIBNEON_LIBS = @LIBNEON_LIBS@ + LIBNETSNMP_CFLAGS = @LIBNETSNMP_CFLAGS@ +-LIBNETSNMP_LDFLAGS = @LIBNETSNMP_LDFLAGS@ ++LIBNETSNMP_LIBS = @LIBNETSNMP_LIBS@ + LIBOBJS = @LIBOBJS@ + LIBPOWERMAN_CFLAGS = @LIBPOWERMAN_CFLAGS@ +-LIBPOWERMAN_LDFLAGS = @LIBPOWERMAN_LDFLAGS@ ++LIBPOWERMAN_LIBS = @LIBPOWERMAN_LIBS@ + LIBS = @LIBS@ + LIBSSL_CFLAGS = @LIBSSL_CFLAGS@ +-LIBSSL_LDFLAGS = @LIBSSL_LDFLAGS@ ++LIBSSL_LIBS = @LIBSSL_LIBS@ + LIBTOOL = @LIBTOOL@ + LIBUSB_CFLAGS = @LIBUSB_CFLAGS@ +-LIBUSB_LDFLAGS = @LIBUSB_LDFLAGS@ ++LIBUSB_LIBS = @LIBUSB_LIBS@ + LIBWRAP_CFLAGS = @LIBWRAP_CFLAGS@ +-LIBWRAP_LDFLAGS = @LIBWRAP_LDFLAGS@ ++LIBWRAP_LIBS = @LIBWRAP_LIBS@ + LIPO = @LIPO@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ +--- a/conf/Makefile.in ++++ b/conf/Makefile.in +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.11 from Makefile.am. ++# Makefile.in generated by automake 1.11.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +@@ -139,22 +139,22 @@ + LIBGD_CFLAGS = @LIBGD_CFLAGS@ + LIBGD_LDFLAGS = @LIBGD_LDFLAGS@ + LIBHAL_CFLAGS = @LIBHAL_CFLAGS@ +-LIBHAL_LDFLAGS = @LIBHAL_LDFLAGS@ ++LIBHAL_LIBS = @LIBHAL_LIBS@ + LIBNEON_CFLAGS = @LIBNEON_CFLAGS@ +-LIBNEON_LDFLAGS = @LIBNEON_LDFLAGS@ ++LIBNEON_LIBS = @LIBNEON_LIBS@ + LIBNETSNMP_CFLAGS = @LIBNETSNMP_CFLAGS@ +-LIBNETSNMP_LDFLAGS = @LIBNETSNMP_LDFLAGS@ ++LIBNETSNMP_LIBS = @LIBNETSNMP_LIBS@ + LIBOBJS = @LIBOBJS@ + LIBPOWERMAN_CFLAGS = @LIBPOWERMAN_CFLAGS@ +-LIBPOWERMAN_LDFLAGS = @LIBPOWERMAN_LDFLAGS@ ++LIBPOWERMAN_LIBS = @LIBPOWERMAN_LIBS@ + LIBS = @LIBS@ + LIBSSL_CFLAGS = @LIBSSL_CFLAGS@ +-LIBSSL_LDFLAGS = @LIBSSL_LDFLAGS@ ++LIBSSL_LIBS = @LIBSSL_LIBS@ + LIBTOOL = @LIBTOOL@ + LIBUSB_CFLAGS = @LIBUSB_CFLAGS@ +-LIBUSB_LDFLAGS = @LIBUSB_LDFLAGS@ ++LIBUSB_LIBS = @LIBUSB_LIBS@ + LIBWRAP_CFLAGS = @LIBWRAP_CFLAGS@ +-LIBWRAP_LDFLAGS = @LIBWRAP_LDFLAGS@ ++LIBWRAP_LIBS = @LIBWRAP_LIBS@ + LIPO = @LIPO@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ +--- a/data/Makefile.in ++++ b/data/Makefile.in +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.11 from Makefile.am. ++# Makefile.in generated by automake 1.11.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +@@ -175,22 +175,22 @@ + LIBGD_CFLAGS = @LIBGD_CFLAGS@ + LIBGD_LDFLAGS = @LIBGD_LDFLAGS@ + LIBHAL_CFLAGS = @LIBHAL_CFLAGS@ +-LIBHAL_LDFLAGS = @LIBHAL_LDFLAGS@ ++LIBHAL_LIBS = @LIBHAL_LIBS@ + LIBNEON_CFLAGS = @LIBNEON_CFLAGS@ +-LIBNEON_LDFLAGS = @LIBNEON_LDFLAGS@ ++LIBNEON_LIBS = @LIBNEON_LIBS@ + LIBNETSNMP_CFLAGS = @LIBNETSNMP_CFLAGS@ +-LIBNETSNMP_LDFLAGS = @LIBNETSNMP_LDFLAGS@ ++LIBNETSNMP_LIBS = @LIBNETSNMP_LIBS@ + LIBOBJS = @LIBOBJS@ + LIBPOWERMAN_CFLAGS = @LIBPOWERMAN_CFLAGS@ +-LIBPOWERMAN_LDFLAGS = @LIBPOWERMAN_LDFLAGS@ ++LIBPOWERMAN_LIBS = @LIBPOWERMAN_LIBS@ + LIBS = @LIBS@ + LIBSSL_CFLAGS = @LIBSSL_CFLAGS@ +-LIBSSL_LDFLAGS = @LIBSSL_LDFLAGS@ ++LIBSSL_LIBS = @LIBSSL_LIBS@ + LIBTOOL = @LIBTOOL@ + LIBUSB_CFLAGS = @LIBUSB_CFLAGS@ +-LIBUSB_LDFLAGS = @LIBUSB_LDFLAGS@ ++LIBUSB_LIBS = @LIBUSB_LIBS@ + LIBWRAP_CFLAGS = @LIBWRAP_CFLAGS@ +-LIBWRAP_LDFLAGS = @LIBWRAP_LDFLAGS@ ++LIBWRAP_LIBS = @LIBWRAP_LIBS@ + LIPO = @LIPO@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ +@@ -357,7 +357,7 @@ + # (which will cause the Makefiles to be regenerated when you run `make'); + # (2) otherwise, pass the desired values on the `make' command line. + $(RECURSIVE_TARGETS): +- @failcom='exit 1'; \ ++ @fail= failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ +@@ -382,7 +382,7 @@ + fi; test -z "$$fail" + + $(RECURSIVE_CLEAN_TARGETS): +- @failcom='exit 1'; \ ++ @fail= failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ +--- a/data/html/Makefile.in ++++ b/data/html/Makefile.in +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.11 from Makefile.am. ++# Makefile.in generated by automake 1.11.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +@@ -134,22 +134,22 @@ + LIBGD_CFLAGS = @LIBGD_CFLAGS@ + LIBGD_LDFLAGS = @LIBGD_LDFLAGS@ + LIBHAL_CFLAGS = @LIBHAL_CFLAGS@ +-LIBHAL_LDFLAGS = @LIBHAL_LDFLAGS@ ++LIBHAL_LIBS = @LIBHAL_LIBS@ + LIBNEON_CFLAGS = @LIBNEON_CFLAGS@ +-LIBNEON_LDFLAGS = @LIBNEON_LDFLAGS@ ++LIBNEON_LIBS = @LIBNEON_LIBS@ + LIBNETSNMP_CFLAGS = @LIBNETSNMP_CFLAGS@ +-LIBNETSNMP_LDFLAGS = @LIBNETSNMP_LDFLAGS@ ++LIBNETSNMP_LIBS = @LIBNETSNMP_LIBS@ + LIBOBJS = @LIBOBJS@ + LIBPOWERMAN_CFLAGS = @LIBPOWERMAN_CFLAGS@ +-LIBPOWERMAN_LDFLAGS = @LIBPOWERMAN_LDFLAGS@ ++LIBPOWERMAN_LIBS = @LIBPOWERMAN_LIBS@ + LIBS = @LIBS@ + LIBSSL_CFLAGS = @LIBSSL_CFLAGS@ +-LIBSSL_LDFLAGS = @LIBSSL_LDFLAGS@ ++LIBSSL_LIBS = @LIBSSL_LIBS@ + LIBTOOL = @LIBTOOL@ + LIBUSB_CFLAGS = @LIBUSB_CFLAGS@ +-LIBUSB_LDFLAGS = @LIBUSB_LDFLAGS@ ++LIBUSB_LIBS = @LIBUSB_LIBS@ + LIBWRAP_CFLAGS = @LIBWRAP_CFLAGS@ +-LIBWRAP_LDFLAGS = @LIBWRAP_LDFLAGS@ ++LIBWRAP_LIBS = @LIBWRAP_LIBS@ + LIPO = @LIPO@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ +--- a/docs/Makefile.in ++++ b/docs/Makefile.in +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.11 from Makefile.am. ++# Makefile.in generated by automake 1.11.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +@@ -111,22 +111,22 @@ + LIBGD_CFLAGS = @LIBGD_CFLAGS@ + LIBGD_LDFLAGS = @LIBGD_LDFLAGS@ + LIBHAL_CFLAGS = @LIBHAL_CFLAGS@ +-LIBHAL_LDFLAGS = @LIBHAL_LDFLAGS@ ++LIBHAL_LIBS = @LIBHAL_LIBS@ + LIBNEON_CFLAGS = @LIBNEON_CFLAGS@ +-LIBNEON_LDFLAGS = @LIBNEON_LDFLAGS@ ++LIBNEON_LIBS = @LIBNEON_LIBS@ + LIBNETSNMP_CFLAGS = @LIBNETSNMP_CFLAGS@ +-LIBNETSNMP_LDFLAGS = @LIBNETSNMP_LDFLAGS@ ++LIBNETSNMP_LIBS = @LIBNETSNMP_LIBS@ + LIBOBJS = @LIBOBJS@ + LIBPOWERMAN_CFLAGS = @LIBPOWERMAN_CFLAGS@ +-LIBPOWERMAN_LDFLAGS = @LIBPOWERMAN_LDFLAGS@ ++LIBPOWERMAN_LIBS = @LIBPOWERMAN_LIBS@ + LIBS = @LIBS@ + LIBSSL_CFLAGS = @LIBSSL_CFLAGS@ +-LIBSSL_LDFLAGS = @LIBSSL_LDFLAGS@ ++LIBSSL_LIBS = @LIBSSL_LIBS@ + LIBTOOL = @LIBTOOL@ + LIBUSB_CFLAGS = @LIBUSB_CFLAGS@ +-LIBUSB_LDFLAGS = @LIBUSB_LDFLAGS@ ++LIBUSB_LIBS = @LIBUSB_LIBS@ + LIBWRAP_CFLAGS = @LIBWRAP_CFLAGS@ +-LIBWRAP_LDFLAGS = @LIBWRAP_LDFLAGS@ ++LIBWRAP_LIBS = @LIBWRAP_LIBS@ + LIPO = @LIPO@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ +--- a/drivers/Makefile.in ++++ b/drivers/Makefile.in +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.11 from Makefile.am. ++# Makefile.in generated by automake 1.11.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +@@ -62,7 +62,7 @@ + @SOME_DRIVERS_FALSE@@WITH_NEONXML_TRUE@am__append_9 = $(NEONXML_DRIVERLIST) + @SOME_DRIVERS_FALSE@@WITH_LIBPOWERMAN_TRUE@am__append_10 = powerman-pdu + @WITH_SSL_TRUE@am__append_11 = $(LIBSSL_CFLAGS) +-@WITH_SSL_TRUE@am__append_12 = $(LIBSSL_LDFLAGS) ++@WITH_SSL_TRUE@am__append_12 = $(LIBSSL_LIBS) + subdir = drivers + DIST_COMMON = $(dist_noinst_HEADERS) $(srcdir)/Makefile.am \ + $(srcdir)/Makefile.in +@@ -476,22 +476,22 @@ + LIBGD_CFLAGS = @LIBGD_CFLAGS@ + LIBGD_LDFLAGS = @LIBGD_LDFLAGS@ + LIBHAL_CFLAGS = @LIBHAL_CFLAGS@ +-LIBHAL_LDFLAGS = @LIBHAL_LDFLAGS@ ++LIBHAL_LIBS = @LIBHAL_LIBS@ + LIBNEON_CFLAGS = @LIBNEON_CFLAGS@ +-LIBNEON_LDFLAGS = @LIBNEON_LDFLAGS@ ++LIBNEON_LIBS = @LIBNEON_LIBS@ + LIBNETSNMP_CFLAGS = @LIBNETSNMP_CFLAGS@ +-LIBNETSNMP_LDFLAGS = @LIBNETSNMP_LDFLAGS@ ++LIBNETSNMP_LIBS = @LIBNETSNMP_LIBS@ + LIBOBJS = @LIBOBJS@ + LIBPOWERMAN_CFLAGS = @LIBPOWERMAN_CFLAGS@ +-LIBPOWERMAN_LDFLAGS = @LIBPOWERMAN_LDFLAGS@ ++LIBPOWERMAN_LIBS = @LIBPOWERMAN_LIBS@ + LIBS = @LIBS@ + LIBSSL_CFLAGS = @LIBSSL_CFLAGS@ +-LIBSSL_LDFLAGS = @LIBSSL_LDFLAGS@ ++LIBSSL_LIBS = @LIBSSL_LIBS@ + LIBTOOL = @LIBTOOL@ + LIBUSB_CFLAGS = @LIBUSB_CFLAGS@ +-LIBUSB_LDFLAGS = @LIBUSB_LDFLAGS@ ++LIBUSB_LIBS = @LIBUSB_LIBS@ + LIBWRAP_CFLAGS = @LIBWRAP_CFLAGS@ +-LIBWRAP_LDFLAGS = @LIBWRAP_LDFLAGS@ ++LIBWRAP_LIBS = @LIBWRAP_LIBS@ + LIPO = @LIPO@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ +@@ -693,18 +693,18 @@ + usbhid_ups_SOURCES = usbhid-ups.c libhid.c libusb.c hidparser.c \ + usb-common.c $(USBHID_UPS_SUBDRIVERS) + +-usbhid_ups_LDADD = $(LDADD_DRIVERS) $(LIBUSB_LDFLAGS) ++usbhid_ups_LDADD = $(LDADD_DRIVERS) $(LIBUSB_LIBS) + tripplite_usb_SOURCES = tripplite_usb.c libusb.c usb-common.c +-tripplite_usb_LDADD = $(LDADD_DRIVERS) $(LIBUSB_LDFLAGS) -lm ++tripplite_usb_LDADD = $(LDADD_DRIVERS) $(LIBUSB_LIBS) -lm + bcmxcp_usb_SOURCES = bcmxcp_usb.c bcmxcp.c usb-common.c +-bcmxcp_usb_LDADD = $(LDADD_DRIVERS) $(LIBUSB_LDFLAGS) ++bcmxcp_usb_LDADD = $(LDADD_DRIVERS) $(LIBUSB_LIBS) + megatec_usb_SOURCES = megatec.c megatec_usb.c libusb.c usb-common.c + megatec_usb_CFLAGS = $(AM_CFLAGS) -DMEGATEC_SUBDRV +-megatec_usb_LDADD = $(LDADD_DRIVERS) $(LIBUSB_LDFLAGS) ++megatec_usb_LDADD = $(LDADD_DRIVERS) $(LIBUSB_LIBS) + blazer_usb_SOURCES = blazer.c blazer_usb.c libusb.c usb-common.c +-blazer_usb_LDADD = $(LDADD_DRIVERS) $(LIBUSB_LDFLAGS) -lm ++blazer_usb_LDADD = $(LDADD_DRIVERS) $(LIBUSB_LIBS) -lm + richcomm_usb_SOURCES = richcomm_usb.c usb-common.c +-richcomm_usb_LDADD = $(LDADD_DRIVERS) $(LIBUSB_LDFLAGS) ++richcomm_usb_LDADD = $(LDADD_DRIVERS) $(LIBUSB_LIBS) + + # HID-over-serial + newmge_shut_SOURCES = usbhid-ups.c libshut.c libhid.c hidparser.c mge-hid.c +@@ -716,28 +716,28 @@ + snmp_ups_SOURCES = snmp-ups.c apc-mib.c baytech-mib.c compaq-mib.c eaton-mib.c \ + ietf-mib.c mge-mib.c netvision-mib.c powerware-mib.c raritan-pdu-mib.c + +-snmp_ups_LDADD = $(LDADD_DRIVERS) $(LIBNETSNMP_LDFLAGS) ++snmp_ups_LDADD = $(LDADD_DRIVERS) $(LIBNETSNMP_LIBS) + + # HAL + hald_addon_usbhid_ups_SOURCES = usbhid-ups.c libhid.c libusb.c hidparser.c \ + $(USBHID_UPS_SUBDRIVERS) + +-hald_addon_usbhid_ups_LDADD = $(LDADD_HAL_DRIVERS) $(LIBUSB_LDFLAGS) $(LIBHAL_LDFLAGS) ++hald_addon_usbhid_ups_LDADD = $(LDADD_HAL_DRIVERS) $(LIBUSB_LIBS) $(LIBHAL_LIBS) + hald_addon_tripplite_usb_SOURCES = tripplite_usb.c libusb.c +-hald_addon_tripplite_usb_LDADD = $(LDADD_HAL_DRIVERS) $(LIBUSB_LDFLAGS) $(LIBHAL_LDFLAGS) -lm ++hald_addon_tripplite_usb_LDADD = $(LDADD_HAL_DRIVERS) $(LIBUSB_LIBS) $(LIBHAL_LIBS) -lm + hald_addon_bcmxcp_usb_SOURCES = bcmxcp_usb.c bcmxcp.c +-hald_addon_bcmxcp_usb_LDADD = $(LDADD_HAL_DRIVERS) $(LIBUSB_LDFLAGS) $(LIBHAL_LDFLAGS) ++hald_addon_bcmxcp_usb_LDADD = $(LDADD_HAL_DRIVERS) $(LIBUSB_LIBS) $(LIBHAL_LIBS) + hald_addon_megatec_usb_SOURCES = megatec.c megatec_usb.c libusb.c + hald_addon_megatec_usb_CFLAGS = $(AM_CFLAGS) -DMEGATEC_SUBDRV +-hald_addon_megatec_usb_LDADD = $(LDADD_HAL_DRIVERS) $(LIBUSB_LDFLAGS) $(LIBHAL_LDFLAGS) ++hald_addon_megatec_usb_LDADD = $(LDADD_HAL_DRIVERS) $(LIBUSB_LIBS) $(LIBHAL_LIBS) + + # NEON XML/HTTP + netxml_ups_SOURCES = netxml-ups.c mge-xml.c +-netxml_ups_LDADD = $(LDADD_DRIVERS) $(LIBNEON_LDFLAGS) ++netxml_ups_LDADD = $(LDADD_DRIVERS) $(LIBNEON_LIBS) + + # Powerman + powerman_pdu_SOURCES = powerman-pdu.c +-powerman_pdu_LDADD = $(LDADD) $(LIBPOWERMAN_LDFLAGS) ++powerman_pdu_LDADD = $(LDADD) $(LIBPOWERMAN_LIBS) + + # ---------------------------------------------------------------------- + # List of header files. The purpose of this list is not dependency +--- a/include/Makefile.in ++++ b/include/Makefile.in +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.11 from Makefile.am. ++# Makefile.in generated by automake 1.11.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +@@ -109,22 +109,22 @@ + LIBGD_CFLAGS = @LIBGD_CFLAGS@ + LIBGD_LDFLAGS = @LIBGD_LDFLAGS@ + LIBHAL_CFLAGS = @LIBHAL_CFLAGS@ +-LIBHAL_LDFLAGS = @LIBHAL_LDFLAGS@ ++LIBHAL_LIBS = @LIBHAL_LIBS@ + LIBNEON_CFLAGS = @LIBNEON_CFLAGS@ +-LIBNEON_LDFLAGS = @LIBNEON_LDFLAGS@ ++LIBNEON_LIBS = @LIBNEON_LIBS@ + LIBNETSNMP_CFLAGS = @LIBNETSNMP_CFLAGS@ +-LIBNETSNMP_LDFLAGS = @LIBNETSNMP_LDFLAGS@ ++LIBNETSNMP_LIBS = @LIBNETSNMP_LIBS@ + LIBOBJS = @LIBOBJS@ + LIBPOWERMAN_CFLAGS = @LIBPOWERMAN_CFLAGS@ +-LIBPOWERMAN_LDFLAGS = @LIBPOWERMAN_LDFLAGS@ ++LIBPOWERMAN_LIBS = @LIBPOWERMAN_LIBS@ + LIBS = @LIBS@ + LIBSSL_CFLAGS = @LIBSSL_CFLAGS@ +-LIBSSL_LDFLAGS = @LIBSSL_LDFLAGS@ ++LIBSSL_LIBS = @LIBSSL_LIBS@ + LIBTOOL = @LIBTOOL@ + LIBUSB_CFLAGS = @LIBUSB_CFLAGS@ +-LIBUSB_LDFLAGS = @LIBUSB_LDFLAGS@ ++LIBUSB_LIBS = @LIBUSB_LIBS@ + LIBWRAP_CFLAGS = @LIBWRAP_CFLAGS@ +-LIBWRAP_LDFLAGS = @LIBWRAP_LDFLAGS@ ++LIBWRAP_LIBS = @LIBWRAP_LIBS@ + LIPO = @LIPO@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ +--- a/lib/Makefile.in ++++ b/lib/Makefile.in +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.11 from Makefile.am. ++# Makefile.in generated by automake 1.11.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +@@ -137,22 +137,22 @@ + LIBGD_CFLAGS = @LIBGD_CFLAGS@ + LIBGD_LDFLAGS = @LIBGD_LDFLAGS@ + LIBHAL_CFLAGS = @LIBHAL_CFLAGS@ +-LIBHAL_LDFLAGS = @LIBHAL_LDFLAGS@ ++LIBHAL_LIBS = @LIBHAL_LIBS@ + LIBNEON_CFLAGS = @LIBNEON_CFLAGS@ +-LIBNEON_LDFLAGS = @LIBNEON_LDFLAGS@ ++LIBNEON_LIBS = @LIBNEON_LIBS@ + LIBNETSNMP_CFLAGS = @LIBNETSNMP_CFLAGS@ +-LIBNETSNMP_LDFLAGS = @LIBNETSNMP_LDFLAGS@ ++LIBNETSNMP_LIBS = @LIBNETSNMP_LIBS@ + LIBOBJS = @LIBOBJS@ + LIBPOWERMAN_CFLAGS = @LIBPOWERMAN_CFLAGS@ +-LIBPOWERMAN_LDFLAGS = @LIBPOWERMAN_LDFLAGS@ ++LIBPOWERMAN_LIBS = @LIBPOWERMAN_LIBS@ + LIBS = @LIBS@ + LIBSSL_CFLAGS = @LIBSSL_CFLAGS@ +-LIBSSL_LDFLAGS = @LIBSSL_LDFLAGS@ ++LIBSSL_LIBS = @LIBSSL_LIBS@ + LIBTOOL = @LIBTOOL@ + LIBUSB_CFLAGS = @LIBUSB_CFLAGS@ +-LIBUSB_LDFLAGS = @LIBUSB_LDFLAGS@ ++LIBUSB_LIBS = @LIBUSB_LIBS@ + LIBWRAP_CFLAGS = @LIBWRAP_CFLAGS@ +-LIBWRAP_LDFLAGS = @LIBWRAP_LDFLAGS@ ++LIBWRAP_LIBS = @LIBWRAP_LIBS@ + LIPO = @LIPO@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ +--- a/ltmain.sh ++++ b/ltmain.sh +@@ -1,6 +1,6 @@ + # Generated from ltmain.m4sh. + +-# ltmain.sh (GNU libtool) 2.2.6 ++# ltmain.sh (GNU libtool) 2.2.6b + # Written by Gordon Matzigkeit , 1996 + + # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007 2008 Free Software Foundation, Inc. +@@ -65,7 +65,7 @@ + # compiler: $LTCC + # compiler flags: $LTCFLAGS + # linker: $LD (gnu? $with_gnu_ld) +-# $progname: (GNU libtool) 2.2.6 Debian-2.2.6a-4 ++# $progname: (GNU libtool) 2.2.6b Debian-2.2.6b-2ubuntu1 + # automake: $automake_version + # autoconf: $autoconf_version + # +@@ -73,9 +73,9 @@ + + PROGRAM=ltmain.sh + PACKAGE=libtool +-VERSION="2.2.6 Debian-2.2.6a-4" ++VERSION="2.2.6b Debian-2.2.6b-2ubuntu1" + TIMESTAMP="" +-package_revision=1.3012 ++package_revision=1.3017 + + # Be Bourne compatible + if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then +--- a/m4/ltversion.m4 ++++ b/m4/ltversion.m4 +@@ -9,15 +9,15 @@ + + # Generated from ltversion.in. + +-# serial 3012 ltversion.m4 ++# serial 3017 ltversion.m4 + # This file is part of GNU Libtool + +-m4_define([LT_PACKAGE_VERSION], [2.2.6]) +-m4_define([LT_PACKAGE_REVISION], [1.3012]) ++m4_define([LT_PACKAGE_VERSION], [2.2.6b]) ++m4_define([LT_PACKAGE_REVISION], [1.3017]) + + AC_DEFUN([LTVERSION_VERSION], +-[macro_version='2.2.6' +-macro_revision='1.3012' ++[macro_version='2.2.6b' ++macro_revision='1.3017' + _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?]) + _LT_DECL(, macro_revision, 0) + ]) +--- a/man/Makefile.in ++++ b/man/Makefile.in +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.11 from Makefile.am. ++# Makefile.in generated by automake 1.11.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +@@ -148,22 +148,22 @@ + LIBGD_CFLAGS = @LIBGD_CFLAGS@ + LIBGD_LDFLAGS = @LIBGD_LDFLAGS@ + LIBHAL_CFLAGS = @LIBHAL_CFLAGS@ +-LIBHAL_LDFLAGS = @LIBHAL_LDFLAGS@ ++LIBHAL_LIBS = @LIBHAL_LIBS@ + LIBNEON_CFLAGS = @LIBNEON_CFLAGS@ +-LIBNEON_LDFLAGS = @LIBNEON_LDFLAGS@ ++LIBNEON_LIBS = @LIBNEON_LIBS@ + LIBNETSNMP_CFLAGS = @LIBNETSNMP_CFLAGS@ +-LIBNETSNMP_LDFLAGS = @LIBNETSNMP_LDFLAGS@ ++LIBNETSNMP_LIBS = @LIBNETSNMP_LIBS@ + LIBOBJS = @LIBOBJS@ + LIBPOWERMAN_CFLAGS = @LIBPOWERMAN_CFLAGS@ +-LIBPOWERMAN_LDFLAGS = @LIBPOWERMAN_LDFLAGS@ ++LIBPOWERMAN_LIBS = @LIBPOWERMAN_LIBS@ + LIBS = @LIBS@ + LIBSSL_CFLAGS = @LIBSSL_CFLAGS@ +-LIBSSL_LDFLAGS = @LIBSSL_LDFLAGS@ ++LIBSSL_LIBS = @LIBSSL_LIBS@ + LIBTOOL = @LIBTOOL@ + LIBUSB_CFLAGS = @LIBUSB_CFLAGS@ +-LIBUSB_LDFLAGS = @LIBUSB_LDFLAGS@ ++LIBUSB_LIBS = @LIBUSB_LIBS@ + LIBWRAP_CFLAGS = @LIBWRAP_CFLAGS@ +-LIBWRAP_LDFLAGS = @LIBWRAP_LDFLAGS@ ++LIBWRAP_LIBS = @LIBWRAP_LIBS@ + LIPO = @LIPO@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ +--- a/scripts/Makefile.in ++++ b/scripts/Makefile.in +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.11 from Makefile.am. ++# Makefile.in generated by automake 1.11.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +@@ -148,22 +148,22 @@ + LIBGD_CFLAGS = @LIBGD_CFLAGS@ + LIBGD_LDFLAGS = @LIBGD_LDFLAGS@ + LIBHAL_CFLAGS = @LIBHAL_CFLAGS@ +-LIBHAL_LDFLAGS = @LIBHAL_LDFLAGS@ ++LIBHAL_LIBS = @LIBHAL_LIBS@ + LIBNEON_CFLAGS = @LIBNEON_CFLAGS@ +-LIBNEON_LDFLAGS = @LIBNEON_LDFLAGS@ ++LIBNEON_LIBS = @LIBNEON_LIBS@ + LIBNETSNMP_CFLAGS = @LIBNETSNMP_CFLAGS@ +-LIBNETSNMP_LDFLAGS = @LIBNETSNMP_LDFLAGS@ ++LIBNETSNMP_LIBS = @LIBNETSNMP_LIBS@ + LIBOBJS = @LIBOBJS@ + LIBPOWERMAN_CFLAGS = @LIBPOWERMAN_CFLAGS@ +-LIBPOWERMAN_LDFLAGS = @LIBPOWERMAN_LDFLAGS@ ++LIBPOWERMAN_LIBS = @LIBPOWERMAN_LIBS@ + LIBS = @LIBS@ + LIBSSL_CFLAGS = @LIBSSL_CFLAGS@ +-LIBSSL_LDFLAGS = @LIBSSL_LDFLAGS@ ++LIBSSL_LIBS = @LIBSSL_LIBS@ + LIBTOOL = @LIBTOOL@ + LIBUSB_CFLAGS = @LIBUSB_CFLAGS@ +-LIBUSB_LDFLAGS = @LIBUSB_LDFLAGS@ ++LIBUSB_LIBS = @LIBUSB_LIBS@ + LIBWRAP_CFLAGS = @LIBWRAP_CFLAGS@ +-LIBWRAP_LDFLAGS = @LIBWRAP_LDFLAGS@ ++LIBWRAP_LIBS = @LIBWRAP_LIBS@ + LIPO = @LIPO@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ +@@ -329,7 +329,7 @@ + # (which will cause the Makefiles to be regenerated when you run `make'); + # (2) otherwise, pass the desired values on the `make' command line. + $(RECURSIVE_TARGETS): +- @failcom='exit 1'; \ ++ @fail= failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ +@@ -354,7 +354,7 @@ + fi; test -z "$$fail" + + $(RECURSIVE_CLEAN_TARGETS): +- @failcom='exit 1'; \ ++ @fail= failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ +--- a/scripts/hal/Makefile.in ++++ b/scripts/hal/Makefile.in +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.11 from Makefile.am. ++# Makefile.in generated by automake 1.11.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +@@ -133,22 +133,22 @@ + LIBGD_CFLAGS = @LIBGD_CFLAGS@ + LIBGD_LDFLAGS = @LIBGD_LDFLAGS@ + LIBHAL_CFLAGS = @LIBHAL_CFLAGS@ +-LIBHAL_LDFLAGS = @LIBHAL_LDFLAGS@ ++LIBHAL_LIBS = @LIBHAL_LIBS@ + LIBNEON_CFLAGS = @LIBNEON_CFLAGS@ +-LIBNEON_LDFLAGS = @LIBNEON_LDFLAGS@ ++LIBNEON_LIBS = @LIBNEON_LIBS@ + LIBNETSNMP_CFLAGS = @LIBNETSNMP_CFLAGS@ +-LIBNETSNMP_LDFLAGS = @LIBNETSNMP_LDFLAGS@ ++LIBNETSNMP_LIBS = @LIBNETSNMP_LIBS@ + LIBOBJS = @LIBOBJS@ + LIBPOWERMAN_CFLAGS = @LIBPOWERMAN_CFLAGS@ +-LIBPOWERMAN_LDFLAGS = @LIBPOWERMAN_LDFLAGS@ ++LIBPOWERMAN_LIBS = @LIBPOWERMAN_LIBS@ + LIBS = @LIBS@ + LIBSSL_CFLAGS = @LIBSSL_CFLAGS@ +-LIBSSL_LDFLAGS = @LIBSSL_LDFLAGS@ ++LIBSSL_LIBS = @LIBSSL_LIBS@ + LIBTOOL = @LIBTOOL@ + LIBUSB_CFLAGS = @LIBUSB_CFLAGS@ +-LIBUSB_LDFLAGS = @LIBUSB_LDFLAGS@ ++LIBUSB_LIBS = @LIBUSB_LIBS@ + LIBWRAP_CFLAGS = @LIBWRAP_CFLAGS@ +-LIBWRAP_LDFLAGS = @LIBWRAP_LDFLAGS@ ++LIBWRAP_LIBS = @LIBWRAP_LIBS@ + LIPO = @LIPO@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ +--- a/scripts/hotplug/Makefile.in ++++ b/scripts/hotplug/Makefile.in +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.11 from Makefile.am. ++# Makefile.in generated by automake 1.11.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +@@ -138,22 +138,22 @@ + LIBGD_CFLAGS = @LIBGD_CFLAGS@ + LIBGD_LDFLAGS = @LIBGD_LDFLAGS@ + LIBHAL_CFLAGS = @LIBHAL_CFLAGS@ +-LIBHAL_LDFLAGS = @LIBHAL_LDFLAGS@ ++LIBHAL_LIBS = @LIBHAL_LIBS@ + LIBNEON_CFLAGS = @LIBNEON_CFLAGS@ +-LIBNEON_LDFLAGS = @LIBNEON_LDFLAGS@ ++LIBNEON_LIBS = @LIBNEON_LIBS@ + LIBNETSNMP_CFLAGS = @LIBNETSNMP_CFLAGS@ +-LIBNETSNMP_LDFLAGS = @LIBNETSNMP_LDFLAGS@ ++LIBNETSNMP_LIBS = @LIBNETSNMP_LIBS@ + LIBOBJS = @LIBOBJS@ + LIBPOWERMAN_CFLAGS = @LIBPOWERMAN_CFLAGS@ +-LIBPOWERMAN_LDFLAGS = @LIBPOWERMAN_LDFLAGS@ ++LIBPOWERMAN_LIBS = @LIBPOWERMAN_LIBS@ + LIBS = @LIBS@ + LIBSSL_CFLAGS = @LIBSSL_CFLAGS@ +-LIBSSL_LDFLAGS = @LIBSSL_LDFLAGS@ ++LIBSSL_LIBS = @LIBSSL_LIBS@ + LIBTOOL = @LIBTOOL@ + LIBUSB_CFLAGS = @LIBUSB_CFLAGS@ +-LIBUSB_LDFLAGS = @LIBUSB_LDFLAGS@ ++LIBUSB_LIBS = @LIBUSB_LIBS@ + LIBWRAP_CFLAGS = @LIBWRAP_CFLAGS@ +-LIBWRAP_LDFLAGS = @LIBWRAP_LDFLAGS@ ++LIBWRAP_LIBS = @LIBWRAP_LIBS@ + LIPO = @LIPO@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ +--- a/scripts/python/Makefile.in ++++ b/scripts/python/Makefile.in +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.11 from Makefile.am. ++# Makefile.in generated by automake 1.11.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +@@ -110,22 +110,22 @@ + LIBGD_CFLAGS = @LIBGD_CFLAGS@ + LIBGD_LDFLAGS = @LIBGD_LDFLAGS@ + LIBHAL_CFLAGS = @LIBHAL_CFLAGS@ +-LIBHAL_LDFLAGS = @LIBHAL_LDFLAGS@ ++LIBHAL_LIBS = @LIBHAL_LIBS@ + LIBNEON_CFLAGS = @LIBNEON_CFLAGS@ +-LIBNEON_LDFLAGS = @LIBNEON_LDFLAGS@ ++LIBNEON_LIBS = @LIBNEON_LIBS@ + LIBNETSNMP_CFLAGS = @LIBNETSNMP_CFLAGS@ +-LIBNETSNMP_LDFLAGS = @LIBNETSNMP_LDFLAGS@ ++LIBNETSNMP_LIBS = @LIBNETSNMP_LIBS@ + LIBOBJS = @LIBOBJS@ + LIBPOWERMAN_CFLAGS = @LIBPOWERMAN_CFLAGS@ +-LIBPOWERMAN_LDFLAGS = @LIBPOWERMAN_LDFLAGS@ ++LIBPOWERMAN_LIBS = @LIBPOWERMAN_LIBS@ + LIBS = @LIBS@ + LIBSSL_CFLAGS = @LIBSSL_CFLAGS@ +-LIBSSL_LDFLAGS = @LIBSSL_LDFLAGS@ ++LIBSSL_LIBS = @LIBSSL_LIBS@ + LIBTOOL = @LIBTOOL@ + LIBUSB_CFLAGS = @LIBUSB_CFLAGS@ +-LIBUSB_LDFLAGS = @LIBUSB_LDFLAGS@ ++LIBUSB_LIBS = @LIBUSB_LIBS@ + LIBWRAP_CFLAGS = @LIBWRAP_CFLAGS@ +-LIBWRAP_LDFLAGS = @LIBWRAP_LDFLAGS@ ++LIBWRAP_LIBS = @LIBWRAP_LIBS@ + LIPO = @LIPO@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ +--- a/scripts/udev/Makefile.in ++++ b/scripts/udev/Makefile.in +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.11 from Makefile.am. ++# Makefile.in generated by automake 1.11.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +@@ -133,22 +133,22 @@ + LIBGD_CFLAGS = @LIBGD_CFLAGS@ + LIBGD_LDFLAGS = @LIBGD_LDFLAGS@ + LIBHAL_CFLAGS = @LIBHAL_CFLAGS@ +-LIBHAL_LDFLAGS = @LIBHAL_LDFLAGS@ ++LIBHAL_LIBS = @LIBHAL_LIBS@ + LIBNEON_CFLAGS = @LIBNEON_CFLAGS@ +-LIBNEON_LDFLAGS = @LIBNEON_LDFLAGS@ ++LIBNEON_LIBS = @LIBNEON_LIBS@ + LIBNETSNMP_CFLAGS = @LIBNETSNMP_CFLAGS@ +-LIBNETSNMP_LDFLAGS = @LIBNETSNMP_LDFLAGS@ ++LIBNETSNMP_LIBS = @LIBNETSNMP_LIBS@ + LIBOBJS = @LIBOBJS@ + LIBPOWERMAN_CFLAGS = @LIBPOWERMAN_CFLAGS@ +-LIBPOWERMAN_LDFLAGS = @LIBPOWERMAN_LDFLAGS@ ++LIBPOWERMAN_LIBS = @LIBPOWERMAN_LIBS@ + LIBS = @LIBS@ + LIBSSL_CFLAGS = @LIBSSL_CFLAGS@ +-LIBSSL_LDFLAGS = @LIBSSL_LDFLAGS@ ++LIBSSL_LIBS = @LIBSSL_LIBS@ + LIBTOOL = @LIBTOOL@ + LIBUSB_CFLAGS = @LIBUSB_CFLAGS@ +-LIBUSB_LDFLAGS = @LIBUSB_LDFLAGS@ ++LIBUSB_LIBS = @LIBUSB_LIBS@ + LIBWRAP_CFLAGS = @LIBWRAP_CFLAGS@ +-LIBWRAP_LDFLAGS = @LIBWRAP_LDFLAGS@ ++LIBWRAP_LIBS = @LIBWRAP_LIBS@ + LIPO = @LIPO@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ +--- a/server/Makefile.in ++++ b/server/Makefile.in +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.11 from Makefile.am. ++# Makefile.in generated by automake 1.11.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +@@ -39,8 +39,8 @@ + target_triplet = @target@ + @WITH_WRAP_TRUE@am__append_1 = $(LIBWRAP_CFLAGS) + @WITH_SSL_TRUE@am__append_2 = $(LIBSSL_CFLAGS) +-@WITH_WRAP_TRUE@am__append_3 = $(LIBWRAP_LDFLAGS) +-@WITH_SSL_TRUE@am__append_4 = $(LIBSSL_LDFLAGS) ++@WITH_WRAP_TRUE@am__append_3 = $(LIBWRAP_LIBS) ++@WITH_SSL_TRUE@am__append_4 = $(LIBSSL_LIBS) + sbin_PROGRAMS = upsd$(EXEEXT) + EXTRA_PROGRAMS = sockdebug$(EXEEXT) + subdir = server +@@ -152,22 +152,22 @@ + LIBGD_CFLAGS = @LIBGD_CFLAGS@ + LIBGD_LDFLAGS = @LIBGD_LDFLAGS@ + LIBHAL_CFLAGS = @LIBHAL_CFLAGS@ +-LIBHAL_LDFLAGS = @LIBHAL_LDFLAGS@ ++LIBHAL_LIBS = @LIBHAL_LIBS@ + LIBNEON_CFLAGS = @LIBNEON_CFLAGS@ +-LIBNEON_LDFLAGS = @LIBNEON_LDFLAGS@ ++LIBNEON_LIBS = @LIBNEON_LIBS@ + LIBNETSNMP_CFLAGS = @LIBNETSNMP_CFLAGS@ +-LIBNETSNMP_LDFLAGS = @LIBNETSNMP_LDFLAGS@ ++LIBNETSNMP_LIBS = @LIBNETSNMP_LIBS@ + LIBOBJS = @LIBOBJS@ + LIBPOWERMAN_CFLAGS = @LIBPOWERMAN_CFLAGS@ +-LIBPOWERMAN_LDFLAGS = @LIBPOWERMAN_LDFLAGS@ ++LIBPOWERMAN_LIBS = @LIBPOWERMAN_LIBS@ + LIBS = @LIBS@ + LIBSSL_CFLAGS = @LIBSSL_CFLAGS@ +-LIBSSL_LDFLAGS = @LIBSSL_LDFLAGS@ ++LIBSSL_LIBS = @LIBSSL_LIBS@ + LIBTOOL = @LIBTOOL@ + LIBUSB_CFLAGS = @LIBUSB_CFLAGS@ +-LIBUSB_LDFLAGS = @LIBUSB_LDFLAGS@ ++LIBUSB_LIBS = @LIBUSB_LIBS@ + LIBWRAP_CFLAGS = @LIBWRAP_CFLAGS@ +-LIBWRAP_LDFLAGS = @LIBWRAP_LDFLAGS@ ++LIBWRAP_LIBS = @LIBWRAP_LIBS@ + LIPO = @LIPO@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ +--- a/tools/Makefile.in ++++ b/tools/Makefile.in +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.11 from Makefile.am. ++# Makefile.in generated by automake 1.11.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +@@ -108,22 +108,22 @@ + LIBGD_CFLAGS = @LIBGD_CFLAGS@ + LIBGD_LDFLAGS = @LIBGD_LDFLAGS@ + LIBHAL_CFLAGS = @LIBHAL_CFLAGS@ +-LIBHAL_LDFLAGS = @LIBHAL_LDFLAGS@ ++LIBHAL_LIBS = @LIBHAL_LIBS@ + LIBNEON_CFLAGS = @LIBNEON_CFLAGS@ +-LIBNEON_LDFLAGS = @LIBNEON_LDFLAGS@ ++LIBNEON_LIBS = @LIBNEON_LIBS@ + LIBNETSNMP_CFLAGS = @LIBNETSNMP_CFLAGS@ +-LIBNETSNMP_LDFLAGS = @LIBNETSNMP_LDFLAGS@ ++LIBNETSNMP_LIBS = @LIBNETSNMP_LIBS@ + LIBOBJS = @LIBOBJS@ + LIBPOWERMAN_CFLAGS = @LIBPOWERMAN_CFLAGS@ +-LIBPOWERMAN_LDFLAGS = @LIBPOWERMAN_LDFLAGS@ ++LIBPOWERMAN_LIBS = @LIBPOWERMAN_LIBS@ + LIBS = @LIBS@ + LIBSSL_CFLAGS = @LIBSSL_CFLAGS@ +-LIBSSL_LDFLAGS = @LIBSSL_LDFLAGS@ ++LIBSSL_LIBS = @LIBSSL_LIBS@ + LIBTOOL = @LIBTOOL@ + LIBUSB_CFLAGS = @LIBUSB_CFLAGS@ +-LIBUSB_LDFLAGS = @LIBUSB_LDFLAGS@ ++LIBUSB_LIBS = @LIBUSB_LIBS@ + LIBWRAP_CFLAGS = @LIBWRAP_CFLAGS@ +-LIBWRAP_LDFLAGS = @LIBWRAP_LDFLAGS@ ++LIBWRAP_LIBS = @LIBWRAP_LIBS@ + LIPO = @LIPO@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ diff -Nru nut-2.4.3/debian/patches/series nut-2.4.3/debian/patches/series --- nut-2.4.3/debian/patches/series 2010-12-24 11:46:41.000000000 +0100 +++ nut-2.4.3/debian/patches/series 2011-01-10 23:12:01.000000000 +0100 @@ -1,3 +1,6 @@ 0001-low_speed_usb_ups.patch 0002-fix_udev_action.patch 0003-fix_spelling_and_typo.patch +0004-netvision-improvements-lp-600950.patch +0005-fix-nut-m4.patch +9999-autoconf.patch diff -Nru nut-2.4.3/debian/rules nut-2.4.3/debian/rules --- nut-2.4.3/debian/rules 2010-12-24 11:46:41.000000000 +0100 +++ nut-2.4.3/debian/rules 2011-01-10 19:47:12.000000000 +0100 @@ -88,6 +88,9 @@ mv $${f} $(CURDIR)/debian/tmp/etc/nut/$${nf}; \ done + # install apport hook + install -D -m 644 debian/source_nut.py $(CURDIR)/debian/tmp/usr/share/apport/package-hooks/source_nut.py + dh_installchangelogs ChangeLog dh_installinit -- start 50 2 3 4 5 . stop 50 0 1 6 . dh_install @@ -113,9 +116,9 @@ dh_shlibdeps # dh_shlibdeps -Xlibupsclient.a ifeq (linux,$(DEB_HOST_ARCH_OS)) - dh_gencontrol -- -Vudev="udev (>= 0.124-1)" +# dh_gencontrol -- -Vudev="udev (>= 0.124-1)" # for Ubuntu -# dh_gencontrol -- -Vudev="udev (>= 136-1)" + dh_gencontrol -- -Vudev="udev (>= 136-1)" else dh_gencontrol -- -Vudev="" endif diff -Nru nut-2.4.3/debian/source_nut.py nut-2.4.3/debian/source_nut.py --- nut-2.4.3/debian/source_nut.py 1970-01-01 01:00:00.000000000 +0100 +++ nut-2.4.3/debian/source_nut.py 2011-01-10 19:47:12.000000000 +0100 @@ -0,0 +1,43 @@ +#!/usr/bin/python + +'''nut Apport interface + +Copyright (C) 2010 Canonical Ltd. +Author: Chuck Short + +This program is free software; you can redistribute it and/or modify it +under the terms of the GNU General Public License as published by the +Free Software Foundation; either version 2 of the License, or (at your +option) any later version. See http://www.gnu.org/copyleft/gpl.html for +the full text of the license. +''' +from apport.hookutils import * + + +def add_info(report,ui): + + response = ui.yesno("The contents of your nut configuration files may help developers diagnose your bug more quickly, however, it may contain sensitive information. Do you want to include it in your bug report?") + + if response == None: #use cancelled + raise StropIteration + + elif response == True: + attach_file(report, '/etc/nut/ups.conf', 'UpsConf') + + elif response == False: + ui.information("The contents of your nut configuration files will NOT be included in the bug report") + + report['USBDevices'] = command_output(['lsusb']) + packages = ['nut', 'nut-cgi', 'nut-snmp', 'nut-hal-drivers', 'nut-xml', 'libupsclient1', + 'libupsclient1-dev'] + versions = '' + for package in packages: + try: + version = packaging.get_version(package) + except ValueError: + version = 'N/A' + if version is None: + version = 'N/A' + versions += '%s %s\n' %(package, version) + report['NutInstalledVersions'] = versions + report['KernelVersion'] = command_output(['uname', '-a'])