6eab7fc47402f1ce34ed331ae80f5bcbee54da82
braney
  Thu Dec 16 13:30:33 2010 -0800
remove USE_PNG and GIF support  #1323
diff --git src/inc/common.mk src/inc/common.mk
index 2fa9475..fd3d7a0 100644
--- src/inc/common.mk
+++ src/inc/common.mk
@@ -15,78 +15,52 @@
   SSLDIR = /usr/include/openssl
 endif
 ifeq (${USE_SSL},)
   ifneq ($(wildcard ${SSLDIR}),)
      USE_SSL=1
   endif
 endif
 
 
 # libssl: disabled by default
 ifeq (${USE_SSL},1)
     L+=-lssl -lcrypto
     HG_DEFS+=-DUSE_SSL
 endif
 
-
-# autodetect if png is installed
-ifeq (${USE_PNG},)
-  ifneq ($(wildcard /usr/include/png.h),)
-    USE_PNG=1
-  endif
-endif
-
+# autodetect where png is installed
 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
-ifeq (${USE_PNG},1)
   L+=${PNGLIB}
-  HG_DEFS+=-DUSE_PNG
   HG_INC+=${PNGINCL}
 
   # 32-bit color enabled by default
   ifneq (${COLOR32},0)
     HG_DEFS+=-DCOLOR32
   endif
-endif
 
 # autodetect if bam is installed
 ifeq (${SAMDIR},)
   SAMDIR = /hive/data/outside/samtools/svn_${MACHTYPE}/samtools
   ifneq ($(wildcard ${SAMDIR}),)
      KNETFILE_HOOKS=1
   endif
 endif
 ifeq (${USE_BAM},)
   ifneq ($(wildcard ${SAMDIR}),)
      USE_BAM=1
   endif
 endif
 
 # libbam (samtools, and Angie's KNETFILE_HOOKS extension to it): disabled by default