From ba76103c7ff10029ff23f0d270a8dd8fa3e40980 Mon Sep 17 00:00:00 2001
From: Joachim Wiberg <troglobit@gmail.com>
Date: Mon, 26 Feb 2024 11:51:12 +0100
Subject: [PATCH] execd: refactor to autotools

Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
---
 package/execd/execd.mk | 13 ++++-----
 src/execd/Makefile     | 26 -----------------
 src/execd/Makefile.am  |  9 ++++++
 src/execd/autogen.sh   |  3 ++
 src/execd/configure.ac | 66 ++++++++++++++++++++++++++++++++++++++++++
 5 files changed, 83 insertions(+), 34 deletions(-)
 delete mode 100644 src/execd/Makefile
 create mode 100644 src/execd/Makefile.am
 create mode 100755 src/execd/autogen.sh
 create mode 100644 src/execd/configure.ac

diff --git a/package/execd/execd.mk b/package/execd/execd.mk
index b17a1e3b..c75683bb 100644
--- a/package/execd/execd.mk
+++ b/package/execd/execd.mk
@@ -11,16 +11,13 @@ EXECD_LICENSE = ISC
 EXECD_LICENSE_FILES = LICENSE
 EXECD_REDISTRIBUTE = NO
 EXECD_DEPENDENCIES = libuev libite
+EXECD_AUTORECONF = YES
 
-define EXECD_BUILD_CMDS
-	$(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) \
-		LDFLAGS="$(TARGET_LDFLAGS)"
+define EXECD_CONF_ENV
+CFLAGS="$(INFIX_CFLAGS)"
 endef
 
-define EXECD_INSTALL_TARGET_CMDS
-	$(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) \
-		DESTDIR="$(TARGET_DIR)" install
-endef
+EXECD_CONF_OPTS = --prefix= --disable-silent-rules
 
 define EXECD_INSTALL_EXTRA
 	cp $(EXECD_PKGDIR)/execd.conf  $(FINIT_D)/available/
@@ -29,4 +26,4 @@ define EXECD_INSTALL_EXTRA
 endef
 EXECD_TARGET_FINALIZE_HOOKS += EXECD_INSTALL_EXTRA
 
-$(eval $(generic-package))
+$(eval $(autotools-package))
diff --git a/src/execd/Makefile b/src/execd/Makefile
deleted file mode 100644
index 88c5cd1e..00000000
--- a/src/execd/Makefile
+++ /dev/null
@@ -1,26 +0,0 @@
-CFLAGS   += -Wall -Wextra -Werror -Wno-unused
-CPPFLAGS += -D_GNU_SOURCE
-LDLIBS   += -luev -lite
-
-TARGET    = execd
-SRC       = execd.c
-OBJ       = $(SRC:.c=.o)
-
-all: $(TARGET)
-
-.c.o:
-	$(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $<
-
-$(OBJ): $(SRC) $(HEADERS)
-
-$(TARGET): $(OBJ)
-	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LDLIBS)
-
-clean:
-	-rm -f $(TARGET) $(OBJ)
-
-distclean: clean
-	-rm *~
-
-install: $(TARGET)
-	install -D $(TARGET) $(DESTDIR)/sbin/
diff --git a/src/execd/Makefile.am b/src/execd/Makefile.am
new file mode 100644
index 00000000..102b04d1
--- /dev/null
+++ b/src/execd/Makefile.am
@@ -0,0 +1,9 @@
+DISTCLEANFILES      = *~ *.d
+ACLOCAL_AMFLAGS     = -I m4
+
+sbin_PROGRAMS       = execd
+execd_SOURCES       = execd.c
+execd_CPPFLAGS      = -D_GNU_SOURCE
+execd_CFLAGS        = -W -Wall -Wextra -Wno-unused
+execd_CFLAGS        = $(libuev_CFLAGS) $(libite_CFLAGS)
+execd_LDADD         = $(libuev_LIBS) $(libite_LIBS)
diff --git a/src/execd/autogen.sh b/src/execd/autogen.sh
new file mode 100755
index 00000000..69ad0e18
--- /dev/null
+++ b/src/execd/autogen.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+autoreconf -W portability -vifm
diff --git a/src/execd/configure.ac b/src/execd/configure.ac
new file mode 100644
index 00000000..dfd732a1
--- /dev/null
+++ b/src/execd/configure.ac
@@ -0,0 +1,66 @@
+AC_PREREQ(2.61)
+AC_INIT([execd], [1.0.0], [https://github.com/kernelkit/infix/issues])
+AM_INIT_AUTOMAKE(1.11 foreign subdir-objects)
+AM_SILENT_RULES(yes)
+
+AC_CONFIG_FILES([
+	Makefile
+])
+
+AC_PROG_CC
+AC_PROG_INSTALL
+
+# Check for pkg-config first, warn if it's not installed
+PKG_PROG_PKG_CONFIG
+
+PKG_CHECK_MODULES([libuev], [libuev >= 2.4.0])
+PKG_CHECK_MODULES([libite], [libite >= 2.5.0])
+
+test "x$prefix" = xNONE && prefix=$ac_default_prefix
+test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
+
+DATAROOTDIR=`eval echo $datarootdir`
+DATAROOTDIR=`eval echo $DATAROOTDIR`
+AC_SUBST(DATAROOTDIR)
+
+LIBDIR=`eval echo $libdir`
+LIBDIR=`eval echo $LIBDIR`
+AC_SUBST(LIBDIR)
+
+LOCALSTATEDIR=`eval echo $localstatedir`
+LOCALSTATEDIR=`eval echo $LOCALSTATEDIR`
+AC_SUBST(LOCALSTATEDIR)
+
+RUNSTATEDIR=`eval echo $runstatedir`
+RUNSTATEDIR=`eval echo $RUNSTATEDIR`
+AC_SUBST(RUNSTATEDIR)
+
+SYSCONFDIR=`eval echo $sysconfdir`
+SYSCONFDIR=`eval echo $SYSCONFDIR`
+AC_SUBST(SYSCONFDIR)
+
+AC_OUTPUT
+
+cat <<EOF
+
+------------------ Summary ------------------
+ $PACKAGE_NAME version $PACKAGE_VERSION
+  Prefix................: $prefix
+  Exec prefix...........: $eprefix
+  Sysconfdir............: `eval echo $sysconfdir`
+  Localstatedir.........: `eval echo $localstatedir`
+  Default fstab.........: `eval echo $fstab`
+  System environment....: ${sysconfig_path:-${sysconfig}}
+  C Compiler............: $CC $CFLAGS $CPPFLAGS $LDFLAGS $LIBS
+  Linker................: $LD $LLDP_LDFLAGS $LLDP_BIN_LDFLAGS $LDFLAGS $LIBS
+
+------------- Compiler version --------------
+$($CC --version || true)
+-------------- Linker version ---------------
+$($LD --version || true)
+---------------------------------------------
+
+Check the above options and compile with:
+ ${MAKE-make}
+
+EOF