From 6f3fbc3624d6b56012741d4c3428b3436119dd5d Mon Sep 17 00:00:00 2001
From: Ozkan Sezer <[EMAIL REDACTED]>
Date: Wed, 15 Jun 2022 17:00:02 +0300
Subject: [PATCH] minor tidy-up to configury.
---
autogen.sh | 11 ++++++-----
configure | 1 -
configure.ac | 8 +++-----
3 files changed, 9 insertions(+), 11 deletions(-)
diff --git a/autogen.sh b/autogen.sh
index c4ec5b4..2b34753 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,8 +1,9 @@
#!/bin/sh
-#
-aclocal -I acinclude
-automake --foreign --include-deps --add-missing --copy
-autoconf
-#./configure $*
+set -e
+
+"${ACLOCAL:-aclocal}" -I acinclude
+"${AUTOMAKE:-automake}" --foreign --include-deps --add-missing --copy
+"${AUTOCONF:-autoconf}"
+
echo "Now you are ready to run ./configure"
diff --git a/configure b/configure
index 85fa25c..1ddf2d2 100755
--- a/configure
+++ b/configure
@@ -17757,7 +17757,6 @@ fi
-
# Finally create all the generated files
ac_config_files="$ac_config_files Makefile sdl2_net-config.cmake sdl2_net-config-version.cmake SDL2_net.spec SDL2_net.pc"
diff --git a/configure.ac b/configure.ac
index f272592..252ed76 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7,7 +7,7 @@ m4_define([MINOR_VERSION_MACRO], [1])
m4_define([MICRO_VERSION_MACRO], [0])
AC_INIT([SDL2_net],
- MAJOR_VERSION_MACRO.MINOR_VERSION_MACRO.MICRO_VERSION_MACRO,
+ [MAJOR_VERSION_MACRO.MINOR_VERSION_MACRO.MICRO_VERSION_MACRO],
[https://github.com/libsdl-org/SDL_net/issues],
[SDL2_net])
AC_CONFIG_MACRO_DIR([acinclude])
@@ -49,10 +49,9 @@ LT_MAJOR=0
LT_REVISION=$INTERFACE_AGE
LT_AGE=`expr $BINARY_AGE - $INTERFACE_AGE`
LT_CURRENT=`expr $LT_MAJOR + $LT_AGE`
-LT_EXTRA="" dnl for OS2 dll name
+LT_EXTRA=""
m4_pattern_allow([^LT_MAJOR$])
-
dnl For use in static assertions
AC_DEFINE_UNQUOTED([SDL_BUILD_MAJOR_VERSION], $MAJOR_VERSION, [ ])
AC_DEFINE_UNQUOTED([SDL_BUILD_MINOR_VERSION], $MINOR_VERSION, [ ])
@@ -68,7 +67,7 @@ dnl Detect the canonical build and host environments
AC_CANONICAL_HOST
dnl Setup for automake
-AM_INIT_AUTOMAKE([1.16 foreign subdir-objects tar-ustar])
+AM_INIT_AUTOMAKE([foreign subdir-objects tar-ustar])
dnl Check for tools
AC_PROG_CC
@@ -248,7 +247,6 @@ AC_SUBST(ENABLE_SHARED_FALSE)
AC_SUBST(ENABLE_STATIC_TRUE)
AC_SUBST(ENABLE_STATIC_FALSE)
-
# Finally create all the generated files
AC_CONFIG_FILES([
Makefile