From 3438bb17c0e17d5bed7df7f03dc3ffefc886db1e 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 | 7 +++----
configure | 46 +---------------------------------------------
configure.ac | 6 ++----
3 files changed, 6 insertions(+), 53 deletions(-)
diff --git a/autogen.sh b/autogen.sh
index 1485429f..2b34753c 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -2,9 +2,8 @@
set -e
-aclocal -I acinclude
-automake --foreign --include-deps --add-missing --copy
-autoconf
+"${ACLOCAL:-aclocal}" -I acinclude
+"${AUTOMAKE:-automake}" --foreign --include-deps --add-missing --copy
+"${AUTOCONF:-autoconf}"
-#./configure $*
echo "Now you are ready to run ./configure"
diff --git a/configure b/configure
index 8e7aeeb6..4c837d43 100755
--- a/configure
+++ b/configure
@@ -10937,9 +10937,9 @@ LT_MAJOR=0
LT_AGE=`expr $BINARY_AGE - $INTERFACE_AGE`
LT_CURRENT=`expr $LT_MAJOR + $LT_AGE`
LT_REVISION=$INTERFACE_AGE
+LT_EXTRA=""
-LT_EXTRA=""
@@ -13177,50 +13177,6 @@ else
RC="$ac_cv_prog_RC"
fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for inline" >&5
-printf %s "checking for inline... " >&6; }
-if test ${ac_cv_c_inline+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
- ac_cv_c_inline=no
-for ac_kw in inline __inline__ __inline; do
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#ifndef __cplusplus
-typedef int foo_t;
-static $ac_kw foo_t static_foo (void) {return 0; }
-$ac_kw foo_t foo (void) {return 0; }
-#endif
-
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
- ac_cv_c_inline=$ac_kw
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
- test "$ac_cv_c_inline" != no && break
-done
-
-fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_inline" >&5
-printf "%s\n" "$ac_cv_c_inline" >&6; }
-
-case $ac_cv_c_inline in
- inline | yes) ;;
- *)
- case $ac_cv_c_inline in
- no) ac_val=;;
- *) ac_val=$ac_cv_c_inline;;
- esac
- cat >>confdefs.h <<_ACEOF
-#ifndef __cplusplus
-#define inline $ac_val
-#endif
-_ACEOF
- ;;
-esac
-
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
printf %s "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
diff --git a/configure.ac b/configure.ac
index 34066d73..cf4a2c51 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7,7 +7,7 @@ m4_define([MINOR_VERSION_MACRO], [5])
m4_define([MICRO_VERSION_MACRO], [1])
AC_INIT([SDL2_image],
- MAJOR_VERSION_MACRO.MINOR_VERSION_MACRO.MICRO_VERSION_MACRO,
+ [MAJOR_VERSION_MACRO.MINOR_VERSION_MACRO.MICRO_VERSION_MACRO],
[https://github.com/libsdl-org/SDL_image/issues],
[SDL2_image])
AC_CONFIG_MACRO_DIR([acinclude])
@@ -40,10 +40,9 @@ LT_MAJOR=0
LT_AGE=`expr $BINARY_AGE - $INTERFACE_AGE`
LT_CURRENT=`expr $LT_MAJOR + $LT_AGE`
LT_REVISION=$INTERFACE_AGE
+LT_EXTRA=""
m4_pattern_allow([LT_MAJOR])
-LT_EXTRA="" dnl for OS2 dll name
-
AC_SUBST(LT_RELEASE)
AC_SUBST(LT_CURRENT)
AC_SUBST(LT_REVISION)
@@ -65,7 +64,6 @@ dnl Check for tools
AC_PROG_CC
AC_PROG_OBJC
AC_CHECK_TOOL(RC,[windres],[:])
-AC_C_INLINE
AC_PROG_INSTALL
AC_PROG_MAKE_SET
PKG_PROG_PKG_CONFIG