[gnuastro-commits] (no subject)

[Mohammad Akhlaghi]

branch: master
commit d830c9034d6d64a79d313f22a12d9c532c9c76a1
Author: Mohammad Akhlaghi <address@hidden>
Date:   Mon May 23 21:04:56 2016 +0900

    No more warning errors from Automake
    
    Thanks to Mathieu Lirzin from Automake, the override problem mentioned in
    commit 0394025 (fdl.texi is now kept in the bootstrapped directory) was
    found to be due to the `-Werror' option that was passed to Automake in
    `configure.ac'. So the workaround mentioned in commit 5d8967c (Better
    workaround for fdl.texi) is no longer necessary.
    
    To avoid such issues raising again, the -Werror option was removed from
    `AM_INIT_AUTOMAKE' in `configure.ac'. All warnings will be printed and will
    thus be clearly visible, however, there will be no error.
---
 configure.ac    |    2 +-
 doc/Makefile.am |   12 ++----------
 2 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/configure.ac b/configure.ac
index 86acd83..5b62716 100644
--- a/configure.ac
+++ b/configure.ac
@@ -39,7 +39,7 @@ AC_INIT([GNU Astronomy Utilities],
         address@hidden, [gnuastro],
         [http://www.gnu.org/software/gnuastro/])
 AC_CONFIG_AUX_DIR([bootstrapped/build-aux])
-AM_INIT_AUTOMAKE([-Wall -Werror subdir-objects gnu])
+AM_INIT_AUTOMAKE([-Wall subdir-objects gnu])
 AC_CONFIG_SRCDIR([lib/fitsarrayvv.c])
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_MACRO_DIRS([bootstrapped/m4])
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 00dd969..88a70aa 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -38,16 +38,8 @@ AM_MAKEINFOFLAGS = -I $(bootstrpdoc)
 
 # This is just a temporary work-around since Automake does not pass the
 # AM_MAKEINFOFLAGS to texi2dvi (which builds DVI and PDF outputs). This was
-# reported in Automake's bug 23599. A better way than the solution below
-# would have been to add the flags to the TEXI2DVI variable like this:
-#
-#    TEXI2DVI = texi2dvi -I $(bootstrpdoc)
-#
-# However, strangely, Automake doesn't allow us to override the value of
-# TEXI2DVI! So the only remaining tool that can be used to pass this
-# include directive to texi2dvi is the AM_V_texinfo. It appears it was
-# there to limit verbosity, but for the time being we are using it here.
-AM_V_texinfo = -I $(bootstrpdoc)
+# reported in Automake's bug 23599.
+TEXI2DVI = texi2dvi -I $(bootstrpdoc)
 
 
 ## Commands to make the texinfo tools.