From ff52fc82670c88339468c1b8a6b4ebdd6a2d3336 Mon Sep 17 00:00:00 2001
From: tron <tron@openttd.org>
Date: Mon, 16 May 2005 08:30:32 +0000
Subject: (svn r2328) There's no need for extra magic to detect libpng on
 FreeBSD

---
 Makefile                          |  5 -----
 makefiledir/Makefile.libdetection | 10 ----------
 2 files changed, 15 deletions(-)

diff --git a/Makefile b/Makefile
index a79551a15..214fdee53 100644
--- a/Makefile
+++ b/Makefile
@@ -457,10 +457,6 @@ endif
 # 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 @@ else
 LIBS += $(shell libpng-config  --L_opts $(PNGCONFIG_FLAGS))
 endif
 endif
-endif
 
 # enables/disables assert()
 ifdef DISABLE_ASSERTS
diff --git a/makefiledir/Makefile.libdetection b/makefiledir/Makefile.libdetection
index 97dc4eaa0..18bd2e490 100644
--- a/makefiledir/Makefile.libdetection
+++ b/makefiledir/Makefile.libdetection
@@ -66,17 +66,7 @@ WITH_NETWORK:=1
 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
-- 
cgit v1.2.3-70-g09d2