Branch: refs/heads/master
Author: Thomas Martitz <thomas.martitz(a)mailbox.org>
Committer: Thomas Martitz <thomas.martitz(a)mailbox.org>
Date: Thu, 10 Feb 2022 20:43:51 UTC
Commit: cda112541a651e7dd6984422949e58ae3f7532ef
https://github.com/geany/geany/commit/cda112541a651e7dd6984422949e58ae3f753…
Log Message:
-----------
autotools: Do not pass --force to autoreconf
This option causes autoreconf to replace files, some of which
are tracked by git and thus cause unecessary noise, since they
gonna be changed, depending on the local versions of autotools.
Without --force only missing files are copied.
Modified Paths:
--------------
autogen.sh
Modified: autogen.sh
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -30,7 +30,7 @@ fi
echo "Processing configure.ac"
-autoreconf --force --install --verbose
+autoreconf --install --verbose
if [ "$NOCONFIGURE" = 1 ]; then
echo "Done. configure skipped."
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).
Branch: refs/heads/master
Author: Thomas Martitz <thomas.martitz(a)mailbox.org>
Committer: Thomas Martitz <thomas.martitz(a)mailbox.org>
Date: Thu, 10 Feb 2022 20:43:51 UTC
Commit: c760e4d172f82d50644916b1185a4c3527128c9b
https://github.com/geany/geany/commit/c760e4d172f82d50644916b1185a4c3527128…
Log Message:
-----------
Resolve a few warnings reported by autoreconf on my system
- AC_PROG_CC_C99 is deprecated, replace with just AC_PROG_CC and an explicit
test for C99 using cache values.
- AM_PROG_LIBTOOL is deprecated, replace with LT_INIT
- AC_USE_SYSTEM_EXTENSIONS must be used before AC_LINK_IFELSE, apparently
Modified Paths:
--------------
configure.ac
m4/geany-plugins.m4
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).
Branch: refs/heads/master
Author: Thomas Martitz <thomas.martitz(a)mailbox.org>
Committer: Thomas Martitz <thomas.martitz(a)mailbox.org>
Date: Thu, 10 Feb 2022 20:43:51 UTC
Commit: 630b40521b63dbd13bda878b99ed152bea064a28
https://github.com/geany/geany/commit/630b40521b63dbd13bda878b99ed152bea064…
Log Message:
-----------
Allow autogen.sh to be run in a seperate build directory
Some preperations were already in place but the final autoreconf
call must be done in the source tree.
Note, this wasn't possible before the switch to autoreconf either.
Modified Paths:
--------------
autogen.sh
Modified: autogen.sh
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -30,7 +30,7 @@ fi
echo "Processing configure.ac"
-autoreconf --install --verbose
+(cd $srcdir; autoreconf --install --verbose)
if [ "$NOCONFIGURE" = 1 ]; then
echo "Done. configure skipped."
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).