From b6cc651887ed06690e077b31631257e19f709948 Mon Sep 17 00:00:00 2001
From: xHire <xhire@wrapsix.org>
Date: Sat, 28 Oct 2017 09:08:45 +0200
Subject: [PATCH] Fixed autoheader.h.in

Base for the patch provided by Olivier Verriest <verri@x25.pm>
---
 .gitignore         |  1 -
 configure.ac       |  5 +++--
 m4/as_ac_expand.m4 | 49 ++++++++++++++++++++++++++++++++++++++++++++++
 src/Makefile.am    |  3 ---
 4 files changed, 52 insertions(+), 6 deletions(-)
 create mode 100644 m4/as_ac_expand.m4

diff --git a/.gitignore b/.gitignore
index f6a5486..6c25da6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,7 +14,6 @@ src/Makefile.in
 Makefile
 src/Makefile
 INSTALL
-src/autoconfig.h.in.in
 src/autoconfig.h.in
 src/autoconfig.h
 src/stamp-h1
diff --git a/configure.ac b/configure.ac
index fb8b7cd..35ea369 100644
--- a/configure.ac
+++ b/configure.ac
@@ -14,7 +14,7 @@ AC_CONFIG_FILES([
 	src/Makefile
 ])
 AC_CONFIG_MACRO_DIR([m4])
-AC_CONFIG_HEADER([src/autoconfig.h.in])
+AC_CONFIG_HEADER([src/autoconfig.h])
 
 ###
 # Configuration options
@@ -33,7 +33,8 @@ else
 fi
 
 
-AC_DEFINE([SYSCONFDIR], "--sysconfdir--", [Configuration files directory])
+AS_AC_EXPAND(XSYSCONFDIR, ${sysconfdir})
+AC_DEFINE_UNQUOTED([SYSCONFDIR], "$XSYSCONFDIR", [Configuration files directory])
 
 ###
 # Final commands
diff --git a/m4/as_ac_expand.m4 b/m4/as_ac_expand.m4
new file mode 100644
index 0000000..deebd2b
--- /dev/null
+++ b/m4/as_ac_expand.m4
@@ -0,0 +1,49 @@
+dnl as-ac-expand.m4 0.2.0                                   -*- autoconf -*-
+dnl autostars m4 macro for expanding directories using configure's prefix
+
+dnl (C) 2003, 2004, 2005 Thomas Vander Stichele <thomas at apestaart dot org>
+
+dnl Copying and distribution of this file, with or without modification,
+dnl are permitted in any medium without royalty provided the copyright
+dnl notice and this notice are preserved.
+
+dnl AS_AC_EXPAND(VAR, CONFIGURE_VAR)
+
+dnl example:
+dnl AS_AC_EXPAND(SYSCONFDIR, $sysconfdir)
+dnl will set SYSCONFDIR to /usr/local/etc if prefix=/usr/local
+
+AC_DEFUN([AS_AC_EXPAND],
+[
+  EXP_VAR=[$1]
+  FROM_VAR=[$2]
+
+  dnl first expand prefix and exec_prefix if necessary
+  prefix_save=$prefix
+  exec_prefix_save=$exec_prefix
+
+  dnl if no prefix given, then use /usr/local, the default prefix
+  if test "x$prefix" = "xNONE"; then
+    prefix="$ac_default_prefix"
+  fi
+  dnl if no exec_prefix given, then use prefix
+  if test "x$exec_prefix" = "xNONE"; then
+    exec_prefix=$prefix
+  fi
+
+  full_var="$FROM_VAR"
+  dnl loop until it doesn't change anymore
+  while true; do
+    new_full_var="`eval echo $full_var`"
+    if test "x$new_full_var" = "x$full_var"; then break; fi
+    full_var=$new_full_var
+  done
+
+  dnl clean up
+  full_var=$new_full_var
+  AC_SUBST([$1], "$full_var")
+
+  dnl restore prefix and exec_prefix
+  prefix=$prefix_save
+  exec_prefix=$exec_prefix_save
+])
diff --git a/src/Makefile.am b/src/Makefile.am
index bc7ae48..2dfa1e0 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -16,6 +16,3 @@ wrapsix_SOURCES = \
 		  transmitter.c transmitter.h \
 		  udp.c udp.h \
 		  wrapper.c wrapper.h
-
-autoconfig.h:
-	sed -e 's|--sysconfdir--|$(sysconfdir)|' autoconfig.h.in > autoconfig.h