--- a/Makefile Mon May 16 00:04:01 2005 +0000
+++ b/Makefile Mon May 16 08:30:32 2005 +0000
@@ -457,10 +457,6 @@
# libpng config
ifdef WITH_PNG
CDEFS += -DWITH_PNG
-# FreeBSD doesn't use libpng-config
-ifdef FREEBSD
-LIBS += -lpng
-else
CFLAGS += $(shell libpng-config --cflags)
# seems like older libpng versions are broken and need this
@@ -476,7 +472,6 @@
LIBS += $(shell libpng-config --L_opts $(PNGCONFIG_FLAGS))
endif
endif
-endif
# enables/disables assert()
ifdef DISABLE_ASSERTS
--- a/makefiledir/Makefile.libdetection Mon May 16 00:04:01 2005 +0000
+++ b/makefiledir/Makefile.libdetection Mon May 16 08:30:32 2005 +0000
@@ -66,17 +66,7 @@
WITH_SDL:=$(shell $(SDL-CONFIG) --version 2>/dev/null)
# libpng detection
-ifdef FREEBSD
-# a little hack was needed for FreeBSD because it misses libpng-config
-WITH_PNG:=$(shell ls /usr/lib | grep "libpng" 2>/dev/null) $(shell \
-ls /usr/local/lib | grep "libpng" 2>/dev/null)
-ifdef WITH_PNG
-# makes the flag look nicer in makefile.config
-WITH_PNG:=1
-endif
-else
WITH_PNG:=$(shell libpng-config --version 2>/dev/null)
-endif
ifdef WITH_PNG
# LibPNG depends on Zlib