summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Sterba <dsterba@suse.com>2016-06-24 13:54:45 +0200
committerDavid Sterba <dsterba@suse.com>2016-06-24 14:05:44 +0200
commit82ef7a6d4292009081bf00fc3dbeba1a37861784 (patch)
treeeff482c87802df40ec86418e97d7a9e2728b0a2b
parent034643237a9260f12e532bf0459f66234e1f8408 (diff)
btrfs-progs: build: let autotools include m4
We'll need some non-standard macro definitions. Signed-off-by: David Sterba <dsterba@suse.com>
-rw-r--r--.gitignore1
-rwxr-xr-xautogen.sh6
2 files changed, 3 insertions, 4 deletions
diff --git a/.gitignore b/.gitignore
index 26ad27e5..214103d2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -66,7 +66,6 @@ configure
cscope.out
depcomp
libtool
-m4/*.m4
Makefile
Documentation/Makefile
missing
diff --git a/autogen.sh b/autogen.sh
index a5f9af24..80442c5b 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -64,9 +64,9 @@ echo " automake: $(automake --version | head -1)"
chmod +x version.sh
rm -rf autom4te.cache
-aclocal $AL_OPTS &&
-autoconf $AC_OPTS &&
-autoheader $AH_OPTS ||
+aclocal -I m4 $AL_OPTS &&
+autoconf -I m4 $AC_OPTS &&
+autoheader -I m4 $AH_OPTS ||
exit 1
# it's better to use helper files from automake installation than