Add option to skip infiniband library checks in diags
Signed-off-by: Michael S. Tsirkin <[EMAIL PROTECTED]>
Index: management/diags/ibtracert/configure.in
===================================================================
--- management/diags/ibtracert/configure.in (revision 2963)
+++ management/diags/ibtracert/configure.in (working copy)
@@ -8,10 +8,18 @@ AC_CONFIG_AUX_DIR(config)
AM_CONFIG_HEADER(config.h)
AM_INIT_AUTOMAKE(ibtracert, 0.9.0)
+AC_ARG_ENABLE(libcheck, [ --disable-libcheck do not test for presense of
ib libraries],
+[ if test x$enableval = xno ; then
+ disable_libcheck=yes
+ fi
+])
+
dnl Checks for programs
AC_PROG_CC
AC_PROG_LIBTOOL
+if test "$disable_libcheck" != "yes"
+then
dnl Checks for libraries
LDFLAGS="$LDFLAGS -L/usr/local/ib/lib"
AC_CHECK_LIB(ibcommon, sys_read_string, [],
@@ -20,10 +28,13 @@ AC_CHECK_LIB(ibumad, umad_init, [],
AC_MSG_ERROR([umad_init() not found. ibroute requires libibumad.]))
AC_CHECK_LIB(ibmad, mad_dump_int, [],
AC_MSG_ERROR([mad_dump_int() not found. ibroute requires libibmad.]))
+fi
dnl Checks for header files.
AC_HEADER_STDC
AC_CHECK_HEADERS([netinet/in.h stdlib.h unistd.h])
+if test "$disable_libcheck" != "yes"
+then
AC_CHECK_HEADER(infiniband/common.h, [],
AC_MSG_ERROR([<infiniband/common.h> not found. ibroute requires
libibcommon.])
)
@@ -33,6 +44,7 @@ AC_CHECK_HEADER(infiniband/umad.h, [],
AC_CHECK_HEADER(infiniband/mad.h, [],
AC_MSG_ERROR([<infiniband/mad.h> not found. ibroute requires libibmad.])
)
+fi
dnl Checks for library functions
AC_FUNC_ERROR_AT_LINE
Index: management/diags/ibnetdiscover/configure.in
===================================================================
--- management/diags/ibnetdiscover/configure.in (revision 2963)
+++ management/diags/ibnetdiscover/configure.in (working copy)
@@ -8,10 +8,18 @@ AC_CONFIG_AUX_DIR(config)
AM_CONFIG_HEADER(config.h)
AM_INIT_AUTOMAKE(ibnetdiscover, 0.9.0)
+AC_ARG_ENABLE(libcheck, [ --disable-libcheck do not test for presense of
ib libraries],
+[ if test x$enableval = xno ; then
+ disable_libcheck=yes
+ fi
+])
+
dnl Checks for programs
AC_PROG_CC
AC_PROG_LIBTOOL
+if test "$disable_libcheck" != "yes"
+then
dnl Checks for libraries
LDFLAGS="$LDFLAGS -L/usr/local/ib/lib"
AC_CHECK_LIB(ibcommon, sys_read_string, [],
@@ -20,10 +28,13 @@ AC_CHECK_LIB(ibumad, umad_init, [],
AC_MSG_ERROR([umad_init() not found. ibnetdiscover requires
libibumad.]))
AC_CHECK_LIB(ibmad, mad_dump_int, [],
AC_MSG_ERROR([mad_dump_int() not found. ibnetdiscover requires
libibmad.]))
+fi
dnl Checks for header files.
AC_HEADER_STDC
AC_CHECK_HEADERS([stdlib.h string.h unistd.h])
+if test "$disable_libcheck" != "yes"
+then
AC_CHECK_HEADER(infiniband/common.h, [],
AC_MSG_ERROR([<infiniband/common.h> not found. ibnetdiscover requires
libibcommon.])
)
@@ -33,6 +44,7 @@ AC_CHECK_HEADER(infiniband/umad.h, [],
AC_CHECK_HEADER(infiniband/mad.h, [],
AC_MSG_ERROR([<infiniband/mad.h> not found. ibnetdiscover requires
libibmad.])
)
+fi
dnl Checks for library functions
AC_FUNC_ERROR_AT_LINE
Index: management/diags/perfquery/configure.in
===================================================================
--- management/diags/perfquery/configure.in (revision 2963)
+++ management/diags/perfquery/configure.in (working copy)
@@ -8,10 +8,18 @@ AC_CONFIG_AUX_DIR(config)
AM_CONFIG_HEADER(config.h)
AM_INIT_AUTOMAKE(perfquery, 0.9.0)
+AC_ARG_ENABLE(libcheck, [ --disable-libcheck do not test for presense of
ib libraries],
+[ if test x$enableval = xno ; then
+ disable_libcheck=yes
+ fi
+])
+
dnl Checks for programs
AC_PROG_CC
AC_PROG_LIBTOOL
+if test "$disable_libcheck" != "yes"
+then
dnl Checks for libraries
LDFLAGS="$LDFLAGS -L/usr/local/ib/lib"
AC_CHECK_LIB(ibcommon, sys_read_string, [],
@@ -20,10 +28,13 @@ AC_CHECK_LIB(ibumad, umad_init, [],
AC_MSG_ERROR([umad_init() not found. perfquery requires libibumad.]))
AC_CHECK_LIB(ibmad, mad_dump_int, [],
AC_MSG_ERROR([mad_dump_int() not found. perfquery requires libibmad.]))
+fi
dnl Checks for header files.
AC_HEADER_STDC
AC_CHECK_HEADERS([stdlib.h string.h unistd.h])
+if test "$disable_libcheck" != "yes"
+then
AC_CHECK_HEADER(infiniband/common.h, [],
AC_MSG_ERROR([<infiniband/common.h> not found. perfquery requires
libibcommon.])
)
@@ -33,6 +44,7 @@ AC_CHECK_HEADER(infiniband/umad.h, [],
AC_CHECK_HEADER(infiniband/mad.h, [],
AC_MSG_ERROR([<infiniband/mad.h> not found. perfquery requires
libibmad.])
)
+fi
dnl Checks for library functions
AC_FUNC_ERROR_AT_LINE
Index: management/diags/smpquery/configure.in
===================================================================
--- management/diags/smpquery/configure.in (revision 2963)
+++ management/diags/smpquery/configure.in (working copy)
@@ -8,10 +8,18 @@ AC_CONFIG_AUX_DIR(config)
AM_CONFIG_HEADER(config.h)
AM_INIT_AUTOMAKE(smpquery, 0.9.0)
+AC_ARG_ENABLE(libcheck, [ --disable-libcheck do not test for presense of
ib libraries],
+[ if test x$enableval = xno ; then
+ disable_libcheck=yes
+ fi
+])
+
dnl Checks for programs
AC_PROG_CC
AC_PROG_LIBTOOL
+if test "$disable_libcheck" != "yes"
+then
dnl Checks for libraries
LDFLAGS="$LDFLAGS -L/usr/local/ib/lib"
AC_CHECK_LIB(ibcommon, sys_read_string, [],
@@ -20,10 +28,13 @@ AC_CHECK_LIB(ibumad, umad_init, [],
AC_MSG_ERROR([umad_init() not found. smpquery requires libibumad.]))
AC_CHECK_LIB(ibmad, mad_dump_int, [],
AC_MSG_ERROR([mad_dump_int() not found. smpquery requires libibmad.]))
+fi
dnl Checks for header files.
AC_HEADER_STDC
AC_CHECK_HEADERS([stdlib.h string.h unistd.h])
+if test "$disable_libcheck" != "yes"
+then
AC_CHECK_HEADER(infiniband/common.h, [],
AC_MSG_ERROR([<infiniband/common.h> not found. smpquery requires
libibcommon.])
)
@@ -33,6 +44,7 @@ AC_CHECK_HEADER(infiniband/umad.h, [],
AC_CHECK_HEADER(infiniband/mad.h, [],
AC_MSG_ERROR([<infiniband/mad.h> not found. smpquery requires
libibmad.])
)
+fi
dnl Checks for library functions
AC_FUNC_ERROR_AT_LINE
Index: management/diags/ibaddr/configure.in
===================================================================
--- management/diags/ibaddr/configure.in (revision 2963)
+++ management/diags/ibaddr/configure.in (working copy)
@@ -8,10 +8,18 @@ AC_CONFIG_AUX_DIR(config)
AM_CONFIG_HEADER(config.h)
AM_INIT_AUTOMAKE(ibaddr, 0.9.0)
+AC_ARG_ENABLE(libcheck, [ --disable-libcheck do not test for presense of
ib libraries],
+[ if test x$enableval = xno ; then
+ disable_libcheck=yes
+ fi
+])
+
dnl Checks for programs
AC_PROG_CC
AC_PROG_LIBTOOL
+if test "$disable_libcheck" != "yes"
+then
dnl Checks for libraries
LDFLAGS="$LDFLAGS -L/usr/local/ib/lib"
AC_CHECK_LIB(ibcommon, sys_read_string, [],
@@ -20,10 +28,13 @@ AC_CHECK_LIB(ibumad, umad_init, [],
AC_MSG_ERROR([umad_init() not found. ibaddr requires libibumad.]))
AC_CHECK_LIB(ibmad, mad_dump_int, [],
AC_MSG_ERROR([mad_dump_int() not found. ibaddr requires libibmad.]))
+fi
dnl Checks for header files.
AC_HEADER_STDC
AC_CHECK_HEADERS([stdlib.h string.h unistd.h])
+if test "$disable_libcheck" != "yes"
+then
AC_CHECK_HEADER(infiniband/common.h, [],
AC_MSG_ERROR([<infiniband/common.h> not found. ibaddr requires
libibcommon.])
)
@@ -33,6 +44,7 @@ AC_CHECK_HEADER(infiniband/umad.h, [],
AC_CHECK_HEADER(infiniband/mad.h, [],
AC_MSG_ERROR([<infiniband/mad.h> not found. ibaddr requires libibmad.])
)
+fi
dnl Checks for library functions
AC_FUNC_ERROR_AT_LINE
Index: management/diags/smpdump/configure.in
===================================================================
--- management/diags/smpdump/configure.in (revision 2963)
+++ management/diags/smpdump/configure.in (working copy)
@@ -8,26 +8,38 @@ AC_CONFIG_AUX_DIR(config)
AM_CONFIG_HEADER(config.h)
AM_INIT_AUTOMAKE(smpdump, 0.9.0)
+AC_ARG_ENABLE(libcheck, [ --disable-libcheck do not test for presense of
ib libraries],
+[ if test x$enableval = xno ; then
+ disable_libcheck=yes
+ fi
+])
+
dnl Checks for programs
AC_PROG_CC
AC_PROG_LIBTOOL
+if test "$disable_libcheck" != "yes"
+then
dnl Checks for libraries
LDFLAGS="$LDFLAGS -L/usr/local/ib/lib"
AC_CHECK_LIB(ibcommon, sys_read_string, [],
AC_MSG_ERROR([sys_read_string() not found. smpdump requires
libibcommon.]))
AC_CHECK_LIB(ibumad, umad_init, [],
AC_MSG_ERROR([umad_init() not found. smpdump requires libibumad.]))
+fi
dnl Checks for header files.
AC_HEADER_STDC
AC_CHECK_HEADERS([fcntl.h inttypes.h netinet/in.h stdlib.h string.h
sys/ioctl.h syslog.h unistd.h])
+if test "$disable_libcheck" != "yes"
+then
AC_CHECK_HEADER(infiniband/common.h, [],
AC_MSG_ERROR([<infiniband/common.h> not found. smpdump requires
libibcommon.])
)
AC_CHECK_HEADER(infiniband/umad.h, [],
AC_MSG_ERROR([<infiniband/umad.h> not found. smpdump requires
libibumad.])
)
+fi
dnl Checks for library functions
AC_CHECK_FUNCS([memset strchr strtoul])
Index: management/diags/ibsysstat/configure.in
===================================================================
--- management/diags/ibsysstat/configure.in (revision 2963)
+++ management/diags/ibsysstat/configure.in (working copy)
@@ -8,10 +8,18 @@ AC_CONFIG_AUX_DIR(config)
AM_CONFIG_HEADER(config.h)
AM_INIT_AUTOMAKE(ibsysstat, 0.9.0)
+AC_ARG_ENABLE(libcheck, [ --disable-libcheck do not test for presense of
ib libraries],
+[ if test x$enableval = xno ; then
+ disable_libcheck=yes
+ fi
+])
+
dnl Checks for programs
AC_PROG_CC
AC_PROG_LIBTOOL
+if test "$disable_libcheck" != "yes"
+then
dnl Checks for libraries
LDFLAGS="$LDFLAGS -L/usr/local/ib/lib"
AC_CHECK_LIB(ibcommon, sys_read_string, [],
@@ -20,10 +28,13 @@ AC_CHECK_LIB(ibumad, umad_init, [],
AC_MSG_ERROR([umad_init() not found. ibsysstat requires libibumad.]))
AC_CHECK_LIB(ibmad, mad_dump_int, [],
AC_MSG_ERROR([mad_dump_int() not found. ibsysstat requires libibmad.]))
+fi
dnl Checks for header files.
AC_HEADER_STDC
AC_CHECK_HEADERS([stdlib.h string.h unistd.h])
+if test "$disable_libcheck" != "yes"
+then
AC_CHECK_HEADER(infiniband/common.h, [],
AC_MSG_ERROR([<infiniband/common.h> not found. ibsysstat requires
libibcommon.])
)
@@ -33,6 +44,7 @@ AC_CHECK_HEADER(infiniband/umad.h, [],
AC_CHECK_HEADER(infiniband/mad.h, [],
AC_MSG_ERROR([<infiniband/mad.h> not found. ibsysstat requires
libibmad.])
)
+fi
dnl Checks for library functions
AC_FUNC_ERROR_AT_LINE
Index: management/diags/ibstat/configure.in
===================================================================
--- management/diags/ibstat/configure.in (revision 2963)
+++ management/diags/ibstat/configure.in (working copy)
@@ -8,10 +8,18 @@ AC_CONFIG_AUX_DIR(config)
AM_CONFIG_HEADER(config.h)
AM_INIT_AUTOMAKE(ibstat, 0.9.0)
+AC_ARG_ENABLE(libcheck, [ --disable-libcheck do not test for presense of
ib libraries],
+[ if test x$enableval = xno ; then
+ disable_libcheck=yes
+ fi
+])
+
dnl Checks for programs
AC_PROG_CC
AC_PROG_LIBTOOL
+if test "$disable_libcheck" != "yes"
+then
dnl Checks for libraries
LDFLAGS="$LDFLAGS -L/usr/local/ib/lib"
AC_CHECK_LIB(ibcommon, sys_read_string, [],
@@ -19,10 +27,13 @@ AC_CHECK_LIB(ibcommon, sys_read_string,
.]))
AC_CHECK_LIB(ibumad, umad_init, [],
AC_MSG_ERROR([umad_init() not found. ibstat requires libibumad.]))
+fi
dnl Checks for header files.
AC_HEADER_STDC
AC_CHECK_HEADERS([fcntl.h inttypes.h netinet/in.h stdlib.h string.h
sys/ioctl.h syslog.h unistd.h])
+if test "$disable_libcheck" != "yes"
+then
AC_CHECK_HEADER(infiniband/common.h, [],
AC_MSG_ERROR([<infiniband/common.h> not found. ibstat requires libibco
mmon.])
@@ -31,6 +42,7 @@ AC_CHECK_HEADER(infiniband/umad.h, [],
AC_MSG_ERROR([<infiniband/umad.h> not found. ibstat requires libibumad
.])
)
+fi
dnl Checks for library functions
AC_CHECK_FUNCS([strtol])
Index: management/diags/ibping/configure.in
===================================================================
--- management/diags/ibping/configure.in (revision 2963)
+++ management/diags/ibping/configure.in (working copy)
@@ -8,10 +8,18 @@ AC_CONFIG_AUX_DIR(config)
AM_CONFIG_HEADER(config.h)
AM_INIT_AUTOMAKE(ibping, 0.9.0)
+AC_ARG_ENABLE(libcheck, [ --disable-libcheck do not test for presense of
ib libraries],
+[ if test x$enableval = xno ; then
+ disable_libcheck=yes
+ fi
+])
+
dnl Checks for programs
AC_PROG_CC
AC_PROG_LIBTOOL
+if test "$disable_libcheck" != "yes"
+then
dnl Checks for libraries
LDFLAGS="$LDFLAGS -L/usr/local/ib/lib"
AC_CHECK_LIB(ibcommon, sys_read_string, [],
@@ -20,10 +28,13 @@ AC_CHECK_LIB(ibumad, umad_init, [],
AC_MSG_ERROR([umad_init() not found. ibping requires libibumad.]))
AC_CHECK_LIB(ibmad, mad_dump_int, [],
AC_MSG_ERROR([mad_dump_int() not found. ibping requires libibmad.]))
+fi
dnl Checks for header files.
AC_HEADER_STDC
AC_CHECK_HEADERS([stdlib.h string.h unistd.h])
+if test "$disable_libcheck" != "yes"
+then
AC_CHECK_HEADER(infiniband/common.h, [],
AC_MSG_ERROR([<infiniband/common.h> not found. ibping requires
libibcommon.])
)
@@ -33,6 +44,7 @@ AC_CHECK_HEADER(infiniband/umad.h, [],
AC_CHECK_HEADER(infiniband/mad.h, [],
AC_MSG_ERROR([<infiniband/mad.h> not found. ibping requires libibmad.])
)
+fi
dnl Checks for library functions
AC_FUNC_ERROR_AT_LINE
Index: management/diags/ibroute/configure.in
===================================================================
--- management/diags/ibroute/configure.in (revision 2963)
+++ management/diags/ibroute/configure.in (working copy)
@@ -8,10 +8,18 @@ AC_CONFIG_AUX_DIR(config)
AM_CONFIG_HEADER(config.h)
AM_INIT_AUTOMAKE(ibroute, 0.9.0)
+AC_ARG_ENABLE(libcheck, [ --disable-libcheck do not test for presense of
ib libraries],
+[ if test x$enableval = xno ; then
+ disable_libcheck=yes
+ fi
+])
+
dnl Checks for programs
AC_PROG_CC
AC_PROG_LIBTOOL
+if test "$disable_libcheck" != "yes"
+then
dnl Checks for libraries
LDFLAGS="$LDFLAGS -L/usr/local/ib/lib"
AC_CHECK_LIB(ibcommon, sys_read_string, [],
@@ -20,10 +28,13 @@ AC_CHECK_LIB(ibumad, umad_init, [],
AC_MSG_ERROR([umad_init() not found. ibroute requires libibumad.]))
AC_CHECK_LIB(ibmad, mad_dump_int, [],
AC_MSG_ERROR([mad_dump_int() not found. ibroute requires libibmad.]))
+fi
dnl Checks for header files.
AC_HEADER_STDC
AC_CHECK_HEADERS([netinet/in.h stdlib.h string.h unistd.h])
+if test "$disable_libcheck" != "yes"
+then
AC_CHECK_HEADER(infiniband/common.h, [],
AC_MSG_ERROR([<infiniband/common.h> not found. ibroute requires
libibcommon.])
)
@@ -33,6 +44,7 @@ AC_CHECK_HEADER(infiniband/umad.h, [],
AC_CHECK_HEADER(infiniband/mad.h, [],
AC_MSG_ERROR([<infiniband/mad.h> not found. ibroute requires libibmad.])
)
+fi
dnl Checks for library functions
AC_FUNC_ERROR_AT_LINE
Index: management/diags/sminfo/configure.in
===================================================================
--- management/diags/sminfo/configure.in (revision 2963)
+++ management/diags/sminfo/configure.in (working copy)
@@ -8,10 +8,18 @@ AC_CONFIG_AUX_DIR(config)
AM_CONFIG_HEADER(config.h)
AM_INIT_AUTOMAKE(sminfo, 0.9.0)
+AC_ARG_ENABLE(libcheck, [ --disable-libcheck do not test for presense of
ib libraries],
+[ if test x$enableval = xno ; then
+ disable_libcheck=yes
+ fi
+])
+
dnl Checks for programs
AC_PROG_CC
AC_PROG_LIBTOOL
+if test "$disable_libcheck" != "yes"
+then
dnl Checks for libraries
LDFLAGS="$LDFLAGS -L/usr/local/ib/lib"
AC_CHECK_LIB(ibcommon, sys_read_string, [],
@@ -20,10 +28,13 @@ AC_CHECK_LIB(ibumad, umad_init, [],
AC_MSG_ERROR([umad_init() not found. sminfo requires libibumad.]))
AC_CHECK_LIB(ibmad, mad_dump_int, [],
AC_MSG_ERROR([mad_dump_int() not found. sminfo requires libibmad.]))
+fi
dnl Checks for header files.
AC_HEADER_STDC
AC_CHECK_HEADERS([stdlib.h unistd.h])
+if test "$disable_libcheck" != "yes"
+then
AC_CHECK_HEADER(infiniband/common.h, [],
AC_MSG_ERROR([<infiniband/common.h> not found. sminfo requires
libibcommon.])
)
@@ -33,6 +44,7 @@ AC_CHECK_HEADER(infiniband/umad.h, [],
AC_CHECK_HEADER(infiniband/mad.h, [],
AC_MSG_ERROR([<infiniband/mad.h> not found. sminfo requires libibmad.])
)
+fi
dnl Checks for library functions
AC_FUNC_ERROR_AT_LINE
--
MST
_______________________________________________
openib-general mailing list
[email protected]
http://openib.org/mailman/listinfo/openib-general
To unsubscribe, please visit http://openib.org/mailman/listinfo/openib-general
