Skip to content

Commit

Permalink
Added AC_CONFIG_MACRO_DIR([build-aux/m4])' to configure.ac.
Browse files Browse the repository at this point in the history
Keep the correct libtool macros in-tree.
  • Loading branch information
randy-waterhouse committed Oct 6, 2016
1 parent bee00a6 commit 648f06a
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 12 deletions.
21 changes: 10 additions & 11 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,19 @@
*.pc
*.la
*.o
libtool
ltmain.sh
missing
install-sh
depcomp
configure
config.*
*.lo
autom4te.cache
ar-lib
test-driver
aclocal.m4
Makefile

# autoreconf
Makefile.in
aclocal.m4
autom4te.cache/
build-aux/
config.log
config.status
configure
libtool

.deps
*.log
.libs
Expand Down
2 changes: 2 additions & 0 deletions Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
# This program is free software; you can redistribute it and/or modify it
# under the terms of the standard MIT license. See COPYING for more details.

ACLOCAL_AMFLAGS = -I build-aux/m4

lib_LTLIBRARIES = libbase58.la
libbase58_la_SOURCES = base58.c
libbase58_la_LDFLAGS = -version-info $(LIBBASE58_SO_VERSION) -no-undefined
Expand Down
Empty file added build-aux/m4/.null
Empty file.
3 changes: 2 additions & 1 deletion configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ AC_INIT(
[0.1.4],
[[email protected]],
[libbase58])
AC_CONFIG_AUX_DIR([.])
AC_CONFIG_AUX_DIR([build-aux])
AC_CONFIG_MACRO_DIR([build-aux/m4])
AC_PREREQ([2.59])
AM_INIT_AUTOMAKE([1.11 -Wall dist-xz foreign])
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
Expand Down

0 comments on commit 648f06a

Please sign in to comment.