37539f0a1ff388e4c9f19abdf21842c5395ad679 hiram Tue Oct 22 12:08:32 2013 -0700 on hgwdev use the static MySQL libraries refs #11966 diff --git src/inc/common.mk src/inc/common.mk index c6a1f1f..e6fd420 100644 --- src/inc/common.mk +++ src/inc/common.mk @@ -69,33 +69,40 @@ endif ifeq (${PNGLIB},) ifneq ($(wildcard /opt/local/lib/libpng.a),) PNGLIB=/opt/local/lib/libpng.a endif endif ifeq (${PNGLIB},) PNGLIB=-lpng endif ifeq (${PNGINCL},) ifneq ($(wildcard /opt/local/include/png.h),) PNGINCL=-I/opt/local/include endif endif +FULLWARN = $(shell uname -n) + # autodetect where mysql includes and libraries are installed # do not need to do this during 'clean' target (this is very slow for 'clean') ifneq ($(MAKECMDGOALS),clean) + # on hgwdev, use the static library. + ifeq (${FULLWARN},hgwdev) + MYSQLINC=/usr/include/mysql + MYSQLLIBS=/usr/lib64/mysql/libmysqlclient.a + endif # this does *not* work on Mac OSX with the dynamic libraries ifneq ($(UNAME_S),Darwin) ifeq (${MYSQLINC},) MYSQLINC := $(shell mysql_config --include | sed -e 's/-I//' || true) # $(info using mysql_config to set MYSQLINC: ${MYSQLINC}) endif ifeq (${MYSQLLIBS},) MYSQLLIBS := $(shell mysql_config --libs || true) # $(info using mysql_config to set MYSQLLIBS: ${MYSQLLIBS}) endif endif ifeq (${MYSQLINC},) ifneq ($(wildcard /usr/local/mysql/include/mysql.h),) MYSQLINC=/usr/local/mysql/include @@ -220,31 +227,30 @@ TABIXINC = ${TABIXDIR} endif ifeq (${TABIXLIB},) TABIXLIB = ${TABIXDIR}/libtabix.a endif HG_INC += -I${TABIXINC} L+=${TABIXLIB} -lz HG_DEFS+=-DUSE_TABIX ifeq (${KNETFILE_HOOKS},1) HG_DEFS+=-DKNETFILE_HOOKS endif endif endif SYS = $(shell uname -s) -FULLWARN = $(shell uname -n) ifeq (${HG_WARN},) ifeq (${SYS},Darwin) HG_WARN = -Wall -Wno-unused-variable HG_WARN_UNINIT= else ifeq (${SYS},SunOS) HG_WARN = -Wall -Wformat -Wimplicit -Wreturn-type HG_WARN_UNINIT=-Wuninitialized else ifeq (${FULLWARN},hgwdev) HG_WARN = -Wall -Werror -Wformat -Wformat-security -Wimplicit -Wreturn-type HG_WARN_UNINIT=-Wuninitialized else HG_WARN = -Wall -Wformat -Wimplicit -Wreturn-type