Imported Upstream version 2.6.1

This commit is contained in:
Arnaud Quette 2011-06-01 22:31:49 +02:00
parent 459aaf9392
commit a367d9bc54
178 changed files with 4651 additions and 3279 deletions

View file

@ -1,9 +1,8 @@
EXTRA_DIST = attribute.h common.h extstate.h parseconf.h proto.h \
state.h timehead.h upsconf.h
state.h timehead.h upsconf.h nut_stdint.h
# http://www.gnu.org/software/automake/manual/automake.html#Clean
BUILT_SOURCES = nut_version.h nut_stdint.h
DISTCLEANFILES = nut_stdint.h
BUILT_SOURCES = nut_version.h
CLEANFILES = nut_version.h
# magic to include SVN revision number in NUT version string

View file

@ -39,7 +39,6 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
$(srcdir)/config.h.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/ax_compare_version.m4 \
$(top_srcdir)/m4/ax_create_stdint_h.m4 \
$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
$(top_srcdir)/m4/lt~obsolete.m4 \
@ -226,12 +225,11 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
udevdir = @udevdir@
EXTRA_DIST = attribute.h common.h extstate.h parseconf.h proto.h \
state.h timehead.h upsconf.h
state.h timehead.h upsconf.h nut_stdint.h
# http://www.gnu.org/software/automake/manual/automake.html#Clean
BUILT_SOURCES = nut_version.h nut_stdint.h
DISTCLEANFILES = nut_stdint.h
BUILT_SOURCES = nut_version.h
CLEANFILES = nut_version.h
all: $(BUILT_SOURCES) config.h
$(MAKE) $(AM_MAKEFLAGS) all-am
@ -355,7 +353,6 @@ clean-generic:
distclean-generic:
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"

View file

@ -288,21 +288,6 @@
/* User to switch to if started as root */
#undef RUN_AS_USER
/* The size of `char', as computed by sizeof. */
#undef SIZEOF_CHAR
/* The size of `int', as computed by sizeof. */
#undef SIZEOF_INT
/* The size of `long', as computed by sizeof. */
#undef SIZEOF_LONG
/* The size of `short', as computed by sizeof. */
#undef SIZEOF_SHORT
/* The size of `void*', as computed by sizeof. */
#undef SIZEOF_VOIDP
/* Path for UPS driver state files */
#undef STATEPATH

34
include/nut_stdint.h Normal file
View file

@ -0,0 +1,34 @@
/*
* nut_stdint.h - Network UPS Tools sets of integer types having specified widths
*
* Copyright (C) 2011 Arjen de Korte <adkorte-guest@alioth.debian.org>
*
* 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.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#ifndef NUT_STDINT_H_SEEN
#define NUT_STDINT_H_SEEN
#include "config.h"
#if defined HAVE_INTTYPES_H
# include <inttypes.h>
#endif
#if defined HAVE_STDINT_H
# include <stdint.h>
#endif
#endif /* NUT_STDINT_H_SEEN */

View file

@ -1,3 +1,3 @@
/* Autogenerated file. Do not change. */
/* This file was generated by "make". */
#define NUT_VERSION_MACRO "2.6.0-2831:2832"
#define NUT_VERSION_MACRO "2.6.1-3015:3023"