New upstream release 2.9.6

1 files changed, 116 insertions, 78 deletions

diff --git a/lib/Makefile b/lib/Makefile
index 6d0b2ec..f463803 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # lib/Makefile.  Generated from Makefile.in by configure.
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -13,13 +14,11 @@
 # PARTICULAR PURPOSE.
 
 
-srcdir = .
-top_srcdir = ..
 
 pkgdatadir = $(datadir)/ipmiutil
-pkglibdir = $(libdir)/ipmiutil
 pkgincludedir = $(includedir)/ipmiutil
-top_builddir = ..
+pkglibdir = $(libdir)/ipmiutil
+pkglibexecdir = $(libexecdir)/ipmiutil
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -44,18 +43,16 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES = libipmiutil.pc
+CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
 DIST_SOURCES =
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-INSTALL = sh ../install-sh -c
-ACLOCAL = ${SHELL} /usr/dev/ipmiutil-2.9.5/missing --run aclocal-1.9
-AMDEP_FALSE = #
-AMDEP_TRUE = 
-AMTAR = ${SHELL} /usr/dev/ipmiutil-2.9.5/missing --run tar
+ACLOCAL = ${SHELL} /usr/dev/ipmiutil-2.9.6/missing --run aclocal-1.11
+AMTAR = ${SHELL} /usr/dev/ipmiutil-2.9.6/missing --run tar
 AR = ar
-AUTOCONF = ${SHELL} /usr/dev/ipmiutil-2.9.5/missing --run autoconf
-AUTOHEADER = ${SHELL} /usr/dev/ipmiutil-2.9.5/missing --run autoheader
-AUTOMAKE = ${SHELL} /usr/dev/ipmiutil-2.9.5/missing --run automake-1.9
+AUTOCONF = ${SHELL} /usr/dev/ipmiutil-2.9.6/missing --run autoconf
+AUTOHEADER = ${SHELL} /usr/dev/ipmiutil-2.9.6/missing --run autoheader
+AUTOMAKE = ${SHELL} /usr/dev/ipmiutil-2.9.6/missing --run automake-1.11
 AWK = gawk
 CC = gcc
 CCDEPMODE = depmode=gcc3
@@ -64,29 +61,27 @@ CPP = gcc -E
 CPPFLAGS = 
 CROSS_CFLAGS = 
 CROSS_LFLAGS = 
-CXX = g++
-CXXCPP = g++ -E
-CXXDEPMODE = depmode=gcc3
-CXXFLAGS = -g -O2
 CYGPATH_W = echo
 DEFS = -DHAVE_CONFIG_H
 DEPDIR = .deps
-ECHO = echo
+DSYMUTIL = 
+DUMPBIN = 
 ECHO_C = 
 ECHO_N = -n
 ECHO_T = 
-EGREP = grep -E
+EGREP = /bin/grep -E
 EXEEXT = 
-F77 = f95
-FFLAGS = -g -O2
+FGREP = /bin/grep -F
 GPL_CFLAGS = 
+GREP = /bin/grep
 IA64_CFLAGS = 
 INIT_DIR = /etc//rc.d/init.d
+INSTALL = sh ../install-sh -c
 INSTALL_DATA = ${INSTALL} -m 644
 INSTALL_PROGRAM = ${INSTALL}
 # INSTALL_DATA = $(INSTALL) -m 644
 INSTALL_SCRIPT = $(INSTALL) -m 755
-INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s
+INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
 INS_LIB = 
 LANDESK_CFLAGS = 
 LANDESK_LDADD = 
@@ -95,6 +90,7 @@ LANPLUS_CRYPTO = -lcrypto
 LANPLUS_LDADD = -L../lib -lipmi_lanplus -L/usr/local/lib -lcrypto
 LANPLUS_LIB = ../lib/libipmi_lanplus.a
 LANPLUS_SAM = yes
+LD = /usr/bin/ld -m elf_x86_64
 LDFLAGS = 
 LD_SAMX = ../lib/libipmi_lanplus.a -lcrypto
 LIBOBJS = 
@@ -102,43 +98,44 @@ LIBS =
 LIBSENSORS = 
 LIBTOOL = $(SHELL) $(top_builddir)/libtool
 LIB_DIR = /usr/lib64
+LIPO = 
 LN_S = ln -s
 LTLIBOBJS = 
-MAKEINFO = ${SHELL} /usr/dev/ipmiutil-2.9.5/missing --run makeinfo
+MAKEINFO = ${SHELL} /usr/dev/ipmiutil-2.9.6/missing --run makeinfo
+MKDIR_P = /bin/mkdir -p
+NM = /usr/bin/nm -B
+NMEDIT = 
+OBJDUMP = objdump
 OBJEXT = o
 OS_CFLAGS = -DLINUX  -fPIC  -fstack-protector --param=ssp-buffer-size=4 -D_FORTIFY_SOURCE=2
 OS_DRIVERS = imbapi.c ipmimv.c ipmild.c ipmidir.c
 OS_LFLAGS = 
+OTOOL = 
+OTOOL64 = 
 PACKAGE = ipmiutil
 PACKAGE_BUGREPORT = 
 PACKAGE_NAME = ipmiutil
-PACKAGE_STRING = ipmiutil 2.9.5
+PACKAGE_STRING = ipmiutil 2.9.6
 PACKAGE_TARNAME = ipmiutil
-PACKAGE_VERSION = 2.9.5
+PACKAGE_VERSION = 2.9.6
 PATH_SEPARATOR = :
-PKG_DIR = /usr/src/redhat
+PKG_DIR = /root/rpmbuild
 RANLIB = ranlib
 SAM2OBJ = isensor2.o ievents2.o
-SED = /bin/sed
+SED = sed
 SET_MAKE = 
 SHELL = /bin/sh
 SHR_LINK = libipmiutil.so
 STRIP = strip
 SUBDIR_S = doc scripts lib util
 SYSTEMD_DIR = /usr/share/ipmiutil
-VERSION = 2.9.5
-WITH_PKG_CONFIG_FALSE = #
-WITH_PKG_CONFIG_TRUE = 
-ac_ct_AR = ar
+VERSION = 2.9.6
+abs_builddir = /usr/dev/ipmiutil-2.9.6/lib
+abs_srcdir = /usr/dev/ipmiutil-2.9.6/lib
+abs_top_builddir = /usr/dev/ipmiutil-2.9.6
+abs_top_srcdir = /usr/dev/ipmiutil-2.9.6
 ac_ct_CC = gcc
-ac_ct_CXX = g++
-ac_ct_F77 = f95
-ac_ct_RANLIB = ranlib
-ac_ct_STRIP = strip
-am__fastdepCC_FALSE = #
-am__fastdepCC_TRUE = 
-am__fastdepCXX_FALSE = #
-am__fastdepCXX_TRUE = 
+ac_ct_DUMPBIN = 
 am__include = include
 am__leading_dot = .
 am__quote = 
@@ -150,29 +147,42 @@ build_alias =
 build_cpu = x86_64
 build_os = linux-gnu
 build_vendor = redhat
+builddir = .
 datadir = $(iprefix)/share
+datarootdir = ${prefix}/share
+docdir = ${datarootdir}/doc/${PACKAGE_TARNAME}
+dvidir = ${docdir}
 exec_prefix = ${prefix}
 host = x86_64-redhat-linux-gnu
 host_alias = 
 host_cpu = x86_64
 host_os = linux-gnu
 host_vendor = redhat
+htmldir = ${docdir}
 includedir = ${prefix}/include
-infodir = ${prefix}/info
-install_sh = /usr/dev/ipmiutil-2.9.5/install-sh
+infodir = ${datarootdir}/info
+install_sh = ${SHELL} /usr/dev/ipmiutil-2.9.6/install-sh
 libdir = $(iprefix)/lib
 libexecdir = ${exec_prefix}/libexec
+localedir = ${datarootdir}/locale
 localstatedir = ${prefix}/var
+lt_ECHO = echo
 mandir = $(iprefix)/man
-mkdir_p = mkdir -p --
+mkdir_p = /bin/mkdir -p
 oldincludedir = /usr/include
+pdfdir = ${docdir}
 pkgconfigdir = ${libdir}/pkgconfig
 prefix = /usr
 program_transform_name = s,x,x,
+psdir = ${docdir}
 sbindir = $(iexec_prefix)/sbin
 sharedstatedir = ${prefix}/com
+srcdir = .
 sysconfdir = ${prefix}/etc
 target_alias = 
+top_build_prefix = ../
+top_builddir = ..
+top_srcdir = ..
 
 #!/bin/sh
 # Makefile.am to build/install ipmiutil lib files
@@ -187,6 +197,7 @@ MKDIR = sh ../mkinstalldirs
 INSTALL_BIN = /usr/bin/install -c
 iprefix = /usr
 iexec_prefix = ${prefix}
+PLUSFLAGS = -DHAVE_LANPLUS
 datato = ${DESTDIR}${datadir}/ipmiutil
 lib32 = ${DESTDIR}$(iprefix)/lib
 lib64 = ${DESTDIR}$(iprefix)/lib64
@@ -197,14 +208,14 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  lib/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  lib/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign lib/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign lib/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -222,6 +233,7 @@ $(top_srcdir)/configure:  $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 libipmiutil.pc: $(top_builddir)/config.status $(srcdir)/libipmiutil.pc.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 
@@ -230,10 +242,6 @@ mostlyclean-libtool:
 
 clean-libtool:
 	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
 tags: TAGS
 TAGS:
 
@@ -242,29 +250,32 @@ CTAGS:
 
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -291,13 +302,14 @@ 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)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
 	@echo "it deletes files that may require special tools to rebuild."
 clean-am: clean-generic clean-libtool mostlyclean-am
 
-distclean-am: clean-am distclean-generic distclean-libtool
+distclean-am: clean-am distclean-generic
 
 dvi: dvi-am
 
@@ -305,18 +317,38 @@ dvi-am:
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
 
 install-data-am:
 
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
 install-exec-am:
 
+install-html: install-html-am
+
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -335,17 +367,20 @@ ps: ps-am
 
 ps-am:
 
-uninstall-am: uninstall-info-am
+uninstall-am:
+
+.MAKE: install-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
 	distclean distclean-generic distclean-libtool distdir dvi \
 	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-exec install-exec-am \
-	install-info install-info-am install-man install-strip \
+	install-data install-data-am install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
+	install-info install-info-am install-man install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
 	installcheck installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
-	uninstall-info-am
+	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
 
 
 all:	
@@ -357,8 +392,10 @@ all:
 	    else cp -f libipmiapi64.a.redhat  libipmiapi.a; fi \
           else cp -f libipmiapi32.a libipmiapi.a; fi \
 	fi
-	cd lanplus; make clean; make  
-	cp -f lanplus/libipmi_lanplus.a  .
+	if [ "$(PLUSFLAGS)" = "-DHAVE_LANPLUS" ]; then \
+	  cd lanplus; make clean; make  ; \
+	  pwd; cp -f libipmi_lanplus.a .. ; \
+	fi
 
 clean:
 	rm -f libipmiapi.a lib*_lanplus.a lib*_lanplus.so
@@ -393,6 +430,7 @@ installso:
 	(cd ${lib32} && rm -f libipmi_lanplus.* ); \
 	../../libtool --finish ${lib64} \
 	fi
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT: