Skip to content

Commit 77bf3f0

Browse files
authored
Merge pull request #7496 from jsquyres/pr/remove-remnants-of-zlib-from-core
Remove a few more remnants of zlib
2 parents 96559fe + 2ffdea6 commit 77bf3f0

File tree

3 files changed

+2
-97
lines changed

3 files changed

+2
-97
lines changed

config/opal_configure_options.m4

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ dnl Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
1010
dnl University of Stuttgart. All rights reserved.
1111
dnl Copyright (c) 2004-2005 The Regents of the University of California.
1212
dnl All rights reserved.
13-
dnl Copyright (c) 2006-2017 Cisco Systems, Inc. All rights reserved
13+
dnl Copyright (c) 2006-2020 Cisco Systems, Inc. All rights reserved
1414
dnl Copyright (c) 2007 Sun Microsystems, Inc. All rights reserved.
1515
dnl Copyright (c) 2009 IBM Corporation. All rights reserved.
1616
dnl Copyright (c) 2009 Los Alamos National Security, LLC. All rights
@@ -535,9 +535,4 @@ dnl some point, this should die.
535535
AC_DEFINE([OPAL_ENABLE_PROGRESS_THREADS],
536536
[0],
537537
[Whether we want BTL progress threads enabled])
538-
539-
dnl Check for zlib support
540-
OPAL_ZLIB_CONFIG
541-
542-
543538
])dnl

config/opal_setup_zlib.m4

Lines changed: 0 additions & 90 deletions
This file was deleted.

configure.ac

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -621,7 +621,7 @@ AC_CHECK_HEADERS([alloca.h aio.h arpa/inet.h dirent.h \
621621
sys/types.h sys/uio.h sys/un.h net/uio.h sys/utsname.h sys/vfs.h sys/wait.h syslog.h \
622622
termios.h ulimit.h unistd.h util.h utmp.h malloc.h \
623623
ifaddrs.h crt_externs.h regex.h mntent.h paths.h \
624-
ioLib.h sockLib.h hostLib.h shlwapi.h sys/synch.h db.h ndbm.h zlib.h ieee754.h])
624+
ioLib.h sockLib.h hostLib.h shlwapi.h sys/synch.h db.h ndbm.h ieee754.h])
625625

626626
AC_CHECK_HEADERS([sys/mount.h], [], [],
627627
[AC_INCLUDES_DEFAULT

0 commit comments

Comments
 (0)