From 65026d3448b487fc02e084b6a871c6a5b3cebe13 Mon Sep 17 00:00:00 2001
From: Michael Jerris <mike@jerris.com>
Date: Thu, 24 Apr 2014 08:11:31 -0400
Subject: [PATCH] FS-6485: --resolve fix -lz include order issue breaking
 ubuntu 14.04 build

---
 configure.in | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/configure.in b/configure.in
index 3f158b0eab..500f3eb727 100644
--- a/configure.in
+++ b/configure.in
@@ -514,10 +514,13 @@ AC_ARG_ENABLE(timerfd-wrapper,
 [AC_HELP_STRING([--enable-timerfd-wrapper],[timerfd is in the kernel but not in your libc])],[enable_timer_fd_wrapper="$enableval"],[enable_timer_fd_wrapper="no"])
 AM_CONDITIONAL([ENABLE_TIMERFD_WRAPPER],[test "x$enable_timer_fd_wrapper" != "xno"])
 
+ESL_LDFLAGS=
+PLATFORM_CORE_LDFLAGS=
+PLATFORM_CORE_LIBS=
 
 AC_CHECK_LIB(z, inflateReset, have_libz=yes, AC_MSG_ERROR([no usable zlib; please install zlib devel package or equivalent]))
 if test "x$have_libz" = "xyes"  ; then
-APR_ADDTO(SWITCH_AM_LDFLAGS, -lz)
+APR_ADDTO([PLATFORM_CORE_LIBS], [-lz])
 fi
 
 AC_CHECK_LIB(jpeg, jpeg_std_error,, AC_MSG_ERROR([no usable libjpeg; please install libjpeg devel package or equivalent]))
@@ -539,9 +542,6 @@ if test "x$have_libresolv" = "xyes"  ; then
 APR_ADDTO(SWITCH_AM_LDFLAGS, -lresolv)
 fi
 
-ESL_LDFLAGS=
-PLATFORM_CORE_LDFLAGS=
-PLATFORM_CORE_LIBS=
 # tweak platform specific flags
 case "$host" in
     *darwin12.*|*darwin11.*)