Fix build on FreeBSD.

diff --git a/FreeBSD.mk b/FreeBSD.mk
index ac4b846dbe433acf47781bdcfad448e60b88563c..c8b2607ed9d91be6d8db89a9b023b366044cd6cd 100644 (file)
--- a/FreeBSD.mk
+++ b/FreeBSD.mk
@@ -1,3 +1,3 @@
 export PATH := /usr/local/bin:/usr/local/GNUstep/System/Tools:$(PATH)
-gcc := g++44
+gcc := g++42
 include PkgConfig.mk

diff --git a/PkgConfig.mk b/PkgConfig.mk
index 47fb41f99fd54632133d954c61e29394fa6aa3b3..368bbcc7cc341b0cc4450ae426129b67de1fadef 100644 (file)
--- a/PkgConfig.mk
+++ b/PkgConfig.mk
@@ -1,6 +1,6 @@
 ifneq ($(shell pkg-config webkit-1.0 --modversion 2>/dev/null),)
 flags += $(shell pkg-config --cflags webkit-1.0)
-library += -lwebkit-1.0
+library += $(shell pkg-config --libs webkit-1.0)
 include Execute.mk
 else
 ifneq ($(shell pkg-config WebKitGtk --modversion 2>/dev/null),)

diff --git a/makefile b/makefile
index 89e54756795d813a5ee88ac1d161b72b63c10051..25482bc08f74958772122cd1dde8619504f36660 100644 (file)
--- a/makefile
+++ b/makefile
@@ -37,7 +37,7 @@ filters := #E4X
 ldid := true
 entitle := $(ldid)
 dll := so
-apr := -lapr-1
+apr := $(shell apr-1-config --link-ld)
 library := 
 console := $(apr) -lreadline
 depends :=