Imported Upstream version 2.6.3
This commit is contained in:
Arnaud Quette
parent
45043b58d0
commit
fad6ced6f6
255 changed files with 11081 additions and 4629 deletions
|
|
@ -8,10 +8,14 @@ CLEANFILES = nut_version.h
|
|||
# magic to include SVN revision number in NUT version string
|
||||
|
||||
nut_version.h: FORCE
|
||||
@SVNREV=`LANG=C svnversion -n $(top_srcdir) 2>/dev/null`; \
|
||||
if [ -z "$$SVNREV" -o "$$SVNREV" = "exported" ]; \
|
||||
then NUT_VERSION="$(PACKAGE_VERSION)"; \
|
||||
else NUT_VERSION="$(PACKAGE_VERSION)-$$SVNREV"; \
|
||||
@GITREV=`git describe --tags 2>/dev/null | sed 's/^v\([0-9]\)/\1/' `; \
|
||||
if [ -z "$$GITREV" ]; \
|
||||
then SVNREV=`LANG=C svnversion -n $(top_srcdir) 2>/dev/null`; \
|
||||
if [ -z "$$SVNREV" -o "$$SVNREV" = "exported" ]; \
|
||||
then NUT_VERSION="$(PACKAGE_VERSION)"; \
|
||||
else NUT_VERSION="$(PACKAGE_VERSION)-$$SVNREV"; \
|
||||
fi ; \
|
||||
else NUT_VERSION="$$GITREV"; \
|
||||
fi ; \
|
||||
echo '/* Autogenerated file. Do not change. */' > _nut_version.h ; \
|
||||
echo '/* This file was generated by "make". */' >> _nut_version.h ; \
|
||||
|
|
|
|||
|
|
@ -48,6 +48,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 \
|
||||
|
|
@ -88,6 +89,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@
|
||||
|
|
@ -120,6 +122,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@
|
||||
|
|
@ -140,6 +144,7 @@ LN_S = @LN_S@
|
|||
LTLIBOBJS = @LTLIBOBJS@
|
||||
MAINT = @MAINT@
|
||||
MAKEINFO = @MAKEINFO@
|
||||
MANIFEST_TOOL = @MANIFEST_TOOL@
|
||||
MKDIR_P = @MKDIR_P@
|
||||
NETLIBS = @NETLIBS@
|
||||
NM = @NM@
|
||||
|
|
@ -171,12 +176,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@
|
||||
|
|
@ -212,7 +219,6 @@ libdir = @libdir@
|
|||
libexecdir = @libexecdir@
|
||||
localedir = @localedir@
|
||||
localstatedir = @localstatedir@
|
||||
lt_ECHO = @lt_ECHO@
|
||||
mandir = @mandir@
|
||||
mkdir_p = @mkdir_p@
|
||||
oldincludedir = @oldincludedir@
|
||||
|
|
@ -454,10 +460,14 @@ uninstall-am:
|
|||
# magic to include SVN revision number in NUT version string
|
||||
|
||||
nut_version.h: FORCE
|
||||
@SVNREV=`LANG=C svnversion -n $(top_srcdir) 2>/dev/null`; \
|
||||
if [ -z "$$SVNREV" -o "$$SVNREV" = "exported" ]; \
|
||||
then NUT_VERSION="$(PACKAGE_VERSION)"; \
|
||||
else NUT_VERSION="$(PACKAGE_VERSION)-$$SVNREV"; \
|
||||
@GITREV=`git describe --tags 2>/dev/null | sed 's/^v\([0-9]\)/\1/' `; \
|
||||
if [ -z "$$GITREV" ]; \
|
||||
then SVNREV=`LANG=C svnversion -n $(top_srcdir) 2>/dev/null`; \
|
||||
if [ -z "$$SVNREV" -o "$$SVNREV" = "exported" ]; \
|
||||
then NUT_VERSION="$(PACKAGE_VERSION)"; \
|
||||
else NUT_VERSION="$(PACKAGE_VERSION)-$$SVNREV"; \
|
||||
fi ; \
|
||||
else NUT_VERSION="$$GITREV"; \
|
||||
fi ; \
|
||||
echo '/* Autogenerated file. Do not change. */' > _nut_version.h ; \
|
||||
echo '/* This file was generated by "make". */' >> _nut_version.h ; \
|
||||
|
|
|
|||
|
|
@ -89,9 +89,15 @@
|
|||
/* Define to 1 if you have the `flock' function. */
|
||||
#undef HAVE_FLOCK
|
||||
|
||||
/* Define if FreeIPMI support is available */
|
||||
#undef HAVE_FREEIPMI
|
||||
|
||||
/* Define to 1 if you have the <freeipmi/freeipmi.h> header file. */
|
||||
#undef HAVE_FREEIPMI_FREEIPMI_H
|
||||
|
||||
/* Define if FreeIPMI monitoring support is available */
|
||||
#undef HAVE_FREEIPMI_MONITORING
|
||||
|
||||
/* Define to 1 if you have the <gdfontmb.h> header file. */
|
||||
#undef HAVE_GDFONTMB_H
|
||||
|
||||
|
|
@ -131,6 +137,9 @@
|
|||
/* Define to 1 if you have the <libhal.h> header file. */
|
||||
#undef HAVE_LIBHAL_H
|
||||
|
||||
/* Define to enable libltdl support */
|
||||
#undef HAVE_LIBLTDL
|
||||
|
||||
/* Define to 1 if you have the <libpowerman.h> header file. */
|
||||
#undef HAVE_LIBPOWERMAN_H
|
||||
|
||||
|
|
@ -143,6 +152,9 @@
|
|||
/* Define to 1 if the system has the type `long long int'. */
|
||||
#undef HAVE_LONG_LONG_INT
|
||||
|
||||
/* Define to 1 if you have the <ltdl.h> header file. */
|
||||
#undef HAVE_LTDL_H
|
||||
|
||||
/* Define to 1 if you have the <memory.h> header file. */
|
||||
#undef HAVE_MEMORY_H
|
||||
|
||||
|
|
@ -324,6 +336,9 @@
|
|||
/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
|
||||
#undef TIME_WITH_SYS_TIME
|
||||
|
||||
/* NUT tree version */
|
||||
#undef TREE_VERSION
|
||||
|
||||
/* Enable extensions on AIX 3, Interix. */
|
||||
#ifndef _ALL_SOURCE
|
||||
# undef _ALL_SOURCE
|
||||
|
|
@ -349,18 +364,51 @@
|
|||
/* Version number of package */
|
||||
#undef VERSION
|
||||
|
||||
/* Define to enable avahi support */
|
||||
/* Define to enable Asciidoc support */
|
||||
#undef WITH_ASCIIDOC
|
||||
|
||||
/* Define to enable Avahi support */
|
||||
#undef WITH_AVAHI
|
||||
|
||||
/* Define to enable CGI (HTTP) support */
|
||||
#undef WITH_CGI
|
||||
|
||||
/* Define to enable development files support */
|
||||
#undef WITH_DEV
|
||||
|
||||
/* Define to enable IPMI support using FreeIPMI */
|
||||
#undef WITH_FREEIPMI
|
||||
|
||||
/* Define to enable HAL support */
|
||||
#undef WITH_HAL
|
||||
|
||||
/* Define to enable IPMI support */
|
||||
#undef WITH_IPMI
|
||||
|
||||
/* Define to enable Neon XML/HTTP support */
|
||||
/* Define to enable libltdl (Libtool dlopen abstraction) support */
|
||||
#undef WITH_LIBLTDL
|
||||
|
||||
/* Define to enable Powerman PDU support */
|
||||
#undef WITH_LIBPOWERMAN
|
||||
|
||||
/* Define to enable Neon HTTP support */
|
||||
#undef WITH_NEON
|
||||
|
||||
/* Define to enable serial support */
|
||||
#undef WITH_SERIAL
|
||||
|
||||
/* Define to enable SNMP support */
|
||||
#undef WITH_SNMP
|
||||
|
||||
/* Define to enable SSL development code */
|
||||
#undef WITH_SSL
|
||||
|
||||
/* Define to enable USB support */
|
||||
#undef WITH_USB
|
||||
|
||||
/* Define to enable libwrap (tcp-wrappers) support */
|
||||
#undef WITH_WRAP
|
||||
|
||||
/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
|
||||
significant byte first (like Motorola and SPARC, unlike Intel). */
|
||||
#if defined AC_APPLE_UNIVERSAL_BUILD
|
||||
|
|
|
|||
|
|
@ -1,3 +1,3 @@
|
|||
/* Autogenerated file. Do not change. */
|
||||
/* This file was generated by "make". */
|
||||
#define NUT_VERSION_MACRO "2.6.2-3235:3238"
|
||||
#define NUT_VERSION_MACRO "2.6.3-3369:3371"
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue