Commit 4db77920 authored by Philip Carns's avatar Philip Carns
Browse files

fix zlib handling in darshan-runtime configure script


git-svn-id: https://svn.mcs.anl.gov/repos/darshan/trunk@480 3b7491f3-a168-0410-bf4b-c445ed680a29
parent 5bf3391e
...@@ -45,16 +45,16 @@ lib/darshan-pnetcdf.po: lib/darshan-pnetcdf.c darshan.h $(DARSHAN_LOG_FORMAT) | ...@@ -45,16 +45,16 @@ lib/darshan-pnetcdf.po: lib/darshan-pnetcdf.c darshan.h $(DARSHAN_LOG_FORMAT) |
$(CC) $(CFLAGS_SHARED) -c $< -o $@ $(CC) $(CFLAGS_SHARED) -c $< -o $@
lib/darshan-hdf5.o: lib/darshan-hdf5.c darshan.h $(DARSHAN_LOG_FORMAT) | lib lib/darshan-hdf5.o: lib/darshan-hdf5.c darshan.h $(DARSHAN_LOG_FORMAT) | lib
$(CC) $(CFLAGS)$(cp_zlib_include_flags) -c $< -o $@ $(CC) $(CFLAGS) -c $< -o $@
lib/darshan-hdf5.po: lib/darshan-hdf5.c darshan.h $(DARSHAN_LOG_FORMAT) | lib lib/darshan-hdf5.po: lib/darshan-hdf5.c darshan.h $(DARSHAN_LOG_FORMAT) | lib
$(CC) $(CFLAGS_SHARED)$(cp_zlib_include_flags) -c $< -o $@ $(CC) $(CFLAGS_SHARED) -c $< -o $@
lib/darshan-posix.o: lib/darshan-posix.c darshan.h $(DARSHAN_LOG_FORMAT) | lib lib/darshan-posix.o: lib/darshan-posix.c darshan.h $(DARSHAN_LOG_FORMAT) | lib
$(CC) $(CFLAGS)$(cp_zlib_include_flags) -c $< -o $@ $(CC) $(CFLAGS) -c $< -o $@
lib/darshan-posix.po: lib/darshan-posix.c darshan.h $(DARSHAN_LOG_FORMAT) | lib lib/darshan-posix.po: lib/darshan-posix.c darshan.h $(DARSHAN_LOG_FORMAT) | lib
$(CC) $(CFLAGS_SHARED) $(cp_zlib_include_flags) -c $< -o $@ $(CC) $(CFLAGS_SHARED) -c $< -o $@
lib/lookup3.o: lib/lookup3.c lib/lookup3.o: lib/lookup3.c
$(CC) $(CFLAGS) -c $< -o $@ $(CC) $(CFLAGS) -c $< -o $@
......
...@@ -3454,12 +3454,6 @@ fi ...@@ -3454,12 +3454,6 @@ fi
fi fi
ZLIB_HOME=/usr/local
if test ! -f "${ZLIB_HOME}/include/zlib.h"
then
ZLIB_HOME=/usr
fi
# #
# Locate zlib, if wanted # Locate zlib, if wanted
# #
......
...@@ -24,6 +24,7 @@ dnl @version 2004-09-20 ...@@ -24,6 +24,7 @@ dnl @version 2004-09-20
dnl @license GPLWithACException dnl @license GPLWithACException
AC_DEFUN([CHECK_ZLIB], AC_DEFUN([CHECK_ZLIB],
# #
# Handle user hints # Handle user hints
# #
...@@ -44,12 +45,6 @@ else ...@@ -44,12 +45,6 @@ else
AC_MSG_RESULT(no) AC_MSG_RESULT(no)
fi]) fi])
ZLIB_HOME=/usr/local
if test ! -f "${ZLIB_HOME}/include/zlib.h"
then
ZLIB_HOME=/usr
fi
# #
# Locate zlib, if wanted # Locate zlib, if wanted
# #
......
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