8b3a01986b2cf3fc0bd975fe0f3bf06abb37123d
hiram
  Mon Sep 20 14:46:31 2021 -0700
fix build on Mac OSX with freetype and mariadbclient libraries no redmine

diff --git src/inc/common.mk src/inc/common.mk
index 68ba051..e189d76 100644
--- src/inc/common.mk
+++ src/inc/common.mk
@@ -25,38 +25,52 @@
 
 # to check for Mac OSX Darwin specifics:
 UNAME_S := $(shell uname -s)
 # to check for builds on hgwdev
 HOSTNAME = $(shell uname -n)
 
 ifeq (${HOSTNAME},hgwdev)
   IS_HGWDEV = yes
 else
   IS_HGWDEV = no
 endif
 
 FREETYPECFLAGS = $(shell freetype-config --cflags  2> /dev/null)
 
 # we use our static library on dev
+ifeq (${FREETYPELIBS},)
   ifeq (${IS_HGWDEV},no)
     ifeq ($(UNAME_S),Darwin)
+	ifneq ($(wildcard /usr/local/Cellar/freetype/2.11.0/lib/libfreetype.a),)
+          ifneq ($(wildcard /usr/local/opt/bzip2/lib/libbz2.a),)
             FREETYPELIBS = /usr/local/Cellar/freetype/2.11.0/lib/libfreetype.a /usr/local/opt/bzip2/lib/libbz2.a
           else
-    FREETYPELIBS =  $(shell freetype-config --libs 2> /dev/null )
+            FREETYPELIBS = /usr/local/Cellar/freetype/2.11.0/lib/libfreetype.a -lbz2
+          endif
+        else
+          ifneq ($(wildcard /opt/local/lib/libfreetype.a),)
+            FREETYPELIBS=/opt/local/lib/libfreetype.a /opt/local/lib/libbz2.a /opt/local/lib/libbrotlidec-static.a /opt/local/lib/libbrotlienc-static.a /opt/local/lib/libbrotlicommon-static.a
+          endif
+        endif
+    endif
   endif
 endif
 
+ifeq (${FREETYPELIBS},)
+  FREETYPELIBS =  $(shell freetype-config --libs 2> /dev/null )
+endif
+
 ifneq (${FREETYPECFLAGS},)
 FREETYPECFLAGS += -DUSE_FREETYPE
 endif
 
 HG_INC += ${FREETYPECFLAGS}
 L += ${FREETYPELIBS}
 
 ifeq (${IS_HGWDEV},yes)
   FULLWARN = yes
 endif
 
 ifeq (${HOSTNAME},cirm-01)
   FULLWARN = yes
 endif
 
@@ -234,34 +248,38 @@
     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.6.4/lib/libmariadbclient.a),)
+          MYSQLLIBS+=/usr/local/Cellar/mariadb/10.6.4/lib/libmariadbclient.a
+    else
       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
+  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
@@ -329,33 +347,37 @@
 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
 
 #global external libraries
 L += $(kentSrc)/htslib/libhts.a
 
 L+=${PNGLIB} ${MLIB} ${ZLIB} ${ICONVLIB}
 HG_INC+=${PNGINCL}
+ifneq ($(wildcard /usr/local/Cellar/mariadb/10.6.4/include/mysql/mysql.h),)
+  HG_INC+=-I/usr/local/Cellar/mariadb/10.6.4/include/mysql
+else
   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
+endif
 ifneq ($(wildcard /usr/local/opt/openssl/include/openssl/hmac.h),)
   HG_INC+=-I/usr/local/opt/openssl/include
 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