Scary hack to use the wrong APR on Mac OSX.

diff --git a/Darwin.mk b/Darwin.mk
index 88a92dcb5023f47399436061b9c6fb0921514f6b..c95a5947ff2b0ba5dd483418095947525af3ebcd 100644 (file)
--- a/Darwin.mk
+++ b/Darwin.mk
@@ -8,6 +8,7 @@ library += -framework JavaScriptCore
 library += -framework WebKit
 library += -liconv
 flags += -I/usr/include/ffi
 library += -framework WebKit
 library += -liconv
 flags += -I/usr/include/ffi

+apr_config := /usr/bin/apr-1-config

 
 ifeq ($(uname_p),i386)
 flags += -m32
 
 ifeq ($(uname_p),i386)
 flags += -m32

diff --git a/makefile b/makefile
index c359b58248e1d0e5a6c9bf7c632be87288027550..bebb995446f6c9897c7fde1669e9afd71b6ab73b 100644 (file)
--- a/makefile
+++ b/makefile
@@ -38,9 +38,9 @@ ldid := true
 entitle := $(ldid)
 lib := lib
 dll := so
 entitle := $(ldid)
 lib := lib
 dll := so

-apr := $(shell apr-1-config --link-ld)
-library := $(apr)
-console := $(apr) -lreadline
+apr_config := apr-1-config
+library := 
+console := -lreadline

 depends :=
 
 restart ?= $(MAKE)
 depends :=
 
 restart ?= $(MAKE)


@@ -62,9 +62,13 @@ endif
 endif
 endif
 
 endif
 endif
 

+apr := $(shell $(apr_config) --link-ld)
+library += $(apr)
+console += $(apr)
+

 flags += -Wall -Werror -Wno-parentheses #-Wno-unused
 flags += -fno-common
 flags += -Wall -Werror -Wno-parentheses #-Wno-unused
 flags += -fno-common

-flags += -I. -Iinclude -I$(shell apr-1-config --includedir)
+flags += -I. -Iinclude -I$(shell $(apr_config) --includedir)

 
 all += $(lib)cycript.$(dll)
 
 
 all += $(lib)cycript.$(dll)