From 9e83f58139663217495f22b37c1031b5c1f71266 Mon Sep 17 00:00:00 2001
From: angt <angt@users.noreply.github.com>
Date: Tue, 3 Nov 2015 17:12:18 +0100
Subject: [PATCH] Use autotools

---
 Makefile     | 40 ----------------------------------------
 Makefile.am  |  3 +++
 autogen.sh   |  2 ++
 configure.ac | 17 +++++++++++++++++
 4 files changed, 22 insertions(+), 40 deletions(-)
 delete mode 100644 Makefile
 create mode 100644 Makefile.am
 create mode 100755 autogen.sh
 create mode 100644 configure.ac

diff --git a/Makefile b/Makefile
deleted file mode 100644
index 30cd677..0000000
--- a/Makefile
+++ /dev/null
@@ -1,40 +0,0 @@
-CC      := gcc
-LDFLAGS := -Wl,-O1,--sort-common,--as-needed
-CFLAGS  := -ffreestanding -Wall -Wextra
-LDLIBS  := -lsodium
-
-prefix  := /usr/local
-
-ifdef temps
-CFLAGS += -save-temps
-endif
-
-ifdef debug
-CFLAGS += -O0 -fno-omit-frame-pointer
-FLAGS  += -g
-else
-CFLAGS += -O3 -fomit-frame-pointer -DNDEBUG
-endif
-
-ifdef sanitize
-FLAGS += -fsanitize=$(sanitize)
-endif
-
-CFLAGS  += $(FLAGS)
-LDFLAGS += $(FLAGS)
-
-.PHONY: default install clean setcap
-
-default: glorytun
-
-install:
-	install -m 755 -d $(DESTDIR)$(prefix)/bin
-	install -m 755 -s glorytun $(DESTDIR)$(prefix)/bin
-
-clean:
-	@rm -f *.[ios] glorytun
-
-setcap:
-	setcap cap_net_admin+ep glorytun
-
-glorytun.o: common.h common-static.h
diff --git a/Makefile.am b/Makefile.am
new file mode 100644
index 0000000..db145ae
--- /dev/null
+++ b/Makefile.am
@@ -0,0 +1,3 @@
+bin_PROGRAMS = glorytun
+glorytun_SOURCES = glorytun.c common.h common-static.h
+glorytun_LDADD = $(sodium_LIBS)
diff --git a/autogen.sh b/autogen.sh
new file mode 100755
index 0000000..08240fd
--- /dev/null
+++ b/autogen.sh
@@ -0,0 +1,2 @@
+#!/bin/sh
+autoreconf -i -f
diff --git a/configure.ac b/configure.ac
new file mode 100644
index 0000000..4c4ea95
--- /dev/null
+++ b/configure.ac
@@ -0,0 +1,17 @@
+AC_PREREQ([2.69])
+AC_INIT([glorytun], [0.0.1])
+AM_INIT_AUTOMAKE([-Wall -Werror foreign])
+AM_SILENT_RULES([yes])
+AC_CONFIG_SRCDIR([common.h])
+AC_PROG_CC_C99
+AC_CHECK_HEADERS([arpa/inet.h netdb.h stdint.h stdlib.h sys/ioctl.h sys/socket.h unistd.h])
+AC_C_INLINE
+AC_C_RESTRICT
+AC_TYPE_SIZE_T
+AC_TYPE_SSIZE_T
+AC_TYPE_UINT8_T
+AC_FUNC_MALLOC
+AC_CHECK_FUNCS([socket strtol])
+PKG_CHECK_MODULES([sodium], [libsodium >= 1.0.4])
+AC_CONFIG_FILES([Makefile])
+AC_OUTPUT