From: Felix Morgner <felix.morgner@gmail.com>
Date: Wed, 26 Feb 2014 20:43:32 +0000 (+0100)
Subject: fixed breakage caused by me
X-Git-Url: http://git.code-monkey.de/?p=umurmur.git;a=commitdiff_plain;h=04b1b47d287fa54a1c036c2bd9c776dd91478fc1

fixed breakage caused by me
---

diff --git a/.gitignore b/.gitignore
index b7e85fe..a3f4d87 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,17 @@
 build
 config.h
+
+# Autotools noise
+Makefile.in
+aclocal.m4
+autom4te.cache/
+config.guess
+config.h.in
+config.h.in~
+config.sub
+configure
+depcomp
+install-sh
+missing
+src/Makefile.in
+
diff --git a/configure.ac b/configure.ac
index a642207..ff2ddd5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -86,6 +86,8 @@ AS_IF([test "x$with_ssl" = xopenssl], [
 	AC_CHECK_LIB([ssl], [SSL_library_init], [], [AC_MSG_ERROR([could not find libssl])])
 ])
 
+AC_DEFINE([DEFAULT_CONFIG], ["/etc/umurmur.conf"], [Default config])
+
 # Checks for header files.
 AC_FUNC_ALLOCA
 AC_CHECK_HEADERS([arpa/inet.h fcntl.h inttypes.h limits.h netinet/tcp.h stddef.h stdint.h stdlib.h string.h sys/socket.h sys/time.h syslog.h unistd.h sys/poll.h], [], [AC_MSG_ERROR([missing a required header])])
diff --git a/src/main.c b/src/main.c
index b169597..bfff28a 100644
--- a/src/main.c
+++ b/src/main.c
@@ -54,6 +54,7 @@
 #include "client.h"
 #include "conf.h"
 #include "version.h"
+#include "config.h"
 
 char system_string[64], version_string[64];
 int bindport;