diff options
| author | Mickaël Rémond <mickael.remond@process-one.net> | 2007-12-01 16:06:24 +0000 |
|---|---|---|
| committer | Mickaël Rémond <mickael.remond@process-one.net> | 2007-12-01 16:06:24 +0000 |
| commit | 71c7879b48469eef31ee8ac6fa4ab591c4ca607d (patch) | |
| tree | 94e2a14d4816a0720af102ecd1e9dbc96491b986 /src | |
| parent | * src/tls/Makefile.win32: Updated for latest Win32 OpenSSL library. (diff) | |
* doc/guide.tex: Updated Windows compilation instructions.
* src/configure.erl: Likewise.
* doc/ejabberd.hrl: Preparing ejabberd 2.0.0 beta release.
* doc/version.tex: Likewise.
SVN Revision: 1009
Diffstat (limited to 'src')
| -rw-r--r-- | src/configure.erl | 18 | ||||
| -rw-r--r-- | src/ejabberd.hrl | 2 |
2 files changed, 10 insertions, 10 deletions
diff --git a/src/configure.erl b/src/configure.erl index 688f94fe5..022124ce1 100644 --- a/src/configure.erl +++ b/src/configure.erl @@ -27,25 +27,25 @@ start() -> true -> ExpatLib = "EXPAT_LIB = $(EXPAT_DIR)\\StaticLibs\\libexpatMT.lib\n", ExpatFlag = "EXPAT_FLAG = -DXML_STATIC\n", - IconvDir = "ICONV_DIR = c:\\progra~1\\libiconv-1.9.1-static\n", - IconvLib = "ICONV_LIB = $(ICONV_DIR)\\lib\\iconv.lib\n", - ZlibDir = "ZLIB_DIR = c:\\progra~1\\zlib-1.2.3\n", + IconvDir = "ICONV_DIR = c:\\sdk\\GnuWin32\n", + IconvLib = "ICONV_LIB = $(ICONV_DIR)\\lib\\libiconv.lib\n", + ZlibDir = "ZLIB_DIR = c:\\sdk\\GnuWin32\n", ZlibLib = "ZLIB_LIB = $(ZLIB_DIR)\\lib\\zlib.lib\n"; false -> ExpatLib = "EXPAT_LIB = $(EXPAT_DIR)\\Libs\\libexpat.lib\n", ExpatFlag = "", - IconvDir = "ICONV_DIR = c:\\progra~1\\libiconv-1.9.1\n", - IconvLib = "ICONV_LIB = $(ICONV_DIR)\\lib\\iconv.lib\n", - ZlibDir = "ZLIB_DIR = c:\\progra~1\\zlib-1.2.3\n", - ZlibLib = "ZLIB_LIB = $(ZLIB_DIR)\\lib\\zlib1.lib\n" + IconvDir = "ICONV_DIR = c:\\sdk\\GnuWin32\n", + IconvLib = "ICONV_LIB = $(ICONV_DIR)\\lib\\libiconv.lib\n", + ZlibDir = "ZLIB_DIR = c:\\sdk\\GnuWin32\n", + ZlibLib = "ZLIB_LIB = $(ZLIB_DIR)\\lib\\zlib.lib\n" end, EVersion = "ERLANG_VERSION = " ++ erlang:system_info(version) ++ "\n", EIDirS = "EI_DIR = " ++ code:lib_dir("erl_interface") ++ "\n", RootDirS = "ERLANG_DIR = " ++ code:root_dir() ++ "\n", Version = "EJABBERD_VERSION = " ++ ?VERSION ++ "\n", - ExpatDir = "EXPAT_DIR = c:\\progra~1\\expat-1.95.7\n", - OpenSSLDir = "OPENSSL_DIR = c:\\progra~1\\OpenSSL\n", + ExpatDir = "EXPAT_DIR = c:\\sdk\\Expat-2.0.0\n", + OpenSSLDir = "OPENSSL_DIR = c:\\sdk\\OpenSSL\n", DBType = "DBTYPE = generic\n", %% 'generic' or 'mssql' SSLDir = "SSLDIR = " ++ code:lib_dir("ssl") ++ "\n", diff --git a/src/ejabberd.hrl b/src/ejabberd.hrl index 2d9b8298c..b9cb99de6 100644 --- a/src/ejabberd.hrl +++ b/src/ejabberd.hrl @@ -8,7 +8,7 @@ %-define(ejabberd_debug, true). %-define(DBGFSM, true). --define(VERSION, "1.1.2"). +-define(VERSION, "2.0.0b1"). %% --------------------------------- %% Logging mechanism |