diff options
| author | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2008-08-07 12:12:02 +0200 |
|---|---|---|
| committer | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2008-08-26 19:50:39 +0200 |
| commit | f4772fd28aebb280d07fe8b49bfbb2aa9d6a5527 (patch) | |
| tree | fe1a6b29bb3e45b70fa27aa2270f1f0f951b541b | |
| parent | db09dab2dbdf5c2ac620aed8d671992e9d25d3bb (diff) | |
Move ACX_PTHREAD macro from acinclude.m4 to m4/ directory.
Make this change because recent versions of libtool (2.2 series) copy
over their m4 macro files if an m4/ directory is present, and because
futher m4/ macro files might be added too.
Also make sure the macro directory is announced to autoconf and is
picked up by aclocal.
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | m4/acx_pthread.m4 (renamed from acinclude.m4) | 0 |
3 files changed, 3 insertions, 0 deletions
diff --git a/Makefile.am b/Makefile.am index e89ea82..1b218c4 100644 --- a/Makefile.am +++ b/Makefile.am @@ -16,6 +16,8 @@ # License along with libasyncns. If not, see # <http://www.gnu.org/licenses/>. +ACLOCAL_AMFLAGS = -I m4 + EXTRA_DIST = bootstrap.sh README LICENSE SUBDIRS=libasyncns doc doxygen diff --git a/configure.ac b/configure.ac index 54c12ac..00a3910 100644 --- a/configure.ac +++ b/configure.ac @@ -23,6 +23,7 @@ AC_PREREQ(2.62) AC_INIT([libasyncns],[0.5],[mznflapaf (at) 0pointer (dot) de]) AC_CONFIG_SRCDIR([libasyncns/asyncns.c]) AC_CONFIG_HEADERS([config.h]) +AC_CONFIG_MACRO_DIR([m4]) AM_INIT_AUTOMAKE([foreign 1.9 -Wall]) AC_SUBST(PACKAGE_URL, [http://0pointer.de/lennart/projects/libasyncns/]) diff --git a/acinclude.m4 b/m4/acx_pthread.m4 index bedf51c..bedf51c 100644 --- a/acinclude.m4 +++ b/m4/acx_pthread.m4 |