38818b43ab5bcaaa6f6af2bceaf19ac24265601e hiram Fri Jun 21 13:10:18 2013 -0700 add new rules for finding mysql as found by compiling on beer30 refs #9149 diff --git src/inc/common.mk src/inc/common.mk index b878ca7..f703f97 100644 --- src/inc/common.mk +++ src/inc/common.mk @@ -63,55 +63,70 @@ PNGINCL=-I/opt/local/include endif endif # autodetect where libmysql is installed 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/mysql55/mysql/mysql.h),) + MYSQLINC=/opt/local/include/mysql55/mysql + 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},) ifneq ($(wildcard /usr/lib64/mysql/libmysqlclient.so),) MYSQLLIBS=/usr/lib64/mysql/libmysqlclient.so endif endif ifeq (${MYSQLLIBS},) ifneq ($(wildcard /usr/lib/libmysqlclient.a),) MYSQLLIBS=/usr/lib/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 ($(findstring src/hg/,${CURDIR}),src/hg/) + ifeq (${MYSQLINC},) + $(error can not find installed mysql development system) + endif +endif # last resort, hoping the compiler can find it in standard locations ifeq (${MYSQLLIBS},) MYSQLLIBS="-lmysqlclient" endif L+=${PNGLIB} HG_INC+=${PNGINCL} # 32-bit color enabled by default ifneq (${COLOR32},0) HG_DEFS+=-DCOLOR32 endif # autodetect UCSC installation of samtabix: ifeq (${SAMTABIXDIR},)