summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2009-06-19 09:00:02 +0000
committerRalf Baechle <ralf@linux-mips.org>2009-06-19 09:00:02 +0000
commit8e2628b2a1f3180d0880aa25c7f914e0e49e725d (patch)
tree04c1960ab67fdf48751f76ffd3ba0bf0686fe0d7
parent79857d49189e879fbd64870fdcf8318e74f61e95 (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 c75defd..61b0c4e 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -23,4 +23,3 @@ libax25.la
libax25io.la
libax25-*.tar.gz
stamp-h1
-m4
diff --git a/Makefile.am b/Makefile.am
index dfb4e4c..85d87f6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,3 @@
-ACLOCAL_AMFLAGS = -I m4
-
lib_LTLIBRARIES = libax25.la libax25io.la
libax25includedir = $(includedir)/netax25
diff --git a/configure.ac b/configure.ac
index 7ff5f47..71b0fac 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,6 @@
AC_PREREQ(2.59)
AC_INIT(libax25, 0.0.12-rc1, linux-hams@vger.kernel.org)
AC_CONFIG_SRCDIR(axlib.h)
-AC_CONFIG_MACRO_DIR([m4]
AM_INIT_AUTOMAKE([foreign no-define])
AM_CONFIG_HEADER(config.h)