dapl/dapl-autotools.patch

57 lines
1.7 KiB
Diff

From: Philipp Thomas <pth@suse.de>
Date: 2014-01-21 18:40:02+01:00
Subject: Enable running autoreconf
References:
Upstream:
Adapt configure.in and Makefile.am so that autoreconf
complains less.
configure.in | 5 +++--
test/dapltest/Makefile.am | 2 +-
2 files changed, 4 insertions(+), 3 deletions(-)
Index: configure.in
===================================================================
--- configure.in.orig 2014-05-05 18:11:33.000000000 +0200
+++ configure.in 2014-06-25 18:11:15.740970867 +0200
@@ -5,7 +5,7 @@ AC_INIT(dapl, 2.0.42, linux-rdma@vger.ke
AC_CONFIG_SRCDIR([dat/udat/udat.c])
AC_CONFIG_AUX_DIR(config)
AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(dapl, 2.0.42)
+AM_INIT_AUTOMAKE([-Wall foreign])
AM_PROG_LIBTOOL
@@ -17,6 +17,7 @@ AC_ARG_ENABLE(libcheck, [ --disable-lib
dnl Checks for programs
AC_PROG_CC
+AM_PROG_CC_C_O
dnl Checks for libraries
if test "$disable_libcheck" != "yes"
@@ -63,7 +64,7 @@ AM_CONDITIONAL(HAVE_LD_VERSION_SCRIPT, t
dnl Support debug mode build - if enable-debug provided the DEBUG variable is set
AC_ARG_ENABLE(debug,
-[ --enable-debug Turn on debug mode, default=off],
+ AS_HELP_STRING([--enable-debug], [Turn on debug mode, default=off]),
[case "${enableval}" in
yes) debug=true ;;
no) debug=false ;;
Index: test/dapltest/Makefile.am
===================================================================
--- test/dapltest/Makefile.am.orig 2014-04-07 19:27:35.000000000 +0200
+++ test/dapltest/Makefile.am 2014-06-25 18:10:20.444662166 +0200
@@ -8,7 +8,7 @@ AM_CFLAGS = -g -Wall -D_GNU_SOURCE
dapltest_CFLAGS = $(AM_FLAGS) $(XFLAGS)
-INCLUDES = -I include \
+AM_CPPFLAGS = -I include \
-I mdep/linux \
-I $(srcdir)/../../dat/include