c5d07ac68ad30b637b912bed05dfb84edf5bc477 hiram Tue Jun 10 11:46:12 2014 -0700 can find libpng.a in usr local lib on Mavericks with homebrew refs #13327 diff --git src/inc/common.mk src/inc/common.mk index 3e9ea2c..206346e 100644 --- src/inc/common.mk +++ src/inc/common.mk @@ -72,30 +72,35 @@ ifneq ($(wildcard /usr/lib64/libpng.a),) PNGLIB=/usr/lib64/libpng.a endif endif ifeq (${PNGLIB},) ifneq ($(wildcard /usr/lib/libpng.a),) PNGLIB=/usr/lib/libpng.a endif endif ifeq (${PNGLIB},) ifneq ($(wildcard /opt/local/lib/libpng.a),) PNGLIB=/opt/local/lib/libpng.a endif endif ifeq (${PNGLIB},) + ifneq ($(wildcard /usr/local/lib/libpng.a),) + PNGLIB=/usr/local/lib/libpng.a + endif +endif +ifeq (${PNGLIB},) PNGLIB := $(shell libpng-config --ldflags || true) endif ifeq (${PNGLIB},) PNGLIB=-lpng endif ifeq (${PNGINCL},) ifneq ($(wildcard /opt/local/include/png.h),) PNGINCL=-I/opt/local/include else PNGINCL := $(shell libpng-config --I_opts || true) # $(info using libpng-config to set PNGINCL: ${PNGINCL}) endif endif # autodetect where mysql includes and libraries are installed