[geany/geany] 1ed556: Merge pull request #3092 from kugel-/autoreconf

[Thomas Martitz]

Branch:      refs/heads/master
Author:      Thomas Martitz <thomas.martitz at mailbox.org>
Committer:   GitHub <noreply at github.com>
Date:        Thu, 10 Feb 2022 21:10:06 UTC
Commit:      1ed5560ae77e3730716f788988be75085b66baaf
             https://github.com/geany/geany/commit/1ed5560ae77e3730716f788988be75085b66baaf

Log Message:
-----------
Merge pull request #3092 from kugel-/autoreconf

Do not pass --force to autoreconf and fix a few autoreconf warnings.


Modified Paths:
--------------
    autogen.sh
    configure.ac
    m4/geany-plugins.m4

Modified: autogen.sh
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -30,7 +30,7 @@ fi
 
 echo "Processing configure.ac"
 
-autoreconf --force --install --verbose
+(cd $srcdir; autoreconf --install --verbose)
 
 if [ "$NOCONFIGURE" = 1 ]; then
     echo "Done. configure skipped."


Modified: configure.ac
13 lines changed, 8 insertions(+), 5 deletions(-)
===================================================================
@@ -9,6 +9,10 @@ AC_CONFIG_MACRO_DIR([m4])
 AM_INIT_AUTOMAKE([1.11 -Wall parallel-tests subdir-objects])
 AC_CONFIG_HEADERS([config.h])
 
+# Silence "AC_LINK_IFELSE before AC_USE_SYSTEM_EXTENSIONS" warnings
+# Note: Enables _GNU_SOURCE on Linux
+AC_USE_SYSTEM_EXTENSIONS
+
 AM_GNU_GETTEXT_VERSION([0.19.8])
 AM_GNU_GETTEXT([external])
 
@@ -23,22 +27,21 @@ if test -n "${build}" -a -n "${target}"; then
 	GEANY_STATUS_ADD([Building Geany for], [${target}])
 fi
 
-# why do we use this?
-AC_USE_SYSTEM_EXTENSIONS
-
 m4_ifdef([AM_PROG_AR],[AM_PROG_AR])
 LT_INIT([disable-static])
 AC_PROG_CC
-AC_PROG_CC_C99
 AM_PROG_CC_C_O
-
 AC_PROG_CXX
 GEANY_PROG_CXX
 AX_CXX_COMPILE_STDCXX_17
 
 AC_PROG_INSTALL
 AC_PROG_LN_S
 
+if test "$ac_cv_prog_cc_c99" = "no"; then
+	AC_MSG_ERROR([Need a C99 compiler])
+fi
+
 # autoscan start
 
 # Checks for header files.


Modified: m4/geany-plugins.m4
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -5,7 +5,7 @@ dnl Result is available in the geany_enable_plugins variable
 AC_DEFUN([GEANY_CHECK_PLUGINS],
 [
 	AC_REQUIRE([AC_DISABLE_STATIC])
-	AC_REQUIRE([AM_PROG_LIBTOOL])
+	AC_REQUIRE([LT_INIT])
 
 	AC_ARG_ENABLE([plugins],
 			[AS_HELP_STRING([--disable-plugins], [compile without plugin support [default=no]])],



--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).