From 96415a27916d9275222f118bc7387cca091cafbd Mon Sep 17 00:00:00 2001 From: Nathan Caldwell Date: Tue, 13 Jan 2009 00:30:37 -0700 Subject: [PATCH] As suggested by autoreconf, keep libool macros in m4 directory. --- Makefile.am | 3 ++- bootstrap.sh | 8 +++++++- configure.ac | 1 + 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am index 6d25ec0..fe45af6 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,3 +1,4 @@ ## Makefile.am -- Process this file with automake to produce Makefile.in +ACLOCAL_AMFLAGS = -I m4 -SUBDIRS = src include \ No newline at end of file +SUBDIRS = src include diff --git a/bootstrap.sh b/bootstrap.sh index 81562f3..c253169 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -1,7 +1,13 @@ #! /bin/sh -rm -rf config +if [[ -d config ]]; then + rm -rf config +fi mkdir -p config +if [[ -d m4 ]]; then + rm -rf m4 +fi +mkdir -p m4 #aclocal \ #&& libtoolize --force --copy \ diff --git a/configure.ac b/configure.ac index 9966c5a..e32d7d6 100644 --- a/configure.ac +++ b/configure.ac @@ -5,6 +5,7 @@ AC_PREREQ(2.61) AC_INIT(libmkv, 0.6.3.1, saintdev@gmail.com) AC_CONFIG_AUX_DIR([config]) +AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_SRCDIR([include/libmkv.h]) AC_CONFIG_HEADER([config.h]) -- 2.11.4.GIT