From e34b5c5adc424666d1ec08e49a4c63eda391f5e5 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sun, 23 Jul 2023 18:39:09 +0200 Subject: [PATCH] Remove unused m4 files and regenerate aclocal.m4 Some of autoconf macros are not used any longer, so get rid of them. --- aclocal.m4 | 7 +- build/aclocal/ax_gcc_option.m4 | 130 ------------------- build/aclocal/ax_gxx_version.m4 | 67 ---------- build/aclocal/gst-element-check.m4 | 23 ---- build/aclocal/gtk.m4 | 196 ----------------------------- build/autogen.mk | 2 - 6 files changed, 2 insertions(+), 423 deletions(-) delete mode 100644 build/aclocal/ax_gcc_option.m4 delete mode 100644 build/aclocal/ax_gxx_version.m4 delete mode 100644 build/aclocal/gst-element-check.m4 delete mode 100644 build/aclocal/gtk.m4 diff --git a/aclocal.m4 b/aclocal.m4 index c46ee945f5..278d4508d6 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1,6 +1,6 @@ -# generated automatically by aclocal 1.15.1 -*- Autoconf -*- +# generated automatically by aclocal 1.16.5 -*- Autoconf -*- -# Copyright (C) 1996-2017 Free Software Foundation, Inc. +# Copyright (C) 1996-2021 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -17,15 +17,12 @@ m4_include([build/aclocal/atomic_builtins.m4]) m4_include([build/aclocal/ax_cflags_gcc_option.m4]) m4_include([build/aclocal/ax_cxx_compile_stdcxx.m4]) m4_include([build/aclocal/ax_func_which_gethostbyname_r.m4]) -m4_include([build/aclocal/ax_gcc_option.m4]) -m4_include([build/aclocal/ax_gxx_version.m4]) m4_include([build/aclocal/ax_subdirs_configure.m4]) m4_include([build/aclocal/bakefile-lang.m4]) m4_include([build/aclocal/bakefile.m4]) m4_include([build/aclocal/gtk-2.0.m4]) m4_include([build/aclocal/gtk-3.0.m4]) m4_include([build/aclocal/gtk-4.0.m4]) -m4_include([build/aclocal/gtk.m4]) m4_include([build/aclocal/pkg.m4]) m4_include([build/aclocal/sdl.m4]) m4_include([build/aclocal/visibility.m4]) diff --git a/build/aclocal/ax_gcc_option.m4 b/build/aclocal/ax_gcc_option.m4 deleted file mode 100644 index a9869ff2c5..0000000000 --- a/build/aclocal/ax_gcc_option.m4 +++ /dev/null @@ -1,130 +0,0 @@ -# =========================================================================== -# http://autoconf-archive.cryp.to/ax_gcc_option.html -# =========================================================================== -# -# SYNOPSIS -# -# AX_GCC_OPTION(OPTION,EXTRA-OPTIONS,TEST-PROGRAM,ACTION-IF-SUCCESSFUL,ACTION-IF-NOT-SUCCESFUL) -# -# DESCRIPTION -# -# AX_GCC_OPTION checks wheter gcc accepts the passed OPTION. If it accepts -# the OPTION then ACTION-IF-SUCCESSFUL will be executed, otherwise -# ACTION-IF-UNSUCCESSFUL. -# -# NOTE: This macro will be obsoleted by AX_C_CHECK_FLAG AX_CXX_CHECK_FLAG, -# AX_CPP_CHECK_FLAG, AX_CXXCPP_CHECK_FLAG and AX_LD_CHECK_FLAG. -# -# A typical usage should be the following one: -# -# AX_GCC_OPTION([-fomit-frame-pointer],[],[],[ -# AC_MSG_NOTICE([The option is supported])],[ -# AC_MSG_NOTICE([No luck this time]) -# ]) -# -# The macro doesn't discriminate between languages so, if you are testing -# for an option that works for C++ but not for C you should use '-x c++' -# as EXTRA-OPTIONS: -# -# AX_GCC_OPTION([-fno-rtti],[-x c++],[],[ ... ],[ ... ]) -# -# OPTION is tested against the following code: -# -# int main() -# { -# return 0; -# } -# -# The optional TEST-PROGRAM comes handy when the default main() is not -# suited for the option being checked -# -# So, if you need to test for -fstrict-prototypes option you should -# probably use the macro as follows: -# -# AX_GCC_OPTION([-fstrict-prototypes],[-x c++],[ -# int main(int argc, char ** argv) -# { -# (void) argc; -# (void) argv; -# -# return 0; -# } -# ],[ ... ],[ ... ]) -# -# Note that the macro compiles but doesn't link the test program so it is -# not suited for checking options that are passed to the linker, like: -# -# -Wl,-L -# -# In order to avoid such kind of problems you should think about usinguse -# the AX_*_CHECK_FLAG family macros -# -# LAST MODIFICATION -# -# 2008-04-12 -# -# COPYLEFT -# -# Copyright (c) 2008 Francesco Salvestrini -# Copyright (c) 2008 Bogdan Drozdowski -# -# This program is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by the -# Free Software Foundation; either version 2 of the License, or (at your -# option) any later version. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General -# Public License for more details. -# -# You should have received a copy of the GNU General Public License along -# with this program. If not, see . -# -# As a special exception, the respective Autoconf Macro's copyright owner -# gives unlimited permission to copy, distribute and modify the configure -# scripts that are the output of Autoconf when processing the Macro. You -# need not follow the terms of the GNU General Public License when using -# or distributing such scripts, even though portions of the text of the -# Macro appear in them. The GNU General Public License (GPL) does govern -# all other use of the material that constitutes the Autoconf Macro. -# -# This special exception to the GPL applies to versions of the Autoconf -# Macro released by the Autoconf Macro Archive. When you make and -# distribute a modified version of the Autoconf Macro, you may extend this -# special exception to the GPL to apply to your modified version as well. - -AC_DEFUN([AX_GCC_OPTION], [ - AC_REQUIRE([AC_PROG_CC]) - - AC_MSG_CHECKING([if gcc accepts $1 option]) - - AS_IF([ test "x$GCC" = "xyes" ],[ - AS_IF([ test -z "$3" ],[ - ax_gcc_option_test="int main() -{ - return 0; -}" - ],[ - ax_gcc_option_test="$3" - ]) - - # Dump the test program to file - cat < conftest.c -$ax_gcc_option_test -EOF - - # Dump back the file to the log, useful for debugging purposes - AC_TRY_COMMAND(cat conftest.c 1>&AS_MESSAGE_LOG_FD) - - AS_IF([ AC_TRY_COMMAND($CC $2 $1 -c conftest.c 1>&AS_MESSAGE_LOG_FD) ],[ - AC_MSG_RESULT([yes]) - $4 - ],[ - AC_MSG_RESULT([no]) - $5 - ]) - ],[ - AC_MSG_RESULT([no gcc available]) - ]) -]) diff --git a/build/aclocal/ax_gxx_version.m4 b/build/aclocal/ax_gxx_version.m4 deleted file mode 100644 index 4b1fdd0fd1..0000000000 --- a/build/aclocal/ax_gxx_version.m4 +++ /dev/null @@ -1,67 +0,0 @@ -# =========================================================================== -# http://autoconf-archive.cryp.to/ax_gxx_version.html -# =========================================================================== -# -# SYNOPSIS -# -# AX_GXX_VERSION -# -# DESCRIPTION -# -# This macro retrieves the g++ version and returns it in the GXX_VERSION -# variable if available, an empty string otherwise. -# -# LAST MODIFICATION -# -# 2008-04-12 -# -# COPYLEFT -# -# Copyright (c) 2008 Francesco Salvestrini -# -# This program is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by the -# Free Software Foundation; either version 2 of the License, or (at your -# option) any later version. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General -# Public License for more details. -# -# You should have received a copy of the GNU General Public License along -# with this program. If not, see . -# -# As a special exception, the respective Autoconf Macro's copyright owner -# gives unlimited permission to copy, distribute and modify the configure -# scripts that are the output of Autoconf when processing the Macro. You -# need not follow the terms of the GNU General Public License when using -# or distributing such scripts, even though portions of the text of the -# Macro appear in them. The GNU General Public License (GPL) does govern -# all other use of the material that constitutes the Autoconf Macro. -# -# This special exception to the GPL applies to versions of the Autoconf -# Macro released by the Autoconf Macro Archive. When you make and -# distribute a modified version of the Autoconf Macro, you may extend this -# special exception to the GPL to apply to your modified version as well. - -AC_DEFUN([AX_GXX_VERSION], [ - GXX_VERSION="" - AX_GCC_OPTION([-dumpversion],[],[],[ - ax_gcc_version_option=yes - ],[ - ax_gcc_version_option=no - ]) - AS_IF([test "x$GXX" = "xyes"],[ - AS_IF([test "x$ax_gxx_version_option" != "no"],[ - AC_CACHE_CHECK([gxx version],[ax_cv_gxx_version],[ - ax_cv_gxx_version="`$CXX -dumpversion`" - AS_IF([test "x$ax_cv_gxx_version" = "x"],[ - ax_cv_gxx_version="" - ]) - ]) - GXX_VERSION=$ax_cv_gxx_version - ]) - ]) - AC_SUBST([GXX_VERSION]) -]) diff --git a/build/aclocal/gst-element-check.m4 b/build/aclocal/gst-element-check.m4 deleted file mode 100644 index e608f195d0..0000000000 --- a/build/aclocal/gst-element-check.m4 +++ /dev/null @@ -1,23 +0,0 @@ -dnl Perform a check for a GStreamer element using gst-inspect -dnl Thomas Vander Stichele -dnl Last modification: 25/01/2005 - -dnl AM_GST_ELEMENT_CHECK(ELEMENT-NAME, ACTION-IF-FOUND, ACTION-IF-NOT-FOUND) - -AC_DEFUN([AM_GST_ELEMENT_CHECK], -[ - if test "x$GST_INSPECT" == "x"; then - AC_CHECK_PROG(GST_INSPECT, gst-inspect, gst-inspect, []) - fi - - if test "x$GST_INSPECT" != "x"; then - AC_MSG_CHECKING(GStreamer element $1) - if [ $GST_INSPECT $1 > /dev/null 2> /dev/null ]; then - AC_MSG_RESULT(found.) - $2 - else - AC_MSG_RESULT(not found.) - $3 - fi - fi -]) diff --git a/build/aclocal/gtk.m4 b/build/aclocal/gtk.m4 deleted file mode 100644 index 0a9961fb66..0000000000 --- a/build/aclocal/gtk.m4 +++ /dev/null @@ -1,196 +0,0 @@ -# Configure paths for GTK+ -# Owen Taylor 97-11-3 - -dnl AM_PATH_GTK([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]]) -dnl Test for GTK, and define GTK_CFLAGS and GTK_LIBS -dnl -AC_DEFUN([AM_PATH_GTK], -[dnl -dnl Get the cflags and libraries from the gtk-config script -dnl -AC_ARG_WITH(gtk-prefix,[ --with-gtk-prefix=PFX Prefix where GTK is installed (optional)], - gtk_config_prefix="$withval", gtk_config_prefix="") -AC_ARG_WITH(gtk-exec-prefix,[ --with-gtk-exec-prefix=PFX Exec prefix where GTK is installed (optional)], - gtk_config_exec_prefix="$withval", gtk_config_exec_prefix="") -AC_ARG_ENABLE(gtktest, [ --disable-gtktest Do not try to compile and run a test GTK program], - , enable_gtktest=yes) - - for module in . $4 - do - case "$module" in - gthread) - gtk_config_args="$gtk_config_args gthread" - ;; - esac - done - - if test x$gtk_config_exec_prefix != x ; then - gtk_config_args="$gtk_config_args --exec-prefix=$gtk_config_exec_prefix" - if test x${GTK_CONFIG+set} != xset ; then - GTK_CONFIG=$gtk_config_exec_prefix/bin/gtk-config - fi - fi - if test x$gtk_config_prefix != x ; then - gtk_config_args="$gtk_config_args --prefix=$gtk_config_prefix" - if test x${GTK_CONFIG+set} != xset ; then - GTK_CONFIG=$gtk_config_prefix/bin/gtk-config - fi - fi - - AC_PATH_PROG(GTK_CONFIG, gtk-config, no) - min_gtk_version=ifelse([$1], ,0.99.7,$1) - AC_MSG_CHECKING(for GTK - version >= $min_gtk_version) - no_gtk="" - if test "$GTK_CONFIG" = "no" ; then - no_gtk=yes - else - GTK_CFLAGS=`$GTK_CONFIG $gtk_config_args --cflags` - GTK_LIBS=`$GTK_CONFIG $gtk_config_args --libs` - gtk_config_major_version=`$GTK_CONFIG $gtk_config_args --version | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` - gtk_config_minor_version=`$GTK_CONFIG $gtk_config_args --version | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` - gtk_config_micro_version=`$GTK_CONFIG $gtk_config_args --version | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` - if test "x$enable_gtktest" = "xyes" ; then - ac_save_CFLAGS="$CFLAGS" - ac_save_LIBS="$LIBS" - CFLAGS="$CFLAGS $GTK_CFLAGS" - LIBS="$GTK_LIBS $LIBS" -dnl -dnl Now check if the installed GTK is sufficiently new. (Also sanity -dnl checks the results of gtk-config to some extent -dnl - rm -f conf.gtktest - AC_TRY_RUN([ -#include -#include -#include - -int -main () -{ - int major, minor, micro; - char *tmp_version; - - system ("touch conf.gtktest"); - - /* HP/UX 9 (%@#!) writes to sscanf strings */ - tmp_version = g_strdup("$min_gtk_version"); - if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { - g_free(tmp_version); - printf("%s, bad version string\n", "$min_gtk_version"); - exit(1); - } - g_free(tmp_version); - - if ((gtk_major_version != $gtk_config_major_version) || - (gtk_minor_version != $gtk_config_minor_version) || - (gtk_micro_version != $gtk_config_micro_version)) - { - printf("\n*** 'gtk-config --version' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n", - $gtk_config_major_version, $gtk_config_minor_version, $gtk_config_micro_version, - gtk_major_version, gtk_minor_version, gtk_micro_version); - printf ("*** was found! If gtk-config was correct, then it is best\n"); - printf ("*** to remove the old version of GTK+. You may also be able to fix the error\n"); - printf("*** by modifying your LD_LIBRARY_PATH environment variable, or by editing\n"); - printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n"); - printf("*** required on your system.\n"); - printf("*** If gtk-config was wrong, set the environment variable GTK_CONFIG\n"); - printf("*** to point to the correct copy of gtk-config, and remove the file config.cache\n"); - printf("*** before re-running configure\n"); - } -#if defined (GTK_MAJOR_VERSION) && defined (GTK_MINOR_VERSION) && defined (GTK_MICRO_VERSION) - else if ((gtk_major_version != GTK_MAJOR_VERSION) || - (gtk_minor_version != GTK_MINOR_VERSION) || - (gtk_micro_version != GTK_MICRO_VERSION)) - { - printf("*** GTK+ header files (version %d.%d.%d) do not match\n", - GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION); - printf("*** library (version %d.%d.%d)\n", - gtk_major_version, gtk_minor_version, gtk_micro_version); - } -#endif /* defined (GTK_MAJOR_VERSION) ... */ - else - { - if ((gtk_major_version > major) || - ((gtk_major_version == major) && (gtk_minor_version > minor)) || - ((gtk_major_version == major) && (gtk_minor_version == minor) && (gtk_micro_version >= micro))) - { - return 0; - } - else - { - printf("\n*** An old version of GTK+ (%d.%d.%d) was found.\n", - gtk_major_version, gtk_minor_version, gtk_micro_version); - printf("*** You need a version of GTK+ newer than %d.%d.%d. The latest version of\n", - major, minor, micro); - printf("*** GTK+ is always available from ftp://ftp.gtk.org.\n"); - printf("***\n"); - printf("*** If you have already installed a sufficiently new version, this error\n"); - printf("*** probably means that the wrong copy of the gtk-config shell script is\n"); - printf("*** being found. The easiest way to fix this is to remove the old version\n"); - printf("*** of GTK+, but you can also set the GTK_CONFIG environment to point to the\n"); - printf("*** correct copy of gtk-config. (In this case, you will have to\n"); - printf("*** modify your LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf\n"); - printf("*** so that the correct libraries are found at run-time))\n"); - } - } - return 1; -} -],, no_gtk=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" - fi - fi - if test "x$no_gtk" = x ; then - AC_MSG_RESULT(yes) - ifelse([$2], , :, [$2]) - else - AC_MSG_RESULT(no) - if test "$GTK_CONFIG" = "no" ; then - echo "*** The gtk-config script installed by GTK could not be found" - echo "*** If GTK was installed in PREFIX, make sure PREFIX/bin is in" - echo "*** your path, or set the GTK_CONFIG environment variable to the" - echo "*** full path to gtk-config." - else - if test -f conf.gtktest ; then - : - else - echo "*** Could not run GTK test program, checking why..." - CFLAGS="$CFLAGS $GTK_CFLAGS" - LIBS="$LIBS $GTK_LIBS" - AC_TRY_LINK([ -#include -#include -], [ return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); ], - [ echo "*** The test program compiled, but did not run. This usually means" - echo "*** that the run-time linker is not finding GTK or finding the wrong" - echo "*** version of GTK. If it is not finding GTK, you'll need to set your" - echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" - echo "*** to the installed location Also, make sure you have run ldconfig if that" - echo "*** is required on your system" - echo "***" - echo "*** If you have an old version installed, it is best to remove it, although" - echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" - echo "***" - echo "*** If you have a RedHat 5.0 system, you should remove the GTK package that" - echo "*** came with the system with the command" - echo "***" - echo "*** rpm --erase --nodeps gtk gtk-devel" ], - [ echo "*** The test program failed to compile or link. See the file config.log for the" - echo "*** exact error that occurred. This usually means GTK was incorrectly installed" - echo "*** or that you have moved GTK since it was installed. In the latter case, you" - echo "*** may want to edit the gtk-config script: $GTK_CONFIG" ]) - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" - fi - fi - GTK_CFLAGS="" - GTK_LIBS="" - ifelse([$3], , :, [$3]) - fi - AC_SUBST(GTK_CFLAGS) - AC_SUBST(GTK_LIBS) - rm -f conf.gtktest -]) diff --git a/build/autogen.mk b/build/autogen.mk index 537a3f5438..90a85e02c6 100644 --- a/build/autogen.mk +++ b/build/autogen.mk @@ -56,9 +56,7 @@ ACLOCAL_SOURCES = \ build/aclocal/ax_func_which_gethostbyname_r.m4 \ build/aclocal/bakefile-lang.m4 \ build/aclocal/bakefile.m4 \ - build/aclocal/gst-element-check.m4 \ build/aclocal/gtk-2.0.m4 \ - build/aclocal/gtk.m4 \ build/aclocal/pkg.m4 \ build/aclocal/sdl.m4 \ build/aclocal/visibility.m4