Commit 7eba5356 authored by vijaysm's avatar vijaysm
Browse files

Fix a bug introduced in the BG/Q configuration updates

parent a1bcb7e6
......@@ -304,7 +304,7 @@ fi
DISTCHECK_CONFIGURE_FLAGS="$DISTCHECK_CONFIGURE_FLAGS --enable-32bit=$enable_32bit --enable-64bit=$enable_64bit"
# Special overrides for flags
if (test "x$enable_static" != "xno" && "x$MB_BLUEGENE_CONF" != "xno"); then
if (test "x$enable_static" != "xno" && test "x$MB_BLUEGENE_CONF" != "xno"); then
LDFLAGS="$LDFLAGS -qnostaticlink -qnostaticlink=libgcc"
fi
......
......@@ -38,6 +38,17 @@ EXTRA_INTEL_FLAGS='-Wall'
EXTRA_INTEL_FFLAGS='-check all'
EXTRA_BG_FLAGS='-qarch=auto -qtune=auto -qpic=large'
MB_CPPFLAGS=""
MB_DEFS=""
# Check if platform is BlueGene
AC_MSG_CHECKING([if platform is IBM BlueGene])
FATHOM_TRY_COMPILER_DEFINE([__bg__],
[MB_DEFS="$MB_DEFS -DBLUEGENE"
MB_BLUEGENE_CONF=yes],
[MB_BLUEGENE_CONF=no])
AC_MSG_RESULT([$MB_BLUEGENE_CONF])
# Find out the appropriate compiler based on user options
FATHOM_CHECK_COMPILERS([yes],[yes],[$ENABLE_FORTRAN])
AM_CONDITIONAL(PARALLEL,[test "x$enablempi" != "xno"])
......@@ -65,17 +76,6 @@ LT_INIT([dlopen])
AC_C_BIGENDIAN
MB_CPPFLAGS=""
MB_DEFS=""
# Check if platform is BlueGene
AC_MSG_CHECKING([if platform is IBM BlueGene])
FATHOM_TRY_COMPILER_DEFINE([__bg__],
[MB_DEFS="$MB_DEFS -DBLUEGENE"
MB_BLUEGENE_CONF=yes],
[MB_BLUEGENE_CONF=no])
AC_MSG_RESULT([$MB_BLUEGENE_CONF])
AC_CHECK_PROG([ZCAT],[gunzip],[gunzip -c],[])
AC_CHECK_PROG([ZCAT],[gzip],[gzip -cd],[])
AC_CHECK_PROG([ZCAT],[zcat],[zcat],[])
......@@ -1339,6 +1339,7 @@ AC_CONFIG_FILES([Makefile
examples/makefile
examples/old/deform_mesh/makefile
src/Makefile
src/MBCN_protos.h
src/io/Makefile
src/io/mhdf/Makefile
src/LocalDiscretization/Makefile
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment