diff options
| author | Emmanuele Bassi <ebassi@gnome.org> | 2017-02-09 17:10:34 +0000 |
|---|---|---|
| committer | Emmanuele Bassi <ebassi@gnome.org> | 2017-02-10 11:23:35 +0000 |
| commit | 48ee13ed3cafd3e4b0c76eedf1355f512173d4fd (patch) | |
| tree | 7fe66dccf2eabd9cea7b4c067b9c535c4815f388 | |
| parent | cf81586a6c4e1e7faaff94701486f24b1e3c2a9b (diff) | |
| download | libepoxy-48ee13ed3cafd3e4b0c76eedf1355f512173d4fd.tar.gz | |
Define a macro directory in the autotools build
As libtool suggest we do; this also allows using ACLOCAL_AMFLAGS inside
build that create a separate environment with their own m4 macros, like
jhbuild and Cerberus.
In order to avoid a warning from autoreconf, we create the empty macros
directory during the autogen.sh step; aclocal would create the directory
for us anyway, but different versions of autotools may have different
behaviours.
Closes: #58
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rwxr-xr-x | autogen.sh | 2 | ||||
| -rw-r--r-- | configure.ac | 1 |
3 files changed, 5 insertions, 0 deletions
diff --git a/Makefile.am b/Makefile.am index 8b5eb01..8fead48 100644 --- a/Makefile.am +++ b/Makefile.am @@ -20,6 +20,8 @@ # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS # IN THE SOFTWARE. +ACLOCAL_AMFLAGS = -I m4 + SUBDIRS = include/epoxy src SUBDIRS += test @@ -6,6 +6,8 @@ test -z "$srcdir" && srcdir=. ORIGDIR=`pwd` cd "$srcdir" +mkdir m4 || exit 1 + autoreconf -v --install || exit $? cd "$ORIGDIR" || exit $? diff --git a/configure.ac b/configure.ac index 50b9d5e..cc1fc50 100644 --- a/configure.ac +++ b/configure.ac @@ -27,6 +27,7 @@ AC_INIT([libepoxy], [libepoxy]) AC_CONFIG_SRCDIR([Makefile.am]) AC_CONFIG_HEADERS([config.h]) +AC_CONFIG_MACRO_DIR([m4]) # Initialize Automake AM_INIT_AUTOMAKE([foreign -Wno-portability dist-xz no-dist-gzip tar-ustar subdir-objects]) |