summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2009-06-19 09:00:04 +0000
committerRalf Baechle <ralf@linux-mips.org>2009-06-19 09:00:04 +0000
commit3864d0d43eb4ed94831365693c3a3771e5e05413 (patch)
treea5686a8f0a2e0f77edd50be0f4996d15b8579d89
parent3a84f71ecd4f99bfa5db29011378f9343fdef80d (diff)
Remove AC_CONFIG_MACRO_DIR and ACLOCAL_AMFLAGS = -I m4 again.
This is recommended by autoreconf by the following warning: libtoolize: Consider adding `AC_CONFIG_MACRO_DIR([m4])' to configure.ac and libtoolize: rerunning libtoolize, to keep the correct libtool macros in-tree. libtoolize: Consider adding `-I m4' to ACLOCAL_AMFLAGS in Makefile.am. For some reason I don't have the time to track down right now it results in a configure script with a syntax error being generated.
-rw-r--r--.cvsignore1
-rw-r--r--Makefile.am2
-rw-r--r--configure.ac1
3 files changed, 0 insertions, 4 deletions
diff --git a/.cvsignore b/.cvsignore
index cb972e1..7bdb315 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -15,5 +15,4 @@ install-sh
libtool
ltmain.sh
missing
-m4
stamp-h1
diff --git a/Makefile.am b/Makefile.am
index 43634bb..b81c242 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,3 @@
-ACLOCAL_AMFLAGS = -I m4
-
SUBDIRS = ax25ipd ax25rtd call listen ax25mond
EXTRA_DIST = pathnames.h
diff --git a/configure.ac b/configure.ac
index 8936c40..f50371f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,6 @@
AC_PREREQ(2.59)
AC_INIT(ax25-apps, 0.0.8-rc1, linux-hams@vger.kernel.org)
AC_CONFIG_SRCDIR(ax25ipd/config.c)
-AC_CONFIG_MACRO_DIR([m4]
AM_INIT_AUTOMAKE
AM_CONFIG_HEADER(config.h)