From: Guus Sliepen <guus@meshlink.io>
Date: Sun, 8 Oct 2017 18:22:56 +0000 (+0200)
Subject: Ensure make distcheck runs without errors.
X-Git-Url: http://git.meshlink.io/?p=meshlink;a=commitdiff_plain;h=1797680356b8a9256fd233a126f0b4cae9d52b17

Ensure make distcheck runs without errors.
---

diff --git a/.gitmodules b/.gitmodules
index 4c6c665a..5dbf3496 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,6 @@
 [submodule "catta"]
 	path = catta
-	url = https://github.com/everbase/catta.git
+	url = git://meshlink.io/catta
 	branch = develop
 [submodule "src/utcp"]
 	path = src/utcp
diff --git a/Makefile.am b/Makefile.am
index 26d555c7..f7de2b76 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,7 +2,7 @@
 
 AUTOMAKE_OPTIONS = gnu
 
-SUBDIRS =  m4 catta src doc test examples
+SUBDIRS =  catta src doc test examples
 
 ACLOCAL_AMFLAGS = -I m4 
 
diff --git a/catta b/catta
index 82eb6a93..08ac450b 160000
--- a/catta
+++ b/catta
@@ -1 +1 @@
-Subproject commit 82eb6a9379c6a472b124ee2e03c71602000139e7
+Subproject commit 08ac450b42b7533e97c02c02bbbef8946b9582fb
diff --git a/configure.ac b/configure.ac
index f62eff73..ed9dc432 100644
--- a/configure.ac
+++ b/configure.ac
@@ -102,17 +102,17 @@ MeshLink_ATTRIBUTE(__malloc__)
 MeshLink_ATTRIBUTE(__warn_unused_result__)
 
 AC_CHECK_TYPES([socklen_t, struct addrinfo, struct sockaddr_in6], , ,
-  [#include "src/have.h"]
+  [#include "$srcdir/src/have.h"]
 )
 
 AC_CHECK_TYPES([struct sockaddr_storage], ,AC_MSG_ERROR([System must support struct sockaddr_storage.]),
-  [#include "src/have.h"]
+  [#include "$srcdir/src/have.h"]
 )
 
 dnl Checks for library functions.
 AC_TYPE_SIGNAL
 AC_CHECK_FUNCS([asprintf fchmod fork gettimeofday random select strdup usleep],
-  [], [], [#include "src/have.h"]
+  [], [], [#include "$srcdir/src/have.h"]
 )
 
 dnl Support for SunOS
@@ -125,11 +125,11 @@ AC_CHECK_FUNC(gethostbyname, [], [
 ])
 
 AC_CHECK_DECLS([freeaddrinfo, gai_strerror, getaddrinfo, getnameinfo],
-  [], [], [#include "src/have.h"]
+  [], [], [#include "$srcdir/src/have.h"]
 )
 
 AC_CACHE_SAVE
 
-AC_CONFIG_FILES([Makefile src/Makefile doc/Makefile m4/Makefile test/Makefile examples/Makefile])
+AC_CONFIG_FILES([Makefile src/Makefile doc/Makefile test/Makefile examples/Makefile])
 
 AC_OUTPUT
diff --git a/examples/Makefile.am b/examples/Makefile.am
index 09cd3a37..462f9d96 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -1,18 +1,18 @@
 noinst_PROGRAMS = meshlinkapp chat chatpp manynodes channels
 
-AM_CPPFLAGS = -I../src -Wall
+AM_CPPFLAGS = -I${top_srcdir}/src -iquote. -Wall
 
 meshlinkapp_SOURCES = meshlinkapp.c
-meshlinkapp_LDADD = ../src/libmeshlink.la ../catta/src/libcatta.la
+meshlinkapp_LDADD = ${top_builddir}/src/libmeshlink.la ${top_builddir}/catta/src/libcatta.la
 
 chat_SOURCES = chat.c
-chat_LDADD = ../src/libmeshlink.la ../catta/src/libcatta.la
+chat_LDADD = ${top_builddir}/src/libmeshlink.la ${top_builddir}/catta/src/libcatta.la
 
 chatpp_SOURCES = chatpp.cc
-chatpp_LDADD = ../src/libmeshlink.la ../catta/src/libcatta.la
+chatpp_LDADD = ${top_builddir}/src/libmeshlink.la ${top_builddir}/catta/src/libcatta.la
 
-manynodes_SOURCES = manynodes.cc
-manynodes_LDADD = ../src/libmeshlink.la ../catta/src/libcatta.la
+manynodes_SOURCES = manynodes.c
+manynodes_LDADD = ${top_builddir}/src/libmeshlink.la ${top_builddir}/catta/src/libcatta.la
 
 channels_SOURCES = channels.c
-channels_LDADD = ../src/libmeshlink.la ../catta/src/libcatta.la
+channels_LDADD = ${top_builddir}/src/libmeshlink.la ${top_builddir}/catta/src/libcatta.la
diff --git a/m4/Makefile.am b/m4/Makefile.am
deleted file mode 100644
index 0f58aefa..00000000
--- a/m4/Makefile.am
+++ /dev/null
@@ -1,4 +0,0 @@
-## Process this file with automake to produce Makefile.in   -*-Makefile-*-
-
-EXTRA_DIST = README *.m4
-
diff --git a/m4/README b/m4/README
deleted file mode 100644
index df032df9..00000000
--- a/m4/README
+++ /dev/null
@@ -1,8 +0,0 @@
-These files are used by a program called aclocal (part of the GNU automake
-package).  aclocal uses these files to create aclocal.m4 which is in turn
-used by autoconf to create the configure script at the the top level in
-this distribution.
-
-The Makefile.am file in this directory is automatically generated
-from the template file, Makefile.am.in.  The generation will fail
-if you don't have all the right tools.
diff --git a/src/Makefile.am b/src/Makefile.am
index 21e45f7d..2e91c23a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -23,7 +23,8 @@ chacha_poly1305_SOURCES = \
 	chacha-poly1305/poly1305.c chacha-poly1305/poly1305.h
 
 utcp_SOURCES = \
-	utcp/utcp.c utcp/utcp.h
+	utcp/utcp.c utcp/utcp.h \
+	utcp/utcp_priv.h
 
 lib_LTLIBRARIES = libmeshlink.la
 
@@ -32,9 +33,7 @@ pkginclude_HEADERS = meshlink++.h meshlink.h
 libmeshlink_la_LDFLAGS = -export-symbols-regex '^(meshlink_|devtool_)'
 
 libmeshlink_la_SOURCES = \
-	meshlink.c meshlink.h \
 	buffer.c buffer.h \
-	cipher.h \
 	conf.c conf.h \
 	connection.c connection.h \
 	crypto.c crypto.h \
@@ -53,6 +52,9 @@ libmeshlink_la_SOURCES = \
 	have.h \
 	list.c list.h \
 	logger.c logger.h \
+	meshlink.c meshlink.h \
+	meshlink_internal.h \
+	meshlink_queue.h \
 	meta.c meta.h \
 	net.c net.h \
 	net_packet.c \
@@ -67,6 +69,7 @@ libmeshlink_la_SOURCES = \
 	protocol_key.c \
 	protocol_misc.c \
 	route.c route.h \
+	sockaddr.h \
 	splay_tree.c splay_tree.h \
 	sptps.c sptps.h \
 	system.h \
@@ -77,13 +80,13 @@ libmeshlink_la_SOURCES = \
 	$(chacha_poly1305_SOURCES) \
 	$(utcp_SOURCES)
 
-libmeshlink_la_CFLAGS = -fPIC -I../catta/include/
+libmeshlink_la_CFLAGS = -fPIC -I${top_srcdir}/catta/include/ -iquote.
 
 if MINGW
-libmeshlink_la_CFLAGS += -I../catta/src/compat/windows/include/
+libmeshlink_la_CFLAGS += -I${top_srcdir}/catta/src/compat/windows/include/
 endif
 
-libmeshlink_la_LIBADD = -lpthread ../catta/src/libcatta.la
+libmeshlink_la_LIBADD = -lpthread ${top_builddir}/catta/src/libcatta.la
 
 libmeshlink_la_SOURCES += \
 	ed25519/ecdh.c \
diff --git a/test/Makefile.am b/test/Makefile.am
index 27d88aeb..85b235d4 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -11,7 +11,7 @@ TESTS = \
 
 dist_check_SCRIPTS = $(TESTS)
 
-AM_CPPFLAGS = -I../src -Wall
+AM_CPPFLAGS = -I${top_srcdir}/src -iquote. -Wall
 
 check_PROGRAMS = \
 	basic \
@@ -38,13 +38,13 @@ basicpp_LDADD = ../src/libmeshlink.la
 trio_SOURCES = trio.c
 trio_LDADD = ../src/libmeshlink.la
 
-channels_SOURCES = channels.cpp
+channels_SOURCES = channels.c
 channels_LDADD = ../src/libmeshlink.la
 
-channels_fork_SOURCES = channels-fork.cpp
+channels_fork_SOURCES = channels-fork.c
 channels_fork_LDADD = ../src/libmeshlink.la
 
-channels_cornercases_SOURCES = channels-cornercases.cpp utils.cpp utils.h
+channels_cornercases_SOURCES = channels-cornercases.c utils.c utils.h
 channels_cornercases_LDADD = ../src/libmeshlink.la
 
 echo_fork_SOURCES = echo-fork.c