* src/ejabberd.cfg.example: Updated

* src/Makefile.*: Can now be build when the Erlang environment is
not Erlang/OTP but the Erlang REPOS CDROM.  Still compatible with
standard Erlang/OTP install
* aclocal.m4: Likewise
* src/Makefile.*: Can now be build with Erlang debug_info with
'make debug=true'

SVN Revision: 448

ChangeLog

@@ -1,3 +1,14 @@
+2005-12-06  Mickael Remond  <mickael.remond@erlang-fr.org>
+        
+	* src/ejabberd.cfg.example: Updated
+
+	* src/Makefile.*: Can now be build when the Erlang environment is
+	not Erlang/OTP but the Erlang REPOS CDROM.  Still compatible with
+	standard Erlang/OTP install
+	* aclocal.m4: Likewise
+	* src/Makefile.*: Can now be build with Erlang debug_info with
+	'make debug=true'
+
 2005-12-06  Alexey Shchepin  <alexey@sevcom.net>
 
 	* src/msgs/pt-br.msg: Updated (thanks to Victor Hugo dos Santos)

TODO

@@ -1,3 +1,5 @@
+Win32 build: Make it possible to compile with +debug_info flag.
+
 mod_muc logging
 
 admin interface

src/Makefile.in

@@ -12,6 +12,11 @@ ERLANG_CFLAGS= @ERLANG_CFLAGS@
 EXPAT_LIBS = @EXPAT_LIBS@
 ERLANG_LIBS = @ERLANG_LIBS@
 
+# make debug=true to compile Erlang module with debug informations.
+ifdef debug
+  ERLC_FLAGS+=+debug_info
+endif
+
 prefix = @prefix@
 
 SUBDIRS = @mod_irc@ @mod_pubsub@ @mod_muc@ @eldap@ @web@ stringprep @tls@ @odbc@
@@ -32,7 +37,7 @@ ASN_FLAGS = -bber_bin +der +compact_bit_string +optimize +noobj
 all: $(ERLSHLIBS) compile-beam all-recursive
 
 compile-beam: XmppAddr.hrl
-	@ERL@ -s make all report -noinput -s erlang halt
+	@ERLC@ $(ERLC_FLAGS) *.erl
 
 
 all-recursive install-recursive uninstall-recursive \

src/Makefile.win32

@@ -100,7 +100,7 @@ all-recursive :
 	cd ..
 
 compile-beam : 
-	erl -s make all report -noinput -s erlang halt
+	erlc *.erl
 
 CLEAN : clean-recursive clean-local
 

src/aclocal.m4

@@ -51,10 +51,40 @@ AC_DEFUN(AM_WITH_ERLANG,
 
 start() ->
     EIDirS = code:lib_dir("erl_interface") ++ "\n",
+    EILibS =  libpath("erl_interface") ++ "\n",
     RootDirS = code:root_dir() ++ "\n",
-	file:write_file("conftest.out", list_to_binary(EIDirS ++ RootDirS)),
+    file:write_file("conftest.out", list_to_binary(EIDirS ++ EILibS ++ RootDirS)),
     halt().
 
+%% return physical architecture based on OS/Processor
+archname() ->
+    ArchStr = erlang:system_info(system_architecture),
+    case os:type() of
+	{win32, _} -> "windows";
+	{unix,UnixName} ->
+	    Specs = string:tokens(ArchStr,"-"),
+	    Cpu = case lists:nth(2,Specs) of
+		      "pc" -> "x86";
+		      _ -> hd(Specs)
+		  end,
+	    atom_to_list(UnixName) ++ "-" ++ Cpu;
+	_ -> "generic"
+    end.
+
+%% Return arch-based library path or a default value if this directory
+%% does not exist
+libpath(App) ->
+    PrivDir    = code:priv_dir(App),
+    ArchDir    = archname(),
+    LibArchDir = filename:join([[PrivDir,"lib",ArchDir]]),
+    case file:list_dir(LibArchDir) of
+	%% Arch lib dir exists: We use it
+	{ok, _List}  -> LibArchDir;
+	%% Arch lib dir does not exist: Return the default value
+	%% ({error, enoent}):
+	_Error -> code:lib_dir("erl_interface") ++ "/lib"
+    end.
+	   
 _EOF
    
    if ! $ERLC conftest.erl; then
@@ -69,11 +99,15 @@ _EOF
        AC_MSG_ERROR([erlang program was not properly executed, (conftest.out was not produced)])
    fi
    
+   # First line
    ERLANG_EI_DIR=`cat conftest.out | head -n 1`
+   # Second line
+   ERLANG_EI_LIB=`cat conftest.out | head -n 2 | tail -n 1`
+   # Third line
    ERLANG_DIR=`cat conftest.out | tail -n 1`
    
    ERLANG_CFLAGS="-I$ERLANG_EI_DIR/include -I$ERLANG_DIR/usr/include"
-   ERLANG_LIBS="-L$ERLANG_EI_DIR/lib -lerl_interface -lei"
+   ERLANG_LIBS="-L$ERLANG_EI_LIB -lerl_interface -lei"
    
    AC_SUBST(ERLANG_CFLAGS)
    AC_SUBST(ERLANG_LIBS)

src/ejabberd.cfg.example

@@ -25,6 +25,8 @@
 {access, configure, [{allow, admin}]}.
 
 % Every username can be registered via in-band registration:
+% You could replace {allow, all} with {deny, all} to prevent user from using
+% in-band registration
 {access, register, [{allow, all}]}.
 
 % After successful registration user will get message with following subject