From ba4ab29c271b57b535cc63e3b43d6a5d9d93f3df Mon Sep 17 00:00:00 2001
From: Alexis Roche <alero585@student.liu.se>
Date: Wed, 28 Sep 2022 12:01:12 +0200
Subject: [PATCH] --without option working
---
.../buildAutoConf/autom4te.cache/output.0 | 2 +-
.../buildAutoConf/autom4te.cache/requests | 90 +++++++++----------
.../buildAutoConf/autom4te.cache/traces.0 | 30 +++----
build-system/buildAutoConf/config.log | 2 +-
build-system/buildAutoConf/config.status | 4 +-
build-system/buildAutoConf/configure | 2 +-
build-system/buildAutoConf/configure.ac | 4 +-
7 files changed, 68 insertions(+), 66 deletions(-)
diff --git a/build-system/buildAutoConf/autom4te.cache/output.0 b/build-system/buildAutoConf/autom4te.cache/output.0
index f822c6a..66e5b6c 100644
--- a/build-system/buildAutoConf/autom4te.cache/output.0
+++ b/build-system/buildAutoConf/autom4te.cache/output.0
@@ -2594,7 +2594,7 @@ TRIG_FUNCTIONS='-DTRIG_FUNCTIONS'
@%:@ Check whether --with-trig-functions was given.
if test "${with_trig_functions+set}" = set; then :
- withval=$with_trig_functions; TRIG_FUNCTIONS
+ withval=$with_trig_functions; TRIG_FUNCTIONS=''
fi
diff --git a/build-system/buildAutoConf/autom4te.cache/requests b/build-system/buildAutoConf/autom4te.cache/requests
index 08e394d..8ef9613 100644
--- a/build-system/buildAutoConf/autom4te.cache/requests
+++ b/build-system/buildAutoConf/autom4te.cache/requests
@@ -14,64 +14,64 @@
'configure.ac'
],
{
- 'LT_INIT' => 1,
- '_AM_MAKEFILE_INCLUDE' => 1,
- 'AC_CONFIG_HEADERS' => 1,
- 'AC_CANONICAL_HOST' => 1,
- 'AC_LIBSOURCE' => 1,
- 'AM_CONDITIONAL' => 1,
- 'LT_CONFIG_LTDL_DIR' => 1,
- 'AM_PROG_FC_C_O' => 1,
- 'AC_INIT' => 1,
- 'AC_DEFINE_TRACE_LITERAL' => 1,
- 'AM_XGETTEXT_OPTION' => 1,
'LT_SUPPORTED_TAG' => 1,
- '_AM_COND_IF' => 1,
'AC_CONFIG_SUBDIRS' => 1,
- 'sinclude' => 1,
- 'AC_CANONICAL_SYSTEM' => 1,
'AC_SUBST' => 1,
- 'AM_INIT_AUTOMAKE' => 1,
- 'AH_OUTPUT' => 1,
- 'AC_PROG_LIBTOOL' => 1,
+ 'AM_PROG_CXX_C_O' => 1,
+ 'include' => 1,
+ 'AC_FC_PP_SRCEXT' => 1,
+ 'AC_LIBSOURCE' => 1,
+ 'AC_INIT' => 1,
+ 'AM_GNU_GETTEXT' => 1,
+ 'AM_PROG_AR' => 1,
+ 'm4_pattern_allow' => 1,
+ 'AM_ENABLE_MULTILIB' => 1,
+ 'AC_CONFIG_LIBOBJ_DIR' => 1,
+ 'AM_AUTOMAKE_VERSION' => 1,
'_AM_COND_ELSE' => 1,
+ 'AC_CANONICAL_TARGET' => 1,
+ '_AM_SUBST_NOTMAKE' => 1,
+ '_m4_warn' => 1,
+ 'AC_SUBST_TRACE' => 1,
+ 'm4_sinclude' => 1,
+ 'AM_PROG_FC_C_O' => 1,
'AC_FC_SRCEXT' => 1,
'_LT_AC_TAGCONFIG' => 1,
- 'AM_GNU_GETTEXT_INTL_SUBDIR' => 1,
- 'AC_CONFIG_FILES' => 1,
+ 'm4_include' => 1,
+ 'AM_POT_TOOLS' => 1,
+ 'AM_XGETTEXT_OPTION' => 1,
+ 'AM_INIT_AUTOMAKE' => 1,
+ 'AC_CONFIG_HEADERS' => 1,
+ 'sinclude' => 1,
+ 'AH_OUTPUT' => 1,
+ 'AC_FC_PP_DEFINE' => 1,
+ 'AM_PROG_F77_C_O' => 1,
+ 'AC_CANONICAL_BUILD' => 1,
+ 'AC_REQUIRE_AUX_FILE' => 1,
'_AM_COND_ENDIF' => 1,
+ 'AM_SILENT_RULES' => 1,
+ 'AM_PROG_MOC' => 1,
+ 'AM_CONDITIONAL' => 1,
+ 'AM_GNU_GETTEXT_INTL_SUBDIR' => 1,
'AM_MAKEFILE_INCLUDE' => 1,
- 'AM_PROG_CXX_C_O' => 1,
+ 'AC_PROG_LIBTOOL' => 1,
+ 'AM_PROG_LIBTOOL' => 1,
'AM_MAINTAINER_MODE' => 1,
- 'AC_SUBST_TRACE' => 1,
- 'm4_pattern_allow' => 1,
- 'include' => 1,
- 'm4_pattern_forbid' => 1,
'AM_PROG_CC_C_O' => 1,
- 'AC_FC_PP_DEFINE' => 1,
- 'AM_POT_TOOLS' => 1,
- 'AM_NLS' => 1,
- 'AC_CANONICAL_TARGET' => 1,
- 'm4_sinclude' => 1,
- 'm4_include' => 1,
'AM_PATH_GUILE' => 1,
- 'AM_PROG_AR' => 1,
- 'AM_GNU_GETTEXT' => 1,
- '_m4_warn' => 1,
- 'AC_CONFIG_LIBOBJ_DIR' => 1,
- 'AM_AUTOMAKE_VERSION' => 1,
- 'AM_SILENT_RULES' => 1,
+ 'AM_NLS' => 1,
+ 'AC_CANONICAL_HOST' => 1,
+ 'm4_pattern_forbid' => 1,
'AC_CONFIG_LINKS' => 1,
- 'AM_PROG_F77_C_O' => 1,
- 'AM_PROG_MOC' => 1,
- 'AC_CANONICAL_BUILD' => 1,
+ '_AM_COND_IF' => 1,
+ 'AC_DEFINE_TRACE_LITERAL' => 1,
+ 'LT_CONFIG_LTDL_DIR' => 1,
+ '_AM_MAKEFILE_INCLUDE' => 1,
'AC_CONFIG_AUX_DIR' => 1,
- '_AM_SUBST_NOTMAKE' => 1,
- 'AC_REQUIRE_AUX_FILE' => 1,
- 'AC_FC_FREEFORM' => 1,
- 'AC_FC_PP_SRCEXT' => 1,
- 'AM_ENABLE_MULTILIB' => 1,
- 'AM_PROG_LIBTOOL' => 1
+ 'LT_INIT' => 1,
+ 'AC_CONFIG_FILES' => 1,
+ 'AC_CANONICAL_SYSTEM' => 1,
+ 'AC_FC_FREEFORM' => 1
}
], 'Autom4te::Request' )
);
diff --git a/build-system/buildAutoConf/autom4te.cache/traces.0 b/build-system/buildAutoConf/autom4te.cache/traces.0
index 075b10f..31c1c74 100644
--- a/build-system/buildAutoConf/autom4te.cache/traces.0
+++ b/build-system/buildAutoConf/autom4te.cache/traces.0
@@ -192,18 +192,18 @@ m4trace:configure.ac:6: -1- m4_pattern_allow([^HAVE_FICLONE$])
m4trace:configure.ac:7: -1- AC_SUBST([TRIG_FUNCTIONS], ['-DTRIG_FUNCTIONS'])
m4trace:configure.ac:7: -1- AC_SUBST_TRACE([TRIG_FUNCTIONS])
m4trace:configure.ac:7: -1- m4_pattern_allow([^TRIG_FUNCTIONS$])
-m4trace:configure.ac:18: -1- AC_SUBST([LIB@&t@OBJS], [$ac_libobjs])
-m4trace:configure.ac:18: -1- AC_SUBST_TRACE([LIB@&t@OBJS])
-m4trace:configure.ac:18: -1- m4_pattern_allow([^LIB@&t@OBJS$])
-m4trace:configure.ac:18: -1- AC_SUBST([LTLIBOBJS], [$ac_ltlibobjs])
-m4trace:configure.ac:18: -1- AC_SUBST_TRACE([LTLIBOBJS])
-m4trace:configure.ac:18: -1- m4_pattern_allow([^LTLIBOBJS$])
-m4trace:configure.ac:18: -1- AC_SUBST_TRACE([top_builddir])
-m4trace:configure.ac:18: -1- AC_SUBST_TRACE([top_build_prefix])
-m4trace:configure.ac:18: -1- AC_SUBST_TRACE([srcdir])
-m4trace:configure.ac:18: -1- AC_SUBST_TRACE([abs_srcdir])
-m4trace:configure.ac:18: -1- AC_SUBST_TRACE([top_srcdir])
-m4trace:configure.ac:18: -1- AC_SUBST_TRACE([abs_top_srcdir])
-m4trace:configure.ac:18: -1- AC_SUBST_TRACE([builddir])
-m4trace:configure.ac:18: -1- AC_SUBST_TRACE([abs_builddir])
-m4trace:configure.ac:18: -1- AC_SUBST_TRACE([abs_top_builddir])
+m4trace:configure.ac:20: -1- AC_SUBST([LIB@&t@OBJS], [$ac_libobjs])
+m4trace:configure.ac:20: -1- AC_SUBST_TRACE([LIB@&t@OBJS])
+m4trace:configure.ac:20: -1- m4_pattern_allow([^LIB@&t@OBJS$])
+m4trace:configure.ac:20: -1- AC_SUBST([LTLIBOBJS], [$ac_ltlibobjs])
+m4trace:configure.ac:20: -1- AC_SUBST_TRACE([LTLIBOBJS])
+m4trace:configure.ac:20: -1- m4_pattern_allow([^LTLIBOBJS$])
+m4trace:configure.ac:20: -1- AC_SUBST_TRACE([top_builddir])
+m4trace:configure.ac:20: -1- AC_SUBST_TRACE([top_build_prefix])
+m4trace:configure.ac:20: -1- AC_SUBST_TRACE([srcdir])
+m4trace:configure.ac:20: -1- AC_SUBST_TRACE([abs_srcdir])
+m4trace:configure.ac:20: -1- AC_SUBST_TRACE([top_srcdir])
+m4trace:configure.ac:20: -1- AC_SUBST_TRACE([abs_top_srcdir])
+m4trace:configure.ac:20: -1- AC_SUBST_TRACE([builddir])
+m4trace:configure.ac:20: -1- AC_SUBST_TRACE([abs_builddir])
+m4trace:configure.ac:20: -1- AC_SUBST_TRACE([abs_top_builddir])
diff --git a/build-system/buildAutoConf/config.log b/build-system/buildAutoConf/config.log
index 25e923c..c8543ef 100644
--- a/build-system/buildAutoConf/config.log
+++ b/build-system/buildAutoConf/config.log
@@ -4,7 +4,7 @@ running configure, to aid debugging if configure makes a mistake.
It was created by lab4auto_conf configure 0.1, which was
generated by GNU Autoconf 2.69. Invocation command line was
- $ ./configure --without-trig-functions
+ $ ./configure
## --------- ##
## Platform. ##
diff --git a/build-system/buildAutoConf/config.status b/build-system/buildAutoConf/config.status
index b58d703..79dd502 100755
--- a/build-system/buildAutoConf/config.status
+++ b/build-system/buildAutoConf/config.status
@@ -417,7 +417,7 @@ $config_files
Report bugs to <Alexis_Sirathee@example.com>."
-ac_cs_config="'--without-trig-functions'"
+ac_cs_config=""
ac_cs_version="\
lab4auto_conf config.status 0.1
configured by ./configure, generated by GNU Autoconf 2.69,
@@ -495,7 +495,7 @@ if $ac_cs_silent; then
fi
if $ac_cs_recheck; then
- set X /bin/bash './configure' '--without-trig-functions' $ac_configure_extra_args --no-create --no-recursion
+ set X /bin/bash './configure' $ac_configure_extra_args --no-create --no-recursion
shift
$as_echo "running CONFIG_SHELL=/bin/bash $*" >&6
CONFIG_SHELL='/bin/bash'
diff --git a/build-system/buildAutoConf/configure b/build-system/buildAutoConf/configure
index 8c86f27..1475d03 100755
--- a/build-system/buildAutoConf/configure
+++ b/build-system/buildAutoConf/configure
@@ -2594,7 +2594,7 @@ TRIG_FUNCTIONS='-DTRIG_FUNCTIONS'
# Check whether --with-trig-functions was given.
if test "${with_trig_functions+set}" = set; then :
- withval=$with_trig_functions; TRIG_FUNCTIONS
+ withval=$with_trig_functions; TRIG_FUNCTIONS=''
fi
diff --git a/build-system/buildAutoConf/configure.ac b/build-system/buildAutoConf/configure.ac
index a8ed5d2..963bed7 100644
--- a/build-system/buildAutoConf/configure.ac
+++ b/build-system/buildAutoConf/configure.ac
@@ -8,7 +8,9 @@ AC_SUBST(TRIG_FUNCTIONS, '-DTRIG_FUNCTIONS')
AC_ARG_WITH([trig-functions],
[AS_HELP_STRING([--without-trig-functions],[no trig functions])],
- [TRIG_FUNCTIONS])
+ [TRIG_FUNCTIONS=''],
+ []
+ )
AC_CHECK_DECL(FICLONE, [HAVE_FICLONE='-DHAVE_CILONE'], , [
#include <linux/fs.h>
--
GitLab