From 92dc665301127ae5a3e089bd8ecd00ed187a28f9 Mon Sep 17 00:00:00 2001 From: Dana Robinson Date: Wed, 16 Sep 2015 10:57:37 -0500 Subject: [svn-r27802] Added an explicit -I m4 to the aclocal line. The files in the m4 directory were not getting picked up on some platforms. Tested on: jam --- autogen.sh | 2 +- hl/src/H5LTanalyze.c | 1 + hl/src/H5LTparse.c | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/autogen.sh b/autogen.sh index 91d8348..6ad3abe 100755 --- a/autogen.sh +++ b/autogen.sh @@ -324,7 +324,7 @@ echo if test -e "${LIBTOOL_DIR}/../share/aclocal" ; then aclocal_include="-I ${LIBTOOL_DIR}/../share/aclocal" fi -aclocal_cmd="${HDF5_ACLOCAL} --force ${aclocal_include}" +aclocal_cmd="${HDF5_ACLOCAL} --force -I m4 ${aclocal_include}" echo ${aclocal_cmd} if [ "$verbose" = true ] ; then ${HDF5_ACLOCAL} --version diff --git a/hl/src/H5LTanalyze.c b/hl/src/H5LTanalyze.c index 54e443d..bad963d 100644 --- a/hl/src/H5LTanalyze.c +++ b/hl/src/H5LTanalyze.c @@ -12,6 +12,7 @@ #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-macros" #pragma GCC diagnostic ignored "-Wunused-parameter" +#pragma GCC diagnostic ignored "-Wredundant-decls" #elif defined __SUNPRO_CC #pragma disable_warn #elif defined _MSC_VER diff --git a/hl/src/H5LTparse.c b/hl/src/H5LTparse.c index 6ca95c54..b63cb49 100644 --- a/hl/src/H5LTparse.c +++ b/hl/src/H5LTparse.c @@ -12,6 +12,7 @@ #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-macros" #pragma GCC diagnostic ignored "-Wunused-parameter" +#pragma GCC diagnostic ignored "-Wredundant-decls" #elif defined __SUNPRO_CC #pragma disable_warn #elif defined _MSC_VER -- cgit v0.12