[PATCH] Fix bootstrap/autoreconf with automake-1.9
Jānis Rukšāns <[email protected]>
| Newsgroups | gmane.linux.isdn.i4l.user |
|---|---|
| Message-ID | <[email protected]> |
Automake 1.9 fails if (as far as I can tell) subdir-objects option is used without specifying AC_PROG_CC_C_O in configure.ac. Also (re-)add empty m4/ directory. When bootstrapping with autoreconf, aclocal is ran before everything else, and it requires the include directory to be present even if empty. It is later populated by libtool. Signed-off-by: Jānis Rukšāns <[email protected]> --- .gitignore | 3 ++- configure.ac | 1 + include/config.h.in | 3 +++ m4/.gitignore | 2 ++ 4 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 m4/.gitignore diff --git a/.gitignore b/.gitignore index 82e66af..f06af49 100644 --- a/.gitignore +++ b/.gitignore @@ -35,11 +35,12 @@ Makefile Makefile.in configure ltmain.sh -m4 aclocal.m4 depcomp missing +compile install-sh +mkinstalldirs config.guess config.sub DEADJOE diff --git a/configure.ac b/configure.ac index 98741c1..04cf457 100644 --- a/configure.ac +++ b/configure.ac @@ -11,6 +11,7 @@ AM_INIT_AUTOMAKE([-Wall foreign subdir-objects]) # Checks for programs. AC_PROG_CC +AC_PROG_CC_C_O AC_PROG_CXX AC_PROG_INSTALL AC_PROG_LIBTOOL diff --git a/include/config.h.in b/include/config.h.in index 4f121a9..7a1c9d3 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -125,6 +125,9 @@ */ #undef LT_OBJDIR +/* Define to 1 if your C compiler doesn't accept -c and -o together. */ +#undef NO_MINUS_C_MINUS_O + /* Name of package */ #undef PACKAGE diff --git a/m4/.gitignore b/m4/.gitignore new file mode 100644 index 0000000..64d9bbc --- /dev/null +++ b/m4/.gitignore @@ -0,0 +1,2 @@ +/libtool.m4 +/lt*.m4 -- 1.7.11.7 _______________________________________________ isdn4linux mailing list [email protected] https://www.isdn4linux.de/mailman/listinfo/isdn4linux