File infiniband-diags-configure.patch of Package infiniband-diags

Overview Repositories Revisions Requests Users Attributes Meta

File infiniband-diags-configure.patch of Package infiniband-diags

---
 Makefile.am              |    2 +-
 configure.ac             |    7 ++++---
 libibnetdisc/Makefile.am |    5 +++--
 3 files changed, 8 insertions(+), 6 deletions(-)

Index: Makefile.am
===================================================================
--- Makefile.am.orig	2013-09-23 01:04:49.000000000 +0200
+++ Makefile.am	2014-02-13 17:26:26.745579232 +0100
@@ -1,7 +1,7 @@
 ACLOCAL_AMFLAGS = -I config
 SUBDIRS = libibnetdisc
 
-INCLUDES = -I$(top_builddir)/include/ -I$(srcdir)/include -I$(includedir) \
+AM_CPPFLAGS = -I$(top_builddir)/include/ -I$(srcdir)/include -I$(includedir) \
 	-I$(includedir)/infiniband -I$(top_srcdir)/libibnetdisc/include
 
 if DEBUG
Index: configure.ac
===================================================================
--- configure.ac.orig	2014-01-26 07:11:13.000000000 +0100
+++ configure.ac	2014-02-13 17:27:43.924785212 +0100
@@ -1,7 +1,7 @@
 dnl Process this file with autoconf to produce a configure script.
 
-AC_PREREQ(2.57)
-AC_INIT(infiniband-diags, 1.6.4, linux-rdma@vger.kernel.org)
+AC_PREREQ(2.63)
+AC_INIT([infiniband-diags],[1.6.4],[linux-rdma@vger.kernel.org])
 AC_CONFIG_AUX_DIR(config)
 AC_CONFIG_MACRO_DIR(config)
 AM_CONFIG_HEADER(config.h)
@@ -12,7 +12,7 @@ AC_SUBST(TARBALL, ${TARBALL:-${PACKAGE}-
 
 dnl support debug mode
 AC_ARG_ENABLE(debug,
-[  --enable-debug Turn on debug mode],
+AS_HELP_STRING([--enable-debug],[Turn on debug mode]),
 [case "${enableval}" in
   yes) debug=true ;;
   no)  debug=false ;;
@@ -23,6 +23,7 @@ AM_CONDITIONAL(DEBUG, test x$debug = xtr
 dnl Checks for programs
 AC_PROG_CC
 AM_PROG_CC_C_O
+AM_PROG_AR
 AC_PROG_LIBTOOL
 
 AC_CHECK_PROG(have_dash, [dash], true, false)
Index: libibnetdisc/Makefile.am
===================================================================
--- libibnetdisc/Makefile.am.orig	2013-09-23 01:04:49.000000000 +0200
+++ libibnetdisc/Makefile.am	2014-02-13 17:26:26.746579209 +0100
@@ -1,7 +1,7 @@
 
 #SUBDIRS = .
 
-INCLUDES = -I$(srcdir)/include -I$(includedir) -I$(includedir)/infiniband
+AM_CPPFLAGS = -I$(srcdir)/include -I$(includedir) -I$(includedir)/infiniband
 
 lib_LTLIBRARIES = libibnetdisc.la
 sbin_PROGRAMS =
@@ -24,7 +24,8 @@ endif
 
 libibnetdisc_la_SOURCES = src/ibnetdisc.c src/ibnetdisc_cache.c src/chassis.c \
 			  src/chassis.h src/internal.h src/query_smp.c
-libibnetdisc_la_CFLAGS = -Wall $(DBGFLAGS) $(GLIB_CFLAGS)
+libibnetdisc_la_CFLAGS = -Wall $(DBGFLAGS)
+libibnetdisc_la_CPPFLAGS = $(AM_CPPFLAGS) $(GLIB_CFLAGS)
 libibnetdisc_la_LDFLAGS = -version-info $(ibnetdisc_api_version) \
 	-export-dynamic $(libibnetdisc_version_script) \
 	-libmad $(GLIB_LIBS)

Places

File infiniband-diags-configure.patch of Package infiniband-diags

Places