31 lines
967 B
Diff
31 lines
967 B
Diff
|
From ce3c33cd54a4de8a3c49c11806fae195328b4413 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Jeff Mahoney <jeffm@suse.com>
|
||
|
|
Date: Fri, 27 Apr 2018 14:50:08 -0400
|
||
|
|
Subject: [PATCH 2/3] btrfs-progs: build: autoconf 2.63 compatibility
|
||
|
|
Patch-mainline: Submitted, linux-btrfs 30 Apr 2018
|
||
|
|
|
||
|
|
Commit 2e1932e6a38 (btrfs-progs: build: simplify version tracking)
|
||
|
|
started m4_chomp to strip the newlines from the version file. m4_chomp
|
||
|
|
was introduced in autoconf 2.64 but SLE11 ships with autoconf 2.63.
|
||
|
|
For purposes of just stripping the newline, m4_flatten is sufficient.
|
||
|
|
|
||
|
|
Signed-off-by: Jeff Mahoney <jeffm@suse.com>
|
||
|
|
---
|
||
|
|
configure.ac | 2 +-
|
||
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/configure.ac b/configure.ac
|
||
|
|
index 2dea1c6..9e5603b 100644
|
||
|
|
--- a/configure.ac
|
||
|
|
+++ b/configure.ac
|
||
|
|
@@ -1,5 +1,5 @@
|
||
|
|
AC_INIT([btrfs-progs],
|
||
|
|
- m4_chomp(m4_include([VERSION])),
|
||
|
|
+ m4_flatten(m4_include([VERSION])),
|
||
|
|
[linux-btrfs@vger.kernel.org],,
|
||
|
|
[http://btrfs.wiki.kernel.org])
|
||
|
|
|
||
|
|
--
|
||
|
|
1.7.12.4
|
||
|
|
|