6ecf49223089b374aae7821ee3a86a4a252ecca9 hiram Tue Oct 26 14:47:51 2010 -0700 add -lpng if libpng.a is not found diff --git src/inc/common.mk src/inc/common.mk index 65c9f3c..deaca0b 100644 --- src/inc/common.mk +++ src/inc/common.mk @@ -33,30 +33,35 @@ ifneq ($(wildcard /usr/include/png.h),) USE_PNG=1 endif endif ifeq (${PNGLIB},) 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},) + ifeq (${USE_PNG},1) + PNGLIB=-lpng + endif +endif ifneq (${PNGLIB},) ifeq (${USE_PNG},) USE_PNG=1 endif endif ifeq (${USE_PNG},) ifneq (${PNGLIB},) ifneq ($(wildcard ${PNGLIB}),) USE_PNG=1 endif endif endif # libpng: disabled by default # for dynamic linking PNGLIB=-lpng