From 52d75340fc614d9b3c8fd81e1fea3c263d5d8849 Mon Sep 17 00:00:00 2001 From: Guillem Jover Date: Thu, 21 Mar 2013 20:33:46 +0100 Subject: [PATCH v2 16/18] build: Install aclocal files into an m4 directory Status: obsolete --- .gitignore | 1 + Makefile.am | 2 ++ bootstrap | 3 +++ configure.ac | 1 + 4 files changed, 7 insertions(+) diff --git a/.gitignore b/.gitignore index 5669078..5bebc2e 100644 --- a/.gitignore +++ b/.gitignore @@ -21,6 +21,7 @@ compile install-sh libtool ltmain.sh +m4/ missing stamp-h1 autom4te.cache diff --git a/Makefile.am b/Makefile.am index 96cb378..2c16caf 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,6 +1,8 @@ AM_MAKEFLAGS = --no-print-directory +ACLOCAL_AMFLAGS = -I m4 + includedir = @includedir@/near include_HEADERS = include/types.h include/log.h include/plugin.h \ diff --git a/bootstrap b/bootstrap index 54516bc..fcc4837 100755 --- a/bootstrap +++ b/bootstrap @@ -1,3 +1,6 @@ #!/bin/sh +set -e + +mkdir -p m4 autoreconf --force --install diff --git a/configure.ac b/configure.ac index 976dacd..737c919 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,6 @@ AC_PREREQ(2.60) AC_INIT(neard, 0.11, [linux-nfc@lists.01.org]) +AC_CONFIG_MACRO_DIR([m4]) AM_INIT_AUTOMAKE([foreign subdir-objects color-tests]) AC_CONFIG_HEADERS(config.h) -- 1.8.3.1