Imported Upstream version 2.6.3

drivers/Makefile.in

@@ -41,7 +41,7 @@ target_triplet = @target@
 @WITH_HAL_TRUE@am__append_1 = $(LIBHAL_CFLAGS)
 @WITH_USB_TRUE@am__append_2 = $(LIBUSB_CFLAGS)
 @WITH_SNMP_TRUE@am__append_3 = $(LIBNETSNMP_CFLAGS)
-@WITH_NEONXML_TRUE@am__append_4 = $(LIBNEON_CFLAGS)
+@WITH_NEON_TRUE@am__append_4 = $(LIBNEON_CFLAGS)
 @WITH_LIBPOWERMAN_TRUE@am__append_5 = $(LIBPOWERMAN_CFLAGS)
 @WITH_IPMI_TRUE@am__append_6 = $(LIBIPMI_CFLAGS)
 EXTRA_PROGRAMS = $(am__EXEEXT_1) $(am__EXEEXT_2) $(am__EXEEXT_4) \
@@ -60,7 +60,7 @@ EXTRA_PROGRAMS = $(am__EXEEXT_1) $(am__EXEEXT_2) $(am__EXEEXT_4) \
 @SOME_DRIVERS_FALSE@@WITH_USB_TRUE@am__append_9 = $(USB_LIBUSB_DRIVERLIST)
 @SOME_DRIVERS_FALSE@@WITH_HAL_TRUE@halexec_PROGRAMS =  \
 @SOME_DRIVERS_FALSE@@WITH_HAL_TRUE@	$(am__EXEEXT_12)
-@SOME_DRIVERS_FALSE@@WITH_NEONXML_TRUE@am__append_10 = $(NEONXML_DRIVERLIST)
+@SOME_DRIVERS_FALSE@@WITH_NEON_TRUE@am__append_10 = $(NEONXML_DRIVERLIST)
 @SOME_DRIVERS_FALSE@@WITH_LIBPOWERMAN_TRUE@am__append_11 = powerman-pdu
 @SOME_DRIVERS_FALSE@@WITH_IPMI_TRUE@am__append_12 = nut-ipmipsu
 @WITH_SSL_TRUE@am__append_13 = $(LIBSSL_CFLAGS)
@@ -80,6 +80,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ax_compare_version.m4 \
 	$(top_srcdir)/m4/nut_check_libfreeipmi.m4 \
 	$(top_srcdir)/m4/nut_check_libgd.m4 \
 	$(top_srcdir)/m4/nut_check_libhal.m4 \
+	$(top_srcdir)/m4/nut_check_libltdl.m4 \
 	$(top_srcdir)/m4/nut_check_libneon.m4 \
 	$(top_srcdir)/m4/nut_check_libnetsnmp.m4 \
 	$(top_srcdir)/m4/nut_check_libpowerman.m4 \
@@ -130,7 +131,7 @@ am__EXEEXT_5 = netxml-ups$(EXEEXT)
 @SOME_DRIVERS_FALSE@@WITH_SERIAL_TRUE@am__EXEEXT_6 = $(am__EXEEXT_1)
 @SOME_DRIVERS_FALSE@@WITH_SNMP_TRUE@am__EXEEXT_7 = $(am__EXEEXT_2)
 @SOME_DRIVERS_FALSE@@WITH_USB_TRUE@am__EXEEXT_8 = $(am__EXEEXT_3)
-@SOME_DRIVERS_FALSE@@WITH_NEONXML_TRUE@am__EXEEXT_9 = $(am__EXEEXT_5)
+@SOME_DRIVERS_FALSE@@WITH_NEON_TRUE@am__EXEEXT_9 = $(am__EXEEXT_5)
 @SOME_DRIVERS_FALSE@@WITH_LIBPOWERMAN_TRUE@am__EXEEXT_10 = powerman-pdu$(EXEEXT)
 @SOME_DRIVERS_FALSE@@WITH_IPMI_TRUE@am__EXEEXT_11 =  \
 @SOME_DRIVERS_FALSE@@WITH_IPMI_TRUE@	nut-ipmipsu$(EXEEXT)
@@ -335,7 +336,7 @@ am_snmp_ups_OBJECTS = snmp-ups.$(OBJEXT) apc-mib.$(OBJEXT) \
 	baytech-mib.$(OBJEXT) compaq-mib.$(OBJEXT) eaton-mib.$(OBJEXT) \
 	ietf-mib.$(OBJEXT) mge-mib.$(OBJEXT) netvision-mib.$(OBJEXT) \
 	powerware-mib.$(OBJEXT) raritan-pdu-mib.$(OBJEXT) \
-	bestpower-mib.$(OBJEXT)
+	bestpower-mib.$(OBJEXT) cyberpower-mib.$(OBJEXT)
 snmp_ups_OBJECTS = $(am_snmp_ups_OBJECTS)
 snmp_ups_DEPENDENCIES = $(LDADD_DRIVERS) $(am__DEPENDENCIES_1)
 am_solis_OBJECTS = solis.$(OBJEXT)
@@ -451,6 +452,7 @@ CYGPATH_W = @CYGPATH_W@
 DBLATEX = @DBLATEX@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
 DOC_BUILD_LIST = @DOC_BUILD_LIST@
 DRIVER_BUILD_LIST = @DRIVER_BUILD_LIST@
 DRIVER_INSTALL_TARGET = @DRIVER_INSTALL_TARGET@
@@ -483,6 +485,8 @@ LIBHAL_CFLAGS = @LIBHAL_CFLAGS@
 LIBHAL_LIBS = @LIBHAL_LIBS@
 LIBIPMI_CFLAGS = @LIBIPMI_CFLAGS@
 LIBIPMI_LIBS = @LIBIPMI_LIBS@
+LIBLTDL_CFLAGS = @LIBLTDL_CFLAGS@
+LIBLTDL_LIBS = @LIBLTDL_LIBS@
 LIBNEON_CFLAGS = @LIBNEON_CFLAGS@
 LIBNEON_LIBS = @LIBNEON_LIBS@
 LIBNETSNMP_CFLAGS = @LIBNETSNMP_CFLAGS@
@@ -503,6 +507,7 @@ LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 NETLIBS = @NETLIBS@
 NM = @NM@
@@ -534,12 +539,14 @@ SHELL = @SHELL@
 STATEPATH = @STATEPATH@
 STRIP = @STRIP@
 SUN_LIBUSB = @SUN_LIBUSB@
+TREE_VERSION = @TREE_VERSION@
 VERSION = @VERSION@
 WORDS_BIGENDIAN = @WORDS_BIGENDIAN@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
@@ -575,7 +582,6 @@ libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -727,7 +733,7 @@ newmge_shut_LDADD = $(LDADD)
 # 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 \
- bestpower-mib.c
+ bestpower-mib.c cyberpower-mib.c
 
 snmp_ups_LDADD = $(LDADD_DRIVERS) $(LIBNETSNMP_LIBS)
 
@@ -768,7 +774,7 @@ dist_noinst_HEADERS = apc-mib.h apc-hid.h baytech-mib.h bcmxcp.h	\
  powercom.h powerpanel.h powerp-bin.h powerp-txt.h powerware-mib.h raritan-pdu-mib.h	\
  safenet.h serial.h snmp-ups.h solis.h tripplite.h tripplite-hid.h 			\
  upshandler.h usb-common.h usbhid-ups.h powercom-hid.h compaq-mib.h idowell-hid.h \
- apcsmart.h apcsmart_tabs.h apcsmart-old.h
+ apcsmart.h apcsmart_tabs.h apcsmart-old.h cyberpower-mib.h
 
 
 # Define a dummy library so that Automake builds rules for the
@@ -1101,6 +1107,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clone.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/compaq-mib.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cps-hid.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cyberpower-mib.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dstate-hal.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dstate.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dummy_ups-dummy-ups.Po@am__quote@