fixed breakage caused by me

diff --git a/.gitignore b/.gitignore
index b7e85fee5807ff2658127c677d4cd8161bad738a..a3f4d87ae1eac78f9b40acd148285d3cf7217cd2 100644 (file)
--- 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 a642207e352b7aa29317a3ca1f27c6cb622db367..ff2ddd526d4ab27cad48e28805ac4c10a4b424b6 100644 (file)
--- 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 b169597a760b913ccc49c025b64f6a854782f136..bfff28ab0b4696d2d36138aea05796b11c7d736f 100644 (file)
--- 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;