9ec5130a97fde5c6855b7d56f39c0d007aa5ff29
hiram
  Wed Jul 26 10:57:42 2017 -0700
rearrangement for Mac will not work on hgwdev refs #19715

diff --git src/inc/common.mk src/inc/common.mk
index 96ad92c..a69e4a3 100644
--- src/inc/common.mk
+++ src/inc/common.mk
@@ -12,33 +12,30 @@
 endif
 ifneq (,$(findstring -,$(MACHTYPE)))
 #    $(info MACHTYPE has - sign ${MACHTYPE})
     MACHTYPE:=$(shell uname -m)
 #    $(info MACHTYPE has - sign set to: ${MACHTYPE})
 endif
 
 HG_DEFS=-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE -DMACHTYPE_${MACHTYPE}
 HG_INC+=-I../inc -I../../inc -I../../../inc -I../../../../inc -I../../../../../inc -I$(kentSrc)/htslib
 
 # to check for Mac OSX Darwin specifics:
 UNAME_S := $(shell uname -s)
 # to check for builds on hgwdev
 FULLWARN = $(shell uname -n)
 
-#global external libraries 
-L=$(kentSrc)/htslib/libhts.a
-
 # pthreads is required
 ifneq ($(UNAME_S),Darwin)
   L+=-pthread
 endif
 
 # autodetect if openssl is installed
 ifeq (${SSLDIR},)
   SSLDIR = /usr/include/openssl
 endif
 
 # autodetect UCSC installation of hal:
 ifeq (${HALDIR},)
     HALDIR = /hive/groups/browser/hal/halRelease
     ifneq ($(wildcard ${HALDIR}),)
         ifeq (${USE_HAL},)
@@ -198,35 +195,41 @@
 ifeq (${FULLWARN},hgwdev)
   MYSQLLIBS += /usr/lib/gcc/x86_64-redhat-linux/4.4.4/libstdc++.a /usr/lib/debug/usr/lib64/librt.a
 else
   ifeq ($(UNAME_S),Darwin)
     MYSQLLIBS += -lstdc++
   else
     MYSQLLIBS += -lstdc++ -lrt
   endif
 endif
 
 ifeq (${ZLIB},)
   ZLIB=-lz
   ifneq ($(wildcard /opt/local/lib/libz.a),)
     ZLIB=/opt/local/lib/libz.a
   endif
+  ifneq ($(wildcard /usr/lib64/libz.a),)
+    ZLIB=/usr/lib64/libz.a
+  endif
 endif
 
 L+=${PNGLIB} ${ZLIB} -lm
 HG_INC+=${PNGINCL}
 
+#global external libraries
+L += $(kentSrc)/htslib/libhts.a
+
 # pass through COREDUMP
 ifneq (${COREDUMP},)
     HG_DEFS+=-DCOREDUMP
 endif
 
 # autodetect UCSC additional source code with password for some external tracks on gbib
 GBIBDIR = /hive/groups/browser/gbib/
 ifneq ($(wildcard ${GBIBDIR}/*.c),)
   HG_DEFS+=-DUSE_GBIB_PWD
   HG_INC += -I${GBIBDIR}
 endif
 
 SYS = $(shell uname -s)
 
 ifeq (${HG_WARN},)