Skip to content

Commit 0ec695f

Browse files
committed
regenerated autotools
1 parent 485916c commit 0ec695f

File tree

2 files changed

+8
-108
lines changed

2 files changed

+8
-108
lines changed

aclocal.m4

Lines changed: 0 additions & 100 deletions
Original file line numberDiff line numberDiff line change
@@ -20,106 +20,6 @@ You have another version of autoconf. It may work, but is not guaranteed to.
2020
If you have problems, you may need to regenerate the build system entirely.
2121
To do so, use the procedure documented by the package, typically 'autoreconf'.])])
2222

23-
# lt~obsolete.m4 -- aclocal satisfying obsolete definitions. -*-Autoconf-*-
24-
#
25-
# Copyright (C) 2004-2005, 2007, 2009, 2011-2015 Free Software
26-
# Foundation, Inc.
27-
# Written by Scott James Remnant, 2004.
28-
#
29-
# This file is free software; the Free Software Foundation gives
30-
# unlimited permission to copy and/or distribute it, with or without
31-
# modifications, as long as this notice is preserved.
32-
33-
# serial 5 lt~obsolete.m4
34-
35-
# These exist entirely to fool aclocal when bootstrapping libtool.
36-
#
37-
# In the past libtool.m4 has provided macros via AC_DEFUN (or AU_DEFUN),
38-
# which have later been changed to m4_define as they aren't part of the
39-
# exported API, or moved to Autoconf or Automake where they belong.
40-
#
41-
# The trouble is, aclocal is a bit thick. It'll see the old AC_DEFUN
42-
# in /usr/share/aclocal/libtool.m4 and remember it, then when it sees us
43-
# using a macro with the same name in our local m4/libtool.m4 it'll
44-
# pull the old libtool.m4 in (it doesn't see our shiny new m4_define
45-
# and doesn't know about Autoconf macros at all.)
46-
#
47-
# So we provide this file, which has a silly filename so it's always
48-
# included after everything else. This provides aclocal with the
49-
# AC_DEFUNs it wants, but when m4 processes it, it doesn't do anything
50-
# because those macros already exist, or will be overwritten later.
51-
# We use AC_DEFUN over AU_DEFUN for compatibility with aclocal-1.6.
52-
#
53-
# Anytime we withdraw an AC_DEFUN or AU_DEFUN, remember to add it here.
54-
# Yes, that means every name once taken will need to remain here until
55-
# we give up compatibility with versions before 1.7, at which point
56-
# we need to keep only those names which we still refer to.
57-
58-
# This is to help aclocal find these macros, as it can't see m4_define.
59-
AC_DEFUN([LTOBSOLETE_VERSION], [m4_if([1])])
60-
61-
m4_ifndef([AC_LIBTOOL_LINKER_OPTION], [AC_DEFUN([AC_LIBTOOL_LINKER_OPTION])])
62-
m4_ifndef([AC_PROG_EGREP], [AC_DEFUN([AC_PROG_EGREP])])
63-
m4_ifndef([_LT_AC_PROG_ECHO_BACKSLASH], [AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH])])
64-
m4_ifndef([_LT_AC_SHELL_INIT], [AC_DEFUN([_LT_AC_SHELL_INIT])])
65-
m4_ifndef([_LT_AC_SYS_LIBPATH_AIX], [AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX])])
66-
m4_ifndef([_LT_PROG_LTMAIN], [AC_DEFUN([_LT_PROG_LTMAIN])])
67-
m4_ifndef([_LT_AC_TAGVAR], [AC_DEFUN([_LT_AC_TAGVAR])])
68-
m4_ifndef([AC_LTDL_ENABLE_INSTALL], [AC_DEFUN([AC_LTDL_ENABLE_INSTALL])])
69-
m4_ifndef([AC_LTDL_PREOPEN], [AC_DEFUN([AC_LTDL_PREOPEN])])
70-
m4_ifndef([_LT_AC_SYS_COMPILER], [AC_DEFUN([_LT_AC_SYS_COMPILER])])
71-
m4_ifndef([_LT_AC_LOCK], [AC_DEFUN([_LT_AC_LOCK])])
72-
m4_ifndef([AC_LIBTOOL_SYS_OLD_ARCHIVE], [AC_DEFUN([AC_LIBTOOL_SYS_OLD_ARCHIVE])])
73-
m4_ifndef([_LT_AC_TRY_DLOPEN_SELF], [AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF])])
74-
m4_ifndef([AC_LIBTOOL_PROG_CC_C_O], [AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O])])
75-
m4_ifndef([AC_LIBTOOL_SYS_HARD_LINK_LOCKS], [AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS])])
76-
m4_ifndef([AC_LIBTOOL_OBJDIR], [AC_DEFUN([AC_LIBTOOL_OBJDIR])])
77-
m4_ifndef([AC_LTDL_OBJDIR], [AC_DEFUN([AC_LTDL_OBJDIR])])
78-
m4_ifndef([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH], [AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH])])
79-
m4_ifndef([AC_LIBTOOL_SYS_LIB_STRIP], [AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP])])
80-
m4_ifndef([AC_PATH_MAGIC], [AC_DEFUN([AC_PATH_MAGIC])])
81-
m4_ifndef([AC_PROG_LD_GNU], [AC_DEFUN([AC_PROG_LD_GNU])])
82-
m4_ifndef([AC_PROG_LD_RELOAD_FLAG], [AC_DEFUN([AC_PROG_LD_RELOAD_FLAG])])
83-
m4_ifndef([AC_DEPLIBS_CHECK_METHOD], [AC_DEFUN([AC_DEPLIBS_CHECK_METHOD])])
84-
m4_ifndef([AC_LIBTOOL_PROG_COMPILER_NO_RTTI], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI])])
85-
m4_ifndef([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE], [AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE])])
86-
m4_ifndef([AC_LIBTOOL_PROG_COMPILER_PIC], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_PIC])])
87-
m4_ifndef([AC_LIBTOOL_PROG_LD_SHLIBS], [AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS])])
88-
m4_ifndef([AC_LIBTOOL_POSTDEP_PREDEP], [AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP])])
89-
m4_ifndef([LT_AC_PROG_EGREP], [AC_DEFUN([LT_AC_PROG_EGREP])])
90-
m4_ifndef([LT_AC_PROG_SED], [AC_DEFUN([LT_AC_PROG_SED])])
91-
m4_ifndef([_LT_CC_BASENAME], [AC_DEFUN([_LT_CC_BASENAME])])
92-
m4_ifndef([_LT_COMPILER_BOILERPLATE], [AC_DEFUN([_LT_COMPILER_BOILERPLATE])])
93-
m4_ifndef([_LT_LINKER_BOILERPLATE], [AC_DEFUN([_LT_LINKER_BOILERPLATE])])
94-
m4_ifndef([_AC_PROG_LIBTOOL], [AC_DEFUN([_AC_PROG_LIBTOOL])])
95-
m4_ifndef([AC_LIBTOOL_SETUP], [AC_DEFUN([AC_LIBTOOL_SETUP])])
96-
m4_ifndef([_LT_AC_CHECK_DLFCN], [AC_DEFUN([_LT_AC_CHECK_DLFCN])])
97-
m4_ifndef([AC_LIBTOOL_SYS_DYNAMIC_LINKER], [AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER])])
98-
m4_ifndef([_LT_AC_TAGCONFIG], [AC_DEFUN([_LT_AC_TAGCONFIG])])
99-
m4_ifndef([AC_DISABLE_FAST_INSTALL], [AC_DEFUN([AC_DISABLE_FAST_INSTALL])])
100-
m4_ifndef([_LT_AC_LANG_CXX], [AC_DEFUN([_LT_AC_LANG_CXX])])
101-
m4_ifndef([_LT_AC_LANG_F77], [AC_DEFUN([_LT_AC_LANG_F77])])
102-
m4_ifndef([_LT_AC_LANG_GCJ], [AC_DEFUN([_LT_AC_LANG_GCJ])])
103-
m4_ifndef([AC_LIBTOOL_LANG_C_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG])])
104-
m4_ifndef([_LT_AC_LANG_C_CONFIG], [AC_DEFUN([_LT_AC_LANG_C_CONFIG])])
105-
m4_ifndef([AC_LIBTOOL_LANG_CXX_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG])])
106-
m4_ifndef([_LT_AC_LANG_CXX_CONFIG], [AC_DEFUN([_LT_AC_LANG_CXX_CONFIG])])
107-
m4_ifndef([AC_LIBTOOL_LANG_F77_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_F77_CONFIG])])
108-
m4_ifndef([_LT_AC_LANG_F77_CONFIG], [AC_DEFUN([_LT_AC_LANG_F77_CONFIG])])
109-
m4_ifndef([AC_LIBTOOL_LANG_GCJ_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_GCJ_CONFIG])])
110-
m4_ifndef([_LT_AC_LANG_GCJ_CONFIG], [AC_DEFUN([_LT_AC_LANG_GCJ_CONFIG])])
111-
m4_ifndef([AC_LIBTOOL_LANG_RC_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG])])
112-
m4_ifndef([_LT_AC_LANG_RC_CONFIG], [AC_DEFUN([_LT_AC_LANG_RC_CONFIG])])
113-
m4_ifndef([AC_LIBTOOL_CONFIG], [AC_DEFUN([AC_LIBTOOL_CONFIG])])
114-
m4_ifndef([_LT_AC_FILE_LTDLL_C], [AC_DEFUN([_LT_AC_FILE_LTDLL_C])])
115-
m4_ifndef([_LT_REQUIRED_DARWIN_CHECKS], [AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS])])
116-
m4_ifndef([_LT_AC_PROG_CXXCPP], [AC_DEFUN([_LT_AC_PROG_CXXCPP])])
117-
m4_ifndef([_LT_PREPARE_SED_QUOTE_VARS], [AC_DEFUN([_LT_PREPARE_SED_QUOTE_VARS])])
118-
m4_ifndef([_LT_PROG_ECHO_BACKSLASH], [AC_DEFUN([_LT_PROG_ECHO_BACKSLASH])])
119-
m4_ifndef([_LT_PROG_F77], [AC_DEFUN([_LT_PROG_F77])])
120-
m4_ifndef([_LT_PROG_FC], [AC_DEFUN([_LT_PROG_FC])])
121-
m4_ifndef([_LT_PROG_CXX], [AC_DEFUN([_LT_PROG_CXX])])
122-
12323
# Copyright (C) 2002-2021 Free Software Foundation, Inc.
12424
#
12525
# This file is free software; the Free Software Foundation

configure

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13413,11 +13413,11 @@ if test x$ac_prog_cxx_stdcxx = xno
1341313413
then :
1341413414
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++11 features" >&5
1341513415
printf %s "checking for $CXX option to enable C++11 features... " >&6; }
13416-
if test ${ac_cv_prog_cxx_11+y}
13416+
if test ${ac_cv_prog_cxx_cxx11+y}
1341713417
then :
1341813418
printf %s "(cached) " >&6
1341913419
else $as_nop
13420-
ac_cv_prog_cxx_11=no
13420+
ac_cv_prog_cxx_cxx11=no
1342113421
ac_save_CXX=$CXX
1342213422
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
1342313423
/* end confdefs.h. */
@@ -13459,11 +13459,11 @@ if test x$ac_prog_cxx_stdcxx = xno
1345913459
then :
1346013460
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++98 features" >&5
1346113461
printf %s "checking for $CXX option to enable C++98 features... " >&6; }
13462-
if test ${ac_cv_prog_cxx_98+y}
13462+
if test ${ac_cv_prog_cxx_cxx98+y}
1346313463
then :
1346413464
printf %s "(cached) " >&6
1346513465
else $as_nop
13466-
ac_cv_prog_cxx_98=no
13466+
ac_cv_prog_cxx_cxx98=no
1346713467
ac_save_CXX=$CXX
1346813468
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
1346913469
/* end confdefs.h. */
@@ -13783,11 +13783,11 @@ if test x$ac_prog_cxx_stdcxx = xno
1378313783
then :
1378413784
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++11 features" >&5
1378513785
printf %s "checking for $CXX option to enable C++11 features... " >&6; }
13786-
if test ${ac_cv_prog_cxx_11+y}
13786+
if test ${ac_cv_prog_cxx_cxx11+y}
1378713787
then :
1378813788
printf %s "(cached) " >&6
1378913789
else $as_nop
13790-
ac_cv_prog_cxx_11=no
13790+
ac_cv_prog_cxx_cxx11=no
1379113791
ac_save_CXX=$CXX
1379213792
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
1379313793
/* end confdefs.h. */
@@ -13829,11 +13829,11 @@ if test x$ac_prog_cxx_stdcxx = xno
1382913829
then :
1383013830
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++98 features" >&5
1383113831
printf %s "checking for $CXX option to enable C++98 features... " >&6; }
13832-
if test ${ac_cv_prog_cxx_98+y}
13832+
if test ${ac_cv_prog_cxx_cxx98+y}
1383313833
then :
1383413834
printf %s "(cached) " >&6
1383513835
else $as_nop
13836-
ac_cv_prog_cxx_98=no
13836+
ac_cv_prog_cxx_cxx98=no
1383713837
ac_save_CXX=$CXX
1383813838
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
1383913839
/* end confdefs.h. */

0 commit comments

Comments
 (0)