Commit 692a62e2 authored by Philip Carns's avatar Philip Carns

fix bug in CFLAGS that accidentally triggered a zlib bug again in

darshan-parser


git-svn-id: https://svn.mcs.anl.gov/repos/darshan/trunk@175 3b7491f3-a168-0410-bf4b-c445ed680a29
parent 8f9ec489
......@@ -1403,8 +1403,6 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
CFLAGS="$CFLAGS -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE"
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
......@@ -3378,6 +3376,8 @@ echo "$as_me: error: $CC doesn't appear to be a valid MPI compiler" >&2;}
fi
rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
old_cflags="$CFLAGS"
CFLAGS="$CFLAGS -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE"
echo "$as_me:$LINENO: checking for off64_t" >&5
echo $ECHO_N "checking for off64_t... $ECHO_C" >&6
cat >conftest.$ac_ext <<_ACEOF
......@@ -3449,6 +3449,7 @@ echo "${ECHO_T}no" >&6
fi
rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
CFLAGS="$old_cflags"
# libc functions wrapped by darshan
......
......@@ -11,8 +11,6 @@ AC_CONFIG_HEADER(darshan-config.h)
AC_PROG_INSTALL
CFLAGS="$CFLAGS -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE"
CHECK_ZLIB
AC_CHECK_PROG(HAVE_MPICC, mpicc, yes, no)
......@@ -84,6 +82,10 @@ AC_TRY_COMPILE([#include <mpi.h>], [int ret = MPI_Init(0, (void*)0)],
AC_MSG_ERROR($CC doesn't appear to be a valid MPI compiler)
)
dnl temporarily set large file flags just for this test; we don't want
dnl it to propigate to the makefile because of zlib bugs
old_cflags="$CFLAGS"
CFLAGS="$CFLAGS -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE"
AC_MSG_CHECKING(for off64_t)
AC_TRY_COMPILE(
[
......@@ -108,6 +110,7 @@ AC_TRY_COMPILE(
AC_DEFINE(HAVE_OFF64_T, 1, Define if off64_t type is defined),
AC_MSG_RESULT(no)
)
CFLAGS="$old_cflags"
# libc functions wrapped by darshan
......
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