Merge pull request #31 from erikd/master

Autotool fixes
jackaudio · Feb 16, 2016 · dbd8ac5 · dbd8ac5
2 parents 7ae3b2b + 22ff0a5
commit dbd8ac5
Show file tree

Hide file tree

Showing 8 changed files with 147 additions and 107 deletions.
diff --git a/.gitignore b/.gitignore
@@ -50,6 +50,7 @@ jack/version.h
 jackd/jack_md5.h
 jackd/jackd
 jackd/jackd.1
+m4
 tags
 tools/alsa_in
 tools/alsa_out
@@ -66,3 +67,4 @@ tools/jack_thread_wait
 tools/jack_transport
 tools/jack_unload
 tools/jackrec
+libjack/.dirstamp
diff --git a/Makefile.am b/Makefile.am
@@ -1,6 +1,8 @@
 MAINTAINERCLEANFILES = Makefile.in aclocal.m4 configure config.h.in \
                        stamp-h.in config.log config.cache config.status
 
+ACLOCAL_AMFLAGS = -I m4
+
 if HAVE_DOXYGEN
 DOC_DIR = doc
 dist-check-doxygen:

diff --git a/autogen.sh b/autogen.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 #
-# on OS X, which(1) returns 0 even when it can't find a program 
+# on OS X, which(1) returns 0 even when it can't find a program
 #
 
 if type libtoolize >/dev/null 2>&1
@@ -18,11 +18,12 @@ else
     fi
 fi
 
-$LIBTOOLIZE --force 2>&1 | sed '/^You should/d' || {
+$LIBTOOLIZE --force --automake 2>&1 | sed '/^You should/d' || {
     echo "libtool failed, exiting..."
     exit 1
 }
 
+ACLOCAL_FLAGS="-I m4"
 aclocal $ACLOCAL_FLAGS || {
     echo "aclocal \$ACLOCAL_FLAGS where \$ACLOCAL_FLAGS= failed, exiting..."
     exit 1