From 70aa4abefb376986ea2f25aa20dfa677abd099ef Mon Sep 17 00:00:00 2001
From: Vadim Yanitskiy <vyanitskiy@sysmocom.de>
Date: Sun, 14 Aug 2022 12:42:42 +0700
Subject: [PATCH] Makefile.am, configure.ac: fix autoreconf related warnings

* aclocal: warning: couldn't open directory 'm4': No such file or directory
* libtoolize: Consider adding 'AC_CONFIG_MACRO_DIRS([m4])' to configure.ac
* libtoolize: Consider adding '-I m4' to ACLOCAL_AMFLAGS in Makefile.am
* configure.ac:9: warning: 'AM_CONFIG_HEADER': this macro is obsolete
  configure.ac:9: You should use the 'AC_CONFIG_HEADERS' macro instead
* configure.ac:22: warning: The macro `AC_PROG_LIBTOOL' is obsolete
* configure.ac:86: warning: AC_OUTPUT should be used without arguments

Change-Id: I3199e7de0a04b4df89d01277cdb305d33902fcc2
---
 .gitignore   |  1 +
 Makefile.am  |  2 ++
 configure.ac | 20 +++++++++++---------
 m4/.gitkeep  |  0
 4 files changed, 14 insertions(+), 9 deletions(-)
 create mode 100644 m4/.gitkeep

diff --git a/.gitignore b/.gitignore
index 474a5d6..c80e81c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,5 +20,6 @@ debian/autoreconf*
 debian/tmp
 debian/*.log
 debian/*.substvars
+m4/*.m4
 
 contrib/libsmpp34.spec
diff --git a/Makefile.am b/Makefile.am
index f888647..4b1006e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,3 +1,5 @@
+ACLOCAL_AMFLAGS = -I m4
+
 SUBDIRS = binaries def_frame def_list
 
 if HAVE_LIBXML2
diff --git a/configure.ac b/configure.ac
index b25602d..fce48b4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6,7 +6,8 @@ AC_INIT(libsmpp34, m4_esyscmd([./git-version-gen .tarball-version]), ultraismo@y
 
 AC_CONFIG_AUX_DIR(aux_config)
 AM_INIT_AUTOMAKE([foreign])
-AM_CONFIG_HEADER([aux_config/config.h])
+AC_CONFIG_HEADERS([aux_config/config.h])
+AC_CONFIG_MACRO_DIRS([m4])
 
 dnl kernel style compile messages
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
@@ -18,8 +19,8 @@ AC_SUBST([RELMAKE])
 # Checks for programs.
 AC_PROG_CC
 AM_PROG_CC_C_O
-AC_PROG_LIBTOOL
 AC_PROG_INSTALL
+LT_INIT
 
 dnl patching ${archive_cmds} to affect generation of file "libtool" to fix linking with clang 
 AS_CASE(["$LD"],[*clang*],
@@ -82,10 +83,11 @@ fi
 AC_MSG_RESULT([CFLAGS="$CFLAGS"])
 AC_MSG_RESULT([CPPFLAGS="$CPPFLAGS"])
 
-AC_OUTPUT([Makefile
-           def_frame/Makefile
-           def_list/Makefile
-           binaries/Makefile
-           test_apps/Makefile
-	   libsmpp34.pc
-	   contrib/libsmpp34.spec])
+AC_CONFIG_FILES([Makefile
+		 def_frame/Makefile
+		 def_list/Makefile
+		 binaries/Makefile
+		 test_apps/Makefile
+		 libsmpp34.pc
+		 contrib/libsmpp34.spec])
+AC_OUTPUT
diff --git a/m4/.gitkeep b/m4/.gitkeep
new file mode 100644
index 0000000..e69de29