[Pkg-ofed-commits] r420 - in /branches/ofed-1.4.2/mstflint/branches/upstream/cur...
gmpc-guest at alioth.debian.org
gmpc-guest at alioth.debian.org
Fri Aug 7 14:58:45 UTC 2009
Author: gmpc-guest
Date: Fri Aug 7 14:58:44 2009
New Revision: 420
URL: http://svn.debian.org/wsvn/pkg-ofed/?sc=1&rev=420
Log:
[svn-upgrade] Integrating new upstream version, mstflint (1.4-OFED-1.4.2)
Modified:
branches/ofed-1.4.2/mstflint/branches/upstream/current/Makefile.am
branches/ofed-1.4.2/mstflint/branches/upstream/current/Makefile.in
branches/ofed-1.4.2/mstflint/branches/upstream/current/autom4te.cache/output.0
branches/ofed-1.4.2/mstflint/branches/upstream/current/autom4te.cache/output.1
branches/ofed-1.4.2/mstflint/branches/upstream/current/autom4te.cache/traces.0
branches/ofed-1.4.2/mstflint/branches/upstream/current/autom4te.cache/traces.1
branches/ofed-1.4.2/mstflint/branches/upstream/current/config.h.in
branches/ofed-1.4.2/mstflint/branches/upstream/current/configure
branches/ofed-1.4.2/mstflint/branches/upstream/current/configure.in
branches/ofed-1.4.2/mstflint/branches/upstream/current/hca_self_test.ofed
branches/ofed-1.4.2/mstflint/branches/upstream/current/mstflint.spec
branches/ofed-1.4.2/mstflint/branches/upstream/current/mtcr.h
branches/ofed-1.4.2/mstflint/branches/upstream/current/vpd.c
Modified: branches/ofed-1.4.2/mstflint/branches/upstream/current/Makefile.am
URL: http://svn.debian.org/wsvn/pkg-ofed/branches/ofed-1.4.2/mstflint/branches/upstream/current/Makefile.am?rev=420&op=diff
==============================================================================
--- branches/ofed-1.4.2/mstflint/branches/upstream/current/Makefile.am (original)
+++ branches/ofed-1.4.2/mstflint/branches/upstream/current/Makefile.am Fri Aug 7 14:58:44 2009
@@ -12,7 +12,9 @@
mstmwrite_SOURCES = mwrite.c mtcr.h
mstflint_SOURCES = flint.cpp mtcr.h mflash.h mflash.c
-mstflint_LDFLAGS = -lz
+
+mstflint_LIBS = @mstflint_LIBS@
+mstflint_CXXFLAGS = @mstflint_CXXFLAGS@
mstregdump_SOURCES = mstdump.c mtcr.h
Modified: branches/ofed-1.4.2/mstflint/branches/upstream/current/Makefile.in
URL: http://svn.debian.org/wsvn/pkg-ofed/branches/ofed-1.4.2/mstflint/branches/upstream/current/Makefile.in?rev=420&op=diff
==============================================================================
--- branches/ofed-1.4.2/mstflint/branches/upstream/current/Makefile.in (original)
+++ branches/ofed-1.4.2/mstflint/branches/upstream/current/Makefile.in Fri Aug 7 14:58:44 2009
@@ -60,7 +60,7 @@
"$(DESTDIR)$(mstflintincludedir)"
binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
PROGRAMS = $(bin_PROGRAMS)
-am_mstflint_OBJECTS = flint.$(OBJEXT) mflash.$(OBJEXT)
+am_mstflint_OBJECTS = mstflint-flint.$(OBJEXT) mflash.$(OBJEXT)
mstflint_OBJECTS = $(am_mstflint_OBJECTS)
mstflint_LDADD = $(LDADD)
am_mstmcra_OBJECTS = mcra.$(OBJEXT)
@@ -215,6 +215,8 @@
localstatedir = @localstatedir@
mandir = @mandir@
mkdir_p = @mkdir_p@
+mstflint_CXXFLAGS = @mstflint_CXXFLAGS@
+mstflint_LIBS = @mstflint_LIBS@
oldincludedir = @oldincludedir@
prefix = @prefix@
program_transform_name = @program_transform_name@
@@ -226,7 +228,6 @@
mstmread_SOURCES = mread.c mtcr.h
mstmwrite_SOURCES = mwrite.c mtcr.h
mstflint_SOURCES = flint.cpp mtcr.h mflash.h mflash.c
-mstflint_LDFLAGS = -lz
mstregdump_SOURCES = mstdump.c mtcr.h
mstvpd_SOURCES = vpd.c
mstmcra_SOURCES = mcra.c mtcr.h
@@ -365,11 +366,11 @@
distclean-compile:
-rm -f *.tab.c
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/flint.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mcra.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mflash.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mread.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mstdump.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mstflint-flint.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mwrite.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/vpd.Po at am__quote@
@@ -414,6 +415,20 @@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
+
+mstflint-flint.o: flint.cpp
+ at am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mstflint_CXXFLAGS) $(CXXFLAGS) -MT mstflint-flint.o -MD -MP -MF "$(DEPDIR)/mstflint-flint.Tpo" -c -o mstflint-flint.o `test -f 'flint.cpp' || echo '$(srcdir)/'`flint.cpp; \
+ at am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/mstflint-flint.Tpo" "$(DEPDIR)/mstflint-flint.Po"; else rm -f "$(DEPDIR)/mstflint-flint.Tpo"; exit 1; fi
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='flint.cpp' object='mstflint-flint.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mstflint_CXXFLAGS) $(CXXFLAGS) -c -o mstflint-flint.o `test -f 'flint.cpp' || echo '$(srcdir)/'`flint.cpp
+
+mstflint-flint.obj: flint.cpp
+ at am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mstflint_CXXFLAGS) $(CXXFLAGS) -MT mstflint-flint.obj -MD -MP -MF "$(DEPDIR)/mstflint-flint.Tpo" -c -o mstflint-flint.obj `if test -f 'flint.cpp'; then $(CYGPATH_W) 'flint.cpp'; else $(CYGPATH_W) '$(srcdir)/flint.cpp'; fi`; \
+ at am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/mstflint-flint.Tpo" "$(DEPDIR)/mstflint-flint.Po"; else rm -f "$(DEPDIR)/mstflint-flint.Tpo"; exit 1; fi
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='flint.cpp' object='mstflint-flint.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mstflint_CXXFLAGS) $(CXXFLAGS) -c -o mstflint-flint.obj `if test -f 'flint.cpp'; then $(CYGPATH_W) 'flint.cpp'; else $(CYGPATH_W) '$(srcdir)/flint.cpp'; fi`
mostlyclean-libtool:
-rm -f *.lo
Modified: branches/ofed-1.4.2/mstflint/branches/upstream/current/autom4te.cache/output.0
URL: http://svn.debian.org/wsvn/pkg-ofed/branches/ofed-1.4.2/mstflint/branches/upstream/current/autom4te.cache/output.0?rev=420&op=diff
==============================================================================
--- branches/ofed-1.4.2/mstflint/branches/upstream/current/autom4te.cache/output.0 (original)
+++ branches/ofed-1.4.2/mstflint/branches/upstream/current/autom4te.cache/output.0 Fri Aug 7 14:58:44 2009
@@ -465,7 +465,7 @@
# include <unistd.h>
#endif"
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS PROJECT VERSION INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE build build_cpu build_vendor build_os host host_cpu host_vendor host_os EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIB@&t at OBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS PROJECT VERSION INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE build build_cpu build_vendor build_os host host_cpu host_vendor host_os EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL mstflint_LIBS mstflint_CXXFLAGS LIB@&t at OBJS LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
@@ -1036,6 +1036,7 @@
--enable-fast-install@<:@=PKGS@:>@
optimize for fast installation @<:@default=yes@:>@
--disable-libtool-lock avoid locking (might break parallel builds)
+ --disable-dc Disable mstflint "dc" command. Eliminate zlib dependency
Optional Packages:
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
@@ -18594,6 +18595,247 @@
ac_config_headers="$ac_config_headers config.h"
+echo "$as_me:$LINENO: checking --enable-dc argument" >&5
+echo $ECHO_N "checking --enable-dc argument... $ECHO_C" >&6
+# Check whether --enable-dc or --disable-dc was given.
+if test "${enable_dc+set}" = set; then
+ enableval="$enable_dc"
+ enable_dc=$enableval
+else
+ enable_dc="yes"
+fi;
+echo "$as_me:$LINENO: result: $enableval" >&5
+echo "${ECHO_T}$enableval" >&6
+if test "$enable_dc" = "yes"; then
+ if test "${ac_cv_header_zlib_h+set}" = set; then
+ echo "$as_me:$LINENO: checking for zlib.h" >&5
+echo $ECHO_N "checking for zlib.h... $ECHO_C" >&6
+if test "${ac_cv_header_zlib_h+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+echo "$as_me:$LINENO: result: $ac_cv_header_zlib_h" >&5
+echo "${ECHO_T}$ac_cv_header_zlib_h" >&6
+else
+ # Is the header compilable?
+echo "$as_me:$LINENO: checking zlib.h usability" >&5
+echo $ECHO_N "checking zlib.h usability... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+@%:@include <zlib.h>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_header_compiler=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_header_compiler=no
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6
+
+# Is the header present?
+echo "$as_me:$LINENO: checking zlib.h presence" >&5
+echo $ECHO_N "checking zlib.h presence... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+@%:@include <zlib.h>
+_ACEOF
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+ else
+ ac_cpp_err=
+ fi
+else
+ ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
+ ac_header_preproc=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_preproc=no
+fi
+rm -f conftest.err conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6
+
+# So? What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+ yes:no: )
+ { echo "$as_me:$LINENO: WARNING: zlib.h: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: zlib.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { echo "$as_me:$LINENO: WARNING: zlib.h: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: zlib.h: proceeding with the compiler's result" >&2;}
+ ac_header_preproc=yes
+ ;;
+ no:yes:* )
+ { echo "$as_me:$LINENO: WARNING: zlib.h: present but cannot be compiled" >&5
+echo "$as_me: WARNING: zlib.h: present but cannot be compiled" >&2;}
+ { echo "$as_me:$LINENO: WARNING: zlib.h: check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: zlib.h: check for missing prerequisite headers?" >&2;}
+ { echo "$as_me:$LINENO: WARNING: zlib.h: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: zlib.h: see the Autoconf documentation" >&2;}
+ { echo "$as_me:$LINENO: WARNING: zlib.h: section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: zlib.h: section \"Present But Cannot Be Compiled\"" >&2;}
+ { echo "$as_me:$LINENO: WARNING: zlib.h: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: zlib.h: proceeding with the preprocessor's result" >&2;}
+ { echo "$as_me:$LINENO: WARNING: zlib.h: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: zlib.h: in the future, the compiler will take precedence" >&2;}
+ (
+ cat <<\_ASBOX
+@%:@@%:@ ----------------------------------- @%:@@%:@
+@%:@@%:@ Report this to orenk at mellanox.co.il @%:@@%:@
+@%:@@%:@ ----------------------------------- @%:@@%:@
+_ASBOX
+ ) |
+ sed "s/^/$as_me: WARNING: /" >&2
+ ;;
+esac
+echo "$as_me:$LINENO: checking for zlib.h" >&5
+echo $ECHO_N "checking for zlib.h... $ECHO_C" >&6
+if test "${ac_cv_header_zlib_h+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ ac_cv_header_zlib_h=$ac_header_preproc
+fi
+echo "$as_me:$LINENO: result: $ac_cv_header_zlib_h" >&5
+echo "${ECHO_T}$ac_cv_header_zlib_h" >&6
+
+fi
+if test $ac_cv_header_zlib_h = yes; then
+ :
+else
+ { { echo "$as_me:$LINENO: error: cannot find zlib.h . Use --disable-dc to remove this dependaency" >&5
+echo "$as_me: error: cannot find zlib.h . Use --disable-dc to remove this dependaency" >&2;}
+ { (exit 1); exit 1; }; }
+fi
+
+
+
+echo "$as_me:$LINENO: checking for uncompress in -lz" >&5
+echo $ECHO_N "checking for uncompress in -lz... $ECHO_C" >&6
+if test "${ac_cv_lib_z_uncompress+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lz $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+
+/* Override any gcc2 internal prototype to avoid an error. */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+char uncompress ();
+int
+main ()
+{
+uncompress ();
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+ (eval $ac_link) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_lib_z_uncompress=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_z_uncompress=no
+fi
+rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:$LINENO: result: $ac_cv_lib_z_uncompress" >&5
+echo "${ECHO_T}$ac_cv_lib_z_uncompress" >&6
+if test $ac_cv_lib_z_uncompress = yes; then
+ cat >>confdefs.h <<_ACEOF
+@%:@define HAVE_LIBZ 1
+_ACEOF
+
+ LIBS="-lz $LIBS"
+
+else
+ { { echo "$as_me:$LINENO: error: cannot find zlib uncompress() function. Use --disable-dc to remove this dependaency" >&5
+echo "$as_me: error: cannot find zlib uncompress() function. Use --disable-dc to remove this dependaency" >&2;}
+ { (exit 1); exit 1; }; }
+fi
+
+ mstflint_LIBS="-lz"
+else
+ mstflint_CXXFLAGS="-DNO_ZLIB"
+fi
+
+
+
ac_config_files="$ac_config_files Makefile mstflint.spec"
cat >confcache <<\_ACEOF
@@ -19307,6 +19549,8 @@
s, at FFLAGS@,$FFLAGS,;t t
s, at ac_ct_F77@,$ac_ct_F77,;t t
s, at LIBTOOL@,$LIBTOOL,;t t
+s, at mstflint_LIBS@,$mstflint_LIBS,;t t
+s, at mstflint_CXXFLAGS@,$mstflint_CXXFLAGS,;t t
s, at LIB@&t at OBJS@,$LIB@&t at OBJS,;t t
s, at LTLIBOBJS@,$LTLIBOBJS,;t t
CEOF
Modified: branches/ofed-1.4.2/mstflint/branches/upstream/current/autom4te.cache/output.1
URL: http://svn.debian.org/wsvn/pkg-ofed/branches/ofed-1.4.2/mstflint/branches/upstream/current/autom4te.cache/output.1?rev=420&op=diff
==============================================================================
--- branches/ofed-1.4.2/mstflint/branches/upstream/current/autom4te.cache/output.1 (original)
+++ branches/ofed-1.4.2/mstflint/branches/upstream/current/autom4te.cache/output.1 Fri Aug 7 14:58:44 2009
@@ -465,7 +465,7 @@
# include <unistd.h>
#endif"
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS PROJECT VERSION INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE build build_cpu build_vendor build_os host host_cpu host_vendor host_os EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIB@&t at OBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS PROJECT VERSION INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE build build_cpu build_vendor build_os host host_cpu host_vendor host_os EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL mstflint_LIBS mstflint_CXXFLAGS LIB@&t at OBJS LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
@@ -1036,6 +1036,7 @@
--enable-fast-install@<:@=PKGS@:>@
optimize for fast installation @<:@default=yes@:>@
--disable-libtool-lock avoid locking (might break parallel builds)
+ --disable-dc Disable mstflint "dc" command. Eliminate zlib dependency
Optional Packages:
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
@@ -18582,6 +18583,247 @@
ac_config_headers="$ac_config_headers config.h"
+echo "$as_me:$LINENO: checking --enable-dc argument" >&5
+echo $ECHO_N "checking --enable-dc argument... $ECHO_C" >&6
+# Check whether --enable-dc or --disable-dc was given.
+if test "${enable_dc+set}" = set; then
+ enableval="$enable_dc"
+ enable_dc=$enableval
+else
+ enable_dc="yes"
+fi;
+echo "$as_me:$LINENO: result: $enableval" >&5
+echo "${ECHO_T}$enableval" >&6
+if test "$enable_dc" = "yes"; then
+ if test "${ac_cv_header_zlib_h+set}" = set; then
+ echo "$as_me:$LINENO: checking for zlib.h" >&5
+echo $ECHO_N "checking for zlib.h... $ECHO_C" >&6
+if test "${ac_cv_header_zlib_h+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+echo "$as_me:$LINENO: result: $ac_cv_header_zlib_h" >&5
+echo "${ECHO_T}$ac_cv_header_zlib_h" >&6
+else
+ # Is the header compilable?
+echo "$as_me:$LINENO: checking zlib.h usability" >&5
+echo $ECHO_N "checking zlib.h usability... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+@%:@include <zlib.h>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_header_compiler=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_header_compiler=no
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6
+
+# Is the header present?
+echo "$as_me:$LINENO: checking zlib.h presence" >&5
+echo $ECHO_N "checking zlib.h presence... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+@%:@include <zlib.h>
+_ACEOF
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+ else
+ ac_cpp_err=
+ fi
+else
+ ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
+ ac_header_preproc=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_preproc=no
+fi
+rm -f conftest.err conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6
+
+# So? What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+ yes:no: )
+ { echo "$as_me:$LINENO: WARNING: zlib.h: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: zlib.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { echo "$as_me:$LINENO: WARNING: zlib.h: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: zlib.h: proceeding with the compiler's result" >&2;}
+ ac_header_preproc=yes
+ ;;
+ no:yes:* )
+ { echo "$as_me:$LINENO: WARNING: zlib.h: present but cannot be compiled" >&5
+echo "$as_me: WARNING: zlib.h: present but cannot be compiled" >&2;}
+ { echo "$as_me:$LINENO: WARNING: zlib.h: check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: zlib.h: check for missing prerequisite headers?" >&2;}
+ { echo "$as_me:$LINENO: WARNING: zlib.h: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: zlib.h: see the Autoconf documentation" >&2;}
+ { echo "$as_me:$LINENO: WARNING: zlib.h: section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: zlib.h: section \"Present But Cannot Be Compiled\"" >&2;}
+ { echo "$as_me:$LINENO: WARNING: zlib.h: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: zlib.h: proceeding with the preprocessor's result" >&2;}
+ { echo "$as_me:$LINENO: WARNING: zlib.h: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: zlib.h: in the future, the compiler will take precedence" >&2;}
+ (
+ cat <<\_ASBOX
+@%:@@%:@ ----------------------------------- @%:@@%:@
+@%:@@%:@ Report this to orenk at mellanox.co.il @%:@@%:@
+@%:@@%:@ ----------------------------------- @%:@@%:@
+_ASBOX
+ ) |
+ sed "s/^/$as_me: WARNING: /" >&2
+ ;;
+esac
+echo "$as_me:$LINENO: checking for zlib.h" >&5
+echo $ECHO_N "checking for zlib.h... $ECHO_C" >&6
+if test "${ac_cv_header_zlib_h+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ ac_cv_header_zlib_h=$ac_header_preproc
+fi
+echo "$as_me:$LINENO: result: $ac_cv_header_zlib_h" >&5
+echo "${ECHO_T}$ac_cv_header_zlib_h" >&6
+
+fi
+if test $ac_cv_header_zlib_h = yes; then
+ :
+else
+ { { echo "$as_me:$LINENO: error: cannot find zlib.h . Use --disable-dc to remove this dependaency" >&5
+echo "$as_me: error: cannot find zlib.h . Use --disable-dc to remove this dependaency" >&2;}
+ { (exit 1); exit 1; }; }
+fi
+
+
+
+echo "$as_me:$LINENO: checking for uncompress in -lz" >&5
+echo $ECHO_N "checking for uncompress in -lz... $ECHO_C" >&6
+if test "${ac_cv_lib_z_uncompress+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lz $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+
+/* Override any gcc2 internal prototype to avoid an error. */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+char uncompress ();
+int
+main ()
+{
+uncompress ();
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+ (eval $ac_link) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_lib_z_uncompress=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_z_uncompress=no
+fi
+rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:$LINENO: result: $ac_cv_lib_z_uncompress" >&5
+echo "${ECHO_T}$ac_cv_lib_z_uncompress" >&6
+if test $ac_cv_lib_z_uncompress = yes; then
+ cat >>confdefs.h <<_ACEOF
+@%:@define HAVE_LIBZ 1
+_ACEOF
+
+ LIBS="-lz $LIBS"
+
+else
+ { { echo "$as_me:$LINENO: error: cannot find zlib uncompress() function. Use --disable-dc to remove this dependaency" >&5
+echo "$as_me: error: cannot find zlib uncompress() function. Use --disable-dc to remove this dependaency" >&2;}
+ { (exit 1); exit 1; }; }
+fi
+
+ mstflint_LIBS="-lz"
+else
+ mstflint_CXXFLAGS="-DNO_ZLIB"
+fi
+
+
+
ac_config_files="$ac_config_files Makefile mstflint.spec"
cat >confcache <<\_ACEOF
@@ -19295,6 +19537,8 @@
s, at FFLAGS@,$FFLAGS,;t t
s, at ac_ct_F77@,$ac_ct_F77,;t t
s, at LIBTOOL@,$LIBTOOL,;t t
+s, at mstflint_LIBS@,$mstflint_LIBS,;t t
+s, at mstflint_CXXFLAGS@,$mstflint_CXXFLAGS,;t t
s, at LIB@&t at OBJS@,$LIB@&t at OBJS,;t t
s, at LTLIBOBJS@,$LTLIBOBJS,;t t
CEOF
Modified: branches/ofed-1.4.2/mstflint/branches/upstream/current/autom4te.cache/traces.0
URL: http://svn.debian.org/wsvn/pkg-ofed/branches/ofed-1.4.2/mstflint/branches/upstream/current/autom4te.cache/traces.0?rev=420&op=diff
==============================================================================
--- branches/ofed-1.4.2/mstflint/branches/upstream/current/autom4te.cache/traces.0 (original)
+++ branches/ofed-1.4.2/mstflint/branches/upstream/current/autom4te.cache/traces.0 Fri Aug 7 14:58:44 2009
@@ -9187,8 +9187,16 @@
m4trace:configure.in:18: -1- _LT_AC_LANG_F77
m4trace:configure.in:18: -1- _LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}F77])
m4trace:configure.in:19: -1- AC_CONFIG_HEADERS([config.h ])
-m4trace:configure.in:21: -1- AC_CONFIG_FILES([Makefile mstflint.spec])
-m4trace:configure.in:22: -1- AC_SUBST([LIB@&t at OBJS], [$ac_libobjs])
-m4trace:configure.in:22: -1- AC_SUBST([LTLIBOBJS], [$ac_ltlibobjs])
-m4trace:configure.in:22: -1- _AC_AM_CONFIG_HEADER_HOOK([$ac_file])
-m4trace:configure.in:22: -1- _AM_OUTPUT_DEPENDENCY_COMMANDS
+m4trace:configure.in:29: -1- AC_CHECK_LIB([z], [uncompress], [], [{ { echo "$as_me:$LINENO: error: cannot find zlib uncompress() function. Use --disable-dc to remove this dependaency" >&5
+echo "$as_me: error: cannot find zlib uncompress() function. Use --disable-dc to remove this dependaency" >&2;}
+ { (exit 1); exit 1; }; }])
+m4trace:configure.in:29: -1- AH_OUTPUT([HAVE_LIBZ], [/* Define to 1 if you have the `z\' library (-lz). */
+#undef HAVE_LIBZ])
+m4trace:configure.in:29: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBZ])
+m4trace:configure.in:34: -1- AC_SUBST([mstflint_LIBS])
+m4trace:configure.in:35: -1- AC_SUBST([mstflint_CXXFLAGS])
+m4trace:configure.in:37: -1- AC_CONFIG_FILES([Makefile mstflint.spec])
+m4trace:configure.in:38: -1- AC_SUBST([LIB@&t at OBJS], [$ac_libobjs])
+m4trace:configure.in:38: -1- AC_SUBST([LTLIBOBJS], [$ac_ltlibobjs])
+m4trace:configure.in:38: -1- _AC_AM_CONFIG_HEADER_HOOK([$ac_file])
+m4trace:configure.in:38: -1- _AM_OUTPUT_DEPENDENCY_COMMANDS
Modified: branches/ofed-1.4.2/mstflint/branches/upstream/current/autom4te.cache/traces.1
URL: http://svn.debian.org/wsvn/pkg-ofed/branches/ofed-1.4.2/mstflint/branches/upstream/current/autom4te.cache/traces.1?rev=420&op=diff
==============================================================================
--- branches/ofed-1.4.2/mstflint/branches/upstream/current/autom4te.cache/traces.1 (original)
+++ branches/ofed-1.4.2/mstflint/branches/upstream/current/autom4te.cache/traces.1 Fri Aug 7 14:58:44 2009
@@ -391,6 +391,14 @@
configure.in:18: the top level])
m4trace:configure.in:18: -1- AC_SUBST([LIBTOOL])
m4trace:configure.in:19: -1- AC_CONFIG_HEADERS([config.h ])
-m4trace:configure.in:21: -1- AC_CONFIG_FILES([Makefile mstflint.spec])
-m4trace:configure.in:22: -1- AC_SUBST([LIB@&t at OBJS], [$ac_libobjs])
-m4trace:configure.in:22: -1- AC_SUBST([LTLIBOBJS], [$ac_ltlibobjs])
+m4trace:configure.in:29: -1- AC_CHECK_LIB([z], [uncompress], [], [{ { echo "$as_me:$LINENO: error: cannot find zlib uncompress() function. Use --disable-dc to remove this dependaency" >&5
+echo "$as_me: error: cannot find zlib uncompress() function. Use --disable-dc to remove this dependaency" >&2;}
+ { (exit 1); exit 1; }; }])
+m4trace:configure.in:29: -1- AH_OUTPUT([HAVE_LIBZ], [/* Define to 1 if you have the `z\' library (-lz). */
+#undef HAVE_LIBZ])
+m4trace:configure.in:29: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBZ])
+m4trace:configure.in:34: -1- AC_SUBST([mstflint_LIBS])
+m4trace:configure.in:35: -1- AC_SUBST([mstflint_CXXFLAGS])
+m4trace:configure.in:37: -1- AC_CONFIG_FILES([Makefile mstflint.spec])
+m4trace:configure.in:38: -1- AC_SUBST([LIB@&t at OBJS], [$ac_libobjs])
+m4trace:configure.in:38: -1- AC_SUBST([LTLIBOBJS], [$ac_ltlibobjs])
Modified: branches/ofed-1.4.2/mstflint/branches/upstream/current/config.h.in
URL: http://svn.debian.org/wsvn/pkg-ofed/branches/ofed-1.4.2/mstflint/branches/upstream/current/config.h.in?rev=420&op=diff
==============================================================================
--- branches/ofed-1.4.2/mstflint/branches/upstream/current/config.h.in (original)
+++ branches/ofed-1.4.2/mstflint/branches/upstream/current/config.h.in Fri Aug 7 14:58:44 2009
@@ -5,6 +5,9 @@
/* Define to 1 if you have the <inttypes.h> header file. */
#undef HAVE_INTTYPES_H
+
+/* Define to 1 if you have the `z' library (-lz). */
+#undef HAVE_LIBZ
/* Define to 1 if you have the <memory.h> header file. */
#undef HAVE_MEMORY_H
Modified: branches/ofed-1.4.2/mstflint/branches/upstream/current/configure
URL: http://svn.debian.org/wsvn/pkg-ofed/branches/ofed-1.4.2/mstflint/branches/upstream/current/configure?rev=420&op=diff
==============================================================================
--- branches/ofed-1.4.2/mstflint/branches/upstream/current/configure (original)
+++ branches/ofed-1.4.2/mstflint/branches/upstream/current/configure Fri Aug 7 14:58:44 2009
@@ -465,7 +465,7 @@
# include <unistd.h>
#endif"
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS PROJECT VERSION INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE build build_cpu build_vendor build_os host host_cpu host_vendor host_os EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS PROJECT VERSION INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE build build_cpu build_vendor build_os host host_cpu host_vendor host_os EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL mstflint_LIBS mstflint_CXXFLAGS LIBOBJS LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
@@ -1036,6 +1036,7 @@
--enable-fast-install[=PKGS]
optimize for fast installation [default=yes]
--disable-libtool-lock avoid locking (might break parallel builds)
+ --disable-dc Disable mstflint "dc" command. Eliminate zlib dependency
Optional Packages:
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
@@ -4141,7 +4142,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 4144 "configure"' > conftest.$ac_ext
+ echo '#line 4145 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -5272,7 +5273,7 @@
# Provide some information about the compiler.
-echo "$as_me:5275:" \
+echo "$as_me:5276:" \
"checking for Fortran 77 compiler version" >&5
ac_compiler=`set X $ac_compile; echo $2`
{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
@@ -6333,11 +6334,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:6336: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:6337: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:6340: \$? = $ac_status" >&5
+ echo "$as_me:6341: \$? = $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.
@@ -6601,11 +6602,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:6604: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:6605: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:6608: \$? = $ac_status" >&5
+ echo "$as_me:6609: \$? = $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.
@@ -6705,11 +6706,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:6708: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:6709: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:6712: \$? = $ac_status" >&5
+ echo "$as_me:6713: \$? = $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
@@ -9063,7 +9064,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 9066 "configure"
+#line 9067 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -9163,7 +9164,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 9166 "configure"
+#line 9167 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -11501,11 +11502,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:11504: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:11505: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:11508: \$? = $ac_status" >&5
+ echo "$as_me:11509: \$? = $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.
@@ -11605,11 +11606,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:11608: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:11609: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:11612: \$? = $ac_status" >&5
+ echo "$as_me:11613: \$? = $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
@@ -13193,11 +13194,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:13196: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13197: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:13200: \$? = $ac_status" >&5
+ echo "$as_me:13201: \$? = $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.
@@ -13297,11 +13298,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:13300: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13301: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:13304: \$? = $ac_status" >&5
+ echo "$as_me:13305: \$? = $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
@@ -15520,11 +15521,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:15523: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:15524: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:15527: \$? = $ac_status" >&5
+ echo "$as_me:15528: \$? = $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.
@@ -15788,11 +15789,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:15791: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:15792: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:15795: \$? = $ac_status" >&5
+ echo "$as_me:15796: \$? = $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.
@@ -15892,11 +15893,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:15895: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:15896: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:15899: \$? = $ac_status" >&5
+ echo "$as_me:15900: \$? = $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
@@ -18580,6 +18581,247 @@
ac_config_headers="$ac_config_headers config.h"
+
+
+echo "$as_me:$LINENO: checking --enable-dc argument" >&5
+echo $ECHO_N "checking --enable-dc argument... $ECHO_C" >&6
+# Check whether --enable-dc or --disable-dc was given.
+if test "${enable_dc+set}" = set; then
+ enableval="$enable_dc"
+ enable_dc=$enableval
+else
+ enable_dc="yes"
+fi;
+echo "$as_me:$LINENO: result: $enableval" >&5
+echo "${ECHO_T}$enableval" >&6
+if test "$enable_dc" = "yes"; then
+ if test "${ac_cv_header_zlib_h+set}" = set; then
+ echo "$as_me:$LINENO: checking for zlib.h" >&5
+echo $ECHO_N "checking for zlib.h... $ECHO_C" >&6
+if test "${ac_cv_header_zlib_h+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+echo "$as_me:$LINENO: result: $ac_cv_header_zlib_h" >&5
+echo "${ECHO_T}$ac_cv_header_zlib_h" >&6
+else
+ # Is the header compilable?
+echo "$as_me:$LINENO: checking zlib.h usability" >&5
+echo $ECHO_N "checking zlib.h usability... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+#include <zlib.h>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_header_compiler=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_header_compiler=no
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6
+
+# Is the header present?
+echo "$as_me:$LINENO: checking zlib.h presence" >&5
+echo $ECHO_N "checking zlib.h presence... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <zlib.h>
+_ACEOF
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+ else
+ ac_cpp_err=
+ fi
+else
+ ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
+ ac_header_preproc=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_preproc=no
+fi
+rm -f conftest.err conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6
+
+# So? What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+ yes:no: )
+ { echo "$as_me:$LINENO: WARNING: zlib.h: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: zlib.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { echo "$as_me:$LINENO: WARNING: zlib.h: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: zlib.h: proceeding with the compiler's result" >&2;}
+ ac_header_preproc=yes
+ ;;
+ no:yes:* )
+ { echo "$as_me:$LINENO: WARNING: zlib.h: present but cannot be compiled" >&5
+echo "$as_me: WARNING: zlib.h: present but cannot be compiled" >&2;}
+ { echo "$as_me:$LINENO: WARNING: zlib.h: check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: zlib.h: check for missing prerequisite headers?" >&2;}
+ { echo "$as_me:$LINENO: WARNING: zlib.h: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: zlib.h: see the Autoconf documentation" >&2;}
+ { echo "$as_me:$LINENO: WARNING: zlib.h: section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: zlib.h: section \"Present But Cannot Be Compiled\"" >&2;}
+ { echo "$as_me:$LINENO: WARNING: zlib.h: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: zlib.h: proceeding with the preprocessor's result" >&2;}
+ { echo "$as_me:$LINENO: WARNING: zlib.h: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: zlib.h: in the future, the compiler will take precedence" >&2;}
+ (
+ cat <<\_ASBOX
+## ----------------------------------- ##
+## Report this to orenk at mellanox.co.il ##
+## ----------------------------------- ##
+_ASBOX
+ ) |
+ sed "s/^/$as_me: WARNING: /" >&2
+ ;;
+esac
+echo "$as_me:$LINENO: checking for zlib.h" >&5
+echo $ECHO_N "checking for zlib.h... $ECHO_C" >&6
+if test "${ac_cv_header_zlib_h+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ ac_cv_header_zlib_h=$ac_header_preproc
+fi
+echo "$as_me:$LINENO: result: $ac_cv_header_zlib_h" >&5
+echo "${ECHO_T}$ac_cv_header_zlib_h" >&6
+
+fi
+if test $ac_cv_header_zlib_h = yes; then
+ :
+else
+ { { echo "$as_me:$LINENO: error: cannot find zlib.h . Use --disable-dc to remove this dependaency" >&5
+echo "$as_me: error: cannot find zlib.h . Use --disable-dc to remove this dependaency" >&2;}
+ { (exit 1); exit 1; }; }
+fi
+
+
+
+echo "$as_me:$LINENO: checking for uncompress in -lz" >&5
+echo $ECHO_N "checking for uncompress in -lz... $ECHO_C" >&6
+if test "${ac_cv_lib_z_uncompress+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lz $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+
+/* Override any gcc2 internal prototype to avoid an error. */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+char uncompress ();
+int
+main ()
+{
+uncompress ();
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+ (eval $ac_link) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_lib_z_uncompress=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_z_uncompress=no
+fi
+rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:$LINENO: result: $ac_cv_lib_z_uncompress" >&5
+echo "${ECHO_T}$ac_cv_lib_z_uncompress" >&6
+if test $ac_cv_lib_z_uncompress = yes; then
+ cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBZ 1
+_ACEOF
+
+ LIBS="-lz $LIBS"
+
+else
+ { { echo "$as_me:$LINENO: error: cannot find zlib uncompress() function. Use --disable-dc to remove this dependaency" >&5
+echo "$as_me: error: cannot find zlib uncompress() function. Use --disable-dc to remove this dependaency" >&2;}
+ { (exit 1); exit 1; }; }
+fi
+
+ mstflint_LIBS="-lz"
+else
+ mstflint_CXXFLAGS="-DNO_ZLIB"
+fi
+
ac_config_files="$ac_config_files Makefile mstflint.spec"
@@ -19295,6 +19537,8 @@
s, at FFLAGS@,$FFLAGS,;t t
s, at ac_ct_F77@,$ac_ct_F77,;t t
s, at LIBTOOL@,$LIBTOOL,;t t
+s, at mstflint_LIBS@,$mstflint_LIBS,;t t
+s, at mstflint_CXXFLAGS@,$mstflint_CXXFLAGS,;t t
s, at LIBOBJS@,$LIBOBJS,;t t
s, at LTLIBOBJS@,$LTLIBOBJS,;t t
CEOF
Modified: branches/ofed-1.4.2/mstflint/branches/upstream/current/configure.in
URL: http://svn.debian.org/wsvn/pkg-ofed/branches/ofed-1.4.2/mstflint/branches/upstream/current/configure.in?rev=420&op=diff
==============================================================================
--- branches/ofed-1.4.2/mstflint/branches/upstream/current/configure.in (original)
+++ branches/ofed-1.4.2/mstflint/branches/upstream/current/configure.in Fri Aug 7 14:58:44 2009
@@ -18,5 +18,21 @@
AC_PROG_LIBTOOL
AC_CONFIG_HEADERS( config.h )
+AC_MSG_CHECKING(--enable-dc argument)
+AC_ARG_ENABLE(dc,
+ [ --disable-dc Disable mstflint "dc" command. Eliminate zlib dependency],
+ [enable_dc=$enableval],
+ [enable_dc="yes"])
+AC_MSG_RESULT($enableval)
+if test "$enable_dc" = "yes"; then
+ AC_CHECK_HEADER(zlib.h,,AC_MSG_ERROR([cannot find zlib.h . Use --disable-dc to remove this dependaency]))
+ AC_CHECK_LIB(z, uncompress,, AC_MSG_ERROR([cannot find zlib uncompress() function. Use --disable-dc to remove this dependaency]))
+ mstflint_LIBS="-lz"
+else
+ mstflint_CXXFLAGS="-DNO_ZLIB"
+fi
+AC_SUBST(mstflint_LIBS)
+AC_SUBST(mstflint_CXXFLAGS)
+
AC_CONFIG_FILES([Makefile mstflint.spec])
AC_OUTPUT
Modified: branches/ofed-1.4.2/mstflint/branches/upstream/current/hca_self_test.ofed
URL: http://svn.debian.org/wsvn/pkg-ofed/branches/ofed-1.4.2/mstflint/branches/upstream/current/hca_self_test.ofed?rev=420&op=diff
==============================================================================
--- branches/ofed-1.4.2/mstflint/branches/upstream/current/hca_self_test.ofed (original)
+++ branches/ofed-1.4.2/mstflint/branches/upstream/current/hca_self_test.ofed Fri Aug 7 14:58:44 2009
@@ -30,7 +30,7 @@
#
# Description: Test health of HCA
-# For colored text
+# For colored text
green='\E[32m'
red='\E[31m'
cyan='\E[36m'
@@ -54,6 +54,14 @@
SINAI_FW_NEEDED=
HERMON_FW_NEEDED=
########################################################################################
+
+for cmd in lspci cat id rpm uname grep ls awk egrep modprobe; do
+ cmd_exist=`which $cmd 2> /dev/null`
+ if [ "$cmd_exist" == "" ]; then
+ echo "Error: $cmd tool was not found in the PATH"
+ exit 1
+ fi
+done
# Color echo
cecho () {
@@ -79,7 +87,7 @@
echo "---- Performing InfiniBand HCA Self Test ----"
# Get OS type
-if [ -f /etc/redhat-release -o -f /etc/fedora-release ]; then
+if [ -f /etc/redhat-release -o -f /etc/fedora-release ]; then
OS_TYPE="RED_HAT"
elif [ -f /etc/SuSE-release ]; then
OS_TYPE="SUSE"
@@ -97,7 +105,7 @@
NUM_MEM_CON=`lspci 2> /dev/null | grep "Memory controller: Mellanox Technolog" | wc -l`
let "NUM_HCAS=$NUM_IB_DEV + $NUM_MEM_CON"
-echo "Number of HCAs Detected ................ "$NUM_HCAS;
+echo "Number of HCAs Detected ................ "$NUM_HCAS;
if [ $NUM_HCAS -ne 0 ]; then
if [ $NUM_MEM_CON -ne 0 ]; then
@@ -112,7 +120,7 @@
else
echo -e "PCI Device Check ....................... ${red}FAIL"
tput sgr0
- echo " REASON: no HCAs in the system"
+ echo " REASON: no HCAs in the system"
EXIT_CODE=1
exit $EXIT_CODE
fi
@@ -121,20 +129,17 @@
RPM_CHECK_FAIL=0
RPM_USR_VER=1
RPM_CUR_BOOTED_KER=1
-else
+else
# RPM check
RPM_CHECK_FAIL=0
- RPM_USR_VER=`rpm -qa | grep kernel-ib | wc -l`
- RPM_KER_VER=`rpm -qa | grep kernel-ib | wc -l`
- RPM_KER_NAME=`rpm -qa | grep kernel-ib | grep -v devel | sed s/kernel-ib-//g | tr \\\n " "`
-
- OFED_VERSION=$(ofed_info | grep OFED)
- if [ $(rpm -qa | grep smp | wc -l) -eq 0 ]; then
- RPM_KER_ARCH=`rpm -q --qf '%{arch}\n' $(rpm -q kernel | head -1)`
- else
- RPM_KER_ARCH=`rpm -q --qf '%{arch}\n' $(rpm -qa | grep smp | head -1)`
- fi
-
+ RPM_USR_VER=`rpm -qa 2> /dev/null | grep kernel-ib | wc -l`
+ RPM_KER_VER=`rpm -qa 2> /dev/null | grep kernel-ib | wc -l`
+ RPM_KER_NAME=`rpm -qa 2> /dev/null | grep kernel-ib | grep -v devel | sed s/kernel-ib-//g | tr \\\n " "`
+
+ OFED_VERSION=$(ofed_info | grep OFED)
+
+ RPM_KER_ARCH=`uname -m`
+
if [ $OS_TYPE = "RED_HAT" ]; then
BOOTED_KER=`uname -r`
elif [ $OS_TYPE = "SUSE" ]; then
@@ -145,25 +150,25 @@
if [ $RPM_USR_VER -eq 0 ] && [ $RPM_KER_VER -eq 0 ]; then
echo -e "Host Driver RPM Check .................. ${red}FAIL"
tput sgr0
- echo " REASON: no RPMs found"
+ echo " REASON: no RPMs found"
RPM_CHECK_FAIL=1
EXIT_CODE=1
elif [ $RPM_USR_VER -eq 0 ]; then
echo -e "Host Driver RPM Check .................. ${red}FAIL"
tput sgr0
- echo " REASON: no user level RPMs found"
+ echo " REASON: no user level RPMs found"
RPM_CHECK_FAIL=1
EXIT_CODE=1
elif [ $RPM_KER_VER -eq 0 ]; then
echo -e "Host Driver RPM Check .................. ${red}FAIL"
tput sgr0
- echo " REASON: no kernel level RPMs found"
+ echo " REASON: no kernel level RPMs found"
RPM_CHECK_FAIL=1
EXIT_CODE=1
fi
if [ $RPM_KER_VER -ne 0 ]; then
- RPM_CUR_BOOTED_KER=`rpm -qa | grep kernel-ib | grep $(echo $BOOTED_KER | sed s/-/_/) | wc -l`
+ RPM_CUR_BOOTED_KER=`rpm -qa 2> null| grep kernel-ib | grep $(echo $BOOTED_KER | sed s/-/_/) | wc -l`
if [ $RPM_CUR_BOOTED_KER -eq 0 ]; then
echo -e "Host Driver RPM Check .................. ${red}FAIL"
tput sgr0
@@ -178,7 +183,7 @@
echo "Host Driver Version .................... $OFED_VERSION $RPM_KER_NAME"
else
echo "Host Driver Version .................... NA"
- fi
+ fi
if [ $RPM_CHECK_FAIL -eq 0 ]; then
echo -e "Host Driver RPM Check .................. ${green}PASS"
@@ -191,15 +196,16 @@
function get_device_id {
loop_cnt=$1
- PCI_DEV=$(lspci 2> /dev/null | grep Mellanox | head -$(expr $loop_cnt + 1) | tail -1 | awk '{print $1}')
- HexDevice_ID=$(lspci -vn 2> /dev/null | grep "Subsystem: 15b3:" | head -$(expr $loop_cnt + 1) | tail -1 | cut -d ":" -f3 )
- if [ "$HexDevice_ID" != "" ]; then
+ PCI_DEV=$(lspci 2> /dev/null | grep -E "(InfiniBand|Memory controller): Mellanox Technolog" | head -$(expr $loop_cnt + 1) | tail -1 | awk '{print $1}')
+ HexDevice_ID=$(lspci -n -d "15b3:" 2> /dev/null | grep $PCI_DEV | tail -1 | cut -d ":" -f4 | cut -d " " -f1)
+
+ if [ "$HexDevice_ID" != "" ]; then
HexDevice_ID=0x$HexDevice_ID
let "tmp=$HexDevice_ID"
Device_ID=$(echo $tmp)
else
Device_ID=$(mstflint -d $PCI_DEV q 2> /dev/null | grep "Device ID" | awk '{print $3}')
- fi
+ fi
echo $Device_ID
}
#get the HCA NAME
@@ -218,7 +224,7 @@
ret_val="Tavor"
fi
echo $ret_val
-
+
}
#get the Driver Name
@@ -226,15 +232,15 @@
loop_cnt=$1
driver_need=""
Device_ID=$(get_device_id $LOOP_COUNT)
- if [ "$Device_ID" != "" ]; then
+ if [ "$Device_ID" != "" ]; then
hca_name=$(get_hca_name $Device_ID)
- if [ "$hca_name" != "" ]; then
- if [ "$hca_name" == "Hermon" ]; then
+ if [ "$hca_name" != "" ]; then
+ if [ "$hca_name" == "Hermon" ]; then
driver_need=$HERMON_DRIVER_NEEDED
else
driver_need=$MTHCA_DRIVER_NEEDED
fi
- fi
+ fi
fi
echo $driver_need
}
@@ -243,7 +249,7 @@
function compare_fw {
found=$1
needed=$2
-
+
n_1=$(echo $needed | cut -f1 -d"." | cut -b 2-)
n_2=$(echo $needed | cut -f2 -d".")
n_3=$(echo $needed | cut -f3 -d".")
@@ -256,15 +262,15 @@
elif [ $f_1 -gt $n_1 ]; then
echo "found"
elif [ $n_2 -gt $f_2 ]; then
- echo "needed"
+ echo "required"
elif [ $f_2 -gt $n_2 ]; then
echo "found"
elif [ $n_3 -gt $f_3 ]; then
- echo "needed"
+ echo "required"
elif [ $f_3 -gt $n_3 ]; then
echo "found"
fi
-
+
}
@@ -283,88 +289,87 @@
#default mthca0
device_num=$mthca_dev_num
-
- ## get the Device Id
+
+ ## get the Device Id
PCI_DEVICE=$(lspci 2> /dev/null | grep Mellanox | head -$(expr $LOOP_COUNT + 1) | tail -1 | awk '{print $1}')
- Device_ID=$(get_device_id $LOOP_COUNT)
+ Device_ID=$(get_device_id $LOOP_COUNT)
if [ "$Device_ID" != "" ]; then
-
hca_name=$(get_hca_name $Device_ID)
if [ "$hca_name" != "" ]; then
-
+
# get the FW and the Expected FW
- if [ "$hca_name" == "Arbel" ]; then
- FW_NEEDED=$ARBEL_FW_NEEDED
- elif [ "$hca_name" == "Memfree" ]; then
- FW_NEEDED=$ARBEL_MF_FW_NEEDED
- elif [ "$hca_name" == "Sinai" ]; then
- FW_NEEDED=$SINAI_FW_NEEDED
- elif [ "$hca_name" == "Hermon" ]; then
- FW_NEEDED=$HERMON_FW_NEEDED
- DRIVER_NEEDED=$HERMON_DRIVER_NEEDED
- device_num=$mlx_dev_num
- elif [ "$hca_name" == "Tavor" ]; then
- FW_NEEDED=$TAVOR_FW_NEEDED
- fi
- legal=$(echo $FW_NEEDED | grep v\[0-9\]\[0-9\]*.\[0-9\]\[0-9\]*.\[0-9\]\[0-9\]*)
-
- # increase the mlx and mthca counter
- if [ "$hca_name" == "Hermon" ]; then
- let "mlx_dev_num=$mlx_dev_num + 1"
- else
- let "mthca_dev_num=$mthca_dev_num + 1"
- fi
-
-
- FW_FOUND=v$(mstflint -d $PCI_DEVICE q 2> /dev/null | grep "FW Version" | awk '{print $3}')
- if [ "$FW_FOUND" = "v" ]; then
- if [ -f "$INFINI_CLASS_PATH/$DRIVER_NEEDED$device_num/fw_ver" ]; then
- FW_FOUND=v`cat $INFINI_CLASS_PATH/$DRIVER_NEEDED$device_num/fw_ver`
- else
- echo -e "HCA Firmware Check ..................... ${red}FAIL"
- tput sgr0
- echo " REASON: HCA #$LOOP_COUNT: failed to get firmware version"
- EXIT_CODE=1
- no_firmware=1
- fi
- fi
-
- if [ "$no_firmware" != "1" ]; then
- echo -e "HCA Firmware on HCA #$LOOP_COUNT ................. $FW_FOUND"
- if [ "$FW_NEEDED" == "$legal" -a "$FW_NEEDED" != "" ]; then
- if [ "$FW_FOUND" = "$FW_NEEDED" ]; then
- echo -e "HCA Firmware Check on HCA #$LOOP_COUNT ........... ${green}PASS"
- tput sgr0
- else
- newest=$(compare_fw $FW_FOUND $FW_NEEDED)
- if [ "$newest" = "found" ]; then
- echo -e "HCA Firmware Check on HCA #$LOOP_COUNT ........... ${green}PASS"
- tput sgr0
- echo " NOTE: The found fw version is higher than the fw included in this package ($FW_NEEDED)"
- else
- echo -e "HCA Firmware Check ..................... ${red}FAIL"
- tput sgr0
- echo " REASON: mismatch HCA #$LOOP_COUNT firmware detected (found $FW_FOUND, required $FW_NEEDED)"
- EXIT_CODE=1
- fi
- fi
- else
- echo -e "HCA Firmware Check for HCA #$LOOP_COUNT .......... NA"
-
- if [ "$FW_NEEDED" == "" ]; then
- echo " REASON: NO required fw version"
- else
- echo " REASON: Bad required fw version format ($FW_NEEDED)"
- fi
- fi
- fi
+ if [ "$hca_name" == "Arbel" ]; then
+ FW_NEEDED=$ARBEL_FW_NEEDED
+ elif [ "$hca_name" == "Memfree" ]; then
+ FW_NEEDED=$ARBEL_MF_FW_NEEDED
+ elif [ "$hca_name" == "Sinai" ]; then
+ FW_NEEDED=$SINAI_FW_NEEDED
+ elif [ "$hca_name" == "Hermon" ]; then
+ FW_NEEDED=$HERMON_FW_NEEDED
+ DRIVER_NEEDED=$HERMON_DRIVER_NEEDED
+ device_num=$mlx_dev_num
+ elif [ "$hca_name" == "Tavor" ]; then
+ FW_NEEDED=$TAVOR_FW_NEEDED
+ fi
+ legal=$(echo $FW_NEEDED | grep v\[0-9\]\[0-9\]*.\[0-9\]\[0-9\]*.\[0-9\]\[0-9\]*)
+
+ # increase the mlx and mthca counter
+ if [ "$hca_name" == "Hermon" ]; then
+ let "mlx_dev_num=$mlx_dev_num + 1"
+ else
+ let "mthca_dev_num=$mthca_dev_num + 1"
+ fi
+
+
+ FW_FOUND=v$(mstflint -d $PCI_DEVICE q 2> /dev/null | grep "FW Version" | awk '{print $3}')
+ if [ "$FW_FOUND" = "v" ]; then
+ if [ -f "$INFINI_CLASS_PATH/$DRIVER_NEEDED$device_num/fw_ver" ]; then
+ FW_FOUND=v`cat $INFINI_CLASS_PATH/$DRIVER_NEEDED$device_num/fw_ver 2> /dev/null`
+ else
+ echo -e "HCA Firmware Check ..................... ${red}FAIL"
+ tput sgr0
+ echo " REASON: HCA #$LOOP_COUNT: failed to get firmware version"
+ EXIT_CODE=1
+ no_firmware=1
+ fi
+ fi
+
+ if [ "$no_firmware" != "1" ]; then
+ echo -e "HCA Firmware on HCA #$LOOP_COUNT ................. $FW_FOUND"
+ if [ "$FW_NEEDED" == "$legal" -a "$FW_NEEDED" != "" ]; then
+ if [ "$FW_FOUND" = "$FW_NEEDED" ]; then
+ echo -e "HCA Firmware Check on HCA #$LOOP_COUNT ........... ${green}PASS"
+ tput sgr0
+ else
+ newest=$(compare_fw $FW_FOUND $FW_NEEDED)
+ if [ "$newest" = "found" ]; then
+ echo -e "HCA Firmware Check on HCA #$LOOP_COUNT ........... ${green}PASS"
+ tput sgr0
+ echo " NOTE: The found fw version is higher than the fw included in this package ($FW_NEEDED)"
+ else
+ echo -e "HCA Firmware Check ..................... ${red}FAIL"
+ tput sgr0
+ echo " REASON: mismatch HCA #$LOOP_COUNT firmware detected (found $FW_FOUND, required $FW_NEEDED)"
+ EXIT_CODE=1
+ fi
+ fi
+ else
+ echo -e "HCA Firmware Check for HCA #$LOOP_COUNT .......... NA"
+
+ if [ "$FW_NEEDED" == "" ]; then
+ echo " REASON: NO required fw version"
+ else
+ echo " REASON: Bad required fw version format ($FW_NEEDED)"
+ fi
+ fi
+ fi
else
echo -e "HCA Firmware Check for HCA #$LOOP_COUNT .......... NA" #couldnt find hca
- fi
+ fi
else
- echo -e "HCA Firmware Check for HCA #$LOOP_COUNT .......... NA" # couldn't find ID
- fi
+ echo -e "HCA Firmware Check for HCA #$LOOP_COUNT .......... NA" # couldn't find ID
+ fi
else
echo -e "HCA Firmware Check for HCA #$LOOP_COUNT .......... NA" #prm ??
fi
@@ -374,17 +379,17 @@
echo -e "HCA Firmware Check ..................... ${red}FAIL"
tput sgr0
echo " REASON: no HCAs in the system"
-
+
EXIT_CODE=1
-
+
fi
# Check host driver initialization
HOST_DRIVER_INIT=0
if [ $NUM_HCAS -ne 0 ] && [ $RPM_CHECK_FAIL -eq 0 ]; then
-
+ MODPROBE_OUT_FILE="/tmp/hca_self_test_modprobe.output"
# Save the output of modprobe ib_ipoib in a tmp file
- modprobe ib_ipoib &> /tmp/hca_self_test_modprobe.output
+ modprobe ib_ipoib &> $MODPROBE_OUT_FILE
let RET_CODE=$?
if [ $RET_CODE -eq 0 ]; then
echo -e "Host Driver Initialization ............. ${green}PASS"
@@ -397,22 +402,22 @@
tput sgr0
EXIT_CODE=1
# "No such device"
- if [ `grep "No such device" /tmp/hca_self_test_modprobe.output | wc -l` -ne 0 ]; then
- echo " REASON: host driver initialization reported: No such device"
+ if [ `grep "No such device" $MODPROBE_OUT_FILE 2> /dev/null | wc -l` -ne 0 ]; then
+ echo " REASON: host driver initialization reported: No such device"
fi
# "No such file or directory"
- if [ `grep "No such file or directory" /tmp/hca_self_test_modprobe.output | wc -l` -ne 0 ]; then
- echo " REASON: host driver initialization reported: No such file or directory"
+ if [ `grep "No such file or directory" $MODPROBE_OUT_FILE 2> /dev/null | wc -l` -ne 0 ]; then
+ echo " REASON: host driver initialization reported: No such file or directory"
echo " It is possible that driver rpm might be missing file(s)"
fi
# "kernel-module version mismatch"
- if [ `grep "kernel-module version mismatch" /tmp/hca_self_test_modprobe.output | wc -l` -ne 0 ]; then
- echo " REASON: host driver initialization reported: kernel-module version mismatch"
+ if [ `grep "kernel-module version mismatch" $MODPROBE_OUT_FILE 2> /dev/null | wc -l` -ne 0 ]; then
+ echo " REASON: host driver initialization reported: kernel-module version mismatch"
fi
# "unresolved symbol"
# Note: Could not test "unresolved symbol" error
- if [ `grep "unresolved symbol" /tmp/hca_self_test_modprobe.output | wc -l` -ne 0 ]; then
- echo " REASON: host driver initialization reported: unresolved symbol"
+ if [ `grep "unresolved symbol" $MODPROBE_OUT_FILE 2> /dev/null | wc -l` -ne 0 ]; then
+ echo " REASON: host driver initialization reported: unresolved symbol"
fi
fi
else
@@ -424,10 +429,10 @@
# Port info
if [ $HOST_DRIVER_INIT -eq 1 ]; then
- NUM_HCAS_PROC=`ls $INFINI_CLASS_PATH | wc -l`
+ NUM_HCAS_PROC=`ls $INFINI_CLASS_PATH 2> /dev/null | wc -l`
LOOP_COUNT=0
NUM_PORT_ACTIVE=0
-
+
mlx_dev_num=0
mthca_dev_num=0
LOOP_COUNT=0
@@ -437,7 +442,7 @@
do
driver_need=$(get_driver $LOOP_COUNT)
if [ "$driver_need" != "" ]; then
- if [ "$driver_need" == "$HERMON_DRIVER_NEEDED" ]; then
+ if [ "$driver_need" == "$HERMON_DRIVER_NEEDED" ]; then
device_num=$mlx_dev_num
let "mlx_dev_num=$mlx_dev_num + 1"
else
@@ -445,15 +450,13 @@
let "mthca_dev_num=$mthca_dev_num + 1"
fi
if [ -f $INFINI_CLASS_PATH/$driver_need$device_num/ports/1/state ]; then
- let "NUM_PORT_ACTIVE+=`grep ACTIVE $INFINI_CLASS_PATH/$driver_need$device_num/ports/1/state | wc -l`"
+ let "NUM_PORT_ACTIVE+=`grep ACTIVE $INFINI_CLASS_PATH/$driver_need$device_num/ports/1/state 2> /dev/null | wc -l`"
fi
if [ -f $INFINI_CLASS_PATH/$driver_need$device_num/ports/2/state ]; then
- let "NUM_PORT_ACTIVE+=`grep ACTIVE $INFINI_CLASS_PATH/$driver_need$device_num/ports/2/state | wc -l`"
+ let "NUM_PORT_ACTIVE+=`grep ACTIVE $INFINI_CLASS_PATH/$driver_need$device_num/ports/2/state 2> /dev/null | wc -l`"
fi
- else
- "Number of HCA Ports Active ............. $NA"
- fi
-
+ fi
+
let "LOOP_COUNT=$LOOP_COUNT + 1"
done
echo "Number of HCA Ports Active ............. $NUM_PORT_ACTIVE"
@@ -469,7 +472,7 @@
driver_need=$(get_driver $LOOP_COUNT)
if [ "$driver_need" != "" ]; then
- if [ "$driver_need" == "$HERMON_DRIVER_NEEDED" ]; then
+ if [ "$driver_need" == "$HERMON_DRIVER_NEEDED" ]; then
device_num=$mlx_dev_num
let "mlx_dev_num=$mlx_dev_num + 1"
else
@@ -478,43 +481,38 @@
fi
if [ -f $INFINI_CLASS_PATH/$driver_need$device_num/ports/1/state ]; then
- PORT_1_STATE=`awk -F: '{print $2}' $INFINI_CLASS_PATH/$driver_need$device_num/ports/1/state`
+ PORT_1_STATE=`awk -F: '{print $2}' $INFINI_CLASS_PATH/$driver_need$device_num/ports/1/state 2> /dev/null`
if [ $PORT_1_STATE = "ACTIVE" ]; then
- PORT_SPEED=`awk -F\( '{print $2}' $INFINI_CLASS_PATH/$driver_need$device_num/ports/1/rate | sed 's/)//'`
+ PORT_SPEED=`awk -F\( '{print $2}' $INFINI_CLASS_PATH/$driver_need$device_num/ports/1/rate 2> /dev/null | sed 's/)//'`
echo -e "Port State of Port #0 on HCA #$LOOP_COUNT ........ ${green}UP $PORT_SPEED"
tput sgr0
else
- if [ $PORT_1_STATE = "INIT" ]; then
+ if [ $PORT_1_STATE = "INIT" ]; then
echo -e "Port State of Port #0 on HCA #$LOOP_COUNT ........ ${cyan}INIT"
else
echo -e "Port State of Port #0 on HCA #$LOOP_COUNT ........ ${red}DOWN"
- fi
+ fi
tput sgr0
fi
fi
if [ -f $INFINI_CLASS_PATH/$driver_need$device_num/ports/2/state ]; then
- PORT_2_STATE=`awk -F: '{print $2}' $INFINI_CLASS_PATH/$driver_need$device_num/ports/2/state`
+ PORT_2_STATE=`awk -F: '{print $2}' $INFINI_CLASS_PATH/$driver_need$device_num/ports/2/state 2> /dev/null`
if [ $PORT_2_STATE = "ACTIVE" ]; then
- PORT_SPEED=`awk -F\( '{print $2}' $INFINI_CLASS_PATH/$driver_need$device_num/ports/2/rate | sed 's/)//'`
+ PORT_SPEED=`awk -F\( '{print $2}' $INFINI_CLASS_PATH/$driver_need$device_num/ports/2/rate 2> /dev/null | sed 's/)//'`
echo -e "Port State of Port #1 on HCA #$LOOP_COUNT ........ ${green}UP $PORT_SPEED"
tput sgr0
else
-
- if [ $PORT_2_STATE = "INIT" ]; then
+
+ if [ $PORT_2_STATE = "INIT" ]; then
echo -e "Port State of Port #1 on HCA #$LOOP_COUNT ........ ${cyan}INIT"
else
echo -e "Port State of Port #1 on HCA #$LOOP_COUNT ........ ${red}DOWN"
- fi
+ fi
tput sgr0
fi
fi
-
- else
- "Number of HCA Ports Active ............. $NA"
- fi
-
-
+ fi
let "LOOP_COUNT=$LOOP_COUNT + 1"
done
else
@@ -524,7 +522,7 @@
# -D-
# Error counters check
-
+
if [ $HOST_DRIVER_INIT -eq 1 ]; then
mlx_dev_num=0
@@ -534,7 +532,7 @@
driver_need=$(get_driver $LOOP_COUNT)
if [ "$driver_need" != "" ]; then
- if [ "$driver_need" == "$HERMON_DRIVER_NEEDED" ]; then
+ if [ "$driver_need" == "$HERMON_DRIVER_NEEDED" ]; then
device_num=$mlx_dev_num
let "mlx_dev_num=$mlx_dev_num + 1"
else
@@ -545,81 +543,100 @@
ERROR_COUNTER_PRINT=0
if [ -f $INFINI_CLASS_PATH/$driver_need$device_num/ports/1/state ]; then
ERROR_COUNTER_PORT_1=0
-
- for i in $INFINI_CLASS_PATH/$driver_need$device_num/ports/1/counters/*error*; do
- if [ `cat $i` -gt 20 ]; then
-
- #echo "$(basename $i): `cat $i`";
- let "ERROR_COUNTER_PORT_1=$ERROR_COUNTER_PORT_1 + 1"
- fi;
+
+ for i in $INFINI_CLASS_PATH/$driver_need$device_num/ports/1/counters/*error*; do
+ err_cnt=`cat $i 2> /dev/null`
+ RET_CODE=$?
+ if [ $RET_CODE -eq 0 ]; then
+ if [ $err_cnt -gt 20 ]; then
+ let "ERROR_COUNTER_PORT_1=$ERROR_COUNTER_PORT_1 + 1"
+ fi;
+ else
+ echo "-W- Failed to read $i file"
+ fi
done
fi
if [ -f $INFINI_CLASS_PATH/$driver_need$device_num/ports/2/state ]; then
-
+
ERROR_COUNTER_PORT_2=0
- for i in $INFINI_CLASS_PATH/$driver_need$device_num/ports/2/counters/*error*; do
- if [ `cat $i` -gt 20 ]; then
-
- #echo "$(basename $i): `cat $i`";
- let "ERROR_COUNTER_PORT_2=$ERROR_COUNTER_PORT_2 + 1"
- fi;
+ for i in $INFINI_CLASS_PATH/$driver_need$device_num/ports/2/counters/*error*; do
+ err_cnt=`cat $i 2> /dev/null`
+ RET_CODE=$?
+ if [ $RET_CODE -eq 0 ]; then
+ if [ $err_cnt -gt 20 ]; then
+
+ let "ERROR_COUNTER_PORT_2=$ERROR_COUNTER_PORT_2 + 1"
+ fi;
+ else
+ echo "-W- Failed to read $i file"
+ fi
done
-
+
else
let ERROR_COUNTER_PORT_2=0
fi
-
+
let "ERROR_COUNTER=$ERROR_COUNTER_PORT_1 + $ERROR_COUNTER_PORT_2"
# Print FAIL only once
if [ $ERROR_COUNTER -ne 0 ] && [ $ERROR_COUNTER_PRINT -ne 1 ]; then
echo -e "Error Counter Check on HCA #$LOOP_COUNT .......... ${red}FAIL"
tput sgr0
- echo " REASON: found errors in the following counters"
+ echo " REASON: found errors in the following counters"
ERROR_COUNTER_PRINT=1
EXIT_CODE=1
fi
-
+
# List the counters which are non-zero
if [ $ERROR_COUNTER -ne 0 ]; then
# Print only if error counters are non-zero of a specific IB port
if [ $ERROR_COUNTER_PORT_1 -ne 0 ]; then
- echo " Errors in $INFINI_CLASS_PATH/$driver_need$device_num/ports/1/counters"
-
- for i in $INFINI_CLASS_PATH/$driver_need$device_num/ports/1/counters/*error*; do
- if [ `cat $i` -gt 20 ]; then
-
- echo " $(basename $i): `cat $i`";
- fi;
+ echo " Errors in $INFINI_CLASS_PATH/$driver_need$device_num/ports/1/counters"
+
+ for i in $INFINI_CLASS_PATH/$driver_need$device_num/ports/1/counters/*error*; do
+ err_cnt=`cat $i 2> /dev/null`
+ RET_CODE=$?
+ if [ $RET_CODE -eq 0 ]; then
+ if [ $err_cnt -gt 20 ]; then
+ echo " $(basename $i): $err_cnt";
+ fi;
+ else
+ echo "-W- Failed to read $i file"
+ fi
done
-
+
fi
-
+
if [ $ERROR_COUNTER_PORT_2 -ne 0 ]; then
- echo " Errors in $INFINI_CLASS_PATH/$driver_need$device_num/ports/2/counters"
-
- for i in $INFINI_CLASS_PATH/$driver_need$device_num/ports/2/counters/*error*; do
- if [ `cat $i` -gt 20 ]; then
-
- echo " $(basename $i): `cat $i`";
- fi;
+ echo " Errors in $INFINI_CLASS_PATH/$driver_need$device_num/ports/2/counters"
+
+ for i in $INFINI_CLASS_PATH/$driver_need$device_num/ports/2/counters/*error*; do
+ err_cnt=`cat $i 2> /dev/null`
+ RET_CODE=$?
+ if [ $RET_CODE -eq 0 ]; then
+ if [ $err_cnt -gt 20 ]; then
+ echo " $(basename $i): $err_cnt";
+ fi;
+ else
+ echo "-W- Failed to read $i file"
+ fi
done
fi
fi
-
+
if [ $ERROR_COUNTER -eq 0 ]; then
echo -e "Error Counter Check on HCA #$LOOP_COUNT .......... ${green}PASS"
tput sgr0
fi
-
+
# Reset these variables for other HCAs
let ERROR_COUNTER_PORT_1=0
let ERROR_COUNTER_PORT_2=0
-
+
else
- "Error Counter Check on HCA #$LOOP_COUNT .......... NA"
- fi
-
+ echo "Error Counter Check on HCA #$LOOP_COUNT .......... NA"
+ fi
+
let "LOOP_COUNT=$LOOP_COUNT + 1"
done
@@ -633,10 +650,10 @@
# Save the output of dmesg in a tmp file
if [ $HOST_DRIVER_INIT -eq 1 ]; then
dmesg > /tmp/hca_self_test_dmesg.output
- VAPI_ERROR_COUNT=`egrep oom-\|"Out of Memory"\|tsIb\|VAPI\|THH_\|THHUL\|KERNEL_IB\|IB_NET\|MOD_LNX_SDP /tmp/hca_self_test_dmesg.output | grep -v 'SOCK: GETSOCKOPT unimplemented option <2>' | wc -l`
- OOPS_COUNT=`grep Oops /tmp/hca_self_test_dmesg.output | wc -l`
- KERNEL_PANIC_COUNT=`grep "Kernel panic" /tmp/hca_self_test_dmesg.output | wc -l`
-
+ VAPI_ERROR_COUNT=`egrep oom-\|"Out of Memory"\|tsIb\|VAPI\|THH_\|THHUL\|KERNEL_IB\|IB_NET\|MOD_LNX_SDP /tmp/hca_self_test_dmesg.output 2> /dev/null | grep -v 'SOCK: GETSOCKOPT unimplemented option <2>' | wc -l`
+ OOPS_COUNT=`grep Oops /tmp/hca_self_test_dmesg.output 2> /dev/null | wc -l`
+ KERNEL_PANIC_COUNT=`grep "Kernel panic" /tmp/hca_self_test_dmesg.output 2> /dev/null | wc -l`
+
if [ $VAPI_ERROR_COUNT -eq 0 ] && [ $OOPS_COUNT -eq 0 ] && [ $KERNEL_PANIC_COUNT -eq 0 ]; then
echo -e "Kernel Syslog Check .................... ${green}PASS"
tput sgr0
@@ -645,15 +662,15 @@
tput sgr0
EXIT_CODE=1
if [ $OOPS_COUNT -ne 0 ]; then
- echo " REASON: Kernel syslog reported: Oops "
+ echo " REASON: Kernel syslog reported: Oops "
grep Oops /tmp/hca_self_test_dmesg.output | uniq | awk -F'\n' '{print " " $1 }'
fi
if [ $KERNEL_PANIC_COUNT -ne 0 ]; then
- echo " REASON: Kernel syslog reported: Kernel panic "
+ echo " REASON: Kernel syslog reported: Kernel panic "
grep "Kernel panic" /tmp/hca_self_test_dmesg.output | uniq | awk -F'\n' '{print " " $1 }'
fi
if [ $VAPI_ERROR_COUNT -ne 0 ]; then
- echo " REASON: Kernel syslog reported: Driver messages "
+ echo " REASON: Kernel syslog reported: Driver messages "
egrep oom-\|"Out of Memory"\|tsIb\|VAPI\|THH_\|THHUL\|KERNEL_IB\|IB_NET\|MOD_LNX_SDP /tmp/hca_self_test_dmesg.output | grep -v 'SOCK: GETSOCKOPT unimplemented option <2>' | uniq | awk -F'\n' '{print " " $1 }'
fi
fi
@@ -662,7 +679,7 @@
fi
-#get the NODE Guide
+#get the NODE Guide
if [ $NUM_HCAS -ne 0 ]; then
mlx_dev_num=0
@@ -674,7 +691,7 @@
do
driver_need=$(get_driver $LOOP_COUNT)
if [ "$driver_need" != "" ]; then
- if [ "$driver_need" == "$HERMON_DRIVER_NEEDED" ]; then
+ if [ "$driver_need" == "$HERMON_DRIVER_NEEDED" ]; then
device_num=$mlx_dev_num
let "mlx_dev_num=$mlx_dev_num + 1"
else
@@ -682,29 +699,29 @@
let "mthca_dev_num=$mthca_dev_num + 1"
fi
- if [ -f "$INFINI_CLASS_PATH/$driver_need$device_num/node_guid" ]; then
+ if [ -f "$INFINI_CLASS_PATH/$driver_need$device_num/node_guid" ]; then
NODE_GUID=$(sed 's/\([0-9a-f]\)\([0-9a-f]\)\([0-9a-f]\)\([0-9a-f]\)/\1\2:\3\4/g' < $INFINI_CLASS_PATH/$driver_need$device_num/node_guid)
echo -e "Node GUID on HCA #$LOOP_COUNT .................... $NODE_GUID"
else
PCI_DEVICE=$(lspci 2> /dev/null | grep Mellanox | head -$(expr $LOOP_COUNT + 1) | tail -1 | awk '{print $1}')
NODE_GUID=$(mstflint -d $PCI_DEVICE q 2> /dev/null | grep "GUIDs:" | awk '{print $2}' | sed 's/\([0-9a-f]\)\([0-9a-f]\)\([0-9a-f]\)\([0-9a-f]\)/\1\2:\3\4:/g' | cut -b -23)
-
- if [ "$NODE_GUID" != "" ]; then
+
+ if [ "$NODE_GUID" != "" ]; then
echo -e "Node GUID on HCA #$LOOP_COUNT .................... $NODE_GUID"
else
echo -e "Node GUID on HCA #$LOOP_COUNT .................... NA"
- fi
+ fi
fi
else
echo "Node GUID on HCA #$LOOP_COUNT .................... NA"
- fi
+ fi
let "LOOP_COUNT=$LOOP_COUNT + 1"
done
fi
-echo "------------------ DONE ---------------------"
+echo "------------------ DONE ---------------------"
echo
#rm -f /tmp/hca_self_test_modprobe.output
rm -f /tmp/hca_self_test_dmesg.output
Modified: branches/ofed-1.4.2/mstflint/branches/upstream/current/mstflint.spec
URL: http://svn.debian.org/wsvn/pkg-ofed/branches/ofed-1.4.2/mstflint/branches/upstream/current/mstflint.spec?rev=420&op=diff
==============================================================================
--- branches/ofed-1.4.2/mstflint/branches/upstream/current/mstflint.spec (original)
+++ branches/ofed-1.4.2/mstflint/branches/upstream/current/mstflint.spec Fri Aug 7 14:58:44 2009
@@ -1,7 +1,7 @@
Summary: Mellanox firmware burning application
Name: mstflint
Version: 1.4
-Release: 1.ofed1.4
+Release: 1.ofed1.4.2
License: GPL/BSD
Url: http://openib.org/
Group: System Environment/Base
Modified: branches/ofed-1.4.2/mstflint/branches/upstream/current/mtcr.h
URL: http://svn.debian.org/wsvn/pkg-ofed/branches/ofed-1.4.2/mstflint/branches/upstream/current/mtcr.h?rev=420&op=diff
==============================================================================
--- branches/ofed-1.4.2/mstflint/branches/upstream/current/mtcr.h (original)
+++ branches/ofed-1.4.2/mstflint/branches/upstream/current/mtcr.h Fri Aug 7 14:58:44 2009
@@ -280,6 +280,8 @@
case 0x6278: /* 25208 */
case 0x5e8c: /* 24204 */
case 0x6274: /* 25204 */
+ case 0x1b3: /* 435 */
+ case 6100: /* 6100 */
return 0;
default:
errno = ENOTTY;
Modified: branches/ofed-1.4.2/mstflint/branches/upstream/current/vpd.c
URL: http://svn.debian.org/wsvn/pkg-ofed/branches/ofed-1.4.2/mstflint/branches/upstream/current/vpd.c?rev=420&op=diff
==============================================================================
--- branches/ofed-1.4.2/mstflint/branches/upstream/current/vpd.c (original)
+++ branches/ofed-1.4.2/mstflint/branches/upstream/current/vpd.c Fri Aug 7 14:58:44 2009
@@ -44,6 +44,13 @@
#include <stdlib.h>
#include <errno.h>
#include <libgen.h>
+#include <sys/times.h>
+
+/* pread is non-blocking, so we loop until we find data. Unfortunately,
+ * we can loop forever if the HCA is crashed or if the wrong device is
+ * specified as an argument. So, we set time outs.
+ */
+static clock_t ticks_per_sec, start_t, curr_t, timeout_t = 5;
struct vpd_cap {
unsigned char id;
@@ -168,7 +175,14 @@
if (ret != sizeof addr_flag)
return ret;
+ start_t = times(NULL);
while((addr_flag[1] & VPD_FLAG) != VPD_FLAG_READ_READY) {
+ curr_t = times(NULL);
+ if ((curr_t - start_t) / ticks_per_sec > timeout_t) {
+ fprintf(stderr, "-E- VPD read timeout\n");
+ return -EIO;
+ }
+
ret = pread(device, addr_flag, sizeof addr_flag,
vpd_cap_offset + VPD_ADDR_OFFSET);
if (ret != sizeof addr_flag)
@@ -211,7 +225,7 @@
for (i = 0; i < VPD_TAG_LENGTH(d); i += 0x3 + field->length) {
field = (struct vpd_field *)(VPD_TAG_DATA(d)->bytes + i);
if (i + 0x3 + field->length > VPD_TAG_LENGTH(d)) {
- fprintf(stderr, "Offset 0x%x+0x%x: "
+ fprintf(stderr, "-E- Offset 0x%x+0x%x: "
"field length 0x%x exceeds total 0x%x\n",
offset, i, field->length, VPD_TAG_LENGTH(d));
return -1;
@@ -318,7 +332,7 @@
}
if (VPD_TAG_NAME(d) != VPD_TAG_F) {
- fprintf(stderr, "Mandatory End(0xF) tag not found.\n");
+ fprintf(stderr, "-E- Mandatory End(0xF) tag not found.\n");
return 1;
}
@@ -326,7 +340,7 @@
return 0;
if (!checksum_len) {
- fprintf(stderr, "Mandatory checksum(RV) field not found.\n");
+ fprintf(stderr, "-E- Mandatory checksum(RV) field not found.\n");
return 1;
}
@@ -335,7 +349,7 @@
b+= vpd[i];
if (b) {
- fprintf(stderr, "Len 0x%x: checksum mismatch: 0x%x\n",
+ fprintf(stderr, "-E- Len 0x%x: checksum mismatch: 0x%x\n",
checksum_len, b);
return 1;
}
@@ -374,13 +388,13 @@
tmp = snprintf(mbuf, sizeof mbuf, "/sys/class/infiniband/%s/device", name);
if (tmp <= 0 || tmp >= (int)sizeof mbuf) {
- fprintf(stderr,"Unable to print device name %s\n", name);
+ fprintf(stderr,"-E- Unable to print device name %s\n", name);
return 1;
}
if (readlink(mbuf, pbuf, sizeof pbuf) < 0) {
- perror("read link");
- fprintf(stderr,"Unable to read link %s\n", mbuf);
+ perror("-E- read link");
+ fprintf(stderr,"-E- Unable to read link %s\n", mbuf);
return 1;
}
@@ -412,13 +426,13 @@
char buf[4096];
if (pci_parse_name(name, buf)) {
- fprintf(stderr, "Unable to parse device name %s\n", name);
+ fprintf(stderr, "-E- Unable to parse device name %s\n", name);
return -1;
}
fd = open(buf, O_RDWR);
if (fd < 0) {
- fprintf(stderr, "Unable to open file %s: %s\n", buf, strerror(errno));
+ fprintf(stderr, "-E- Unable to open file %s: %s\n", buf, strerror(errno));
}
return fd;
}
@@ -437,24 +451,34 @@
rc = 1;
goto usage;
}
- if (argc == 3) {
- if (!strcmp("-m", argv[1])) {
- argv++;
- argc--;
- m = 1;
- } else if (!strcmp("-n", argv[1])) {
- argv++;
- argc--;
- n = 1;
- } else {
- rc = 2;
- goto usage;
- }
- }
-
- name = argv[1];
- argv++;
- argc--;
+
+ ticks_per_sec = sysconf(_SC_CLK_TCK);
+
+ do
+ {
+ i=getopt(argc, argv, "mnt:");
+ if (i<0) {
+ break;
+ }
+
+ switch (i) {
+ case 'm':
+ m=1;
+ break;
+ case 'n':
+ n=1;
+ break;
+ case 't':
+ timeout_t = strtol(optarg, NULL, 0);
+ break;
+ default:
+ goto usage;
+ }
+ } while (1 == 1);
+
+ name = argv[optind];
+ argc -= optind;
+ argv += optind;
if (!strcmp("-", name)) {
if (fread(d, VPD_MAX_SIZE, 1, stdin) != 1)
@@ -486,6 +510,14 @@
return 0;
usage:
- fprintf(stderr, "Usage: %s [-m|-n] <file|-> [-- keyword ...]\n", argv[0]);
+ fprintf(stderr, "Usage: %s [-m|-n] [-t ##] <file> [-- keyword ...]\n", argv[0]);
+ fprintf(stderr, "-m\tDump raw VPD data to stdout.\n");
+ fprintf(stderr, "-n\tDo not validate check sum.\n");
+ fprintf(stderr, "-t ##\tTime out after ## seconds. (Default is 30.)\n\n");
+ fprintf(stderr, "file\tThe PCI id number of the HCA (for example, \"2:00.0\"),\n");
+ fprintf(stderr, "\tthe device name (such as \"mlx4_0\")\n");
+ fprintf(stderr, "\tthe absolute path to the device (\"/sys/class/infiniband/mlx4_0/device\")\n");
+ fprintf(stderr, "\tor '-' to read VPD data from the standard input.\n\n");
+ fprintf(stderr, "keyword(s): Only display the requested information. (ID, PN, EC, SN, etc...)\n");
return rc;
}
More information about the Pkg-ofed-commits
mailing list