Commit 4cc118d7 authored by vvaltman's avatar vvaltman

Merge branch 'master' of github.com:vysheng/tg

Conflicts:
	Makefile.tgl
parents 9c050b0d f302863a
...@@ -69,6 +69,7 @@ If using [Homebrew](http://brew.sh/): ...@@ -69,6 +69,7 @@ If using [Homebrew](http://brew.sh/):
brew install libconfig brew install libconfig
brew install readline brew install readline
brew install lua brew install lua
brew install libevent
export CFLAGS="-I/usr/local/include -I/usr/local/Cellar/readline/6.3.8/include" export CFLAGS="-I/usr/local/include -I/usr/local/Cellar/readline/6.3.8/include"
export LDFLAGS="-L/usr/local/lib -L/usr/local/Cellar/readline/6.3.8/lib" export LDFLAGS="-L/usr/local/lib -L/usr/local/Cellar/readline/6.3.8/lib"
./configure && make ./configure && make
......
...@@ -29,6 +29,10 @@ ...@@ -29,6 +29,10 @@
#include <termios.h> #include <termios.h>
#include <unistd.h> #include <unistd.h>
#include <assert.h> #include <assert.h>
#ifdef __FreeBSD__
#include <sys/socket.h>
#include <netinet/in.h>
#endif
#if (READLINE == GNU) #if (READLINE == GNU)
#include <readline/readline.h> #include <readline/readline.h>
#else #else
...@@ -844,7 +848,11 @@ int main (int argc, char **argv) { ...@@ -844,7 +848,11 @@ int main (int argc, char **argv) {
running_for_first_time (); running_for_first_time ();
parse_config (); parse_config ();
#ifdef __FreeBSD__
tgl_set_rsa_key (TLS, "/usr/local/etc/" PROG_NAME "/server.pub");
#else
tgl_set_rsa_key (TLS, "/etc/" PROG_NAME "/server.pub"); tgl_set_rsa_key (TLS, "/etc/" PROG_NAME "/server.pub");
#endif
tgl_set_rsa_key (TLS, "tg-server.pub"); tgl_set_rsa_key (TLS, "tg-server.pub");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment