Permalink
Browse files

- use autoconf erlang builtin support in configure.in

- don't try to compile mochiweb libs on old version of erlang.

SVN Revision: 889
  • Loading branch information...
1 parent 7488413 commit 54a7fac7099f2442a21448ee82c8ca53ac39810f @nniclausse nniclausse committed Sep 1, 2008
Showing with 938 additions and 291 deletions.
  1. +8 −3 Makefile.in
  2. +849 −143 configure
  3. +81 −145 configure.in
View
@@ -10,10 +10,12 @@ ERL_OPTS=@ERL_OPTS@
# FIXME
DIALYZER=dialyzer
-ERLDIR=@ERLDIR@
+ERLDIR=@ERLANG_ROOT_DIR@
export ERLDIR
-ERLANG_XMERL_DIR=@ERLANG_XMERL_DIR@
+USEMOCHIWEBLIBS=@erlang_cv_orelse@
+
+ERLANG_XMERL_DIR=@ERLANG_LIB_DIR_xmerl@/include
raw_erlang_prefix=@libdir@/erlang/
@@ -89,7 +91,10 @@ TARGETDIR = $(ERLANG_LIB_DIR)/$(APPLICATION)-$(VERSION)
TEMPLATES = $(wildcard $(ESRC)/templates/*.thtml)
TMP = $(wildcard *~) $(wildcard src/*~) $(wildcard inc/*~)
INC_FILES = $(wildcard $(INC)/*.hrl)
-LIBSRC = $(wildcard $(ESRC)/lib/*.erl)
+LIBSRC = $(wildcard $(ESRC)/lib/[^mochi]*.erl)
+ifeq ($(USEMOCHIWEBLIBS),yes)
+LIBSRC += $(wildcard $(ESRC)/lib/mochi*.erl)
+endif
TESTSRC = $(wildcard $(ESRC)/test/*.erl)
SRC = $(wildcard $(ESRC)/$(APPLICATION)/*.erl)
CONTROLLER_SRC = $(wildcard $(ESRC)/$(CONTROLLER_APPLICATION)/*.erl)
Oops, something went wrong.

0 comments on commit 54a7fac

Please sign in to comment.