From 04b1b47d287fa54a1c036c2bd9c776dd91478fc1 Mon Sep 17 00:00:00 2001 From: Felix Morgner Date: Wed, 26 Feb 2014 21:43:32 +0100 Subject: [PATCH] fixed breakage caused by me --- .gitignore | 15 +++++++++++++++ configure.ac | 2 ++ src/main.c | 1 + 3 files changed, 18 insertions(+) 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; -- 2.30.2