[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
This commit is contained in:
Dana Robinson 2015-09-16 10:57:37 -05:00
parent d90e4acfa7
commit 92dc665301
3 changed files with 3 additions and 1 deletions

View File

@ -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

View File

@ -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

View File

@ -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