Mercurial > octave-nkf
changeset 17562:76a8a179bf5b
Move Automake options into AM_INIT_AUTOMAKE
* configure.ac (AM_INIT_AUTOMAKE): Add required Automake options from
bootstrap.conf. Add -Wno-override option since we override certain
Automake targets and variables.
* bootstrap.conf (AUTOMAKE): Delete Automake override variable.
| author | Mike Miller <mtmiller@ieee.org> |
|---|---|
| date | Thu, 03 Oct 2013 22:52:02 -0400 |
| parents | b41860a0bc24 |
| children | d7ca186396d4 |
| files | bootstrap.conf configure.ac |
| diffstat | 2 files changed, 1 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/bootstrap.conf Thu Oct 03 22:19:12 2013 -0400 +++ b/bootstrap.conf Thu Oct 03 22:52:02 2013 -0400 @@ -153,12 +153,6 @@ # This avoids the need for sha1sum or compatible utility in bootstrap. SKIP_PO=true -## Use --foreign since we auto-generate the AUTHORS file and the default -## --gnu strictness level doesn't like it if the AUTHORS file is missing. - -AUTOMAKE="automake --foreign --warnings=no-portability" -export AUTOMAKE - bootstrap_post_import_hook () { ## Check for files that automake --gnu would normally look for, except
--- a/configure.ac Thu Oct 03 22:19:12 2013 -0400 +++ b/configure.ac Thu Oct 03 22:52:02 2013 -0400 @@ -41,7 +41,7 @@ AC_CONFIG_AUX_DIR([build-aux]) AC_CONFIG_MACRO_DIR([m4]) -AM_INIT_AUTOMAKE([1.11 tar-ustar subdir-objects]) +AM_INIT_AUTOMAKE([1.11 foreign -Wno-portability -Wno-override tar-ustar subdir-objects]) ## Add the option to enable silent rules, available since Automake 1.11 ## and included by default starting with Automake 1.13.