From f180bcae24e3bc182b388bac02b97d6c47082998 Mon Sep 17 00:00:00 2001
From: Joachim Wiberg <troglobit@gmail.com>
Date: Tue, 18 Apr 2023 10:07:14 +0200
Subject: [PATCH] src/net: convert to GNU Configure & Build system

 - Simplify build process, including cross compilation
 - Add basic test framework, available as `make check`

Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
---
 src/net/.gitignore       | 11 +++++++++++
 src/net/Makefile         | 14 --------------
 src/net/Makefile.am      |  4 ++++
 src/net/autogen.sh       |  3 +++
 src/net/configure.ac     | 40 ++++++++++++++++++++++++++++++++++++++++
 src/net/src/Makefile.am  |  5 +++++
 src/net/{ => src}/main.c |  0
 src/net/test/Makefile.am |  6 ++++++
 8 files changed, 69 insertions(+), 14 deletions(-)
 delete mode 100644 src/net/Makefile
 create mode 100644 src/net/Makefile.am
 create mode 100755 src/net/autogen.sh
 create mode 100644 src/net/configure.ac
 create mode 100644 src/net/src/Makefile.am
 rename src/net/{ => src}/main.c (100%)
 create mode 100644 src/net/test/Makefile.am

diff --git a/src/net/.gitignore b/src/net/.gitignore
index 5166df2d..15b6c7eb 100644
--- a/src/net/.gitignore
+++ b/src/net/.gitignore
@@ -1,2 +1,13 @@
 *.o
+*.log
+*.trs
 net
+Makefile
+Makefile.in
+aclocal.m4
+autom4te.cache/
+aux/
+config.*
+configure
+src/.deps/
+stamp-h1
diff --git a/src/net/Makefile b/src/net/Makefile
deleted file mode 100644
index 5c14a66e..00000000
--- a/src/net/Makefile
+++ /dev/null
@@ -1,14 +0,0 @@
-LDLIBS = -lite
-EXEC   = net
-
-net: main.o
-	$(CC) -o $@ $^ $(LDLIBS)
-
-check: $(EXEC)
-	./test.sh
-
-clean:
-	$(RM) net
-
-distclean: clean
-	$(RM) *.o *~
diff --git a/src/net/Makefile.am b/src/net/Makefile.am
new file mode 100644
index 00000000..fd16c15f
--- /dev/null
+++ b/src/net/Makefile.am
@@ -0,0 +1,4 @@
+SUBDIRS         = src test
+DISTCLEANFILES  = *~ *.d
+ACLOCAL_AMFLAGS = -I m4
+
diff --git a/src/net/autogen.sh b/src/net/autogen.sh
new file mode 100755
index 00000000..69ad0e18
--- /dev/null
+++ b/src/net/autogen.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+autoreconf -W portability -vifm
diff --git a/src/net/configure.ac b/src/net/configure.ac
new file mode 100644
index 00000000..bf7350df
--- /dev/null
+++ b/src/net/configure.ac
@@ -0,0 +1,40 @@
+AC_PREREQ(2.61)
+AC_INIT([net], [1.0], [https://github.com/kernelkit/infix/issues])
+AC_CONFIG_AUX_DIR(aux)
+AM_INIT_AUTOMAKE([1.11 foreign])
+AM_SILENT_RULES([yes])
+
+AC_CONFIG_SRCDIR([src/main.c])
+AC_CONFIG_HEADERS([config.h])
+AC_CONFIG_FILES([Makefile src/Makefile test/Makefile])
+AC_CONFIG_MACRO_DIR([m4])
+
+AC_PROG_CC
+AC_PROG_INSTALL
+
+# Check for pkg-config first, warn if it's not installed
+PKG_PROG_PKG_CONFIG
+PKG_CHECK_MODULES([libite],  [libite >= 2.5.0])
+
+AC_OUTPUT
+
+SYSCONFDIR=`eval echo $sysconfdir`
+RUNSTATEDIR=`eval echo $runstatedir`
+RUNSTATEDIR=`eval echo $RUNSTATEDIR`
+cat <<EOF
+
+------------------ Summary ------------------
+ $PACKAGE_NAME version $PACKAGE_VERSION
+  Prefix.........: $prefix
+  Sysconfdir.....: $SYSCONFDIR
+  Runstatedir....: $RUNSTATEDIR
+  C Compiler.....: $CC $CFLAGS $CPPFLAGS $LDFLAGS $LIBS
+
+------------- Compiler version --------------
+$($CC --version || true)
+---------------------------------------------
+
+Check the above options and compile with:
+ ${MAKE-make}
+
+EOF
diff --git a/src/net/src/Makefile.am b/src/net/src/Makefile.am
new file mode 100644
index 00000000..c9b18fa2
--- /dev/null
+++ b/src/net/src/Makefile.am
@@ -0,0 +1,5 @@
+sbin_PROGRAMS   = net
+
+net_SOURCES     = main.c
+net_CFLAGS      = $(libite_CFLAGS) -Wall -Wextra -Werror -Wno-unused-parameter
+net_LDADD       = $(libite_LIBS)
diff --git a/src/net/main.c b/src/net/src/main.c
similarity index 100%
rename from src/net/main.c
rename to src/net/src/main.c
diff --git a/src/net/test/Makefile.am b/src/net/test/Makefile.am
new file mode 100644
index 00000000..12a88309
--- /dev/null
+++ b/src/net/test/Makefile.am
@@ -0,0 +1,6 @@
+EXTRA_DIST         = three-independent.sh
+CLEANFILES         = *~ *.trs *.log
+
+TEST_EXTENSIONS    = .sh
+TESTS_ENVIRONMENT  = unshare -mrun
+TESTS              = three-independent.sh