a2e177597fbd6c1a6dc7f8ea5f4f45ec9b8f08ac
hiram
  Sun May 10 13:23:19 2020 -0700
better time to select libmariadbclient.a for Mac OSX Catalina no redmine

diff --git src/inc/common.mk src/inc/common.mk
index 8d4dfa2..a8fe6c5 100644
--- src/inc/common.mk
+++ src/inc/common.mk
@@ -207,30 +207,35 @@
     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 /usr/local/Cellar/mariadb/10.4.12/lib/libmariadbclient.a),)
+          MYSQLLIBS+=/usr/local/Cellar/mariadb/10.4.12/lib/libmariadbclient.a
+     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},)
@@ -303,33 +308,30 @@
     ZLIB=/usr/lib64/libz.a
   endif
 endif
 
 #global external libraries
 L += $(kentSrc)/htslib/libhts.a
 
 L+=${PNGLIB} ${MLIB} ${ZLIB} ${ICONVLIB}
 HG_INC+=${PNGINCL}
 ifneq ($(wildcard /usr/local/Cellar/mariadb/10.4.12/include/mysql/mysql.h),)
   HG_INC+=-I/usr/local/Cellar/mariadb/10.4.12/include/mysql
 endif
 ifneq ($(wildcard /usr/local/opt/openssl/include/openssl/hmac.h),)
   HG_INC+=-I/usr/local/opt/openssl/include
 endif
-ifneq ($(wildcard /usr/local/Cellar/mariadb/10.4.12/lib/libmariadbclient.a),)
-  L+=/usr/local/Cellar/mariadb/10.4.12/lib/libmariadbclient.a
-endif
 
 # 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)