Permalink
Browse files

Revert "Build GEOS"

This reverts commit bba652d.

Change-Id: I4ae007cefe27ae4f31e3c44c0cb1b9bbc4c223eb
Reviewed-on: http://review.couchbase.org/14787
Reviewed-by: Filipe David Borba Manana <fdmanana@gmail.com>
Tested-by: Filipe David Borba Manana <fdmanana@gmail.com>
  • Loading branch information...
1 parent 8b8155d commit bbd3f783c6db8397aa3f5421623978eb073f8cc1 @fdmanana fdmanana committed with fdmanana Apr 12, 2012
Showing with 2 additions and 21 deletions.
  1. +2 −21 Makefile.top
View
@@ -32,10 +32,6 @@ COMPONENTS += sigar portsigar
BUILD_SIGAR := 1
endif
-ifneq "$(realpath geos)" ""
-BUILD_GEOS := 1
-endif
-
ifdef FOR_WINDOWS
COMPONENTS := $(filter-out memcachetest libcouchbase, $(COMPONENTS))
endif
@@ -207,8 +203,8 @@ make-install-ns_server: make-install-geocouch
cd ns_server && ./configure "--prefix=$(PREFIX)"
$(MAKE) -C ns_server install "PREFIX=$(PREFIX)"
-make-install-geocouch: build-geos
- $(MAKE) -C geocouch COUCH_SRC=../couchdb/src/couchdb "CFLAGS=-I$(PREFIX)/include $(CFLAGS)" "LDFLAGS=-L$(PREFIX)/lib $(LDFLAGS)"
+make-install-geocouch:
+ $(MAKE) -C geocouch COUCH_SRC=../couchdb/src/couchdb
mkdir -p $(DESTDIR)$(PREFIX)/lib/couchdb/plugins/geocouch/ebin
cp -r geocouch/ebin/* $(DESTDIR)$(PREFIX)/lib/couchdb/plugins/geocouch/ebin
mkdir -p $(DESTDIR)$(PREFIX)/etc/couchdb/default.d
@@ -240,12 +236,6 @@ ifdef PLEASE_BUILD_COUCH_DEPS
deps-for-couchdb: make-install-couchdb-deps
endif
-ifdef BUILD_GEOS
-build-geos: make-install-geos
-else
-build-geos:
-endif
-
WRAPPERS := $(patsubst %, $(PREFIX)/bin/%, memcached-wrapper moxi-wrapper)
$(WRAPPERS): $(PREFIX)/bin/%: tlm/%.in
@@ -364,15 +354,6 @@ make-install-icu4c: icu4c/source/Makefile
make-install-couchdb-deps: make-install-icu4c
-
-geos/Makefile:
- (cd geos && ./autogen.sh && ./configure "--prefix=$(PREFIX)")
-
-make-install-geos: geos/Makefile
- $(MAKE) -C geos
- $(MAKE) -C geos install
-
-
CHECK_COMPONENTS ?= $(COMPONENTS)
CHECK_TARGETS := $(patsubst %, check-%, $(CHECK_COMPONENTS))

0 comments on commit bbd3f78

Please sign in to comment.