From 0bf004cf6b0d8222dbac31884a6ae9f88e4f288c Mon Sep 17 00:00:00 2001 From: david Date: Wed, 19 Sep 2012 16:41:25 +0000 Subject: [PATCH] Move acinclude.m4 inclusion from aclocal.m4 to configure.ac. aclocal.m4 is autogenerated, so running aclocal would remove the m4_include of acinclude.m4. The exceptions are at the top of the source tree and in nsock/src, where an acinclude.m4 lives; aclocal notices it there and automatically adds an inclusion to the end of aclocal.m4, so no inclusion is needed in configure.ac. --- ncat/aclocal.m4 | 2 -- ncat/configure.ac | 2 ++ nping/aclocal.m4 | 2 -- nping/configure.ac | 2 ++ 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ncat/aclocal.m4 b/ncat/aclocal.m4 index be495ab92..0f808a9ae 100644 --- a/ncat/aclocal.m4 +++ b/ncat/aclocal.m4 @@ -22,5 +22,3 @@ # AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS. AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)]) - -m4_include([../acinclude.m4]) diff --git a/ncat/configure.ac b/ncat/configure.ac index fffd7c2f5..c46afd0bd 100644 --- a/ncat/configure.ac +++ b/ncat/configure.ac @@ -6,6 +6,8 @@ AC_INIT(ncat_main.c) AM_CONFIG_HEADER(config.h) +m4_include([../acinclude.m4]) + AC_CANONICAL_HOST use_openssl="yes" diff --git a/nping/aclocal.m4 b/nping/aclocal.m4 index 796309614..11ed53bac 100644 --- a/nping/aclocal.m4 +++ b/nping/aclocal.m4 @@ -10,5 +10,3 @@ # but WITHOUT ANY WARRANTY, to the extent permitted by law; without # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. - -m4_include([../acinclude.m4]) diff --git a/nping/configure.ac b/nping/configure.ac index 2cf3788ab..782f674da 100644 --- a/nping/configure.ac +++ b/nping/configure.ac @@ -7,6 +7,8 @@ sinclude(nbase/configlocal.m4) dnl Process this file with autoconf to produce a configure script. AC_INIT(nping.cc) +m4_include([../acinclude.m4]) + AC_ARG_WITH(localdirs, AC_HELP_STRING([--with-localdirs], [Explicitly ask compiler to use /usr/local/{include,libs} if they exist ]), [ case "$with_localdirs" in