3840f06abae2ec4a7a37e83a3533bc53efaae36e
hiram
  Fri Sep 1 12:32:03 2017 -0700
now using libpng.a and libz.a need to reorder link libs and add some for Mac OSX build refs #9149

diff --git src/inc/common.mk src/inc/common.mk
index a69e4a3..3b0ea23 100644
--- src/inc/common.mk
+++ src/inc/common.mk
@@ -120,35 +120,50 @@
   ifeq (${MYSQLINC},)
     MYSQLINC := $(shell mysql_config --include | sed -e 's/-I//' || true)
 #        $(info using mysql_config to set MYSQLINC: ${MYSQLINC})
   endif
   ifeq (${MYSQLINC},)
     ifneq ($(wildcard /usr/local/mysql/include/mysql.h),)
 	  MYSQLINC=/usr/local/mysql/include
     endif
   endif
   ifeq (${MYSQLINC},)
     ifneq ($(wildcard /usr/include/mysql/mysql.h),)
 	  MYSQLINC=/usr/include/mysql
     endif
   endif
   ifeq (${MYSQLINC},)
+    ifneq ($(wildcard /opt/local/include/mysql57/mysql/mysql.h),)
+	  MYSQLINC=/opt/local/include/mysql57/mysql
+    endif
+  endif
+  ifeq (${MYSQLINC},)
     ifneq ($(wildcard /opt/local/include/mysql55/mysql/mysql.h),)
 	  MYSQLINC=/opt/local/include/mysql55/mysql
     endif
   endif
   ifeq (${MYSQLLIBS},)
+    ifneq ($(wildcard /opt/local/lib/mysql57/mysql/libmysqlclient.a),)
+	  MYSQLLIBS=/opt/local/lib/mysql57/mysql/libmysqlclient.a
+    endif
+  endif
+  ifeq (${MYSQLLIBS},)
+    ifneq ($(wildcard /opt/local/lib/mysql55/mysql/libmysqlclient.a),)
+	  MYSQLLIBS=/opt/local/lib/mysql55/mysql/libmysqlclient.a
+    endif
+  endif
+  ifeq (${MYSQLLIBS},)
     ifneq ($(wildcard /usr/lib64/mysql/libmysqlclient.a),)
 	  MYSQLLIBS=/usr/lib64/mysql/libmysqlclient.a
     endif
   endif
   ifeq (${MYSQLLIBS},)
     ifneq ($(wildcard /usr/local/mysql/lib/libmysqlclient.a),)
 	  MYSQLLIBS=/usr/local/mysql/lib/libmysqlclient.a
     endif
   endif
   ifeq (${MYSQLLIBS},)
     ifneq ($(wildcard /usr/local/mysql/lib/libmysqlclient.a),)
 	  MYSQLLIBS=/usr/local/mysql/lib/libmysqlclient.a
     endif
   endif
   ifeq (${MYSQLLIBS},)
@@ -200,36 +215,36 @@
   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
 
+L+=${PNGLIB} ${ZLIB} -lm
+HG_INC+=${PNGINCL}
+
 # 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},)