From d2235042c83fa39394cedc9819e7fcce4e154845 Mon Sep 17 00:00:00 2001 From: Andrea Bedini Date: Fri, 10 Feb 2023 17:11:45 +0800 Subject: [PATCH 01/21] Better value for pkg-config cflags --- src/libcmd/nix-cmd.pc.in | 2 +- src/libexpr/nix-expr.pc.in | 2 +- src/libmain/nix-main.pc.in | 2 +- src/libstore/nix-store.pc.in | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/libcmd/nix-cmd.pc.in b/src/libcmd/nix-cmd.pc.in index 39575f222ea..1dbf1e68340 100644 --- a/src/libcmd/nix-cmd.pc.in +++ b/src/libcmd/nix-cmd.pc.in @@ -6,4 +6,4 @@ Name: Nix Description: Nix Package Manager Version: @PACKAGE_VERSION@ Libs: -L${libdir} -lnixcmd -Cflags: -I${includedir}/nix -std=c++2a +Cflags: -I${includedir} -std=c++2a diff --git a/src/libexpr/nix-expr.pc.in b/src/libexpr/nix-expr.pc.in index 60ffb5dba4d..c93a8ce36bc 100644 --- a/src/libexpr/nix-expr.pc.in +++ b/src/libexpr/nix-expr.pc.in @@ -7,4 +7,4 @@ Description: Nix Package Manager Version: @PACKAGE_VERSION@ Requires: nix-store bdw-gc Libs: -L${libdir} -lnixexpr -Cflags: -I${includedir}/nix -std=c++2a +Cflags: -I${includedir} -std=c++2a diff --git a/src/libmain/nix-main.pc.in b/src/libmain/nix-main.pc.in index fb3ead6facb..215b7a6d374 100644 --- a/src/libmain/nix-main.pc.in +++ b/src/libmain/nix-main.pc.in @@ -6,4 +6,4 @@ Name: Nix Description: Nix Package Manager Version: @PACKAGE_VERSION@ Libs: -L${libdir} -lnixmain -Cflags: -I${includedir}/nix -std=c++2a +Cflags: -I${includedir} -std=c++2a diff --git a/src/libstore/nix-store.pc.in b/src/libstore/nix-store.pc.in index dc42d0bca2a..0f9efe1a859 100644 --- a/src/libstore/nix-store.pc.in +++ b/src/libstore/nix-store.pc.in @@ -6,4 +6,4 @@ Name: Nix Description: Nix Package Manager Version: @PACKAGE_VERSION@ Libs: -L${libdir} -lnixstore -lnixutil -Cflags: -I${includedir}/nix -std=c++2a +Cflags: -I${includedir} -std=c++2a From 85db1189ace4fc1d9b30e5288151f85e42e7d06a Mon Sep 17 00:00:00 2001 From: Andrea Bedini Date: Thu, 16 Feb 2023 12:11:21 +0800 Subject: [PATCH 02/21] Fix perl bindings --- perl/lib/Nix/Store.xs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/perl/lib/Nix/Store.xs b/perl/lib/Nix/Store.xs index de91dc28d87..7b7fb2fe6ab 100644 --- a/perl/lib/Nix/Store.xs +++ b/perl/lib/Nix/Store.xs @@ -1,4 +1,4 @@ -#include "config.h" +#include "nix/config.h" #include "EXTERN.h" #include "perl.h" @@ -8,11 +8,11 @@ #undef do_open #undef do_close -#include "derivations.hh" -#include "globals.hh" -#include "store-api.hh" -#include "util.hh" -#include "crypto.hh" +#include "nix/derivations.hh" +#include "nix/globals.hh" +#include "nix/store-api.hh" +#include "nix/util.hh" +#include "nix/crypto.hh" #include #include From 746f4d567b159cab74fe64935f62c60d781daf98 Mon Sep 17 00:00:00 2001 From: Andrea Bedini Date: Thu, 16 Feb 2023 16:32:53 +0800 Subject: [PATCH 03/21] Fix #5832 --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 09b3651b91f..3f487c56ce2 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -AC_INIT([nix],[m4_esyscmd(bash -c "echo -n $(cat ./.version)$VERSION_SUFFIX")]) +AC_INIT([nix],m4_esyscmd(bash -c "echo -n $(cat ./.version)$VERSION_SUFFIX")) AC_CONFIG_MACRO_DIRS([m4]) AC_CONFIG_SRCDIR(README.md) AC_CONFIG_AUX_DIR(config) From bb99593e927f679fbded78501636bb0e693f45dc Mon Sep 17 00:00:00 2001 From: Andrea Bedini Date: Fri, 17 Feb 2023 11:03:16 +0800 Subject: [PATCH 04/21] Move libutil include files --- local.mk | 4 +- perl/Makefile | 2 +- perl/autom4te.cache/output.0 | 5623 +++++++++++++++++ perl/autom4te.cache/requests | 84 + perl/autom4te.cache/traces.0 | 291 + perl/config.log | 465 ++ perl/configure | 5623 +++++++++++++++++ perl/lib/Nix/Store.xs | 2 +- src/build-remote/build-remote.cc | 4 +- src/libcmd/command.hh | 2 +- src/libcmd/common-eval-args.cc | 2 +- src/libcmd/common-eval-args.hh | 2 +- src/libcmd/installables.cc | 4 +- src/libcmd/installables.hh | 2 +- src/libcmd/local.mk | 8 +- src/libcmd/markdown.cc | 4 +- src/libcmd/markdown.hh | 2 +- src/libcmd/repl.cc | 4 +- src/libexpr/attr-path.cc | 2 +- src/libexpr/eval-cache.hh | 4 +- src/libexpr/eval.cc | 6 +- src/libexpr/eval.hh | 6 +- src/libexpr/flake/flake.cc | 2 +- src/libexpr/flake/flake.hh | 2 +- src/libexpr/flake/flakeref.cc | 4 +- src/libexpr/flake/flakeref.hh | 4 +- src/libexpr/flake/lockfile.cc | 2 +- src/libexpr/function-trace.cc | 2 +- src/libexpr/get-drvs.cc | 2 +- src/libexpr/local.mk | 7 +- src/libexpr/nixexpr.cc | 2 +- src/libexpr/nixexpr.hh | 4 +- src/libexpr/parser.y | 2 +- src/libexpr/primops.cc | 4 +- src/libexpr/primops/fetchClosure.cc | 2 +- src/libexpr/primops/fetchMercurial.cc | 4 +- src/libexpr/symbol-table.hh | 4 +- src/libexpr/tests/local.mk | 6 +- src/libexpr/value-to-json.cc | 2 +- src/libexpr/value-to-xml.cc | 4 +- src/libexpr/value/context.hh | 4 +- src/libfetchers/attrs.hh | 2 +- src/libfetchers/cache.cc | 2 +- src/libfetchers/fetch-settings.hh | 6 +- src/libfetchers/fetchers.hh | 6 +- src/libfetchers/git.cc | 8 +- src/libfetchers/github.cc | 6 +- src/libfetchers/indirect.cc | 2 +- src/libfetchers/local.mk | 4 +- src/libfetchers/mercurial.cc | 4 +- src/libfetchers/path.cc | 2 +- src/libfetchers/registry.cc | 2 +- src/libfetchers/registry.hh | 2 +- src/libfetchers/tarball.cc | 8 +- src/libmain/common-args.hh | 2 +- src/libmain/local.mk | 4 +- src/libmain/loggers.cc | 2 +- src/libmain/loggers.hh | 2 +- src/libmain/progress-bar.cc | 4 +- src/libmain/progress-bar.hh | 2 +- src/libmain/shared.cc | 2 +- src/libmain/shared.hh | 4 +- src/libmain/stack.cc | 2 +- src/libstore/binary-cache-store.cc | 10 +- src/libstore/binary-cache-store.hh | 2 +- src/libstore/build/derivation-goal.cc | 12 +- .../build/drv-output-substitution-goal.cc | 4 +- src/libstore/build/goal.hh | 2 +- src/libstore/build/hook-instance.hh | 4 +- src/libstore/build/local-derivation-goal.cc | 18 +- src/libstore/build/substitution-goal.cc | 2 +- src/libstore/build/worker.hh | 2 +- src/libstore/builtins/fetchurl.cc | 4 +- src/libstore/builtins/unpack-channel.cc | 2 +- src/libstore/content-address.cc | 4 +- src/libstore/content-address.hh | 2 +- src/libstore/crypto.cc | 2 +- src/libstore/crypto.hh | 2 +- src/libstore/daemon.cc | 8 +- src/libstore/daemon.hh | 2 +- src/libstore/derivations.cc | 2 +- src/libstore/derivations.hh | 6 +- src/libstore/derived-path.hh | 4 +- src/libstore/dummy-store.cc | 2 +- src/libstore/export-import.cc | 4 +- src/libstore/filetransfer.cc | 8 +- src/libstore/filetransfer.hh | 6 +- src/libstore/fs-accessor.hh | 2 +- src/libstore/gc.cc | 2 +- src/libstore/globals.cc | 10 +- src/libstore/globals.hh | 8 +- src/libstore/http-binary-cache-store.cc | 2 +- src/libstore/legacy-ssh-store.cc | 6 +- src/libstore/local-fs-store.cc | 4 +- src/libstore/local-store.cc | 10 +- src/libstore/local-store.hh | 4 +- src/libstore/local.mk | 4 +- src/libstore/lock.hh | 2 +- src/libstore/machines.cc | 2 +- src/libstore/machines.hh | 2 +- src/libstore/misc.cc | 8 +- src/libstore/names.cc | 2 +- src/libstore/names.hh | 2 +- src/libstore/nar-accessor.cc | 2 +- src/libstore/nar-info-disk-cache.cc | 2 +- src/libstore/nar-info-disk-cache.hh | 2 +- src/libstore/nar-info.hh | 4 +- src/libstore/optimise-store.cc | 2 +- src/libstore/outputs-spec.cc | 4 +- src/libstore/outputs-spec.hh | 2 +- src/libstore/path-info.hh | 2 +- src/libstore/path.hh | 2 +- src/libstore/pathlocks.cc | 4 +- src/libstore/pathlocks.hh | 2 +- src/libstore/profiles.cc | 2 +- src/libstore/profiles.hh | 2 +- src/libstore/realisation.cc | 2 +- src/libstore/realisation.hh | 4 +- src/libstore/references.cc | 6 +- src/libstore/references.hh | 2 +- src/libstore/remote-fs-accessor.hh | 2 +- src/libstore/remote-store.cc | 14 +- src/libstore/s3-binary-cache-store.cc | 2 +- src/libstore/s3.hh | 2 +- src/libstore/sqlite.cc | 2 +- src/libstore/sqlite.hh | 2 +- src/libstore/ssh-store.cc | 4 +- src/libstore/ssh.hh | 4 +- src/libstore/store-api.cc | 10 +- src/libstore/store-api.hh | 10 +- src/libstore/tests/local.mk | 5 +- src/libstore/worker-protocol.hh | 2 +- src/libutil/archive.cc | 6 +- src/libutil/args.cc | 4 +- src/libutil/canon-path.cc | 4 +- src/libutil/cgroup.cc | 6 +- src/libutil/compression.cc | 10 +- src/libutil/compute-levels.cc | 2 +- src/libutil/config.cc | 8 +- src/libutil/error.cc | 4 +- src/libutil/experimental-features.cc | 4 +- src/libutil/filesystem.cc | 6 +- src/libutil/git.cc | 2 +- src/libutil/hash.cc | 10 +- src/libutil/hilite.cc | 2 +- .../nix/util}/abstract-setting-to-json.hh | 2 +- .../{ => include/nix/util}/ansicolor.hh | 0 src/libutil/{ => include/nix/util}/archive.hh | 4 +- src/libutil/{ => include/nix/util}/args.hh | 2 +- .../{ => include/nix/util}/callback.hh | 0 .../{ => include/nix/util}/canon-path.hh | 0 src/libutil/{ => include/nix/util}/cgroup.hh | 2 +- .../{ => include/nix/util}/chunked-vector.hh | 0 src/libutil/{ => include/nix/util}/closure.hh | 2 +- .../{ => include/nix/util}/comparator.hh | 0 .../{ => include/nix/util}/compression.hh | 6 +- .../{ => include/nix/util}/compute-levels.hh | 2 +- src/libutil/{ => include/nix/util}/config.hh | 2 +- src/libutil/{ => include/nix/util}/error.hh | 6 +- .../nix/util}/experimental-features.hh | 6 +- src/libutil/{ => include/nix/util}/finally.hh | 0 src/libutil/{ => include/nix/util}/fmt.hh | 2 +- src/libutil/{ => include/nix/util}/git.hh | 0 src/libutil/{ => include/nix/util}/hash.hh | 4 +- src/libutil/{ => include/nix/util}/hilite.hh | 0 .../{ => include/nix/util}/json-impls.hh | 0 .../{ => include/nix/util}/json-utils.hh | 0 src/libutil/{ => include/nix/util}/logging.hh | 6 +- .../{ => include/nix/util}/lru-cache.hh | 0 .../{ => include/nix/util}/monitor-fd.hh | 0 .../{ => include/nix/util}/namespaces.hh | 0 src/libutil/{ => include/nix/util}/pool.hh | 4 +- src/libutil/{ => include/nix/util}/ref.hh | 0 .../nix/util}/regex-combinators.hh | 0 .../{ => include/nix/util}/serialise.hh | 4 +- src/libutil/{ => include/nix/util}/split.hh | 2 +- .../{ => include/nix/util}/suggestions.hh | 4 +- src/libutil/{ => include/nix/util}/sync.hh | 0 src/libutil/{ => include/nix/util}/tarfile.hh | 2 +- .../{ => include/nix/util}/thread-pool.hh | 4 +- .../{ => include/nix/util}/topo-sort.hh | 2 +- src/libutil/{ => include/nix/util}/types.hh | 2 +- .../{ => include/nix/util}/url-parts.hh | 0 src/libutil/{ => include/nix/util}/url.hh | 2 +- src/libutil/{ => include/nix/util}/util.hh | 8 +- .../{ => include/nix/util}/xml-writer.hh | 0 src/libutil/local.mk | 2 + src/libutil/logging.cc | 6 +- src/libutil/namespaces.cc | 6 +- src/libutil/serialise.cc | 4 +- src/libutil/suggestions.cc | 6 +- src/libutil/tarfile.cc | 4 +- src/libutil/tests/canon-path.cc | 2 +- src/libutil/tests/chunked-vector.cc | 2 +- src/libutil/tests/closure.cc | 2 +- src/libutil/tests/compression.cc | 2 +- src/libutil/tests/config.cc | 4 +- src/libutil/tests/git.cc | 2 +- src/libutil/tests/hash.cc | 4 +- src/libutil/tests/hash.hh | 2 +- src/libutil/tests/hilite.cc | 2 +- src/libutil/tests/local.mk | 2 +- src/libutil/tests/logging.cc | 4 +- src/libutil/tests/lru-cache.cc | 2 +- src/libutil/tests/pool.cc | 2 +- src/libutil/tests/suggestions.cc | 2 +- src/libutil/tests/tests.cc | 4 +- src/libutil/tests/url.cc | 2 +- src/libutil/tests/xml-writer.cc | 2 +- src/libutil/thread-pool.cc | 2 +- src/libutil/url.cc | 8 +- src/libutil/util.cc | 10 +- src/libutil/xml-writer.cc | 2 +- src/nix-build/nix-build.cc | 2 +- src/nix-channel/nix-channel.cc | 2 +- src/nix-env/nix-env.cc | 4 +- src/nix-env/user-env.cc | 2 +- src/nix-instantiate/nix-instantiate.cc | 2 +- src/nix-store/dotgraph.cc | 2 +- src/nix-store/graphml.cc | 2 +- src/nix-store/nix-store.cc | 6 +- src/nix/add-to-store.cc | 2 +- src/nix/daemon.cc | 8 +- src/nix/doctor.cc | 4 +- src/nix/dump-path.cc | 2 +- src/nix/hash.cc | 4 +- src/nix/local.mk | 9 +- src/nix/main.cc | 2 +- src/nix/ping-store.cc | 2 +- src/nix/prefetch.cc | 4 +- src/nix/profile.cc | 2 +- src/nix/run.cc | 2 +- src/nix/search.cc | 2 +- src/nix/show-derivation.cc | 2 +- src/nix/sigs.cc | 2 +- src/nix/store-copy-log.cc | 4 +- src/nix/verify.cc | 4 +- tests/plugins/local.mk | 5 +- tests/plugins/plugintest.cc | 2 +- 239 files changed, 12511 insertions(+), 389 deletions(-) create mode 100644 perl/autom4te.cache/output.0 create mode 100644 perl/autom4te.cache/requests create mode 100644 perl/autom4te.cache/traces.0 create mode 100644 perl/config.log create mode 100755 perl/configure rename src/libutil/{ => include/nix/util}/abstract-setting-to-json.hh (92%) rename src/libutil/{ => include/nix/util}/ansicolor.hh (100%) rename src/libutil/{ => include/nix/util}/archive.hh (97%) rename src/libutil/{ => include/nix/util}/args.hh (99%) rename src/libutil/{ => include/nix/util}/callback.hh (100%) rename src/libutil/{ => include/nix/util}/canon-path.hh (100%) rename src/libutil/{ => include/nix/util}/cgroup.hh (95%) rename src/libutil/{ => include/nix/util}/chunked-vector.hh (100%) rename src/libutil/{ => include/nix/util}/closure.hh (98%) rename src/libutil/{ => include/nix/util}/comparator.hh (100%) rename src/libutil/{ => include/nix/util}/compression.hh (88%) rename src/libutil/{ => include/nix/util}/compute-levels.hh (62%) rename src/libutil/{ => include/nix/util}/config.hh (99%) rename src/libutil/{ => include/nix/util}/error.hh (98%) rename src/libutil/{ => include/nix/util}/experimental-features.hh (94%) rename src/libutil/{ => include/nix/util}/finally.hh (100%) rename src/libutil/{ => include/nix/util}/fmt.hh (99%) rename src/libutil/{ => include/nix/util}/git.hh (100%) rename src/libutil/{ => include/nix/util}/hash.hh (98%) rename src/libutil/{ => include/nix/util}/hilite.hh (100%) rename src/libutil/{ => include/nix/util}/json-impls.hh (100%) rename src/libutil/{ => include/nix/util}/json-utils.hh (100%) rename src/libutil/{ => include/nix/util}/logging.hh (98%) rename src/libutil/{ => include/nix/util}/lru-cache.hh (100%) rename src/libutil/{ => include/nix/util}/monitor-fd.hh (100%) rename src/libutil/{ => include/nix/util}/namespaces.hh (100%) rename src/libutil/{ => include/nix/util}/pool.hh (98%) rename src/libutil/{ => include/nix/util}/ref.hh (100%) rename src/libutil/{ => include/nix/util}/regex-combinators.hh (100%) rename src/libutil/{ => include/nix/util}/serialise.hh (99%) rename src/libutil/{ => include/nix/util}/split.hh (96%) rename src/libutil/{ => include/nix/util}/suggestions.hh (96%) rename src/libutil/{ => include/nix/util}/sync.hh (100%) rename src/libutil/{ => include/nix/util}/tarfile.hh (94%) rename src/libutil/{ => include/nix/util}/thread-pool.hh (98%) rename src/libutil/{ => include/nix/util}/topo-sort.hh (97%) rename src/libutil/{ => include/nix/util}/types.hh (99%) rename src/libutil/{ => include/nix/util}/url-parts.hh (100%) rename src/libutil/{ => include/nix/util}/url.hh (97%) rename src/libutil/{ => include/nix/util}/util.hh (99%) rename src/libutil/{ => include/nix/util}/xml-writer.hh (100%) diff --git a/local.mk b/local.mk index 6a7074e8e14..5cbdc378b49 100644 --- a/local.mk +++ b/local.mk @@ -5,6 +5,6 @@ GLOBAL_CXXFLAGS += -Wno-deprecated-declarations $(foreach i, config.h $(wildcard src/lib*/*.hh), \ $(eval $(call install-file-in, $(i), $(includedir)/nix, 0644))) -$(GCH): src/libutil/util.hh config.h +$(GCH): src/libutil/include/nix/util/util.hh config.h -GCH_CXXFLAGS = -I src/libutil +GCH_CXXFLAGS = -Isrc/libutil/include/nix/util diff --git a/perl/Makefile b/perl/Makefile index c2c95f25503..053d8643ff2 100644 --- a/perl/Makefile +++ b/perl/Makefile @@ -1,6 +1,6 @@ makefiles = local.mk -GLOBAL_CXXFLAGS += -g -Wall -std=c++2a -I ../src +GLOBAL_CXXFLAGS += -g -Wall -std=c++2a -I../src -I../src/libutil/include -include Makefile.config diff --git a/perl/autom4te.cache/output.0 b/perl/autom4te.cache/output.0 new file mode 100644 index 00000000000..4b4b83915d3 --- /dev/null +++ b/perl/autom4te.cache/output.0 @@ -0,0 +1,5623 @@ +@%:@! /bin/sh +@%:@ Guess values for system-dependent variables and create Makefiles. +@%:@ Generated by GNU Autoconf 2.71 for nix-perl 2.14.0. +@%:@ +@%:@ +@%:@ Copyright (C) 1992-1996, 1998-2017, 2020-2021 Free Software Foundation, +@%:@ Inc. +@%:@ +@%:@ +@%:@ This configure script is free software; the Free Software Foundation +@%:@ gives unlimited permission to copy, distribute and modify it. +## -------------------- ## +## M4sh Initialization. ## +## -------------------- ## + +# Be more Bourne compatible +DUALCASE=1; export DUALCASE # for MKS sh +as_nop=: +if test ${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1 +then : + emulate sh + NULLCMD=: + # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which + # is contrary to our usage. Disable this feature. + alias -g '${1+"$@"}'='"$@"' + setopt NO_GLOB_SUBST +else $as_nop + case `(set -o) 2>/dev/null` in @%:@( + *posix*) : + set -o posix ;; @%:@( + *) : + ;; +esac +fi + + + +# Reset variables that may have inherited troublesome values from +# the environment. + +# IFS needs to be set, to space, tab, and newline, in precisely that order. +# (If _AS_PATH_WALK were called with IFS unset, it would have the +# side effect of setting IFS to empty, thus disabling word splitting.) +# Quoting is to prevent editors from complaining about space-tab. +as_nl=' +' +export as_nl +IFS=" "" $as_nl" + +PS1='$ ' +PS2='> ' +PS4='+ ' + +# Ensure predictable behavior from utilities with locale-dependent output. +LC_ALL=C +export LC_ALL +LANGUAGE=C +export LANGUAGE + +# We cannot yet rely on "unset" to work, but we need these variables +# to be unset--not just set to an empty or harmless value--now, to +# avoid bugs in old shells (e.g. pre-3.0 UWIN ksh). This construct +# also avoids known problems related to "unset" and subshell syntax +# in other old shells (e.g. bash 2.01 and pdksh 5.2.14). +for as_var in BASH_ENV ENV MAIL MAILPATH CDPATH +do eval test \${$as_var+y} \ + && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : +done + +# Ensure that fds 0, 1, and 2 are open. +if (exec 3>&0) 2>/dev/null; then :; else exec 0&1) 2>/dev/null; then :; else exec 1>/dev/null; fi +if (exec 3>&2) ; then :; else exec 2>/dev/null; fi + +# The user is always right. +if ${PATH_SEPARATOR+false} :; then + PATH_SEPARATOR=: + (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { + (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || + PATH_SEPARATOR=';' + } +fi + + +# Find who we are. Look in the path if we contain no directory separator. +as_myself= +case $0 in @%:@(( + *[\\/]* ) as_myself=$0 ;; + *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + test -r "$as_dir$0" && as_myself=$as_dir$0 && break + done +IFS=$as_save_IFS + + ;; +esac +# We did not find ourselves, most probably we were run as `sh COMMAND' +# in which case we are not to be found in the path. +if test "x$as_myself" = x; then + as_myself=$0 +fi +if test ! -f "$as_myself"; then + printf "%s\n" "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 + exit 1 +fi + + +# Use a proper internal environment variable to ensure we don't fall + # into an infinite loop, continuously re-executing ourselves. + if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then + _as_can_reexec=no; export _as_can_reexec; + # We cannot yet assume a decent shell, so we have to provide a +# neutralization value for shells without unset; and this also +# works around shells that cannot unset nonexistent variables. +# Preserve -v and -x to the replacement shell. +BASH_ENV=/dev/null +ENV=/dev/null +(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV +case $- in @%:@ (((( + *v*x* | *x*v* ) as_opts=-vx ;; + *v* ) as_opts=-v ;; + *x* ) as_opts=-x ;; + * ) as_opts= ;; +esac +exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} +# Admittedly, this is quite paranoid, since all the known shells bail +# out after a failed `exec'. +printf "%s\n" "$0: could not re-execute with $CONFIG_SHELL" >&2 +exit 255 + fi + # We don't want this to propagate to other subprocesses. + { _as_can_reexec=; unset _as_can_reexec;} +if test "x$CONFIG_SHELL" = x; then + as_bourne_compatible="as_nop=: +if test \${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1 +then : + emulate sh + NULLCMD=: + # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which + # is contrary to our usage. Disable this feature. + alias -g '\${1+\"\$@\"}'='\"\$@\"' + setopt NO_GLOB_SUBST +else \$as_nop + case \`(set -o) 2>/dev/null\` in @%:@( + *posix*) : + set -o posix ;; @%:@( + *) : + ;; +esac +fi +" + as_required="as_fn_return () { (exit \$1); } +as_fn_success () { as_fn_return 0; } +as_fn_failure () { as_fn_return 1; } +as_fn_ret_success () { return 0; } +as_fn_ret_failure () { return 1; } + +exitcode=0 +as_fn_success || { exitcode=1; echo as_fn_success failed.; } +as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; } +as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; } +as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; } +if ( set x; as_fn_ret_success y && test x = \"\$1\" ) +then : + +else \$as_nop + exitcode=1; echo positional parameters were not saved. +fi +test x\$exitcode = x0 || exit 1 +blah=\$(echo \$(echo blah)) +test x\"\$blah\" = xblah || exit 1 +test -x / || exit 1" + as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO + as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO + eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && + test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1" + if (eval "$as_required") 2>/dev/null +then : + as_have_required=yes +else $as_nop + as_have_required=no +fi + if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null +then : + +else $as_nop + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +as_found=false +for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + as_found=: + case $as_dir in @%:@( + /*) + for as_base in sh bash ksh sh5; do + # Try only shells that exist, to save several forks. + as_shell=$as_dir$as_base + if { test -f "$as_shell" || test -f "$as_shell.exe"; } && + as_run=a "$as_shell" -c "$as_bourne_compatible""$as_required" 2>/dev/null +then : + CONFIG_SHELL=$as_shell as_have_required=yes + if as_run=a "$as_shell" -c "$as_bourne_compatible""$as_suggested" 2>/dev/null +then : + break 2 +fi +fi + done;; + esac + as_found=false +done +IFS=$as_save_IFS +if $as_found +then : + +else $as_nop + if { test -f "$SHELL" || test -f "$SHELL.exe"; } && + as_run=a "$SHELL" -c "$as_bourne_compatible""$as_required" 2>/dev/null +then : + CONFIG_SHELL=$SHELL as_have_required=yes +fi +fi + + + if test "x$CONFIG_SHELL" != x +then : + export CONFIG_SHELL + # We cannot yet assume a decent shell, so we have to provide a +# neutralization value for shells without unset; and this also +# works around shells that cannot unset nonexistent variables. +# Preserve -v and -x to the replacement shell. +BASH_ENV=/dev/null +ENV=/dev/null +(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV +case $- in @%:@ (((( + *v*x* | *x*v* ) as_opts=-vx ;; + *v* ) as_opts=-v ;; + *x* ) as_opts=-x ;; + * ) as_opts= ;; +esac +exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} +# Admittedly, this is quite paranoid, since all the known shells bail +# out after a failed `exec'. +printf "%s\n" "$0: could not re-execute with $CONFIG_SHELL" >&2 +exit 255 +fi + + if test x$as_have_required = xno +then : + printf "%s\n" "$0: This script requires a shell more modern than all" + printf "%s\n" "$0: the shells that I found on your system." + if test ${ZSH_VERSION+y} ; then + printf "%s\n" "$0: In particular, zsh $ZSH_VERSION has bugs and should" + printf "%s\n" "$0: be upgraded to zsh 4.3.4 or later." + else + printf "%s\n" "$0: Please tell bug-autoconf@gnu.org about your system, +$0: including any error possibly output before this +$0: message. Then install a modern shell, or manually run +$0: the script under such a shell if you do have one." + fi + exit 1 +fi +fi +fi +SHELL=${CONFIG_SHELL-/bin/sh} +export SHELL +# Unset more variables known to interfere with behavior of common tools. +CLICOLOR_FORCE= GREP_OPTIONS= +unset CLICOLOR_FORCE GREP_OPTIONS + +## --------------------- ## +## M4sh Shell Functions. ## +## --------------------- ## +@%:@ as_fn_unset VAR +@%:@ --------------- +@%:@ Portably unset VAR. +as_fn_unset () +{ + { eval $1=; unset $1;} +} +as_unset=as_fn_unset + + +@%:@ as_fn_set_status STATUS +@%:@ ----------------------- +@%:@ Set @S|@? to STATUS, without forking. +as_fn_set_status () +{ + return $1 +} @%:@ as_fn_set_status + +@%:@ as_fn_exit STATUS +@%:@ ----------------- +@%:@ Exit the shell with STATUS, even in a "trap 0" or "set -e" context. +as_fn_exit () +{ + set +e + as_fn_set_status $1 + exit $1 +} @%:@ as_fn_exit +@%:@ as_fn_nop +@%:@ --------- +@%:@ Do nothing but, unlike ":", preserve the value of @S|@?. +as_fn_nop () +{ + return $? +} +as_nop=as_fn_nop + +@%:@ as_fn_mkdir_p +@%:@ ------------- +@%:@ Create "@S|@as_dir" as a directory, including parents if necessary. +as_fn_mkdir_p () +{ + + case $as_dir in #( + -*) as_dir=./$as_dir;; + esac + test -d "$as_dir" || eval $as_mkdir_p || { + as_dirs= + while :; do + case $as_dir in #( + *\'*) as_qdir=`printf "%s\n" "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( + *) as_qdir=$as_dir;; + esac + as_dirs="'$as_qdir' $as_dirs" + as_dir=`$as_dirname -- "$as_dir" || +$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$as_dir" : 'X\(//\)[^/]' \| \ + X"$as_dir" : 'X\(//\)$' \| \ + X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || +printf "%s\n" X"$as_dir" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + test -d "$as_dir" && break + done + test -z "$as_dirs" || eval "mkdir $as_dirs" + } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" + + +} @%:@ as_fn_mkdir_p + +@%:@ as_fn_executable_p FILE +@%:@ ----------------------- +@%:@ Test if FILE is an executable regular file. +as_fn_executable_p () +{ + test -f "$1" && test -x "$1" +} @%:@ as_fn_executable_p +@%:@ as_fn_append VAR VALUE +@%:@ ---------------------- +@%:@ Append the text in VALUE to the end of the definition contained in VAR. Take +@%:@ advantage of any shell optimizations that allow amortized linear growth over +@%:@ repeated appends, instead of the typical quadratic growth present in naive +@%:@ implementations. +if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null +then : + eval 'as_fn_append () + { + eval $1+=\$2 + }' +else $as_nop + as_fn_append () + { + eval $1=\$$1\$2 + } +fi # as_fn_append + +@%:@ as_fn_arith ARG... +@%:@ ------------------ +@%:@ Perform arithmetic evaluation on the ARGs, and store the result in the +@%:@ global @S|@as_val. Take advantage of shells that can avoid forks. The arguments +@%:@ must be portable across @S|@(()) and expr. +if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null +then : + eval 'as_fn_arith () + { + as_val=$(( $* )) + }' +else $as_nop + as_fn_arith () + { + as_val=`expr "$@" || test $? -eq 1` + } +fi # as_fn_arith + +@%:@ as_fn_nop +@%:@ --------- +@%:@ Do nothing but, unlike ":", preserve the value of @S|@?. +as_fn_nop () +{ + return $? +} +as_nop=as_fn_nop + +@%:@ as_fn_error STATUS ERROR [LINENO LOG_FD] +@%:@ ---------------------------------------- +@%:@ Output "`basename @S|@0`: error: ERROR" to stderr. If LINENO and LOG_FD are +@%:@ provided, also output the error to LOG_FD, referencing LINENO. Then exit the +@%:@ script with STATUS, using 1 if that was 0. +as_fn_error () +{ + as_status=$1; test $as_status -eq 0 && as_status=1 + if test "$4"; then + as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 + fi + printf "%s\n" "$as_me: error: $2" >&2 + as_fn_exit $as_status +} @%:@ as_fn_error + +if expr a : '\(a\)' >/dev/null 2>&1 && + test "X`expr 00001 : '.*\(...\)'`" = X001; then + as_expr=expr +else + as_expr=false +fi + +if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then + as_basename=basename +else + as_basename=false +fi + +if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then + as_dirname=dirname +else + as_dirname=false +fi + +as_me=`$as_basename -- "$0" || +$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ + X"$0" : 'X\(//\)$' \| \ + X"$0" : 'X\(/\)' \| . 2>/dev/null || +printf "%s\n" X/"$0" | + sed '/^.*\/\([^/][^/]*\)\/*$/{ + s//\1/ + q + } + /^X\/\(\/\/\)$/{ + s//\1/ + q + } + /^X\/\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + +# Avoid depending upon Character Ranges. +as_cr_letters='abcdefghijklmnopqrstuvwxyz' +as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' +as_cr_Letters=$as_cr_letters$as_cr_LETTERS +as_cr_digits='0123456789' +as_cr_alnum=$as_cr_Letters$as_cr_digits + + + as_lineno_1=$LINENO as_lineno_1a=$LINENO + as_lineno_2=$LINENO as_lineno_2a=$LINENO + eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" && + test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || { + # Blame Lee E. McMahon (1931-1989) for sed's syntax. :-) + sed -n ' + p + /[$]LINENO/= + ' <$as_myself | + sed ' + s/[$]LINENO.*/&-/ + t lineno + b + :lineno + N + :loop + s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/ + t loop + s/-\n.*// + ' >$as_me.lineno && + chmod +x "$as_me.lineno" || + { printf "%s\n" "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } + + # If we had to re-execute with $CONFIG_SHELL, we're ensured to have + # already done that, so ensure we don't try to do so again and fall + # in an infinite loop. This has already happened in practice. + _as_can_reexec=no; export _as_can_reexec + # Don't try to exec as it changes $[0], causing all sort of problems + # (the dirname of $[0] is not the place where we might find the + # original and so on. Autoconf is especially sensitive to this). + . "./$as_me.lineno" + # Exit status is that of the last command. + exit +} + + +# Determine whether it's possible to make 'echo' print without a newline. +# These variables are no longer used directly by Autoconf, but are AC_SUBSTed +# for compatibility with existing Makefiles. +ECHO_C= ECHO_N= ECHO_T= +case `echo -n x` in @%:@((((( +-n*) + case `echo 'xy\c'` in + *c*) ECHO_T=' ';; # ECHO_T is single tab character. + xy) ECHO_C='\c';; + *) echo `echo ksh88 bug on AIX 6.1` > /dev/null + ECHO_T=' ';; + esac;; +*) + ECHO_N='-n';; +esac + +# For backward compatibility with old third-party macros, we provide +# the shell variables $as_echo and $as_echo_n. New code should use +# AS_ECHO(["message"]) and AS_ECHO_N(["message"]), respectively. +as_@&t@echo='printf %s\n' +as_@&t@echo_n='printf %s' + + +rm -f conf$$ conf$$.exe conf$$.file +if test -d conf$$.dir; then + rm -f conf$$.dir/conf$$.file +else + rm -f conf$$.dir + mkdir conf$$.dir 2>/dev/null +fi +if (echo >conf$$.file) 2>/dev/null; then + if ln -s conf$$.file conf$$ 2>/dev/null; then + as_ln_s='ln -s' + # ... but there are two gotchas: + # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. + # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. + # In both cases, we have to default to `cp -pR'. + ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || + as_ln_s='cp -pR' + elif ln conf$$.file conf$$ 2>/dev/null; then + as_ln_s=ln + else + as_ln_s='cp -pR' + fi +else + as_ln_s='cp -pR' +fi +rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file +rmdir conf$$.dir 2>/dev/null + +if mkdir -p . 2>/dev/null; then + as_mkdir_p='mkdir -p "$as_dir"' +else + test -d ./-p && rmdir ./-p + as_mkdir_p=false +fi + +as_test_x='test -x' +as_executable_p=as_fn_executable_p + +# Sed expression to map a string onto a valid CPP name. +as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" + +# Sed expression to map a string onto a valid variable name. +as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" + + +test -n "$DJDIR" || exec 7<&0 &1 + +# Name of the host. +# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status, +# so uname gets run too. +ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` + +# +# Initializations. +# +ac_default_prefix=/usr/local +ac_clean_files= +ac_config_libobj_dir=. +LIB@&t@OBJS= +cross_compiling=no +subdirs= +MFLAGS= +MAKEFLAGS= + +# Identity of this package. +PACKAGE_NAME='nix-perl' +PACKAGE_TARNAME='nix-perl' +PACKAGE_VERSION='2.14.0' +PACKAGE_STRING='nix-perl 2.14.0' +PACKAGE_BUGREPORT='' +PACKAGE_URL='' + +ac_unique_file="MANIFEST" +ac_subst_vars='LTLIBOBJS +LIB@&t@OBJS +NIX +perlFlags +perllibdir +xz +bzip2 +curl +perl +host_os +host_vendor +host_cpu +host +build_os +build_vendor +build_cpu +build +ac_ct_CXX +CXXFLAGS +CXX +OBJEXT +EXEEXT +ac_ct_CC +CPPFLAGS +LDFLAGS +CFLAGS +CC +target_alias +host_alias +build_alias +LIBS +ECHO_T +ECHO_N +ECHO_C +DEFS +mandir +localedir +libdir +psdir +pdfdir +dvidir +htmldir +infodir +docdir +oldincludedir +includedir +runstatedir +localstatedir +sharedstatedir +sysconfdir +datadir +datarootdir +libexecdir +sbindir +bindir +program_transform_name +prefix +exec_prefix +PACKAGE_URL +PACKAGE_BUGREPORT +PACKAGE_STRING +PACKAGE_VERSION +PACKAGE_TARNAME +PACKAGE_NAME +PATH_SEPARATOR +SHELL' +ac_subst_files='' +ac_user_opts=' +enable_option_checking +enable_largefile +with_dbi +with_dbd_sqlite +' + ac_precious_vars='build_alias +host_alias +target_alias +CC +CFLAGS +LDFLAGS +LIBS +CPPFLAGS +CXX +CXXFLAGS +CCC' + + +# Initialize some variables set by options. +ac_init_help= +ac_init_version=false +ac_unrecognized_opts= +ac_unrecognized_sep= +# The variables have the same names as the options, with +# dashes changed to underlines. +cache_file=/dev/null +exec_prefix=NONE +no_create= +no_recursion= +prefix=NONE +program_prefix=NONE +program_suffix=NONE +program_transform_name=s,x,x, +silent= +site= +srcdir= +verbose= +x_includes=NONE +x_libraries=NONE + +# Installation directory options. +# These are left unexpanded so users can "make install exec_prefix=/foo" +# and all the variables that are supposed to be based on exec_prefix +# by default will actually change. +# Use braces instead of parens because sh, perl, etc. also accept them. +# (The list follows the same order as the GNU Coding Standards.) +bindir='${exec_prefix}/bin' +sbindir='${exec_prefix}/sbin' +libexecdir='${exec_prefix}/libexec' +datarootdir='${prefix}/share' +datadir='${datarootdir}' +sysconfdir='${prefix}/etc' +sharedstatedir='${prefix}/com' +localstatedir='${prefix}/var' +runstatedir='${localstatedir}/run' +includedir='${prefix}/include' +oldincludedir='/usr/include' +docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' +infodir='${datarootdir}/info' +htmldir='${docdir}' +dvidir='${docdir}' +pdfdir='${docdir}' +psdir='${docdir}' +libdir='${exec_prefix}/lib' +localedir='${datarootdir}/locale' +mandir='${datarootdir}/man' + +ac_prev= +ac_dashdash= +for ac_option +do + # If the previous option needs an argument, assign it. + if test -n "$ac_prev"; then + eval $ac_prev=\$ac_option + ac_prev= + continue + fi + + case $ac_option in + *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; + *=) ac_optarg= ;; + *) ac_optarg=yes ;; + esac + + case $ac_dashdash$ac_option in + --) + ac_dashdash=yes ;; + + -bindir | --bindir | --bindi | --bind | --bin | --bi) + ac_prev=bindir ;; + -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*) + bindir=$ac_optarg ;; + + -build | --build | --buil | --bui | --bu) + ac_prev=build_alias ;; + -build=* | --build=* | --buil=* | --bui=* | --bu=*) + build_alias=$ac_optarg ;; + + -cache-file | --cache-file | --cache-fil | --cache-fi \ + | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c) + ac_prev=cache_file ;; + -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \ + | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*) + cache_file=$ac_optarg ;; + + --config-cache | -C) + cache_file=config.cache ;; + + -datadir | --datadir | --datadi | --datad) + ac_prev=datadir ;; + -datadir=* | --datadir=* | --datadi=* | --datad=*) + datadir=$ac_optarg ;; + + -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \ + | --dataroo | --dataro | --datar) + ac_prev=datarootdir ;; + -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \ + | --dataroot=* | --dataroo=* | --dataro=* | --datar=*) + datarootdir=$ac_optarg ;; + + -disable-* | --disable-*) + ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'` + # Reject names that are not valid shell variable names. + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && + as_fn_error $? "invalid feature name: \`$ac_useropt'" + ac_useropt_orig=$ac_useropt + ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'` + case $ac_user_opts in + *" +"enable_$ac_useropt" +"*) ;; + *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig" + ac_unrecognized_sep=', ';; + esac + eval enable_$ac_useropt=no ;; + + -docdir | --docdir | --docdi | --doc | --do) + ac_prev=docdir ;; + -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*) + docdir=$ac_optarg ;; + + -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv) + ac_prev=dvidir ;; + -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*) + dvidir=$ac_optarg ;; + + -enable-* | --enable-*) + ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` + # Reject names that are not valid shell variable names. + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && + as_fn_error $? "invalid feature name: \`$ac_useropt'" + ac_useropt_orig=$ac_useropt + ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'` + case $ac_user_opts in + *" +"enable_$ac_useropt" +"*) ;; + *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig" + ac_unrecognized_sep=', ';; + esac + eval enable_$ac_useropt=\$ac_optarg ;; + + -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \ + | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \ + | --exec | --exe | --ex) + ac_prev=exec_prefix ;; + -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \ + | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \ + | --exec=* | --exe=* | --ex=*) + exec_prefix=$ac_optarg ;; + + -gas | --gas | --ga | --g) + # Obsolete; use --with-gas. + with_gas=yes ;; + + -help | --help | --hel | --he | -h) + ac_init_help=long ;; + -help=r* | --help=r* | --hel=r* | --he=r* | -hr*) + ac_init_help=recursive ;; + -help=s* | --help=s* | --hel=s* | --he=s* | -hs*) + ac_init_help=short ;; + + -host | --host | --hos | --ho) + ac_prev=host_alias ;; + -host=* | --host=* | --hos=* | --ho=*) + host_alias=$ac_optarg ;; + + -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht) + ac_prev=htmldir ;; + -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \ + | --ht=*) + htmldir=$ac_optarg ;; + + -includedir | --includedir | --includedi | --included | --include \ + | --includ | --inclu | --incl | --inc) + ac_prev=includedir ;; + -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \ + | --includ=* | --inclu=* | --incl=* | --inc=*) + includedir=$ac_optarg ;; + + -infodir | --infodir | --infodi | --infod | --info | --inf) + ac_prev=infodir ;; + -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*) + infodir=$ac_optarg ;; + + -libdir | --libdir | --libdi | --libd) + ac_prev=libdir ;; + -libdir=* | --libdir=* | --libdi=* | --libd=*) + libdir=$ac_optarg ;; + + -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \ + | --libexe | --libex | --libe) + ac_prev=libexecdir ;; + -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \ + | --libexe=* | --libex=* | --libe=*) + libexecdir=$ac_optarg ;; + + -localedir | --localedir | --localedi | --localed | --locale) + ac_prev=localedir ;; + -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*) + localedir=$ac_optarg ;; + + -localstatedir | --localstatedir | --localstatedi | --localstated \ + | --localstate | --localstat | --localsta | --localst | --locals) + ac_prev=localstatedir ;; + -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \ + | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*) + localstatedir=$ac_optarg ;; + + -mandir | --mandir | --mandi | --mand | --man | --ma | --m) + ac_prev=mandir ;; + -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*) + mandir=$ac_optarg ;; + + -nfp | --nfp | --nf) + # Obsolete; use --without-fp. + with_fp=no ;; + + -no-create | --no-create | --no-creat | --no-crea | --no-cre \ + | --no-cr | --no-c | -n) + no_create=yes ;; + + -no-recursion | --no-recursion | --no-recursio | --no-recursi \ + | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) + no_recursion=yes ;; + + -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \ + | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \ + | --oldin | --oldi | --old | --ol | --o) + ac_prev=oldincludedir ;; + -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \ + | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \ + | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*) + oldincludedir=$ac_optarg ;; + + -prefix | --prefix | --prefi | --pref | --pre | --pr | --p) + ac_prev=prefix ;; + -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*) + prefix=$ac_optarg ;; + + -program-prefix | --program-prefix | --program-prefi | --program-pref \ + | --program-pre | --program-pr | --program-p) + ac_prev=program_prefix ;; + -program-prefix=* | --program-prefix=* | --program-prefi=* \ + | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*) + program_prefix=$ac_optarg ;; + + -program-suffix | --program-suffix | --program-suffi | --program-suff \ + | --program-suf | --program-su | --program-s) + ac_prev=program_suffix ;; + -program-suffix=* | --program-suffix=* | --program-suffi=* \ + | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*) + program_suffix=$ac_optarg ;; + + -program-transform-name | --program-transform-name \ + | --program-transform-nam | --program-transform-na \ + | --program-transform-n | --program-transform- \ + | --program-transform | --program-transfor \ + | --program-transfo | --program-transf \ + | --program-trans | --program-tran \ + | --progr-tra | --program-tr | --program-t) + ac_prev=program_transform_name ;; + -program-transform-name=* | --program-transform-name=* \ + | --program-transform-nam=* | --program-transform-na=* \ + | --program-transform-n=* | --program-transform-=* \ + | --program-transform=* | --program-transfor=* \ + | --program-transfo=* | --program-transf=* \ + | --program-trans=* | --program-tran=* \ + | --progr-tra=* | --program-tr=* | --program-t=*) + program_transform_name=$ac_optarg ;; + + -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd) + ac_prev=pdfdir ;; + -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*) + pdfdir=$ac_optarg ;; + + -psdir | --psdir | --psdi | --psd | --ps) + ac_prev=psdir ;; + -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*) + psdir=$ac_optarg ;; + + -q | -quiet | --quiet | --quie | --qui | --qu | --q \ + | -silent | --silent | --silen | --sile | --sil) + silent=yes ;; + + -runstatedir | --runstatedir | --runstatedi | --runstated \ + | --runstate | --runstat | --runsta | --runst | --runs \ + | --run | --ru | --r) + ac_prev=runstatedir ;; + -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \ + | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \ + | --run=* | --ru=* | --r=*) + runstatedir=$ac_optarg ;; + + -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) + ac_prev=sbindir ;; + -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ + | --sbi=* | --sb=*) + sbindir=$ac_optarg ;; + + -sharedstatedir | --sharedstatedir | --sharedstatedi \ + | --sharedstated | --sharedstate | --sharedstat | --sharedsta \ + | --sharedst | --shareds | --shared | --share | --shar \ + | --sha | --sh) + ac_prev=sharedstatedir ;; + -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \ + | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \ + | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \ + | --sha=* | --sh=*) + sharedstatedir=$ac_optarg ;; + + -site | --site | --sit) + ac_prev=site ;; + -site=* | --site=* | --sit=*) + site=$ac_optarg ;; + + -srcdir | --srcdir | --srcdi | --srcd | --src | --sr) + ac_prev=srcdir ;; + -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*) + srcdir=$ac_optarg ;; + + -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \ + | --syscon | --sysco | --sysc | --sys | --sy) + ac_prev=sysconfdir ;; + -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \ + | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*) + sysconfdir=$ac_optarg ;; + + -target | --target | --targe | --targ | --tar | --ta | --t) + ac_prev=target_alias ;; + -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*) + target_alias=$ac_optarg ;; + + -v | -verbose | --verbose | --verbos | --verbo | --verb) + verbose=yes ;; + + -version | --version | --versio | --versi | --vers | -V) + ac_init_version=: ;; + + -with-* | --with-*) + ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` + # Reject names that are not valid shell variable names. + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && + as_fn_error $? "invalid package name: \`$ac_useropt'" + ac_useropt_orig=$ac_useropt + ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'` + case $ac_user_opts in + *" +"with_$ac_useropt" +"*) ;; + *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig" + ac_unrecognized_sep=', ';; + esac + eval with_$ac_useropt=\$ac_optarg ;; + + -without-* | --without-*) + ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'` + # Reject names that are not valid shell variable names. + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && + as_fn_error $? "invalid package name: \`$ac_useropt'" + ac_useropt_orig=$ac_useropt + ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'` + case $ac_user_opts in + *" +"with_$ac_useropt" +"*) ;; + *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig" + ac_unrecognized_sep=', ';; + esac + eval with_$ac_useropt=no ;; + + --x) + # Obsolete; use --with-x. + with_x=yes ;; + + -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \ + | --x-incl | --x-inc | --x-in | --x-i) + ac_prev=x_includes ;; + -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \ + | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*) + x_includes=$ac_optarg ;; + + -x-libraries | --x-libraries | --x-librarie | --x-librari \ + | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l) + ac_prev=x_libraries ;; + -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \ + | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) + x_libraries=$ac_optarg ;; + + -*) as_fn_error $? "unrecognized option: \`$ac_option' +Try \`$0 --help' for more information" + ;; + + *=*) + ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='` + # Reject names that are not valid shell variable names. + case $ac_envvar in #( + '' | [0-9]* | *[!_$as_cr_alnum]* ) + as_fn_error $? "invalid variable name: \`$ac_envvar'" ;; + esac + eval $ac_envvar=\$ac_optarg + export $ac_envvar ;; + + *) + # FIXME: should be removed in autoconf 3.0. + printf "%s\n" "$as_me: WARNING: you should use --build, --host, --target" >&2 + expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && + printf "%s\n" "$as_me: WARNING: invalid host type: $ac_option" >&2 + : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}" + ;; + + esac +done + +if test -n "$ac_prev"; then + ac_option=--`echo $ac_prev | sed 's/_/-/g'` + as_fn_error $? "missing argument to $ac_option" +fi + +if test -n "$ac_unrecognized_opts"; then + case $enable_option_checking in + no) ;; + fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;; + *) printf "%s\n" "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; + esac +fi + +# Check all directory arguments for consistency. +for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ + datadir sysconfdir sharedstatedir localstatedir includedir \ + oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ + libdir localedir mandir runstatedir +do + eval ac_val=\$$ac_var + # Remove trailing slashes. + case $ac_val in + */ ) + ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'` + eval $ac_var=\$ac_val;; + esac + # Be sure to have absolute directory names. + case $ac_val in + [\\/$]* | ?:[\\/]* ) continue;; + NONE | '' ) case $ac_var in *prefix ) continue;; esac;; + esac + as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val" +done + +# There might be people who depend on the old broken behavior: `$host' +# used to hold the argument of --host etc. +# FIXME: To remove some day. +build=$build_alias +host=$host_alias +target=$target_alias + +# FIXME: To remove some day. +if test "x$host_alias" != x; then + if test "x$build_alias" = x; then + cross_compiling=maybe + elif test "x$build_alias" != "x$host_alias"; then + cross_compiling=yes + fi +fi + +ac_tool_prefix= +test -n "$host_alias" && ac_tool_prefix=$host_alias- + +test "$silent" = yes && exec 6>/dev/null + + +ac_pwd=`pwd` && test -n "$ac_pwd" && +ac_ls_di=`ls -di .` && +ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || + as_fn_error $? "working directory cannot be determined" +test "X$ac_ls_di" = "X$ac_pwd_ls_di" || + as_fn_error $? "pwd does not report name of working directory" + + +# Find the source files, if location was not specified. +if test -z "$srcdir"; then + ac_srcdir_defaulted=yes + # Try the directory containing this script, then the parent directory. + ac_confdir=`$as_dirname -- "$as_myself" || +$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$as_myself" : 'X\(//\)[^/]' \| \ + X"$as_myself" : 'X\(//\)$' \| \ + X"$as_myself" : 'X\(/\)' \| . 2>/dev/null || +printf "%s\n" X"$as_myself" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + srcdir=$ac_confdir + if test ! -r "$srcdir/$ac_unique_file"; then + srcdir=.. + fi +else + ac_srcdir_defaulted=no +fi +if test ! -r "$srcdir/$ac_unique_file"; then + test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." + as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir" +fi +ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" +ac_abs_confdir=`( + cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg" + pwd)` +# When building in place, set srcdir=. +if test "$ac_abs_confdir" = "$ac_pwd"; then + srcdir=. +fi +# Remove unnecessary trailing slashes from srcdir. +# Double slashes in file names in object file debugging info +# mess up M-x gdb in Emacs. +case $srcdir in +*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;; +esac +for ac_var in $ac_precious_vars; do + eval ac_env_${ac_var}_set=\${${ac_var}+set} + eval ac_env_${ac_var}_value=\$${ac_var} + eval ac_cv_env_${ac_var}_set=\${${ac_var}+set} + eval ac_cv_env_${ac_var}_value=\$${ac_var} +done + +# +# Report the --help message. +# +if test "$ac_init_help" = "long"; then + # Omit some internal or obsolete options to make the list less imposing. + # This message is too long to be a string in the A/UX 3.1 sh. + cat <<_ACEOF +\`configure' configures nix-perl 2.14.0 to adapt to many kinds of systems. + +Usage: $0 [OPTION]... [VAR=VALUE]... + +To assign environment variables (e.g., CC, CFLAGS...), specify them as +VAR=VALUE. See below for descriptions of some of the useful variables. + +Defaults for the options are specified in brackets. + +Configuration: + -h, --help display this help and exit + --help=short display options specific to this package + --help=recursive display the short help of all the included packages + -V, --version display version information and exit + -q, --quiet, --silent do not print \`checking ...' messages + --cache-file=FILE cache test results in FILE [disabled] + -C, --config-cache alias for \`--cache-file=config.cache' + -n, --no-create do not create output files + --srcdir=DIR find the sources in DIR [configure dir or \`..'] + +Installation directories: + --prefix=PREFIX install architecture-independent files in PREFIX + @<:@@S|@ac_default_prefix@:>@ + --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX + @<:@PREFIX@:>@ + +By default, \`make install' will install all the files in +\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify +an installation prefix other than \`$ac_default_prefix' using \`--prefix', +for instance \`--prefix=\$HOME'. + +For better control, use the options below. + +Fine tuning of the installation directories: + --bindir=DIR user executables [EPREFIX/bin] + --sbindir=DIR system admin executables [EPREFIX/sbin] + --libexecdir=DIR program executables [EPREFIX/libexec] + --sysconfdir=DIR read-only single-machine data [PREFIX/etc] + --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] + --localstatedir=DIR modifiable single-machine data [PREFIX/var] + --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run] + --libdir=DIR object code libraries [EPREFIX/lib] + --includedir=DIR C header files [PREFIX/include] + --oldincludedir=DIR C header files for non-gcc [/usr/include] + --datarootdir=DIR read-only arch.-independent data root [PREFIX/share] + --datadir=DIR read-only architecture-independent data [DATAROOTDIR] + --infodir=DIR info documentation [DATAROOTDIR/info] + --localedir=DIR locale-dependent data [DATAROOTDIR/locale] + --mandir=DIR man documentation [DATAROOTDIR/man] + --docdir=DIR documentation root @<:@DATAROOTDIR/doc/nix-perl@:>@ + --htmldir=DIR html documentation [DOCDIR] + --dvidir=DIR dvi documentation [DOCDIR] + --pdfdir=DIR pdf documentation [DOCDIR] + --psdir=DIR ps documentation [DOCDIR] +_ACEOF + + cat <<\_ACEOF + +System types: + --build=BUILD configure for building on BUILD [guessed] + --host=HOST cross-compile to build programs to run on HOST [BUILD] +_ACEOF +fi + +if test -n "$ac_init_help"; then + case $ac_init_help in + short | recursive ) echo "Configuration of nix-perl 2.14.0:";; + esac + cat <<\_ACEOF + +Optional Features: + --disable-option-checking ignore unrecognized --enable/--with options + --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) + --enable-FEATURE[=ARG] include FEATURE [ARG=yes] + --disable-largefile omit support for large files + +Optional Packages: + --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] + --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) + --with-dbi=PATH prefix of the Perl DBI library + --with-dbd-sqlite=PATH prefix of the Perl DBD::SQLite library + +Some influential environment variables: + CC C compiler command + CFLAGS C compiler flags + LDFLAGS linker flags, e.g. -L if you have libraries in a + nonstandard directory + LIBS libraries to pass to the linker, e.g. -l + CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I if + you have headers in a nonstandard directory + CXX C++ compiler command + CXXFLAGS C++ compiler flags + +Use these variables to override the choices made by `configure' or to help +it to find libraries and programs with nonstandard names/locations. + +Report bugs to the package provider. +_ACEOF +ac_status=$? +fi + +if test "$ac_init_help" = "recursive"; then + # If there are subdirs, report their specific --help. + for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue + test -d "$ac_dir" || + { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } || + continue + ac_builddir=. + +case "$ac_dir" in +.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; +*) + ac_dir_suffix=/`printf "%s\n" "$ac_dir" | sed 's|^\.[\\/]||'` + # A ".." for each directory in $ac_dir_suffix. + ac_top_builddir_sub=`printf "%s\n" "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` + case $ac_top_builddir_sub in + "") ac_top_builddir_sub=. ac_top_build_prefix= ;; + *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; + esac ;; +esac +ac_abs_top_builddir=$ac_pwd +ac_abs_builddir=$ac_pwd$ac_dir_suffix +# for backward compatibility: +ac_top_builddir=$ac_top_build_prefix + +case $srcdir in + .) # We are building in place. + ac_srcdir=. + ac_top_srcdir=$ac_top_builddir_sub + ac_abs_top_srcdir=$ac_pwd ;; + [\\/]* | ?:[\\/]* ) # Absolute name. + ac_srcdir=$srcdir$ac_dir_suffix; + ac_top_srcdir=$srcdir + ac_abs_top_srcdir=$srcdir ;; + *) # Relative name. + ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix + ac_top_srcdir=$ac_top_build_prefix$srcdir + ac_abs_top_srcdir=$ac_pwd/$srcdir ;; +esac +ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix + + cd "$ac_dir" || { ac_status=$?; continue; } + # Check for configure.gnu first; this name is used for a wrapper for + # Metaconfig's "Configure" on case-insensitive file systems. + if test -f "$ac_srcdir/configure.gnu"; then + echo && + $SHELL "$ac_srcdir/configure.gnu" --help=recursive + elif test -f "$ac_srcdir/configure"; then + echo && + $SHELL "$ac_srcdir/configure" --help=recursive + else + printf "%s\n" "$as_me: WARNING: no configuration information is in $ac_dir" >&2 + fi || ac_status=$? + cd "$ac_pwd" || { ac_status=$?; break; } + done +fi + +test -n "$ac_init_help" && exit $ac_status +if $ac_init_version; then + cat <<\_ACEOF +nix-perl configure 2.14.0 +generated by GNU Autoconf 2.71 + +Copyright (C) 2021 Free Software Foundation, Inc. +This configure script is free software; the Free Software Foundation +gives unlimited permission to copy, distribute and modify it. +_ACEOF + exit +fi + +## ------------------------ ## +## Autoconf initialization. ## +## ------------------------ ## + +@%:@ ac_fn_c_try_compile LINENO +@%:@ -------------------------- +@%:@ Try to compile conftest.@S|@ac_ext, and return whether this succeeded. +ac_fn_c_try_compile () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + rm -f conftest.$ac_objext conftest.beam + if { { ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +printf "%s\n" "$ac_try_echo"; } >&5 + (eval "$ac_compile") 2>conftest.err + ac_status=$? + if test -s conftest.err; then + grep -v '^ *+' conftest.err >conftest.er1 + cat conftest.er1 >&5 + mv -f conftest.er1 conftest.err + fi + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext +then : + ac_retval=0 +else $as_nop + printf "%s\n" "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_retval=1 +fi + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + as_fn_set_status $ac_retval + +} @%:@ ac_fn_c_try_compile + +@%:@ ac_fn_cxx_try_compile LINENO +@%:@ ---------------------------- +@%:@ Try to compile conftest.@S|@ac_ext, and return whether this succeeded. +ac_fn_cxx_try_compile () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + rm -f conftest.$ac_objext conftest.beam + if { { ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +printf "%s\n" "$ac_try_echo"; } >&5 + (eval "$ac_compile") 2>conftest.err + ac_status=$? + if test -s conftest.err; then + grep -v '^ *+' conftest.err >conftest.er1 + cat conftest.er1 >&5 + mv -f conftest.er1 conftest.err + fi + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext +then : + ac_retval=0 +else $as_nop + printf "%s\n" "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_retval=1 +fi + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + as_fn_set_status $ac_retval + +} @%:@ ac_fn_cxx_try_compile +ac_configure_args_raw= +for ac_arg +do + case $ac_arg in + *\'*) + ac_arg=`printf "%s\n" "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; + esac + as_fn_append ac_configure_args_raw " '$ac_arg'" +done + +case $ac_configure_args_raw in + *$as_nl*) + ac_safe_unquote= ;; + *) + ac_unsafe_z='|&;<>()$`\\"*?@<:@ '' ' # This string ends in space, tab. + ac_unsafe_a="$ac_unsafe_z#~" + ac_safe_unquote="s/ '\\([^$ac_unsafe_a][^$ac_unsafe_z]*\\)'/ \\1/g" + ac_configure_args_raw=` printf "%s\n" "$ac_configure_args_raw" | sed "$ac_safe_unquote"`;; +esac + +cat >config.log <<_ACEOF +This file contains any messages produced by compilers while +running configure, to aid debugging if configure makes a mistake. + +It was created by nix-perl $as_me 2.14.0, which was +generated by GNU Autoconf 2.71. Invocation command line was + + $ $0$ac_configure_args_raw + +_ACEOF +exec 5>>config.log +{ +cat <<_ASUNAME +## --------- ## +## Platform. ## +## --------- ## + +hostname = `(hostname || uname -n) 2>/dev/null | sed 1q` +uname -m = `(uname -m) 2>/dev/null || echo unknown` +uname -r = `(uname -r) 2>/dev/null || echo unknown` +uname -s = `(uname -s) 2>/dev/null || echo unknown` +uname -v = `(uname -v) 2>/dev/null || echo unknown` + +/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown` +/bin/uname -X = `(/bin/uname -X) 2>/dev/null || echo unknown` + +/bin/arch = `(/bin/arch) 2>/dev/null || echo unknown` +/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown` +/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown` +/usr/bin/hostinfo = `(/usr/bin/hostinfo) 2>/dev/null || echo unknown` +/bin/machine = `(/bin/machine) 2>/dev/null || echo unknown` +/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown` +/bin/universe = `(/bin/universe) 2>/dev/null || echo unknown` + +_ASUNAME + +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + printf "%s\n" "PATH: $as_dir" + done +IFS=$as_save_IFS + +} >&5 + +cat >&5 <<_ACEOF + + +## ----------- ## +## Core tests. ## +## ----------- ## + +_ACEOF + + +# Keep a trace of the command line. +# Strip out --no-create and --no-recursion so they do not pile up. +# Strip out --silent because we don't want to record it for future runs. +# Also quote any args containing shell meta-characters. +# Make two passes to allow for proper duplicate-argument suppression. +ac_configure_args= +ac_configure_args0= +ac_configure_args1= +ac_must_keep_next=false +for ac_pass in 1 2 +do + for ac_arg + do + case $ac_arg in + -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;; + -q | -quiet | --quiet | --quie | --qui | --qu | --q \ + | -silent | --silent | --silen | --sile | --sil) + continue ;; + *\'*) + ac_arg=`printf "%s\n" "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; + esac + case $ac_pass in + 1) as_fn_append ac_configure_args0 " '$ac_arg'" ;; + 2) + as_fn_append ac_configure_args1 " '$ac_arg'" + if test $ac_must_keep_next = true; then + ac_must_keep_next=false # Got value, back to normal. + else + case $ac_arg in + *=* | --config-cache | -C | -disable-* | --disable-* \ + | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \ + | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \ + | -with-* | --with-* | -without-* | --without-* | --x) + case "$ac_configure_args0 " in + "$ac_configure_args1"*" '$ac_arg' "* ) continue ;; + esac + ;; + -* ) ac_must_keep_next=true ;; + esac + fi + as_fn_append ac_configure_args " '$ac_arg'" + ;; + esac + done +done +{ ac_configure_args0=; unset ac_configure_args0;} +{ ac_configure_args1=; unset ac_configure_args1;} + +# When interrupted or exit'd, cleanup temporary files, and complete +# config.log. We remove comments because anyway the quotes in there +# would cause problems or look ugly. +# WARNING: Use '\'' to represent an apostrophe within the trap. +# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug. +trap 'exit_status=$? + # Sanitize IFS. + IFS=" "" $as_nl" + # Save into config.log some information that might help in debugging. + { + echo + + printf "%s\n" "## ---------------- ## +## Cache variables. ## +## ---------------- ##" + echo + # The following way of writing the cache mishandles newlines in values, +( + for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do + eval ac_val=\$$ac_var + case $ac_val in #( + *${as_nl}*) + case $ac_var in #( + *_cv_*) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 +printf "%s\n" "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; + esac + case $ac_var in #( + _ | IFS | as_nl) ;; #( + BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( + *) { eval $ac_var=; unset $ac_var;} ;; + esac ;; + esac + done + (set) 2>&1 | + case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #( + *${as_nl}ac_space=\ *) + sed -n \ + "s/'\''/'\''\\\\'\'''\''/g; + s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p" + ;; #( + *) + sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" + ;; + esac | + sort +) + echo + + printf "%s\n" "## ----------------- ## +## Output variables. ## +## ----------------- ##" + echo + for ac_var in $ac_subst_vars + do + eval ac_val=\$$ac_var + case $ac_val in + *\'\''*) ac_val=`printf "%s\n" "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; + esac + printf "%s\n" "$ac_var='\''$ac_val'\''" + done | sort + echo + + if test -n "$ac_subst_files"; then + printf "%s\n" "## ------------------- ## +## File substitutions. ## +## ------------------- ##" + echo + for ac_var in $ac_subst_files + do + eval ac_val=\$$ac_var + case $ac_val in + *\'\''*) ac_val=`printf "%s\n" "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; + esac + printf "%s\n" "$ac_var='\''$ac_val'\''" + done | sort + echo + fi + + if test -s confdefs.h; then + printf "%s\n" "## ----------- ## +## confdefs.h. ## +## ----------- ##" + echo + cat confdefs.h + echo + fi + test "$ac_signal" != 0 && + printf "%s\n" "$as_me: caught signal $ac_signal" + printf "%s\n" "$as_me: exit $exit_status" + } >&5 + rm -f core *.core core.conftest.* && + rm -f -r conftest* confdefs* conf$$* $ac_clean_files && + exit $exit_status +' 0 +for ac_signal in 1 2 13 15; do + trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal +done +ac_signal=0 + +# confdefs.h avoids OS command line length limits that DEFS can exceed. +rm -f -r conftest* confdefs.h + +printf "%s\n" "/* confdefs.h */" > confdefs.h + +# Predefined preprocessor variables. + +printf "%s\n" "@%:@define PACKAGE_NAME \"$PACKAGE_NAME\"" >>confdefs.h + +printf "%s\n" "@%:@define PACKAGE_TARNAME \"$PACKAGE_TARNAME\"" >>confdefs.h + +printf "%s\n" "@%:@define PACKAGE_VERSION \"$PACKAGE_VERSION\"" >>confdefs.h + +printf "%s\n" "@%:@define PACKAGE_STRING \"$PACKAGE_STRING\"" >>confdefs.h + +printf "%s\n" "@%:@define PACKAGE_BUGREPORT \"$PACKAGE_BUGREPORT\"" >>confdefs.h + +printf "%s\n" "@%:@define PACKAGE_URL \"$PACKAGE_URL\"" >>confdefs.h + + +# Let the site file select an alternate cache file if it wants to. +# Prefer an explicitly selected file to automatically selected ones. +if test -n "$CONFIG_SITE"; then + ac_site_files="$CONFIG_SITE" +elif test "x$prefix" != xNONE; then + ac_site_files="$prefix/share/config.site $prefix/etc/config.site" +else + ac_site_files="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site" +fi + +for ac_site_file in $ac_site_files +do + case $ac_site_file in @%:@( + */*) : + ;; @%:@( + *) : + ac_site_file=./$ac_site_file ;; +esac + if test -f "$ac_site_file" && test -r "$ac_site_file"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5 +printf "%s\n" "$as_me: loading site script $ac_site_file" >&6;} + sed 's/^/| /' "$ac_site_file" >&5 + . "$ac_site_file" \ + || { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "failed to load site script $ac_site_file +See \`config.log' for more details" "$LINENO" 5; } + fi +done + +if test -r "$cache_file"; then + # Some versions of bash will fail to source /dev/null (special files + # actually), so we avoid doing that. DJGPP emulates it as a regular file. + if test /dev/null != "$cache_file" && test -f "$cache_file"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5 +printf "%s\n" "$as_me: loading cache $cache_file" >&6;} + case $cache_file in + [\\/]* | ?:[\\/]* ) . "$cache_file";; + *) . "./$cache_file";; + esac + fi +else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5 +printf "%s\n" "$as_me: creating cache $cache_file" >&6;} + >$cache_file +fi + +# Test code for whether the C compiler supports C89 (global declarations) +ac_c_conftest_c89_globals=' +/* Does the compiler advertise C89 conformance? + Do not test the value of __STDC__, because some compilers set it to 0 + while being otherwise adequately conformant. */ +#if !defined __STDC__ +# error "Compiler does not advertise C89 conformance" +#endif + +#include +#include +struct stat; +/* Most of the following tests are stolen from RCS 5.7 src/conf.sh. */ +struct buf { int x; }; +struct buf * (*rcsopen) (struct buf *, struct stat *, int); +static char *e (p, i) + char **p; + int i; +{ + return p[i]; +} +static char *f (char * (*g) (char **, int), char **p, ...) +{ + char *s; + va_list v; + va_start (v,p); + s = g (p, va_arg (v,int)); + va_end (v); + return s; +} + +/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has + function prototypes and stuff, but not \xHH hex character constants. + These do not provoke an error unfortunately, instead are silently treated + as an "x". The following induces an error, until -std is added to get + proper ANSI mode. Curiously \x00 != x always comes out true, for an + array size at least. It is necessary to write \x00 == 0 to get something + that is true only with -std. */ +int osf4_cc_array ['\''\x00'\'' == 0 ? 1 : -1]; + +/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters + inside strings and character constants. */ +#define FOO(x) '\''x'\'' +int xlc6_cc_array[FOO(a) == '\''x'\'' ? 1 : -1]; + +int test (int i, double x); +struct s1 {int (*f) (int a);}; +struct s2 {int (*f) (double a);}; +int pairnames (int, char **, int *(*)(struct buf *, struct stat *, int), + int, int);' + +# Test code for whether the C compiler supports C89 (body of main). +ac_c_conftest_c89_main=' +ok |= (argc == 0 || f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]); +' + +# Test code for whether the C compiler supports C99 (global declarations) +ac_c_conftest_c99_globals=' +// Does the compiler advertise C99 conformance? +#if !defined __STDC_VERSION__ || __STDC_VERSION__ < 199901L +# error "Compiler does not advertise C99 conformance" +#endif + +#include +extern int puts (const char *); +extern int printf (const char *, ...); +extern int dprintf (int, const char *, ...); +extern void *malloc (size_t); + +// Check varargs macros. These examples are taken from C99 6.10.3.5. +// dprintf is used instead of fprintf to avoid needing to declare +// FILE and stderr. +#define debug(...) dprintf (2, __VA_ARGS__) +#define showlist(...) puts (#__VA_ARGS__) +#define report(test,...) ((test) ? puts (#test) : printf (__VA_ARGS__)) +static void +test_varargs_macros (void) +{ + int x = 1234; + int y = 5678; + debug ("Flag"); + debug ("X = %d\n", x); + showlist (The first, second, and third items.); + report (x>y, "x is %d but y is %d", x, y); +} + +// Check long long types. +#define BIG64 18446744073709551615ull +#define BIG32 4294967295ul +#define BIG_OK (BIG64 / BIG32 == 4294967297ull && BIG64 % BIG32 == 0) +#if !BIG_OK + #error "your preprocessor is broken" +#endif +#if BIG_OK +#else + #error "your preprocessor is broken" +#endif +static long long int bignum = -9223372036854775807LL; +static unsigned long long int ubignum = BIG64; + +struct incomplete_array +{ + int datasize; + double data[]; +}; + +struct named_init { + int number; + const wchar_t *name; + double average; +}; + +typedef const char *ccp; + +static inline int +test_restrict (ccp restrict text) +{ + // See if C++-style comments work. + // Iterate through items via the restricted pointer. + // Also check for declarations in for loops. + for (unsigned int i = 0; *(text+i) != '\''\0'\''; ++i) + continue; + return 0; +} + +// Check varargs and va_copy. +static bool +test_varargs (const char *format, ...) +{ + va_list args; + va_start (args, format); + va_list args_copy; + va_copy (args_copy, args); + + const char *str = ""; + int number = 0; + float fnumber = 0; + + while (*format) + { + switch (*format++) + { + case '\''s'\'': // string + str = va_arg (args_copy, const char *); + break; + case '\''d'\'': // int + number = va_arg (args_copy, int); + break; + case '\''f'\'': // float + fnumber = va_arg (args_copy, double); + break; + default: + break; + } + } + va_end (args_copy); + va_end (args); + + return *str && number && fnumber; +} +' + +# Test code for whether the C compiler supports C99 (body of main). +ac_c_conftest_c99_main=' + // Check bool. + _Bool success = false; + success |= (argc != 0); + + // Check restrict. + if (test_restrict ("String literal") == 0) + success = true; + char *restrict newvar = "Another string"; + + // Check varargs. + success &= test_varargs ("s, d'\'' f .", "string", 65, 34.234); + test_varargs_macros (); + + // Check flexible array members. + struct incomplete_array *ia = + malloc (sizeof (struct incomplete_array) + (sizeof (double) * 10)); + ia->datasize = 10; + for (int i = 0; i < ia->datasize; ++i) + ia->data[i] = i * 1.234; + + // Check named initializers. + struct named_init ni = { + .number = 34, + .name = L"Test wide string", + .average = 543.34343, + }; + + ni.number = 58; + + int dynamic_array[ni.number]; + dynamic_array[0] = argv[0][0]; + dynamic_array[ni.number - 1] = 543; + + // work around unused variable warnings + ok |= (!success || bignum == 0LL || ubignum == 0uLL || newvar[0] == '\''x'\'' + || dynamic_array[ni.number - 1] != 543); +' + +# Test code for whether the C compiler supports C11 (global declarations) +ac_c_conftest_c11_globals=' +// Does the compiler advertise C11 conformance? +#if !defined __STDC_VERSION__ || __STDC_VERSION__ < 201112L +# error "Compiler does not advertise C11 conformance" +#endif + +// Check _Alignas. +char _Alignas (double) aligned_as_double; +char _Alignas (0) no_special_alignment; +extern char aligned_as_int; +char _Alignas (0) _Alignas (int) aligned_as_int; + +// Check _Alignof. +enum +{ + int_alignment = _Alignof (int), + int_array_alignment = _Alignof (int[100]), + char_alignment = _Alignof (char) +}; +_Static_assert (0 < -_Alignof (int), "_Alignof is signed"); + +// Check _Noreturn. +int _Noreturn does_not_return (void) { for (;;) continue; } + +// Check _Static_assert. +struct test_static_assert +{ + int x; + _Static_assert (sizeof (int) <= sizeof (long int), + "_Static_assert does not work in struct"); + long int y; +}; + +// Check UTF-8 literals. +#define u8 syntax error! +char const utf8_literal[] = u8"happens to be ASCII" "another string"; + +// Check duplicate typedefs. +typedef long *long_ptr; +typedef long int *long_ptr; +typedef long_ptr long_ptr; + +// Anonymous structures and unions -- taken from C11 6.7.2.1 Example 1. +struct anonymous +{ + union { + struct { int i; int j; }; + struct { int k; long int l; } w; + }; + int m; +} v1; +' + +# Test code for whether the C compiler supports C11 (body of main). +ac_c_conftest_c11_main=' + _Static_assert ((offsetof (struct anonymous, i) + == offsetof (struct anonymous, w.k)), + "Anonymous union alignment botch"); + v1.i = 2; + v1.w.k = 5; + ok |= v1.i != 5; +' + +# Test code for whether the C compiler supports C11 (complete). +ac_c_conftest_c11_program="${ac_c_conftest_c89_globals} +${ac_c_conftest_c99_globals} +${ac_c_conftest_c11_globals} + +int +main (int argc, char **argv) +{ + int ok = 0; + ${ac_c_conftest_c89_main} + ${ac_c_conftest_c99_main} + ${ac_c_conftest_c11_main} + return ok; +} +" + +# Test code for whether the C compiler supports C99 (complete). +ac_c_conftest_c99_program="${ac_c_conftest_c89_globals} +${ac_c_conftest_c99_globals} + +int +main (int argc, char **argv) +{ + int ok = 0; + ${ac_c_conftest_c89_main} + ${ac_c_conftest_c99_main} + return ok; +} +" + +# Test code for whether the C compiler supports C89 (complete). +ac_c_conftest_c89_program="${ac_c_conftest_c89_globals} + +int +main (int argc, char **argv) +{ + int ok = 0; + ${ac_c_conftest_c89_main} + return ok; +} +" + +# Test code for whether the C++ compiler supports C++98 (global declarations) +ac_cxx_conftest_cxx98_globals=' +// Does the compiler advertise C++98 conformance? +#if !defined __cplusplus || __cplusplus < 199711L +# error "Compiler does not advertise C++98 conformance" +#endif + +// These inclusions are to reject old compilers that +// lack the unsuffixed header files. +#include +#include + +// and are *not* freestanding headers in C++98. +extern void assert (int); +namespace std { + extern int strcmp (const char *, const char *); +} + +// Namespaces, exceptions, and templates were all added after "C++ 2.0". +using std::exception; +using std::strcmp; + +namespace { + +void test_exception_syntax() +{ + try { + throw "test"; + } catch (const char *s) { + // Extra parentheses suppress a warning when building autoconf itself, + // due to lint rules shared with more typical C programs. + assert (!(strcmp) (s, "test")); + } +} + +template struct test_template +{ + T const val; + explicit test_template(T t) : val(t) {} + template T add(U u) { return static_cast(u) + val; } +}; + +} // anonymous namespace +' + +# Test code for whether the C++ compiler supports C++98 (body of main) +ac_cxx_conftest_cxx98_main=' + assert (argc); + assert (! argv[0]); +{ + test_exception_syntax (); + test_template tt (2.0); + assert (tt.add (4) == 6.0); + assert (true && !false); +} +' + +# Test code for whether the C++ compiler supports C++11 (global declarations) +ac_cxx_conftest_cxx11_globals=' +// Does the compiler advertise C++ 2011 conformance? +#if !defined __cplusplus || __cplusplus < 201103L +# error "Compiler does not advertise C++11 conformance" +#endif + +namespace cxx11test +{ + constexpr int get_val() { return 20; } + + struct testinit + { + int i; + double d; + }; + + class delegate + { + public: + delegate(int n) : n(n) {} + delegate(): delegate(2354) {} + + virtual int getval() { return this->n; }; + protected: + int n; + }; + + class overridden : public delegate + { + public: + overridden(int n): delegate(n) {} + virtual int getval() override final { return this->n * 2; } + }; + + class nocopy + { + public: + nocopy(int i): i(i) {} + nocopy() = default; + nocopy(const nocopy&) = delete; + nocopy & operator=(const nocopy&) = delete; + private: + int i; + }; + + // for testing lambda expressions + template Ret eval(Fn f, Ret v) + { + return f(v); + } + + // for testing variadic templates and trailing return types + template auto sum(V first) -> V + { + return first; + } + template auto sum(V first, Args... rest) -> V + { + return first + sum(rest...); + } +} +' + +# Test code for whether the C++ compiler supports C++11 (body of main) +ac_cxx_conftest_cxx11_main=' +{ + // Test auto and decltype + auto a1 = 6538; + auto a2 = 48573953.4; + auto a3 = "String literal"; + + int total = 0; + for (auto i = a3; *i; ++i) { total += *i; } + + decltype(a2) a4 = 34895.034; +} +{ + // Test constexpr + short sa[cxx11test::get_val()] = { 0 }; +} +{ + // Test initializer lists + cxx11test::testinit il = { 4323, 435234.23544 }; +} +{ + // Test range-based for + int array[] = {9, 7, 13, 15, 4, 18, 12, 10, 5, 3, + 14, 19, 17, 8, 6, 20, 16, 2, 11, 1}; + for (auto &x : array) { x += 23; } +} +{ + // Test lambda expressions + using cxx11test::eval; + assert (eval ([](int x) { return x*2; }, 21) == 42); + double d = 2.0; + assert (eval ([&](double x) { return d += x; }, 3.0) == 5.0); + assert (d == 5.0); + assert (eval ([=](double x) mutable { return d += x; }, 4.0) == 9.0); + assert (d == 5.0); +} +{ + // Test use of variadic templates + using cxx11test::sum; + auto a = sum(1); + auto b = sum(1, 2); + auto c = sum(1.0, 2.0, 3.0); +} +{ + // Test constructor delegation + cxx11test::delegate d1; + cxx11test::delegate d2(); + cxx11test::delegate d3(45); +} +{ + // Test override and final + cxx11test::overridden o1(55464); +} +{ + // Test nullptr + char *c = nullptr; +} +{ + // Test template brackets + test_template<::test_template> v(test_template(12)); +} +{ + // Unicode literals + char const *utf8 = u8"UTF-8 string \u2500"; + char16_t const *utf16 = u"UTF-8 string \u2500"; + char32_t const *utf32 = U"UTF-32 string \u2500"; +} +' + +# Test code for whether the C compiler supports C++11 (complete). +ac_cxx_conftest_cxx11_program="${ac_cxx_conftest_cxx98_globals} +${ac_cxx_conftest_cxx11_globals} + +int +main (int argc, char **argv) +{ + int ok = 0; + ${ac_cxx_conftest_cxx98_main} + ${ac_cxx_conftest_cxx11_main} + return ok; +} +" + +# Test code for whether the C compiler supports C++98 (complete). +ac_cxx_conftest_cxx98_program="${ac_cxx_conftest_cxx98_globals} +int +main (int argc, char **argv) +{ + int ok = 0; + ${ac_cxx_conftest_cxx98_main} + return ok; +} +" + + +# Auxiliary files required by this configure script. +ac_aux_files="config.guess config.sub" + +# Locations in which to look for auxiliary files. +ac_aux_dir_candidates="${srcdir}/../config" + +# Search for a directory containing all of the required auxiliary files, +# $ac_aux_files, from the $PATH-style list $ac_aux_dir_candidates. +# If we don't find one directory that contains all the files we need, +# we report the set of missing files from the *first* directory in +# $ac_aux_dir_candidates and give up. +ac_missing_aux_files="" +ac_first_candidate=: +printf "%s\n" "$as_me:${as_lineno-$LINENO}: looking for aux files: $ac_aux_files" >&5 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +as_found=false +for as_dir in $ac_aux_dir_candidates +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + as_found=: + + printf "%s\n" "$as_me:${as_lineno-$LINENO}: trying $as_dir" >&5 + ac_aux_dir_found=yes + ac_install_sh= + for ac_aux in $ac_aux_files + do + # As a special case, if "install-sh" is required, that requirement + # can be satisfied by any of "install-sh", "install.sh", or "shtool", + # and $ac_install_sh is set appropriately for whichever one is found. + if test x"$ac_aux" = x"install-sh" + then + if test -f "${as_dir}install-sh"; then + printf "%s\n" "$as_me:${as_lineno-$LINENO}: ${as_dir}install-sh found" >&5 + ac_install_sh="${as_dir}install-sh -c" + elif test -f "${as_dir}install.sh"; then + printf "%s\n" "$as_me:${as_lineno-$LINENO}: ${as_dir}install.sh found" >&5 + ac_install_sh="${as_dir}install.sh -c" + elif test -f "${as_dir}shtool"; then + printf "%s\n" "$as_me:${as_lineno-$LINENO}: ${as_dir}shtool found" >&5 + ac_install_sh="${as_dir}shtool install -c" + else + ac_aux_dir_found=no + if $ac_first_candidate; then + ac_missing_aux_files="${ac_missing_aux_files} install-sh" + else + break + fi + fi + else + if test -f "${as_dir}${ac_aux}"; then + printf "%s\n" "$as_me:${as_lineno-$LINENO}: ${as_dir}${ac_aux} found" >&5 + else + ac_aux_dir_found=no + if $ac_first_candidate; then + ac_missing_aux_files="${ac_missing_aux_files} ${ac_aux}" + else + break + fi + fi + fi + done + if test "$ac_aux_dir_found" = yes; then + ac_aux_dir="$as_dir" + break + fi + ac_first_candidate=false + + as_found=false +done +IFS=$as_save_IFS +if $as_found +then : + +else $as_nop + as_fn_error $? "cannot find required auxiliary files:$ac_missing_aux_files" "$LINENO" 5 +fi + + +# These three variables are undocumented and unsupported, +# and are intended to be withdrawn in a future Autoconf release. +# They can cause serious problems if a builder's source tree is in a directory +# whose full name contains unusual characters. +if test -f "${ac_aux_dir}config.guess"; then + ac_@&t@config_guess="$SHELL ${ac_aux_dir}config.guess" +fi +if test -f "${ac_aux_dir}config.sub"; then + ac_@&t@config_sub="$SHELL ${ac_aux_dir}config.sub" +fi +if test -f "$ac_aux_dir/configure"; then + ac_@&t@configure="$SHELL ${ac_aux_dir}configure" +fi + +# Check that the precious variables saved in the cache have kept the same +# value. +ac_cache_corrupted=false +for ac_var in $ac_precious_vars; do + eval ac_old_set=\$ac_cv_env_${ac_var}_set + eval ac_new_set=\$ac_env_${ac_var}_set + eval ac_old_val=\$ac_cv_env_${ac_var}_value + eval ac_new_val=\$ac_env_${ac_var}_value + case $ac_old_set,$ac_new_set in + set,) + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 +printf "%s\n" "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} + ac_cache_corrupted=: ;; + ,set) + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5 +printf "%s\n" "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} + ac_cache_corrupted=: ;; + ,);; + *) + if test "x$ac_old_val" != "x$ac_new_val"; then + # differences in whitespace do not lead to failure. + ac_old_val_w=`echo x $ac_old_val` + ac_new_val_w=`echo x $ac_new_val` + if test "$ac_old_val_w" != "$ac_new_val_w"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5 +printf "%s\n" "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} + ac_cache_corrupted=: + else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5 +printf "%s\n" "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;} + eval $ac_var=\$ac_old_val + fi + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: former value: \`$ac_old_val'" >&5 +printf "%s\n" "$as_me: former value: \`$ac_old_val'" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: current value: \`$ac_new_val'" >&5 +printf "%s\n" "$as_me: current value: \`$ac_new_val'" >&2;} + fi;; + esac + # Pass precious variables to config.status. + if test "$ac_new_set" = set; then + case $ac_new_val in + *\'*) ac_arg=$ac_var=`printf "%s\n" "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; + *) ac_arg=$ac_var=$ac_new_val ;; + esac + case " $ac_configure_args " in + *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy. + *) as_fn_append ac_configure_args " '$ac_arg'" ;; + esac + fi +done +if $ac_cache_corrupted; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 +printf "%s\n" "$as_me: error: changes in the environment can compromise the build" >&2;} + as_fn_error $? "run \`${MAKE-make} distclean' and/or \`rm $cache_file' + and start over" "$LINENO" 5 +fi +## -------------------- ## +## Main body of script. ## +## -------------------- ## + +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + + + + +CFLAGS= +CXXFLAGS= + + + + + + + + + +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. +set dummy ${ac_tool_prefix}gcc; ac_word=$2 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_CC+y} +then : + printf %s "(cached) " >&6 +else $as_nop + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_prog_CC="${ac_tool_prefix}gcc" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +CC=$ac_cv_prog_CC +if test -n "$CC"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +printf "%s\n" "$CC" >&6; } +else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_CC"; then + ac_ct_CC=$CC + # Extract the first word of "gcc", so it can be a program name with args. +set dummy gcc; ac_word=$2 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_ac_ct_CC+y} +then : + printf %s "(cached) " >&6 +else $as_nop + if test -n "$ac_ct_CC"; then + ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_CC="gcc" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +ac_ct_CC=$ac_cv_prog_ac_ct_CC +if test -n "$ac_ct_CC"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 +printf "%s\n" "$ac_ct_CC" >&6; } +else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +fi + + if test "x$ac_ct_CC" = x; then + CC="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + CC=$ac_ct_CC + fi +else + CC="$ac_cv_prog_CC" +fi + +if test -z "$CC"; then + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. +set dummy ${ac_tool_prefix}cc; ac_word=$2 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_CC+y} +then : + printf %s "(cached) " >&6 +else $as_nop + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_prog_CC="${ac_tool_prefix}cc" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +CC=$ac_cv_prog_CC +if test -n "$CC"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +printf "%s\n" "$CC" >&6; } +else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +fi + + + fi +fi +if test -z "$CC"; then + # Extract the first word of "cc", so it can be a program name with args. +set dummy cc; ac_word=$2 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_CC+y} +then : + printf %s "(cached) " >&6 +else $as_nop + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +else + ac_prog_rejected=no +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + if test "$as_dir$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then + ac_prog_rejected=yes + continue + fi + ac_cv_prog_CC="cc" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +if test $ac_prog_rejected = yes; then + # We found a bogon in the path, so make sure we never use it. + set dummy $ac_cv_prog_CC + shift + if test $@%:@ != 0; then + # We chose a different compiler from the bogus one. + # However, it has the same basename, so the bogon will be chosen + # first if we set CC to just the basename; use the full file name. + shift + ac_cv_prog_CC="$as_dir$ac_word${1+' '}$@" + fi +fi +fi +fi +CC=$ac_cv_prog_CC +if test -n "$CC"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +printf "%s\n" "$CC" >&6; } +else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +fi + + +fi +if test -z "$CC"; then + if test -n "$ac_tool_prefix"; then + for ac_prog in cl.exe + do + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. +set dummy $ac_tool_prefix$ac_prog; ac_word=$2 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_CC+y} +then : + printf %s "(cached) " >&6 +else $as_nop + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_prog_CC="$ac_tool_prefix$ac_prog" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +CC=$ac_cv_prog_CC +if test -n "$CC"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +printf "%s\n" "$CC" >&6; } +else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +fi + + + test -n "$CC" && break + done +fi +if test -z "$CC"; then + ac_ct_CC=$CC + for ac_prog in cl.exe +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_ac_ct_CC+y} +then : + printf %s "(cached) " >&6 +else $as_nop + if test -n "$ac_ct_CC"; then + ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_CC="$ac_prog" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +ac_ct_CC=$ac_cv_prog_ac_ct_CC +if test -n "$ac_ct_CC"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 +printf "%s\n" "$ac_ct_CC" >&6; } +else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +fi + + + test -n "$ac_ct_CC" && break +done + + if test "x$ac_ct_CC" = x; then + CC="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + CC=$ac_ct_CC + fi +fi + +fi +if test -z "$CC"; then + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}clang", so it can be a program name with args. +set dummy ${ac_tool_prefix}clang; ac_word=$2 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_CC+y} +then : + printf %s "(cached) " >&6 +else $as_nop + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_prog_CC="${ac_tool_prefix}clang" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +CC=$ac_cv_prog_CC +if test -n "$CC"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +printf "%s\n" "$CC" >&6; } +else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_CC"; then + ac_ct_CC=$CC + # Extract the first word of "clang", so it can be a program name with args. +set dummy clang; ac_word=$2 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_ac_ct_CC+y} +then : + printf %s "(cached) " >&6 +else $as_nop + if test -n "$ac_ct_CC"; then + ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_CC="clang" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +ac_ct_CC=$ac_cv_prog_ac_ct_CC +if test -n "$ac_ct_CC"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 +printf "%s\n" "$ac_ct_CC" >&6; } +else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +fi + + if test "x$ac_ct_CC" = x; then + CC="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + CC=$ac_ct_CC + fi +else + CC="$ac_cv_prog_CC" +fi + +fi + + +test -z "$CC" && { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "no acceptable C compiler found in \$PATH +See \`config.log' for more details" "$LINENO" 5; } + +# Provide some information about the compiler. +printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 +set X $ac_compile +ac_compiler=$2 +for ac_option in --version -v -V -qversion -version; do + { { ac_try="$ac_compiler $ac_option >&5" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +printf "%s\n" "$ac_try_echo"; } >&5 + (eval "$ac_compiler $ac_option >&5") 2>conftest.err + ac_status=$? + if test -s conftest.err; then + sed '10a\ +... rest of stderr output deleted ... + 10q' conftest.err >conftest.er1 + cat conftest.er1 >&5 + fi + rm -f conftest.er1 conftest.err + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } +done + +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main (void) +{ + + ; + return 0; +} +_ACEOF +ac_clean_files_save=$ac_clean_files +ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out" +# Try to create an executable without -o first, disregard a.out. +# It will help us diagnose broken compilers, and finding out an intuition +# of exeext. +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5 +printf %s "checking whether the C compiler works... " >&6; } +ac_link_default=`printf "%s\n" "$ac_link" | sed 's/ -o *conftest[^ ]*//'` + +# The possible output files: +ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*" + +ac_rmfiles= +for ac_file in $ac_files +do + case $ac_file in + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;; + * ) ac_rmfiles="$ac_rmfiles $ac_file";; + esac +done +rm -f $ac_rmfiles + +if { { ac_try="$ac_link_default" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +printf "%s\n" "$ac_try_echo"; } >&5 + (eval "$ac_link_default") 2>&5 + ac_status=$? + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } +then : + # Autoconf-2.13 could set the ac_cv_exeext variable to `no'. +# So ignore a value of `no', otherwise this would lead to `EXEEXT = no' +# in a Makefile. We should not override ac_cv_exeext if it was cached, +# so that the user can short-circuit this test for compilers unknown to +# Autoconf. +for ac_file in $ac_files '' +do + test -f "$ac_file" || continue + case $ac_file in + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) + ;; + [ab].out ) + # We found the default executable, but exeext='' is most + # certainly right. + break;; + *.* ) + if test ${ac_cv_exeext+y} && test "$ac_cv_exeext" != no; + then :; else + ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` + fi + # We set ac_cv_exeext here because the later test for it is not + # safe: cross compilers may not add the suffix if given an `-o' + # argument, so we may need to know it at that point already. + # Even if this section looks crufty: it has the advantage of + # actually working. + break;; + * ) + break;; + esac +done +test "$ac_cv_exeext" = no && ac_cv_exeext= + +else $as_nop + ac_file='' +fi +if test -z "$ac_file" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +printf "%s\n" "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error 77 "C compiler cannot create executables +See \`config.log' for more details" "$LINENO" 5; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5 +printf %s "checking for C compiler default output file name... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5 +printf "%s\n" "$ac_file" >&6; } +ac_exeext=$ac_cv_exeext + +rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out +ac_clean_files=$ac_clean_files_save +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5 +printf %s "checking for suffix of executables... " >&6; } +if { { ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +printf "%s\n" "$ac_try_echo"; } >&5 + (eval "$ac_link") 2>&5 + ac_status=$? + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } +then : + # If both `conftest.exe' and `conftest' are `present' (well, observable) +# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will +# work properly (i.e., refer to `conftest.exe'), while it won't with +# `rm'. +for ac_file in conftest.exe conftest conftest.*; do + test -f "$ac_file" || continue + case $ac_file in + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;; + *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` + break;; + * ) break;; + esac +done +else $as_nop + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "cannot compute suffix of executables: cannot compile and link +See \`config.log' for more details" "$LINENO" 5; } +fi +rm -f conftest conftest$ac_cv_exeext +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 +printf "%s\n" "$ac_cv_exeext" >&6; } + +rm -f conftest.$ac_ext +EXEEXT=$ac_cv_exeext +ac_exeext=$EXEEXT +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +@%:@include +int +main (void) +{ +FILE *f = fopen ("conftest.out", "w"); + return ferror (f) || fclose (f) != 0; + + ; + return 0; +} +_ACEOF +ac_clean_files="$ac_clean_files conftest.out" +# Check that the compiler produces executables we can run. If not, either +# the compiler is broken, or we cross compile. +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5 +printf %s "checking whether we are cross compiling... " >&6; } +if test "$cross_compiling" != yes; then + { { ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +printf "%s\n" "$ac_try_echo"; } >&5 + (eval "$ac_link") 2>&5 + ac_status=$? + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + if { ac_try='./conftest$ac_cv_exeext' + { { case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +printf "%s\n" "$ac_try_echo"; } >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; }; then + cross_compiling=no + else + if test "$cross_compiling" = maybe; then + cross_compiling=yes + else + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error 77 "cannot run C compiled programs. +If you meant to cross compile, use \`--host'. +See \`config.log' for more details" "$LINENO" 5; } + fi + fi +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 +printf "%s\n" "$cross_compiling" >&6; } + +rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out +ac_clean_files=$ac_clean_files_save +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 +printf %s "checking for suffix of object files... " >&6; } +if test ${ac_cv_objext+y} +then : + printf %s "(cached) " >&6 +else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main (void) +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.o conftest.obj +if { { ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +printf "%s\n" "$ac_try_echo"; } >&5 + (eval "$ac_compile") 2>&5 + ac_status=$? + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } +then : + for ac_file in conftest.o conftest.obj conftest.*; do + test -f "$ac_file" || continue; + case $ac_file in + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;; + *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'` + break;; + esac +done +else $as_nop + printf "%s\n" "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "cannot compute suffix of object files: cannot compile +See \`config.log' for more details" "$LINENO" 5; } +fi +rm -f conftest.$ac_cv_objext conftest.$ac_ext +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5 +printf "%s\n" "$ac_cv_objext" >&6; } +OBJEXT=$ac_cv_objext +ac_objext=$OBJEXT +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports GNU C" >&5 +printf %s "checking whether the compiler supports GNU C... " >&6; } +if test ${ac_cv_c_compiler_gnu+y} +then : + printf %s "(cached) " >&6 +else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main (void) +{ +#ifndef __GNUC__ + choke me +#endif + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + ac_compiler_gnu=yes +else $as_nop + ac_compiler_gnu=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +ac_cv_c_compiler_gnu=$ac_compiler_gnu + +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5 +printf "%s\n" "$ac_cv_c_compiler_gnu" >&6; } +ac_compiler_gnu=$ac_cv_c_compiler_gnu + +if test $ac_compiler_gnu = yes; then + GCC=yes +else + GCC= +fi +ac_test_CFLAGS=${CFLAGS+y} +ac_save_CFLAGS=$CFLAGS +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 +printf %s "checking whether $CC accepts -g... " >&6; } +if test ${ac_cv_prog_cc_g+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_save_c_werror_flag=$ac_c_werror_flag + ac_c_werror_flag=yes + ac_cv_prog_cc_g=no + CFLAGS="-g" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main (void) +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + ac_cv_prog_cc_g=yes +else $as_nop + CFLAGS="" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main (void) +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + +else $as_nop + ac_c_werror_flag=$ac_save_c_werror_flag + CFLAGS="-g" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main (void) +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + ac_cv_prog_cc_g=yes +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext + ac_c_werror_flag=$ac_save_c_werror_flag +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5 +printf "%s\n" "$ac_cv_prog_cc_g" >&6; } +if test $ac_test_CFLAGS; then + CFLAGS=$ac_save_CFLAGS +elif test $ac_cv_prog_cc_g = yes; then + if test "$GCC" = yes; then + CFLAGS="-g -O2" + else + CFLAGS="-g" + fi +else + if test "$GCC" = yes; then + CFLAGS="-O2" + else + CFLAGS= + fi +fi +ac_prog_cc_stdc=no +if test x$ac_prog_cc_stdc = xno +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C11 features" >&5 +printf %s "checking for $CC option to enable C11 features... " >&6; } +if test ${ac_cv_prog_cc_c11+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_cv_prog_cc_c11=no +ac_save_CC=$CC +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$ac_c_conftest_c11_program +_ACEOF +for ac_arg in '' -std=gnu11 +do + CC="$ac_save_CC $ac_arg" + if ac_fn_c_try_compile "$LINENO" +then : + ac_cv_prog_cc_c11=$ac_arg +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam + test "x$ac_cv_prog_cc_c11" != "xno" && break +done +rm -f conftest.$ac_ext +CC=$ac_save_CC +fi + +if test "x$ac_cv_prog_cc_c11" = xno +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 +printf "%s\n" "unsupported" >&6; } +else $as_nop + if test "x$ac_cv_prog_cc_c11" = x +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 +printf "%s\n" "none needed" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c11" >&5 +printf "%s\n" "$ac_cv_prog_cc_c11" >&6; } + CC="$CC $ac_cv_prog_cc_c11" +fi + ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c11 + ac_prog_cc_stdc=c11 +fi +fi +if test x$ac_prog_cc_stdc = xno +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C99 features" >&5 +printf %s "checking for $CC option to enable C99 features... " >&6; } +if test ${ac_cv_prog_cc_c99+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_cv_prog_cc_c99=no +ac_save_CC=$CC +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$ac_c_conftest_c99_program +_ACEOF +for ac_arg in '' -std=gnu99 -std=c99 -c99 -qlanglvl=extc1x -qlanglvl=extc99 -AC99 -D_STDC_C99= +do + CC="$ac_save_CC $ac_arg" + if ac_fn_c_try_compile "$LINENO" +then : + ac_cv_prog_cc_c99=$ac_arg +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam + test "x$ac_cv_prog_cc_c99" != "xno" && break +done +rm -f conftest.$ac_ext +CC=$ac_save_CC +fi + +if test "x$ac_cv_prog_cc_c99" = xno +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 +printf "%s\n" "unsupported" >&6; } +else $as_nop + if test "x$ac_cv_prog_cc_c99" = x +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 +printf "%s\n" "none needed" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c99" >&5 +printf "%s\n" "$ac_cv_prog_cc_c99" >&6; } + CC="$CC $ac_cv_prog_cc_c99" +fi + ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c99 + ac_prog_cc_stdc=c99 +fi +fi +if test x$ac_prog_cc_stdc = xno +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C89 features" >&5 +printf %s "checking for $CC option to enable C89 features... " >&6; } +if test ${ac_cv_prog_cc_c89+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_cv_prog_cc_c89=no +ac_save_CC=$CC +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$ac_c_conftest_c89_program +_ACEOF +for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" +do + CC="$ac_save_CC $ac_arg" + if ac_fn_c_try_compile "$LINENO" +then : + ac_cv_prog_cc_c89=$ac_arg +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam + test "x$ac_cv_prog_cc_c89" != "xno" && break +done +rm -f conftest.$ac_ext +CC=$ac_save_CC +fi + +if test "x$ac_cv_prog_cc_c89" = xno +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 +printf "%s\n" "unsupported" >&6; } +else $as_nop + if test "x$ac_cv_prog_cc_c89" = x +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 +printf "%s\n" "none needed" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 +printf "%s\n" "$ac_cv_prog_cc_c89" >&6; } + CC="$CC $ac_cv_prog_cc_c89" +fi + ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c89 + ac_prog_cc_stdc=c89 +fi +fi + +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + + + + + + +ac_ext=cpp +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu +if test -z "$CXX"; then + if test -n "$CCC"; then + CXX=$CCC + else + if test -n "$ac_tool_prefix"; then + for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC clang++ + do + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. +set dummy $ac_tool_prefix$ac_prog; ac_word=$2 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_CXX+y} +then : + printf %s "(cached) " >&6 +else $as_nop + if test -n "$CXX"; then + ac_cv_prog_CXX="$CXX" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +CXX=$ac_cv_prog_CXX +if test -n "$CXX"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5 +printf "%s\n" "$CXX" >&6; } +else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +fi + + + test -n "$CXX" && break + done +fi +if test -z "$CXX"; then + ac_ct_CXX=$CXX + for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC clang++ +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_ac_ct_CXX+y} +then : + printf %s "(cached) " >&6 +else $as_nop + if test -n "$ac_ct_CXX"; then + ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_CXX="$ac_prog" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +ac_ct_CXX=$ac_cv_prog_ac_ct_CXX +if test -n "$ac_ct_CXX"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5 +printf "%s\n" "$ac_ct_CXX" >&6; } +else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +fi + + + test -n "$ac_ct_CXX" && break +done + + if test "x$ac_ct_CXX" = x; then + CXX="g++" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + CXX=$ac_ct_CXX + fi +fi + + fi +fi +# Provide some information about the compiler. +printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C++ compiler version" >&5 +set X $ac_compile +ac_compiler=$2 +for ac_option in --version -v -V -qversion; do + { { ac_try="$ac_compiler $ac_option >&5" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +printf "%s\n" "$ac_try_echo"; } >&5 + (eval "$ac_compiler $ac_option >&5") 2>conftest.err + ac_status=$? + if test -s conftest.err; then + sed '10a\ +... rest of stderr output deleted ... + 10q' conftest.err >conftest.er1 + cat conftest.er1 >&5 + fi + rm -f conftest.er1 conftest.err + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } +done + +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports GNU C++" >&5 +printf %s "checking whether the compiler supports GNU C++... " >&6; } +if test ${ac_cv_cxx_compiler_gnu+y} +then : + printf %s "(cached) " >&6 +else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main (void) +{ +#ifndef __GNUC__ + choke me +#endif + + ; + return 0; +} +_ACEOF +if ac_fn_cxx_try_compile "$LINENO" +then : + ac_compiler_gnu=yes +else $as_nop + ac_compiler_gnu=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +ac_cv_cxx_compiler_gnu=$ac_compiler_gnu + +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_compiler_gnu" >&5 +printf "%s\n" "$ac_cv_cxx_compiler_gnu" >&6; } +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + +if test $ac_compiler_gnu = yes; then + GXX=yes +else + GXX= +fi +ac_test_CXXFLAGS=${CXXFLAGS+y} +ac_save_CXXFLAGS=$CXXFLAGS +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5 +printf %s "checking whether $CXX accepts -g... " >&6; } +if test ${ac_cv_prog_cxx_g+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_save_cxx_werror_flag=$ac_cxx_werror_flag + ac_cxx_werror_flag=yes + ac_cv_prog_cxx_g=no + CXXFLAGS="-g" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main (void) +{ + + ; + return 0; +} +_ACEOF +if ac_fn_cxx_try_compile "$LINENO" +then : + ac_cv_prog_cxx_g=yes +else $as_nop + CXXFLAGS="" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main (void) +{ + + ; + return 0; +} +_ACEOF +if ac_fn_cxx_try_compile "$LINENO" +then : + +else $as_nop + ac_cxx_werror_flag=$ac_save_cxx_werror_flag + CXXFLAGS="-g" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main (void) +{ + + ; + return 0; +} +_ACEOF +if ac_fn_cxx_try_compile "$LINENO" +then : + ac_cv_prog_cxx_g=yes +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext + ac_cxx_werror_flag=$ac_save_cxx_werror_flag +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_g" >&5 +printf "%s\n" "$ac_cv_prog_cxx_g" >&6; } +if test $ac_test_CXXFLAGS; then + CXXFLAGS=$ac_save_CXXFLAGS +elif test $ac_cv_prog_cxx_g = yes; then + if test "$GXX" = yes; then + CXXFLAGS="-g -O2" + else + CXXFLAGS="-g" + fi +else + if test "$GXX" = yes; then + CXXFLAGS="-O2" + else + CXXFLAGS= + fi +fi +ac_prog_cxx_stdcxx=no +if test x$ac_prog_cxx_stdcxx = xno +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++11 features" >&5 +printf %s "checking for $CXX option to enable C++11 features... " >&6; } +if test ${ac_cv_prog_cxx_11+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_cv_prog_cxx_11=no +ac_save_CXX=$CXX +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$ac_cxx_conftest_cxx11_program +_ACEOF +for ac_arg in '' -std=gnu++11 -std=gnu++0x -std=c++11 -std=c++0x -qlanglvl=extended0x -AA +do + CXX="$ac_save_CXX $ac_arg" + if ac_fn_cxx_try_compile "$LINENO" +then : + ac_cv_prog_cxx_cxx11=$ac_arg +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam + test "x$ac_cv_prog_cxx_cxx11" != "xno" && break +done +rm -f conftest.$ac_ext +CXX=$ac_save_CXX +fi + +if test "x$ac_cv_prog_cxx_cxx11" = xno +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 +printf "%s\n" "unsupported" >&6; } +else $as_nop + if test "x$ac_cv_prog_cxx_cxx11" = x +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 +printf "%s\n" "none needed" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_cxx11" >&5 +printf "%s\n" "$ac_cv_prog_cxx_cxx11" >&6; } + CXX="$CXX $ac_cv_prog_cxx_cxx11" +fi + ac_cv_prog_cxx_stdcxx=$ac_cv_prog_cxx_cxx11 + ac_prog_cxx_stdcxx=cxx11 +fi +fi +if test x$ac_prog_cxx_stdcxx = xno +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++98 features" >&5 +printf %s "checking for $CXX option to enable C++98 features... " >&6; } +if test ${ac_cv_prog_cxx_98+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_cv_prog_cxx_98=no +ac_save_CXX=$CXX +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$ac_cxx_conftest_cxx98_program +_ACEOF +for ac_arg in '' -std=gnu++98 -std=c++98 -qlanglvl=extended -AA +do + CXX="$ac_save_CXX $ac_arg" + if ac_fn_cxx_try_compile "$LINENO" +then : + ac_cv_prog_cxx_cxx98=$ac_arg +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam + test "x$ac_cv_prog_cxx_cxx98" != "xno" && break +done +rm -f conftest.$ac_ext +CXX=$ac_save_CXX +fi + +if test "x$ac_cv_prog_cxx_cxx98" = xno +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 +printf "%s\n" "unsupported" >&6; } +else $as_nop + if test "x$ac_cv_prog_cxx_cxx98" = x +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 +printf "%s\n" "none needed" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_cxx98" >&5 +printf "%s\n" "$ac_cv_prog_cxx_cxx98" >&6; } + CXX="$CXX $ac_cv_prog_cxx_cxx98" +fi + ac_cv_prog_cxx_stdcxx=$ac_cv_prog_cxx_cxx98 + ac_prog_cxx_stdcxx=cxx98 +fi +fi + +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + + + + + # Make sure we can run config.sub. +$SHELL "${ac_aux_dir}config.sub" sun4 >/dev/null 2>&1 || + as_fn_error $? "cannot run $SHELL ${ac_aux_dir}config.sub" "$LINENO" 5 + +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 +printf %s "checking build system type... " >&6; } +if test ${ac_cv_build+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_build_alias=$build_alias +test "x$ac_build_alias" = x && + ac_build_alias=`$SHELL "${ac_aux_dir}config.guess"` +test "x$ac_build_alias" = x && + as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5 +ac_cv_build=`$SHELL "${ac_aux_dir}config.sub" $ac_build_alias` || + as_fn_error $? "$SHELL ${ac_aux_dir}config.sub $ac_build_alias failed" "$LINENO" 5 + +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5 +printf "%s\n" "$ac_cv_build" >&6; } +case $ac_cv_build in +*-*-*) ;; +*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;; +esac +build=$ac_cv_build +ac_save_IFS=$IFS; IFS='-' +set x $ac_cv_build +shift +build_cpu=$1 +build_vendor=$2 +shift; shift +# Remember, the first character of IFS is used to create $*, +# except with old shells: +build_os=$* +IFS=$ac_save_IFS +case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac + + +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking host system type" >&5 +printf %s "checking host system type... " >&6; } +if test ${ac_cv_host+y} +then : + printf %s "(cached) " >&6 +else $as_nop + if test "x$host_alias" = x; then + ac_cv_host=$ac_cv_build +else + ac_cv_host=`$SHELL "${ac_aux_dir}config.sub" $host_alias` || + as_fn_error $? "$SHELL ${ac_aux_dir}config.sub $host_alias failed" "$LINENO" 5 +fi + +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5 +printf "%s\n" "$ac_cv_host" >&6; } +case $ac_cv_host in +*-*-*) ;; +*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;; +esac +host=$ac_cv_host +ac_save_IFS=$IFS; IFS='-' +set x $ac_cv_host +shift +host_cpu=$1 +host_vendor=$2 +shift; shift +# Remember, the first character of IFS is used to create $*, +# except with old shells: +host_os=$* +IFS=$ac_save_IFS +case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac + + + +# Use 64-bit file system calls so that we can support files > 2 GiB. + +@%:@ Check whether --enable-largefile was given. +if test ${enable_largefile+y} +then : + enableval=$enable_largefile; +fi + +if test "$enable_largefile" != no; then + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for special C compiler options needed for large files" >&5 +printf %s "checking for special C compiler options needed for large files... " >&6; } +if test ${ac_cv_sys_largefile_CC+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_cv_sys_largefile_CC=no + if test "$GCC" != yes; then + ac_save_CC=$CC + while :; do + # IRIX 6.2 and later do not support large files by default, + # so use the C compiler's -n32 option if that helps. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +@%:@include + /* Check that off_t can represent 2**63 - 1 correctly. + We can't simply define LARGE_OFF_T to be 9223372036854775807, + since some C++ compilers masquerading as C compilers + incorrectly reject 9223372036854775807. */ +@%:@define LARGE_OFF_T (((off_t) 1 << 31 << 31) - 1 + ((off_t) 1 << 31 << 31)) + int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 + && LARGE_OFF_T % 2147483647 == 1) + ? 1 : -1]; +int +main (void) +{ + + ; + return 0; +} +_ACEOF + if ac_fn_c_try_compile "$LINENO" +then : + break +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam + CC="$CC -n32" + if ac_fn_c_try_compile "$LINENO" +then : + ac_cv_sys_largefile_CC=' -n32'; break +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam + break + done + CC=$ac_save_CC + rm -f conftest.$ac_ext + fi +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_largefile_CC" >&5 +printf "%s\n" "$ac_cv_sys_largefile_CC" >&6; } + if test "$ac_cv_sys_largefile_CC" != no; then + CC=$CC$ac_cv_sys_largefile_CC + fi + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for _FILE_OFFSET_BITS value needed for large files" >&5 +printf %s "checking for _FILE_OFFSET_BITS value needed for large files... " >&6; } +if test ${ac_cv_sys_file_offset_bits+y} +then : + printf %s "(cached) " >&6 +else $as_nop + while :; do + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +@%:@include + /* Check that off_t can represent 2**63 - 1 correctly. + We can't simply define LARGE_OFF_T to be 9223372036854775807, + since some C++ compilers masquerading as C compilers + incorrectly reject 9223372036854775807. */ +@%:@define LARGE_OFF_T (((off_t) 1 << 31 << 31) - 1 + ((off_t) 1 << 31 << 31)) + int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 + && LARGE_OFF_T % 2147483647 == 1) + ? 1 : -1]; +int +main (void) +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + ac_cv_sys_file_offset_bits=no; break +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +@%:@define _FILE_OFFSET_BITS 64 +@%:@include + /* Check that off_t can represent 2**63 - 1 correctly. + We can't simply define LARGE_OFF_T to be 9223372036854775807, + since some C++ compilers masquerading as C compilers + incorrectly reject 9223372036854775807. */ +@%:@define LARGE_OFF_T (((off_t) 1 << 31 << 31) - 1 + ((off_t) 1 << 31 << 31)) + int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 + && LARGE_OFF_T % 2147483647 == 1) + ? 1 : -1]; +int +main (void) +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + ac_cv_sys_file_offset_bits=64; break +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext + ac_cv_sys_file_offset_bits=unknown + break +done +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_file_offset_bits" >&5 +printf "%s\n" "$ac_cv_sys_file_offset_bits" >&6; } +case $ac_cv_sys_file_offset_bits in #( + no | unknown) ;; + *) +printf "%s\n" "@%:@define _FILE_OFFSET_BITS $ac_cv_sys_file_offset_bits" >>confdefs.h +;; +esac +rm -rf conftest* + if test $ac_cv_sys_file_offset_bits = unknown; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for _LARGE_FILES value needed for large files" >&5 +printf %s "checking for _LARGE_FILES value needed for large files... " >&6; } +if test ${ac_cv_sys_large_files+y} +then : + printf %s "(cached) " >&6 +else $as_nop + while :; do + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +@%:@include + /* Check that off_t can represent 2**63 - 1 correctly. + We can't simply define LARGE_OFF_T to be 9223372036854775807, + since some C++ compilers masquerading as C compilers + incorrectly reject 9223372036854775807. */ +@%:@define LARGE_OFF_T (((off_t) 1 << 31 << 31) - 1 + ((off_t) 1 << 31 << 31)) + int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 + && LARGE_OFF_T % 2147483647 == 1) + ? 1 : -1]; +int +main (void) +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + ac_cv_sys_large_files=no; break +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +@%:@define _LARGE_FILES 1 +@%:@include + /* Check that off_t can represent 2**63 - 1 correctly. + We can't simply define LARGE_OFF_T to be 9223372036854775807, + since some C++ compilers masquerading as C compilers + incorrectly reject 9223372036854775807. */ +@%:@define LARGE_OFF_T (((off_t) 1 << 31 << 31) - 1 + ((off_t) 1 << 31 << 31)) + int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 + && LARGE_OFF_T % 2147483647 == 1) + ? 1 : -1]; +int +main (void) +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + ac_cv_sys_large_files=1; break +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext + ac_cv_sys_large_files=unknown + break +done +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_large_files" >&5 +printf "%s\n" "$ac_cv_sys_large_files" >&6; } +case $ac_cv_sys_large_files in #( + no | unknown) ;; + *) +printf "%s\n" "@%:@define _LARGE_FILES $ac_cv_sys_large_files" >>confdefs.h +;; +esac +rm -rf conftest* + fi +fi + + + + + +# Extract the first word of "perl", so it can be a program name with args. +set dummy perl; ac_word=$2 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_perl+y} +then : + printf %s "(cached) " >&6 +else $as_nop + case $perl in + [\\/]* | ?:[\\/]*) + ac_cv_path_perl="$perl" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_perl="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + ;; +esac +fi +perl=$ac_cv_path_perl +if test -n "$perl"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $perl" >&5 +printf "%s\n" "$perl" >&6; } +else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +fi + + +if test -z "$perl"; then + as_fn_error $? "perl is required" "$LINENO" 5 +fi + + +# Extract the first word of "curl", so it can be a program name with args. +set dummy curl; ac_word=$2 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_curl+y} +then : + printf %s "(cached) " >&6 +else $as_nop + case $curl in + [\\/]* | ?:[\\/]*) + ac_cv_path_curl="$curl" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_curl="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + ;; +esac +fi +curl=$ac_cv_path_curl +if test -n "$curl"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $curl" >&5 +printf "%s\n" "$curl" >&6; } +else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +fi + + +if test -z "$curl"; then + as_fn_error $? "curl is required" "$LINENO" 5 +fi + + +# Extract the first word of "bzip2", so it can be a program name with args. +set dummy bzip2; ac_word=$2 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_bzip2+y} +then : + printf %s "(cached) " >&6 +else $as_nop + case $bzip2 in + [\\/]* | ?:[\\/]*) + ac_cv_path_bzip2="$bzip2" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_bzip2="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + ;; +esac +fi +bzip2=$ac_cv_path_bzip2 +if test -n "$bzip2"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $bzip2" >&5 +printf "%s\n" "$bzip2" >&6; } +else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +fi + + +if test -z "$bzip2"; then + as_fn_error $? "bzip2 is required" "$LINENO" 5 +fi + + +# Extract the first word of "xz", so it can be a program name with args. +set dummy xz; ac_word=$2 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_xz+y} +then : + printf %s "(cached) " >&6 +else $as_nop + case $xz in + [\\/]* | ?:[\\/]*) + ac_cv_path_xz="$xz" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_xz="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + ;; +esac +fi +xz=$ac_cv_path_xz +if test -n "$xz"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xz" >&5 +printf "%s\n" "$xz" >&6; } +else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +fi + + +if test -z "$xz"; then + as_fn_error $? "xz is required" "$LINENO" 5 +fi + + +# Test that Perl has the open/fork feature (Perl 5.8.0 and beyond). +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether Perl is recent enough" >&5 +printf %s "checking whether Perl is recent enough... " >&6; } +if ! $perl -e 'open(FOO, "-|", "true"); while () { print; }; close FOO or die;'; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + as_fn_error $? "Your Perl version is too old. Nix requires Perl 5.8.0 or newer." "$LINENO" 5 +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } + + +# Figure out where to install Perl modules. +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for the Perl installation prefix" >&5 +printf %s "checking for the Perl installation prefix... " >&6; } +perlversion=$($perl -e 'use Config; print $Config{version};') +perlarchname=$($perl -e 'use Config; print $Config{archname};') +perllibdir=${libdir}/perl5/site_perl/$perlversion/$perlarchname + +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $perllibdir" >&5 +printf "%s\n" "$perllibdir" >&6; } + +# Look for libsodium. +PKG_CHECK_MODULES(SODIUM, libsodium, CXXFLAGS="$SODIUM_CFLAGS $CXXFLAGS") + +# Check for the required Perl dependencies (DBI and DBD::SQLite). +perlFlags="-I$perllibdir" + + +@%:@ Check whether --with-dbi was given. +if test ${with_dbi+y} +then : + withval=$with_dbi; perlFlags="$perlFlags -I$withval" +fi + + + +@%:@ Check whether --with-dbd-sqlite was given. +if test ${with_dbd_sqlite+y} +then : + withval=$with_dbd_sqlite; perlFlags="$perlFlags -I$withval" +fi + + +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether DBD::SQLite works" >&5 +printf %s "checking whether DBD::SQLite works... " >&6; } +if ! $perl $perlFlags -e 'use DBI; use DBD::SQLite;' 2>&5; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "The Perl modules DBI and/or DBD::SQLite are missing. +See \`config.log' for more details" "$LINENO" 5; } +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } + + + +PKG_CHECK_MODULES(NIX, nix-store) + + +# Extract the first word of "nix", so it can be a program name with args. +set dummy nix; ac_word=$2 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_NIX+y} +then : + printf %s "(cached) " >&6 +else $as_nop + case $NIX in + [\\/]* | ?:[\\/]*) + ac_cv_path_NIX="$NIX" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_NIX="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + ;; +esac +fi +NIX=$ac_cv_path_NIX +if test -n "$NIX"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $NIX" >&5 +printf "%s\n" "$NIX" >&6; } +else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +fi + + +if test -z "$NIX"; then + as_fn_error $? "nix is required" "$LINENO" 5 +fi + + +# Expand all variables in config.status. +test "$prefix" = NONE && prefix=$ac_default_prefix +test "$exec_prefix" = NONE && exec_prefix='${prefix}' +for name in $ac_subst_vars; do + declare $name="$(eval echo "${!name}")" + declare $name="$(eval echo "${!name}")" + declare $name="$(eval echo "${!name}")" +done + +rm -f Makefile.config +ln -sfn ../mk mk + +ac_config_files="$ac_config_files " + +cat >confcache <<\_ACEOF +# This file is a shell script that caches the results of configure +# tests run on this system so they can be shared between configure +# scripts and configure runs, see configure's option --config-cache. +# It is not useful on other systems. If it contains results you don't +# want to keep, you may remove or edit it. +# +# config.status only pays attention to the cache file if you give it +# the --recheck option to rerun configure. +# +# `ac_cv_env_foo' variables (set or unset) will be overridden when +# loading this file, other *unset* `ac_cv_foo' will be assigned the +# following values. + +_ACEOF + +# The following way of writing the cache mishandles newlines in values, +# but we know of no workaround that is simple, portable, and efficient. +# So, we kill variables containing newlines. +# Ultrix sh set writes to stderr and can't be redirected directly, +# and sets the high bit in the cache file unless we assign to the vars. +( + for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do + eval ac_val=\$$ac_var + case $ac_val in #( + *${as_nl}*) + case $ac_var in #( + *_cv_*) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 +printf "%s\n" "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; + esac + case $ac_var in #( + _ | IFS | as_nl) ;; #( + BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( + *) { eval $ac_var=; unset $ac_var;} ;; + esac ;; + esac + done + + (set) 2>&1 | + case $as_nl`(ac_space=' '; set) 2>&1` in #( + *${as_nl}ac_space=\ *) + # `set' does not quote correctly, so add quotes: double-quote + # substitution turns \\\\ into \\, and sed turns \\ into \. + sed -n \ + "s/'/'\\\\''/g; + s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" + ;; #( + *) + # `set' quotes correctly as required by POSIX, so do not add quotes. + sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" + ;; + esac | + sort +) | + sed ' + /^ac_cv_env_/b end + t clear + :clear + s/^\([^=]*\)=\(.*[{}].*\)$/test ${\1+y} || &/ + t end + s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ + :end' >>confcache +if diff "$cache_file" confcache >/dev/null 2>&1; then :; else + if test -w "$cache_file"; then + if test "x$cache_file" != "x/dev/null"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 +printf "%s\n" "$as_me: updating cache $cache_file" >&6;} + if test ! -f "$cache_file" || test -h "$cache_file"; then + cat confcache >"$cache_file" + else + case $cache_file in #( + */* | ?:*) + mv -f confcache "$cache_file"$$ && + mv -f "$cache_file"$$ "$cache_file" ;; #( + *) + mv -f confcache "$cache_file" ;; + esac + fi + fi + else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 +printf "%s\n" "$as_me: not updating unwritable cache $cache_file" >&6;} + fi +fi +rm -f confcache + +test "x$prefix" = xNONE && prefix=$ac_default_prefix +# Let make expand exec_prefix. +test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' + +# Transform confdefs.h into DEFS. +# Protect against shell expansion while executing Makefile rules. +# Protect against Makefile macro expansion. +# +# If the first sed substitution is executed (which looks for macros that +# take arguments), then branch to the quote section. Otherwise, +# look for a macro that doesn't take arguments. +ac_script=' +:mline +/\\$/{ + N + s,\\\n,, + b mline +} +t clear +:clear +s/^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*([^)]*)\)[ ]*\(.*\)/-D\1=\2/g +t quote +s/^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\)/-D\1=\2/g +t quote +b any +:quote +s/[ `~#$^&*(){}\\|;'\''"<>?]/\\&/g +s/\[/\\&/g +s/\]/\\&/g +s/\$/$$/g +H +:any +${ + g + s/^\n// + s/\n/ /g + p +} +' +DEFS=`sed -n "$ac_script" confdefs.h` + + +ac_libobjs= +ac_ltlibobjs= +U= +for ac_i in : $LIB@&t@OBJS; do test "x$ac_i" = x: && continue + # 1. Remove the extension, and $U if already installed. + ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' + ac_i=`printf "%s\n" "$ac_i" | sed "$ac_script"` + # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR + # will be set to the directory where LIBOBJS objects are built. + as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext" + as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo' +done +LIB@&t@OBJS=$ac_libobjs + +LTLIBOBJS=$ac_ltlibobjs + + + +: "${CONFIG_STATUS=./config.status}" +ac_write_fail=0 +ac_clean_files_save=$ac_clean_files +ac_clean_files="$ac_clean_files $CONFIG_STATUS" +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5 +printf "%s\n" "$as_me: creating $CONFIG_STATUS" >&6;} +as_write_fail=0 +cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1 +#! $SHELL +# Generated by $as_me. +# Run this file to recreate the current configuration. +# Compiler output produced by configure, useful for debugging +# configure, is in config.log if it exists. + +debug=false +ac_cs_recheck=false +ac_cs_silent=false + +SHELL=\${CONFIG_SHELL-$SHELL} +export SHELL +_ASEOF +cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1 +## -------------------- ## +## M4sh Initialization. ## +## -------------------- ## + +# Be more Bourne compatible +DUALCASE=1; export DUALCASE # for MKS sh +as_nop=: +if test ${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1 +then : + emulate sh + NULLCMD=: + # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which + # is contrary to our usage. Disable this feature. + alias -g '${1+"$@"}'='"$@"' + setopt NO_GLOB_SUBST +else $as_nop + case `(set -o) 2>/dev/null` in @%:@( + *posix*) : + set -o posix ;; @%:@( + *) : + ;; +esac +fi + + + +# Reset variables that may have inherited troublesome values from +# the environment. + +# IFS needs to be set, to space, tab, and newline, in precisely that order. +# (If _AS_PATH_WALK were called with IFS unset, it would have the +# side effect of setting IFS to empty, thus disabling word splitting.) +# Quoting is to prevent editors from complaining about space-tab. +as_nl=' +' +export as_nl +IFS=" "" $as_nl" + +PS1='$ ' +PS2='> ' +PS4='+ ' + +# Ensure predictable behavior from utilities with locale-dependent output. +LC_ALL=C +export LC_ALL +LANGUAGE=C +export LANGUAGE + +# We cannot yet rely on "unset" to work, but we need these variables +# to be unset--not just set to an empty or harmless value--now, to +# avoid bugs in old shells (e.g. pre-3.0 UWIN ksh). This construct +# also avoids known problems related to "unset" and subshell syntax +# in other old shells (e.g. bash 2.01 and pdksh 5.2.14). +for as_var in BASH_ENV ENV MAIL MAILPATH CDPATH +do eval test \${$as_var+y} \ + && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : +done + +# Ensure that fds 0, 1, and 2 are open. +if (exec 3>&0) 2>/dev/null; then :; else exec 0&1) 2>/dev/null; then :; else exec 1>/dev/null; fi +if (exec 3>&2) ; then :; else exec 2>/dev/null; fi + +# The user is always right. +if ${PATH_SEPARATOR+false} :; then + PATH_SEPARATOR=: + (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { + (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || + PATH_SEPARATOR=';' + } +fi + + +# Find who we are. Look in the path if we contain no directory separator. +as_myself= +case $0 in @%:@(( + *[\\/]* ) as_myself=$0 ;; + *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + test -r "$as_dir$0" && as_myself=$as_dir$0 && break + done +IFS=$as_save_IFS + + ;; +esac +# We did not find ourselves, most probably we were run as `sh COMMAND' +# in which case we are not to be found in the path. +if test "x$as_myself" = x; then + as_myself=$0 +fi +if test ! -f "$as_myself"; then + printf "%s\n" "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 + exit 1 +fi + + + +@%:@ as_fn_error STATUS ERROR [LINENO LOG_FD] +@%:@ ---------------------------------------- +@%:@ Output "`basename @S|@0`: error: ERROR" to stderr. If LINENO and LOG_FD are +@%:@ provided, also output the error to LOG_FD, referencing LINENO. Then exit the +@%:@ script with STATUS, using 1 if that was 0. +as_fn_error () +{ + as_status=$1; test $as_status -eq 0 && as_status=1 + if test "$4"; then + as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 + fi + printf "%s\n" "$as_me: error: $2" >&2 + as_fn_exit $as_status +} @%:@ as_fn_error + + + +@%:@ as_fn_set_status STATUS +@%:@ ----------------------- +@%:@ Set @S|@? to STATUS, without forking. +as_fn_set_status () +{ + return $1 +} @%:@ as_fn_set_status + +@%:@ as_fn_exit STATUS +@%:@ ----------------- +@%:@ Exit the shell with STATUS, even in a "trap 0" or "set -e" context. +as_fn_exit () +{ + set +e + as_fn_set_status $1 + exit $1 +} @%:@ as_fn_exit + +@%:@ as_fn_unset VAR +@%:@ --------------- +@%:@ Portably unset VAR. +as_fn_unset () +{ + { eval $1=; unset $1;} +} +as_unset=as_fn_unset + +@%:@ as_fn_append VAR VALUE +@%:@ ---------------------- +@%:@ Append the text in VALUE to the end of the definition contained in VAR. Take +@%:@ advantage of any shell optimizations that allow amortized linear growth over +@%:@ repeated appends, instead of the typical quadratic growth present in naive +@%:@ implementations. +if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null +then : + eval 'as_fn_append () + { + eval $1+=\$2 + }' +else $as_nop + as_fn_append () + { + eval $1=\$$1\$2 + } +fi # as_fn_append + +@%:@ as_fn_arith ARG... +@%:@ ------------------ +@%:@ Perform arithmetic evaluation on the ARGs, and store the result in the +@%:@ global @S|@as_val. Take advantage of shells that can avoid forks. The arguments +@%:@ must be portable across @S|@(()) and expr. +if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null +then : + eval 'as_fn_arith () + { + as_val=$(( $* )) + }' +else $as_nop + as_fn_arith () + { + as_val=`expr "$@" || test $? -eq 1` + } +fi # as_fn_arith + + +if expr a : '\(a\)' >/dev/null 2>&1 && + test "X`expr 00001 : '.*\(...\)'`" = X001; then + as_expr=expr +else + as_expr=false +fi + +if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then + as_basename=basename +else + as_basename=false +fi + +if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then + as_dirname=dirname +else + as_dirname=false +fi + +as_me=`$as_basename -- "$0" || +$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ + X"$0" : 'X\(//\)$' \| \ + X"$0" : 'X\(/\)' \| . 2>/dev/null || +printf "%s\n" X/"$0" | + sed '/^.*\/\([^/][^/]*\)\/*$/{ + s//\1/ + q + } + /^X\/\(\/\/\)$/{ + s//\1/ + q + } + /^X\/\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + +# Avoid depending upon Character Ranges. +as_cr_letters='abcdefghijklmnopqrstuvwxyz' +as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' +as_cr_Letters=$as_cr_letters$as_cr_LETTERS +as_cr_digits='0123456789' +as_cr_alnum=$as_cr_Letters$as_cr_digits + + +# Determine whether it's possible to make 'echo' print without a newline. +# These variables are no longer used directly by Autoconf, but are AC_SUBSTed +# for compatibility with existing Makefiles. +ECHO_C= ECHO_N= ECHO_T= +case `echo -n x` in @%:@((((( +-n*) + case `echo 'xy\c'` in + *c*) ECHO_T=' ';; # ECHO_T is single tab character. + xy) ECHO_C='\c';; + *) echo `echo ksh88 bug on AIX 6.1` > /dev/null + ECHO_T=' ';; + esac;; +*) + ECHO_N='-n';; +esac + +# For backward compatibility with old third-party macros, we provide +# the shell variables $as_echo and $as_echo_n. New code should use +# AS_ECHO(["message"]) and AS_ECHO_N(["message"]), respectively. +as_@&t@echo='printf %s\n' +as_@&t@echo_n='printf %s' + +rm -f conf$$ conf$$.exe conf$$.file +if test -d conf$$.dir; then + rm -f conf$$.dir/conf$$.file +else + rm -f conf$$.dir + mkdir conf$$.dir 2>/dev/null +fi +if (echo >conf$$.file) 2>/dev/null; then + if ln -s conf$$.file conf$$ 2>/dev/null; then + as_ln_s='ln -s' + # ... but there are two gotchas: + # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. + # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. + # In both cases, we have to default to `cp -pR'. + ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || + as_ln_s='cp -pR' + elif ln conf$$.file conf$$ 2>/dev/null; then + as_ln_s=ln + else + as_ln_s='cp -pR' + fi +else + as_ln_s='cp -pR' +fi +rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file +rmdir conf$$.dir 2>/dev/null + + +@%:@ as_fn_mkdir_p +@%:@ ------------- +@%:@ Create "@S|@as_dir" as a directory, including parents if necessary. +as_fn_mkdir_p () +{ + + case $as_dir in #( + -*) as_dir=./$as_dir;; + esac + test -d "$as_dir" || eval $as_mkdir_p || { + as_dirs= + while :; do + case $as_dir in #( + *\'*) as_qdir=`printf "%s\n" "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( + *) as_qdir=$as_dir;; + esac + as_dirs="'$as_qdir' $as_dirs" + as_dir=`$as_dirname -- "$as_dir" || +$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$as_dir" : 'X\(//\)[^/]' \| \ + X"$as_dir" : 'X\(//\)$' \| \ + X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || +printf "%s\n" X"$as_dir" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + test -d "$as_dir" && break + done + test -z "$as_dirs" || eval "mkdir $as_dirs" + } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" + + +} @%:@ as_fn_mkdir_p +if mkdir -p . 2>/dev/null; then + as_mkdir_p='mkdir -p "$as_dir"' +else + test -d ./-p && rmdir ./-p + as_mkdir_p=false +fi + + +@%:@ as_fn_executable_p FILE +@%:@ ----------------------- +@%:@ Test if FILE is an executable regular file. +as_fn_executable_p () +{ + test -f "$1" && test -x "$1" +} @%:@ as_fn_executable_p +as_test_x='test -x' +as_executable_p=as_fn_executable_p + +# Sed expression to map a string onto a valid CPP name. +as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" + +# Sed expression to map a string onto a valid variable name. +as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" + + +exec 6>&1 +## ----------------------------------- ## +## Main body of $CONFIG_STATUS script. ## +## ----------------------------------- ## +_ASEOF +test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1 + +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +# Save the log message, to keep $0 and so on meaningful, and to +# report actual input values of CONFIG_FILES etc. instead of their +# values after options handling. +ac_log=" +This file was extended by nix-perl $as_me 2.14.0, which was +generated by GNU Autoconf 2.71. Invocation command line was + + CONFIG_FILES = $CONFIG_FILES + CONFIG_HEADERS = $CONFIG_HEADERS + CONFIG_LINKS = $CONFIG_LINKS + CONFIG_COMMANDS = $CONFIG_COMMANDS + $ $0 $@ + +on `(hostname || uname -n) 2>/dev/null | sed 1q` +" + +_ACEOF + +case $ac_config_files in *" +"*) set x $ac_config_files; shift; ac_config_files=$*;; +esac + + + +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +# Files that config.status was made for. +config_files="$ac_config_files" + +_ACEOF + +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +ac_cs_usage="\ +\`$as_me' instantiates files and other configuration actions +from templates according to the current configuration. Unless the files +and actions are specified as TAGs, all are instantiated by default. + +Usage: $0 [OPTION]... [TAG]... + + -h, --help print this help, then exit + -V, --version print version number and configuration settings, then exit + --config print configuration, then exit + -q, --quiet, --silent + do not print progress messages + -d, --debug don't remove temporary files + --recheck update $as_me by reconfiguring in the same conditions + --file=FILE[:TEMPLATE] + instantiate the configuration file FILE + +Configuration files: +$config_files + +Report bugs to the package provider." + +_ACEOF +ac_cs_config=`printf "%s\n" "$ac_configure_args" | sed "$ac_safe_unquote"` +ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\''/g"` +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +ac_cs_config='$ac_cs_config_escaped' +ac_cs_version="\\ +nix-perl config.status 2.14.0 +configured by $0, generated by GNU Autoconf 2.71, + with options \\"\$ac_cs_config\\" + +Copyright (C) 2021 Free Software Foundation, Inc. +This config.status script is free software; the Free Software Foundation +gives unlimited permission to copy, distribute and modify it." + +ac_pwd='$ac_pwd' +srcdir='$srcdir' +test -n "\$AWK" || AWK=awk +_ACEOF + +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +# The default lists apply if the user does not specify any file. +ac_need_defaults=: +while test $# != 0 +do + case $1 in + --*=?*) + ac_option=`expr "X$1" : 'X\([^=]*\)='` + ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'` + ac_shift=: + ;; + --*=) + ac_option=`expr "X$1" : 'X\([^=]*\)='` + ac_optarg= + ac_shift=: + ;; + *) + ac_option=$1 + ac_optarg=$2 + ac_shift=shift + ;; + esac + + case $ac_option in + # Handling of the options. + -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) + ac_cs_recheck=: ;; + --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) + printf "%s\n" "$ac_cs_version"; exit ;; + --config | --confi | --conf | --con | --co | --c ) + printf "%s\n" "$ac_cs_config"; exit ;; + --debug | --debu | --deb | --de | --d | -d ) + debug=: ;; + --file | --fil | --fi | --f ) + $ac_shift + case $ac_optarg in + *\'*) ac_optarg=`printf "%s\n" "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; + '') as_fn_error $? "missing file argument" ;; + esac + as_fn_append CONFIG_FILES " '$ac_optarg'" + ac_need_defaults=false;; + --he | --h | --help | --hel | -h ) + printf "%s\n" "$ac_cs_usage"; exit ;; + -q | -quiet | --quiet | --quie | --qui | --qu | --q \ + | -silent | --silent | --silen | --sile | --sil | --si | --s) + ac_cs_silent=: ;; + + # This is an error. + -*) as_fn_error $? "unrecognized option: \`$1' +Try \`$0 --help' for more information." ;; + + *) as_fn_append ac_config_targets " $1" + ac_need_defaults=false ;; + + esac + shift +done + +ac_configure_extra_args= + +if $ac_cs_silent; then + exec 6>/dev/null + ac_configure_extra_args="$ac_configure_extra_args --silent" +fi + +_ACEOF +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +if \$ac_cs_recheck; then + set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion + shift + \printf "%s\n" "running CONFIG_SHELL=$SHELL \$*" >&6 + CONFIG_SHELL='$SHELL' + export CONFIG_SHELL + exec "\$@" +fi + +_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +exec 5>>config.log +{ + echo + sed 'h;s/./-/g;s/^.../@%:@@%:@ /;s/...$/ @%:@@%:@/;p;x;p;x' <<_ASBOX +@%:@@%:@ Running $as_me. @%:@@%:@ +_ASBOX + printf "%s\n" "$ac_log" +} >&5 + +_ACEOF +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +_ACEOF + +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 + +# Handling of arguments. +for ac_config_target in $ac_config_targets +do + case $ac_config_target in + + *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; + esac +done + + +# If the user did not use the arguments to specify the items to instantiate, +# then the envvar interface is used. Set only those that are not. +# We use the long form for the default assignment because of an extremely +# bizarre bug on SunOS 4.1.3. +if $ac_need_defaults; then + test ${CONFIG_FILES+y} || CONFIG_FILES=$config_files +fi + +# Have a temporary directory for convenience. Make it in the build tree +# simply because there is no reason against having it here, and in addition, +# creating and moving files from /tmp can sometimes cause problems. +# Hook for its removal unless debugging. +# Note that there is a small window in which the directory will not be cleaned: +# after its creation but before its name has been assigned to `$tmp'. +$debug || +{ + tmp= ac_tmp= + trap 'exit_status=$? + : "${ac_tmp:=$tmp}" + { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status +' 0 + trap 'as_fn_exit 1' 1 2 13 15 +} +# Create a (secure) tmp directory for tmp files. + +{ + tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` && + test -d "$tmp" +} || +{ + tmp=./conf$$-$RANDOM + (umask 077 && mkdir "$tmp") +} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5 +ac_tmp=$tmp + +# Set up the scripts for CONFIG_FILES section. +# No need to generate them if there are no CONFIG_FILES. +# This happens for instance with `./config.status config.h'. +if test -n "$CONFIG_FILES"; then + + +ac_cr=`echo X | tr X '\015'` +# On cygwin, bash can eat \r inside `` if the user requested igncr. +# But we know of no other shell where ac_cr would be empty at this +# point, so we can use a bashism as a fallback. +if test "x$ac_cr" = x; then + eval ac_cr=\$\'\\r\' +fi +ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' /dev/null` +if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then + ac_cs_awk_cr='\\r' +else + ac_cs_awk_cr=$ac_cr +fi + +echo 'BEGIN {' >"$ac_tmp/subs1.awk" && +_ACEOF + + +{ + echo "cat >conf$$subs.awk <<_ACEOF" && + echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' && + echo "_ACEOF" +} >conf$$subs.sh || + as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 +ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'` +ac_delim='%!_!# ' +for ac_last_try in false false false false false :; do + . ./conf$$subs.sh || + as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 + + ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` + if test $ac_delim_n = $ac_delim_num; then + break + elif $ac_last_try; then + as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 + else + ac_delim="$ac_delim!$ac_delim _$ac_delim!! " + fi +done +rm -f conf$$subs.sh + +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK && +_ACEOF +sed -n ' +h +s/^/S["/; s/!.*/"]=/ +p +g +s/^[^!]*!// +:repl +t repl +s/'"$ac_delim"'$// +t delim +:nl +h +s/\(.\{148\}\)..*/\1/ +t more1 +s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/ +p +n +b repl +:more1 +s/["\\]/\\&/g; s/^/"/; s/$/"\\/ +p +g +s/.\{148\}// +t nl +:delim +h +s/\(.\{148\}\)..*/\1/ +t more2 +s/["\\]/\\&/g; s/^/"/; s/$/"/ +p +b +:more2 +s/["\\]/\\&/g; s/^/"/; s/$/"\\/ +p +g +s/.\{148\}// +t delim +' >$CONFIG_STATUS || ac_write_fail=1 +rm -f conf$$subs.awk +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +_ACAWK +cat >>"\$ac_tmp/subs1.awk" <<_ACAWK && + for (key in S) S_is_set[key] = 1 + FS = "" + +} +{ + line = $ 0 + nfields = split(line, field, "@") + substed = 0 + len = length(field[1]) + for (i = 2; i < nfields; i++) { + key = field[i] + keylen = length(key) + if (S_is_set[key]) { + value = S[key] + line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3) + len += length(value) + length(field[++i]) + substed = 1 + } else + len += 1 + keylen + } + + print line +} + +_ACAWK +_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then + sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g" +else + cat +fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \ + || as_fn_error $? "could not setup config files machinery" "$LINENO" 5 +_ACEOF + +# VPATH may cause trouble with some makes, so we remove sole $(srcdir), +# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and +# trailing colons and then remove the whole line if VPATH becomes empty +# (actually we leave an empty line to preserve line numbers). +if test "x$srcdir" = x.; then + ac_vpsub='/^[ ]*VPATH[ ]*=[ ]*/{ +h +s/// +s/^/:/ +s/[ ]*$/:/ +s/:\$(srcdir):/:/g +s/:\${srcdir}:/:/g +s/:@srcdir@:/:/g +s/^:*// +s/:*$// +x +s/\(=[ ]*\).*/\1/ +G +s/\n// +s/^[^=]*=[ ]*$// +}' +fi + +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +fi # test -n "$CONFIG_FILES" + + +eval set X " :F $CONFIG_FILES " +shift +for ac_tag +do + case $ac_tag in + :[FHLC]) ac_mode=$ac_tag; continue;; + esac + case $ac_mode$ac_tag in + :[FHL]*:*);; + :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;; + :[FH]-) ac_tag=-:-;; + :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; + esac + ac_save_IFS=$IFS + IFS=: + set x $ac_tag + IFS=$ac_save_IFS + shift + ac_file=$1 + shift + + case $ac_mode in + :L) ac_source=$1;; + :[FH]) + ac_file_inputs= + for ac_f + do + case $ac_f in + -) ac_f="$ac_tmp/stdin";; + *) # Look for the file first in the build tree, then in the source tree + # (if the path is not absolute). The absolute path cannot be DOS-style, + # because $ac_f cannot contain `:'. + test -f "$ac_f" || + case $ac_f in + [\\/$]*) false;; + *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; + esac || + as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;; + esac + case $ac_f in *\'*) ac_f=`printf "%s\n" "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac + as_fn_append ac_file_inputs " '$ac_f'" + done + + # Let's still pretend it is `configure' which instantiates (i.e., don't + # use $as_me), people would be surprised to read: + # /* config.h. Generated by config.status. */ + configure_input='Generated from '` + printf "%s\n" "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g' + `' by configure.' + if test x"$ac_file" != x-; then + configure_input="$ac_file. $configure_input" + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5 +printf "%s\n" "$as_me: creating $ac_file" >&6;} + fi + # Neutralize special characters interpreted by sed in replacement strings. + case $configure_input in #( + *\&* | *\|* | *\\* ) + ac_sed_conf_input=`printf "%s\n" "$configure_input" | + sed 's/[\\\\&|]/\\\\&/g'`;; #( + *) ac_sed_conf_input=$configure_input;; + esac + + case $ac_tag in + *:-:* | *:-) cat >"$ac_tmp/stdin" \ + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; + esac + ;; + esac + + ac_dir=`$as_dirname -- "$ac_file" || +$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$ac_file" : 'X\(//\)[^/]' \| \ + X"$ac_file" : 'X\(//\)$' \| \ + X"$ac_file" : 'X\(/\)' \| . 2>/dev/null || +printf "%s\n" X"$ac_file" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + as_dir="$ac_dir"; as_fn_mkdir_p + ac_builddir=. + +case "$ac_dir" in +.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; +*) + ac_dir_suffix=/`printf "%s\n" "$ac_dir" | sed 's|^\.[\\/]||'` + # A ".." for each directory in $ac_dir_suffix. + ac_top_builddir_sub=`printf "%s\n" "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` + case $ac_top_builddir_sub in + "") ac_top_builddir_sub=. ac_top_build_prefix= ;; + *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; + esac ;; +esac +ac_abs_top_builddir=$ac_pwd +ac_abs_builddir=$ac_pwd$ac_dir_suffix +# for backward compatibility: +ac_top_builddir=$ac_top_build_prefix + +case $srcdir in + .) # We are building in place. + ac_srcdir=. + ac_top_srcdir=$ac_top_builddir_sub + ac_abs_top_srcdir=$ac_pwd ;; + [\\/]* | ?:[\\/]* ) # Absolute name. + ac_srcdir=$srcdir$ac_dir_suffix; + ac_top_srcdir=$srcdir + ac_abs_top_srcdir=$srcdir ;; + *) # Relative name. + ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix + ac_top_srcdir=$ac_top_build_prefix$srcdir + ac_abs_top_srcdir=$ac_pwd/$srcdir ;; +esac +ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix + + + case $ac_mode in + :F) + # + # CONFIG_FILE + # + +_ACEOF + +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +# If the template does not know about datarootdir, expand it. +# FIXME: This hack should be removed a few years after 2.60. +ac_datarootdir_hack=; ac_datarootdir_seen= +ac_sed_dataroot=' +/datarootdir/ { + p + q +} +/@datadir@/p +/@docdir@/p +/@infodir@/p +/@localedir@/p +/@mandir@/p' +case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in +*datarootdir*) ac_datarootdir_seen=yes;; +*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*) + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 +printf "%s\n" "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} +_ACEOF +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 + ac_datarootdir_hack=' + s&@datadir@&$datadir&g + s&@docdir@&$docdir&g + s&@infodir@&$infodir&g + s&@localedir@&$localedir&g + s&@mandir@&$mandir&g + s&\\\${datarootdir}&$datarootdir&g' ;; +esac +_ACEOF + +# Neutralize VPATH when `$srcdir' = `.'. +# Shell code in configure.ac might set extrasub. +# FIXME: do we really want to maintain this feature? +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +ac_sed_extra="$ac_vpsub +$extrasub +_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +:t +/@[a-zA-Z_][a-zA-Z_0-9]*@/!b +s|@configure_input@|$ac_sed_conf_input|;t t +s&@top_builddir@&$ac_top_builddir_sub&;t t +s&@top_build_prefix@&$ac_top_build_prefix&;t t +s&@srcdir@&$ac_srcdir&;t t +s&@abs_srcdir@&$ac_abs_srcdir&;t t +s&@top_srcdir@&$ac_top_srcdir&;t t +s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t +s&@builddir@&$ac_builddir&;t t +s&@abs_builddir@&$ac_abs_builddir&;t t +s&@abs_top_builddir@&$ac_abs_top_builddir&;t t +$ac_datarootdir_hack +" +eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \ + >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5 + +test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && + { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } && + { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' \ + "$ac_tmp/out"`; test -z "$ac_out"; } && + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' +which seems to be undefined. Please make sure it is defined" >&5 +printf "%s\n" "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' +which seems to be undefined. Please make sure it is defined" >&2;} + + rm -f "$ac_tmp/stdin" + case $ac_file in + -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";; + *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";; + esac \ + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 + ;; + + + + esac + +done # for ac_tag + + +as_fn_exit 0 +_ACEOF +ac_clean_files=$ac_clean_files_save + +test $ac_write_fail = 0 || + as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5 + + +# configure is writing to config.log, and then calls config.status. +# config.status does its own redirection, appending to config.log. +# Unfortunately, on DOS this fails, as config.log is still kept open +# by configure, so config.status won't be able to write to it; its +# output is simply discarded. So we exec the FD to /dev/null, +# effectively closing config.log, so it can be properly (re)opened and +# appended to by config.status. When coming back to configure, we +# need to make the FD available again. +if test "$no_create" != yes; then + ac_cs_success=: + ac_config_status_args= + test "$silent" = yes && + ac_config_status_args="$ac_config_status_args --quiet" + exec 5>/dev/null + $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false + exec 5>>config.log + # Use ||, not &&, to avoid exiting from the if with $? = 1, which + # would make configure fail if this is the last instruction. + $ac_cs_success || as_fn_exit 1 +fi +if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 +printf "%s\n" "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} +fi + + \ No newline at end of file diff --git a/perl/autom4te.cache/requests b/perl/autom4te.cache/requests new file mode 100644 index 00000000000..e0d0a58e468 --- /dev/null +++ b/perl/autom4te.cache/requests @@ -0,0 +1,84 @@ +# This file was generated by Autom4te 2.71. +# It contains the lists of macros which have been traced. +# It can be safely removed. + +@request = ( + bless( [ + '0', + 1, + [ + '/nix/store/760wf32r5vwm20fvyfg2dndrm8drjvrb-autoconf-2.71/share/autoconf' + ], + [ + '/nix/store/760wf32r5vwm20fvyfg2dndrm8drjvrb-autoconf-2.71/share/autoconf/autoconf/autoconf.m4f', + '/nix/store/760wf32r5vwm20fvyfg2dndrm8drjvrb-autoconf-2.71/share/autoconf/autoconf/trailer.m4', + 'configure.ac' + ], + { + '_m4_warn' => 1, + 'AM_POT_TOOLS' => 1, + 'AC_CONFIG_LIBOBJ_DIR' => 1, + 'AC_LIBSOURCE' => 1, + 'AC_SUBST' => 1, + 'AC_CONFIG_AUX_DIR' => 1, + 'AC_REQUIRE_AUX_FILE' => 1, + 'AC_CONFIG_FILES' => 1, + 'AH_OUTPUT' => 1, + 'AM_MAKEFILE_INCLUDE' => 1, + 'AM_ENABLE_MULTILIB' => 1, + 'LT_SUPPORTED_TAG' => 1, + 'AM_PROG_MOC' => 1, + 'AM_MAINTAINER_MODE' => 1, + 'AC_FC_SRCEXT' => 1, + 'm4_include' => 1, + 'AC_CANONICAL_SYSTEM' => 1, + 'AM_PROG_MKDIR_P' => 1, + 'AC_CANONICAL_TARGET' => 1, + 'm4_pattern_allow' => 1, + 'AM_INIT_AUTOMAKE' => 1, + 'LT_CONFIG_LTDL_DIR' => 1, + 'AM_EXTRA_RECURSIVE_TARGETS' => 1, + 'AC_CANONICAL_BUILD' => 1, + '_AM_SUBST_NOTMAKE' => 1, + 'AC_CANONICAL_HOST' => 1, + 'AC_SUBST_TRACE' => 1, + 'AC_CONFIG_SUBDIRS' => 1, + 'AC_PROG_LIBTOOL' => 1, + 'AC_FC_FREEFORM' => 1, + 'LT_INIT' => 1, + 'AC_CONFIG_MACRO_DIR_TRACE' => 1, + 'm4_sinclude' => 1, + 'AM_SILENT_RULES' => 1, + 'AM_AUTOMAKE_VERSION' => 1, + 'AC_FC_PP_DEFINE' => 1, + 'AC_INIT' => 1, + 'GTK_DOC_CHECK' => 1, + 'AM_PROG_LIBTOOL' => 1, + 'include' => 1, + 'AM_NLS' => 1, + 'AM_CONDITIONAL' => 1, + 'AC_DEFINE_TRACE_LITERAL' => 1, + 'AM_PROG_AR' => 1, + 'IT_PROG_INTLTOOL' => 1, + 'AM_PATH_GUILE' => 1, + 'AC_CONFIG_HEADERS' => 1, + 'm4_pattern_forbid' => 1, + 'AC_FC_PP_SRCEXT' => 1, + 'AM_XGETTEXT_OPTION' => 1, + '_AM_COND_ELSE' => 1, + 'sinclude' => 1, + 'AM_PROG_F77_C_O' => 1, + '_AM_COND_ENDIF' => 1, + 'AM_PROG_CXX_C_O' => 1, + 'AC_CONFIG_LINKS' => 1, + '_AM_COND_IF' => 1, + 'AM_GNU_GETTEXT_INTL_SUBDIR' => 1, + '_LT_AC_TAGCONFIG' => 1, + 'AM_PROG_FC_C_O' => 1, + 'AM_GNU_GETTEXT' => 1, + 'AM_PROG_CC_C_O' => 1, + '_AM_MAKEFILE_INCLUDE' => 1 + } + ], 'Autom4te::Request' ) + ); + diff --git a/perl/autom4te.cache/traces.0 b/perl/autom4te.cache/traces.0 new file mode 100644 index 00000000000..be2156d0c91 --- /dev/null +++ b/perl/autom4te.cache/traces.0 @@ -0,0 +1,291 @@ +m4trace:configure.ac:1: -1- AC_INIT([nix-perl], [2.14.0]) +m4trace:configure.ac:1: -1- m4_pattern_forbid([^_?A[CHUM]_]) +m4trace:configure.ac:1: -1- m4_pattern_forbid([_AC_]) +m4trace:configure.ac:1: -1- m4_pattern_forbid([^LIBOBJS$], [do not use LIBOBJS directly, use AC_LIBOBJ (see section `AC_LIBOBJ vs LIBOBJS']) +m4trace:configure.ac:1: -1- m4_pattern_allow([^AS_FLAGS$]) +m4trace:configure.ac:1: -1- m4_pattern_forbid([^_?m4_]) +m4trace:configure.ac:1: -1- m4_pattern_forbid([^dnl$]) +m4trace:configure.ac:1: -1- m4_pattern_forbid([^_?AS_]) +m4trace:configure.ac:1: -1- AC_SUBST([SHELL]) +m4trace:configure.ac:1: -1- AC_SUBST_TRACE([SHELL]) +m4trace:configure.ac:1: -1- m4_pattern_allow([^SHELL$]) +m4trace:configure.ac:1: -1- AC_SUBST([PATH_SEPARATOR]) +m4trace:configure.ac:1: -1- AC_SUBST_TRACE([PATH_SEPARATOR]) +m4trace:configure.ac:1: -1- m4_pattern_allow([^PATH_SEPARATOR$]) +m4trace:configure.ac:1: -1- AC_SUBST([PACKAGE_NAME], [m4_ifdef([AC_PACKAGE_NAME], ['AC_PACKAGE_NAME'])]) +m4trace:configure.ac:1: -1- AC_SUBST_TRACE([PACKAGE_NAME]) +m4trace:configure.ac:1: -1- m4_pattern_allow([^PACKAGE_NAME$]) +m4trace:configure.ac:1: -1- AC_SUBST([PACKAGE_TARNAME], [m4_ifdef([AC_PACKAGE_TARNAME], ['AC_PACKAGE_TARNAME'])]) +m4trace:configure.ac:1: -1- AC_SUBST_TRACE([PACKAGE_TARNAME]) +m4trace:configure.ac:1: -1- m4_pattern_allow([^PACKAGE_TARNAME$]) +m4trace:configure.ac:1: -1- AC_SUBST([PACKAGE_VERSION], [m4_ifdef([AC_PACKAGE_VERSION], ['AC_PACKAGE_VERSION'])]) +m4trace:configure.ac:1: -1- AC_SUBST_TRACE([PACKAGE_VERSION]) +m4trace:configure.ac:1: -1- m4_pattern_allow([^PACKAGE_VERSION$]) +m4trace:configure.ac:1: -1- AC_SUBST([PACKAGE_STRING], [m4_ifdef([AC_PACKAGE_STRING], ['AC_PACKAGE_STRING'])]) +m4trace:configure.ac:1: -1- AC_SUBST_TRACE([PACKAGE_STRING]) +m4trace:configure.ac:1: -1- m4_pattern_allow([^PACKAGE_STRING$]) +m4trace:configure.ac:1: -1- AC_SUBST([PACKAGE_BUGREPORT], [m4_ifdef([AC_PACKAGE_BUGREPORT], ['AC_PACKAGE_BUGREPORT'])]) +m4trace:configure.ac:1: -1- AC_SUBST_TRACE([PACKAGE_BUGREPORT]) +m4trace:configure.ac:1: -1- m4_pattern_allow([^PACKAGE_BUGREPORT$]) +m4trace:configure.ac:1: -1- AC_SUBST([PACKAGE_URL], [m4_ifdef([AC_PACKAGE_URL], ['AC_PACKAGE_URL'])]) +m4trace:configure.ac:1: -1- AC_SUBST_TRACE([PACKAGE_URL]) +m4trace:configure.ac:1: -1- m4_pattern_allow([^PACKAGE_URL$]) +m4trace:configure.ac:1: -1- AC_SUBST([exec_prefix], [NONE]) +m4trace:configure.ac:1: -1- AC_SUBST_TRACE([exec_prefix]) +m4trace:configure.ac:1: -1- m4_pattern_allow([^exec_prefix$]) +m4trace:configure.ac:1: -1- AC_SUBST([prefix], [NONE]) +m4trace:configure.ac:1: -1- AC_SUBST_TRACE([prefix]) +m4trace:configure.ac:1: -1- m4_pattern_allow([^prefix$]) +m4trace:configure.ac:1: -1- AC_SUBST([program_transform_name], [s,x,x,]) +m4trace:configure.ac:1: -1- AC_SUBST_TRACE([program_transform_name]) +m4trace:configure.ac:1: -1- m4_pattern_allow([^program_transform_name$]) +m4trace:configure.ac:1: -1- AC_SUBST([bindir], ['${exec_prefix}/bin']) +m4trace:configure.ac:1: -1- AC_SUBST_TRACE([bindir]) +m4trace:configure.ac:1: -1- m4_pattern_allow([^bindir$]) +m4trace:configure.ac:1: -1- AC_SUBST([sbindir], ['${exec_prefix}/sbin']) +m4trace:configure.ac:1: -1- AC_SUBST_TRACE([sbindir]) +m4trace:configure.ac:1: -1- m4_pattern_allow([^sbindir$]) +m4trace:configure.ac:1: -1- AC_SUBST([libexecdir], ['${exec_prefix}/libexec']) +m4trace:configure.ac:1: -1- AC_SUBST_TRACE([libexecdir]) +m4trace:configure.ac:1: -1- m4_pattern_allow([^libexecdir$]) +m4trace:configure.ac:1: -1- AC_SUBST([datarootdir], ['${prefix}/share']) +m4trace:configure.ac:1: -1- AC_SUBST_TRACE([datarootdir]) +m4trace:configure.ac:1: -1- m4_pattern_allow([^datarootdir$]) +m4trace:configure.ac:1: -1- AC_SUBST([datadir], ['${datarootdir}']) +m4trace:configure.ac:1: -1- AC_SUBST_TRACE([datadir]) +m4trace:configure.ac:1: -1- m4_pattern_allow([^datadir$]) +m4trace:configure.ac:1: -1- AC_SUBST([sysconfdir], ['${prefix}/etc']) +m4trace:configure.ac:1: -1- AC_SUBST_TRACE([sysconfdir]) +m4trace:configure.ac:1: -1- m4_pattern_allow([^sysconfdir$]) +m4trace:configure.ac:1: -1- AC_SUBST([sharedstatedir], ['${prefix}/com']) +m4trace:configure.ac:1: -1- AC_SUBST_TRACE([sharedstatedir]) +m4trace:configure.ac:1: -1- m4_pattern_allow([^sharedstatedir$]) +m4trace:configure.ac:1: -1- AC_SUBST([localstatedir], ['${prefix}/var']) +m4trace:configure.ac:1: -1- AC_SUBST_TRACE([localstatedir]) +m4trace:configure.ac:1: -1- m4_pattern_allow([^localstatedir$]) +m4trace:configure.ac:1: -1- AC_SUBST([runstatedir], ['${localstatedir}/run']) +m4trace:configure.ac:1: -1- AC_SUBST_TRACE([runstatedir]) +m4trace:configure.ac:1: -1- m4_pattern_allow([^runstatedir$]) +m4trace:configure.ac:1: -1- AC_SUBST([includedir], ['${prefix}/include']) +m4trace:configure.ac:1: -1- AC_SUBST_TRACE([includedir]) +m4trace:configure.ac:1: -1- m4_pattern_allow([^includedir$]) +m4trace:configure.ac:1: -1- AC_SUBST([oldincludedir], ['/usr/include']) +m4trace:configure.ac:1: -1- AC_SUBST_TRACE([oldincludedir]) +m4trace:configure.ac:1: -1- m4_pattern_allow([^oldincludedir$]) +m4trace:configure.ac:1: -1- AC_SUBST([docdir], [m4_ifset([AC_PACKAGE_TARNAME], + ['${datarootdir}/doc/${PACKAGE_TARNAME}'], + ['${datarootdir}/doc/${PACKAGE}'])]) +m4trace:configure.ac:1: -1- AC_SUBST_TRACE([docdir]) +m4trace:configure.ac:1: -1- m4_pattern_allow([^docdir$]) +m4trace:configure.ac:1: -1- AC_SUBST([infodir], ['${datarootdir}/info']) +m4trace:configure.ac:1: -1- AC_SUBST_TRACE([infodir]) +m4trace:configure.ac:1: -1- m4_pattern_allow([^infodir$]) +m4trace:configure.ac:1: -1- AC_SUBST([htmldir], ['${docdir}']) +m4trace:configure.ac:1: -1- AC_SUBST_TRACE([htmldir]) +m4trace:configure.ac:1: -1- m4_pattern_allow([^htmldir$]) +m4trace:configure.ac:1: -1- AC_SUBST([dvidir], ['${docdir}']) +m4trace:configure.ac:1: -1- AC_SUBST_TRACE([dvidir]) +m4trace:configure.ac:1: -1- m4_pattern_allow([^dvidir$]) +m4trace:configure.ac:1: -1- AC_SUBST([pdfdir], ['${docdir}']) +m4trace:configure.ac:1: -1- AC_SUBST_TRACE([pdfdir]) +m4trace:configure.ac:1: -1- m4_pattern_allow([^pdfdir$]) +m4trace:configure.ac:1: -1- AC_SUBST([psdir], ['${docdir}']) +m4trace:configure.ac:1: -1- AC_SUBST_TRACE([psdir]) +m4trace:configure.ac:1: -1- m4_pattern_allow([^psdir$]) +m4trace:configure.ac:1: -1- AC_SUBST([libdir], ['${exec_prefix}/lib']) +m4trace:configure.ac:1: -1- AC_SUBST_TRACE([libdir]) +m4trace:configure.ac:1: -1- m4_pattern_allow([^libdir$]) +m4trace:configure.ac:1: -1- AC_SUBST([localedir], ['${datarootdir}/locale']) +m4trace:configure.ac:1: -1- AC_SUBST_TRACE([localedir]) +m4trace:configure.ac:1: -1- m4_pattern_allow([^localedir$]) +m4trace:configure.ac:1: -1- AC_SUBST([mandir], ['${datarootdir}/man']) +m4trace:configure.ac:1: -1- AC_SUBST_TRACE([mandir]) +m4trace:configure.ac:1: -1- m4_pattern_allow([^mandir$]) +m4trace:configure.ac:1: -1- AC_DEFINE_TRACE_LITERAL([PACKAGE_NAME]) +m4trace:configure.ac:1: -1- m4_pattern_allow([^PACKAGE_NAME$]) +m4trace:configure.ac:1: -1- AH_OUTPUT([PACKAGE_NAME], [/* Define to the full name of this package. */ +@%:@undef PACKAGE_NAME]) +m4trace:configure.ac:1: -1- AC_DEFINE_TRACE_LITERAL([PACKAGE_TARNAME]) +m4trace:configure.ac:1: -1- m4_pattern_allow([^PACKAGE_TARNAME$]) +m4trace:configure.ac:1: -1- AH_OUTPUT([PACKAGE_TARNAME], [/* Define to the one symbol short name of this package. */ +@%:@undef PACKAGE_TARNAME]) +m4trace:configure.ac:1: -1- AC_DEFINE_TRACE_LITERAL([PACKAGE_VERSION]) +m4trace:configure.ac:1: -1- m4_pattern_allow([^PACKAGE_VERSION$]) +m4trace:configure.ac:1: -1- AH_OUTPUT([PACKAGE_VERSION], [/* Define to the version of this package. */ +@%:@undef PACKAGE_VERSION]) +m4trace:configure.ac:1: -1- AC_DEFINE_TRACE_LITERAL([PACKAGE_STRING]) +m4trace:configure.ac:1: -1- m4_pattern_allow([^PACKAGE_STRING$]) +m4trace:configure.ac:1: -1- AH_OUTPUT([PACKAGE_STRING], [/* Define to the full name and version of this package. */ +@%:@undef PACKAGE_STRING]) +m4trace:configure.ac:1: -1- AC_DEFINE_TRACE_LITERAL([PACKAGE_BUGREPORT]) +m4trace:configure.ac:1: -1- m4_pattern_allow([^PACKAGE_BUGREPORT$]) +m4trace:configure.ac:1: -1- AH_OUTPUT([PACKAGE_BUGREPORT], [/* Define to the address where bug reports for this package should be sent. */ +@%:@undef PACKAGE_BUGREPORT]) +m4trace:configure.ac:1: -1- AC_DEFINE_TRACE_LITERAL([PACKAGE_URL]) +m4trace:configure.ac:1: -1- m4_pattern_allow([^PACKAGE_URL$]) +m4trace:configure.ac:1: -1- AH_OUTPUT([PACKAGE_URL], [/* Define to the home page for this package. */ +@%:@undef PACKAGE_URL]) +m4trace:configure.ac:1: -1- AC_SUBST([DEFS]) +m4trace:configure.ac:1: -1- AC_SUBST_TRACE([DEFS]) +m4trace:configure.ac:1: -1- m4_pattern_allow([^DEFS$]) +m4trace:configure.ac:1: -1- AC_SUBST([ECHO_C]) +m4trace:configure.ac:1: -1- AC_SUBST_TRACE([ECHO_C]) +m4trace:configure.ac:1: -1- m4_pattern_allow([^ECHO_C$]) +m4trace:configure.ac:1: -1- AC_SUBST([ECHO_N]) +m4trace:configure.ac:1: -1- AC_SUBST_TRACE([ECHO_N]) +m4trace:configure.ac:1: -1- m4_pattern_allow([^ECHO_N$]) +m4trace:configure.ac:1: -1- AC_SUBST([ECHO_T]) +m4trace:configure.ac:1: -1- AC_SUBST_TRACE([ECHO_T]) +m4trace:configure.ac:1: -1- m4_pattern_allow([^ECHO_T$]) +m4trace:configure.ac:1: -1- AC_SUBST([LIBS]) +m4trace:configure.ac:1: -1- AC_SUBST_TRACE([LIBS]) +m4trace:configure.ac:1: -1- m4_pattern_allow([^LIBS$]) +m4trace:configure.ac:1: -1- AC_SUBST([build_alias]) +m4trace:configure.ac:1: -1- AC_SUBST_TRACE([build_alias]) +m4trace:configure.ac:1: -1- m4_pattern_allow([^build_alias$]) +m4trace:configure.ac:1: -1- AC_SUBST([host_alias]) +m4trace:configure.ac:1: -1- AC_SUBST_TRACE([host_alias]) +m4trace:configure.ac:1: -1- m4_pattern_allow([^host_alias$]) +m4trace:configure.ac:1: -1- AC_SUBST([target_alias]) +m4trace:configure.ac:1: -1- AC_SUBST_TRACE([target_alias]) +m4trace:configure.ac:1: -1- m4_pattern_allow([^target_alias$]) +m4trace:configure.ac:3: -1- AC_CONFIG_AUX_DIR([../config]) +m4trace:configure.ac:7: -1- AC_SUBST([CC]) +m4trace:configure.ac:7: -1- AC_SUBST_TRACE([CC]) +m4trace:configure.ac:7: -1- m4_pattern_allow([^CC$]) +m4trace:configure.ac:7: -1- AC_SUBST([CFLAGS]) +m4trace:configure.ac:7: -1- AC_SUBST_TRACE([CFLAGS]) +m4trace:configure.ac:7: -1- m4_pattern_allow([^CFLAGS$]) +m4trace:configure.ac:7: -1- AC_SUBST([LDFLAGS]) +m4trace:configure.ac:7: -1- AC_SUBST_TRACE([LDFLAGS]) +m4trace:configure.ac:7: -1- m4_pattern_allow([^LDFLAGS$]) +m4trace:configure.ac:7: -1- AC_SUBST([LIBS]) +m4trace:configure.ac:7: -1- AC_SUBST_TRACE([LIBS]) +m4trace:configure.ac:7: -1- m4_pattern_allow([^LIBS$]) +m4trace:configure.ac:7: -1- AC_SUBST([CPPFLAGS]) +m4trace:configure.ac:7: -1- AC_SUBST_TRACE([CPPFLAGS]) +m4trace:configure.ac:7: -1- m4_pattern_allow([^CPPFLAGS$]) +m4trace:configure.ac:7: -1- AC_SUBST([CC]) +m4trace:configure.ac:7: -1- AC_SUBST_TRACE([CC]) +m4trace:configure.ac:7: -1- m4_pattern_allow([^CC$]) +m4trace:configure.ac:7: -1- AC_SUBST([CC]) +m4trace:configure.ac:7: -1- AC_SUBST_TRACE([CC]) +m4trace:configure.ac:7: -1- m4_pattern_allow([^CC$]) +m4trace:configure.ac:7: -1- AC_SUBST([CC]) +m4trace:configure.ac:7: -1- AC_SUBST_TRACE([CC]) +m4trace:configure.ac:7: -1- m4_pattern_allow([^CC$]) +m4trace:configure.ac:7: -1- AC_SUBST([CC]) +m4trace:configure.ac:7: -1- AC_SUBST_TRACE([CC]) +m4trace:configure.ac:7: -1- m4_pattern_allow([^CC$]) +m4trace:configure.ac:7: -1- AC_SUBST([ac_ct_CC]) +m4trace:configure.ac:7: -1- AC_SUBST_TRACE([ac_ct_CC]) +m4trace:configure.ac:7: -1- m4_pattern_allow([^ac_ct_CC$]) +m4trace:configure.ac:7: -1- AC_SUBST([CC]) +m4trace:configure.ac:7: -1- AC_SUBST_TRACE([CC]) +m4trace:configure.ac:7: -1- m4_pattern_allow([^CC$]) +m4trace:configure.ac:7: -1- AC_SUBST([EXEEXT], [$ac_cv_exeext]) +m4trace:configure.ac:7: -1- AC_SUBST_TRACE([EXEEXT]) +m4trace:configure.ac:7: -1- m4_pattern_allow([^EXEEXT$]) +m4trace:configure.ac:7: -1- AC_SUBST([OBJEXT], [$ac_cv_objext]) +m4trace:configure.ac:7: -1- AC_SUBST_TRACE([OBJEXT]) +m4trace:configure.ac:7: -1- m4_pattern_allow([^OBJEXT$]) +m4trace:configure.ac:8: -1- AC_SUBST([CXX]) +m4trace:configure.ac:8: -1- AC_SUBST_TRACE([CXX]) +m4trace:configure.ac:8: -1- m4_pattern_allow([^CXX$]) +m4trace:configure.ac:8: -1- AC_SUBST([CXXFLAGS]) +m4trace:configure.ac:8: -1- AC_SUBST_TRACE([CXXFLAGS]) +m4trace:configure.ac:8: -1- m4_pattern_allow([^CXXFLAGS$]) +m4trace:configure.ac:8: -1- AC_SUBST([LDFLAGS]) +m4trace:configure.ac:8: -1- AC_SUBST_TRACE([LDFLAGS]) +m4trace:configure.ac:8: -1- m4_pattern_allow([^LDFLAGS$]) +m4trace:configure.ac:8: -1- AC_SUBST([LIBS]) +m4trace:configure.ac:8: -1- AC_SUBST_TRACE([LIBS]) +m4trace:configure.ac:8: -1- m4_pattern_allow([^LIBS$]) +m4trace:configure.ac:8: -1- AC_SUBST([CPPFLAGS]) +m4trace:configure.ac:8: -1- AC_SUBST_TRACE([CPPFLAGS]) +m4trace:configure.ac:8: -1- m4_pattern_allow([^CPPFLAGS$]) +m4trace:configure.ac:8: -1- AC_SUBST([CXX]) +m4trace:configure.ac:8: -1- AC_SUBST_TRACE([CXX]) +m4trace:configure.ac:8: -1- m4_pattern_allow([^CXX$]) +m4trace:configure.ac:8: -1- AC_SUBST([ac_ct_CXX]) +m4trace:configure.ac:8: -1- AC_SUBST_TRACE([ac_ct_CXX]) +m4trace:configure.ac:8: -1- m4_pattern_allow([^ac_ct_CXX$]) +m4trace:configure.ac:10: -1- AC_CANONICAL_HOST +m4trace:configure.ac:10: -1- AC_CANONICAL_BUILD +m4trace:configure.ac:10: -1- AC_REQUIRE_AUX_FILE([config.sub]) +m4trace:configure.ac:10: -1- AC_REQUIRE_AUX_FILE([config.guess]) +m4trace:configure.ac:10: -1- AC_SUBST([build], [$ac_cv_build]) +m4trace:configure.ac:10: -1- AC_SUBST_TRACE([build]) +m4trace:configure.ac:10: -1- m4_pattern_allow([^build$]) +m4trace:configure.ac:10: -1- AC_SUBST([build_cpu], [$[1]]) +m4trace:configure.ac:10: -1- AC_SUBST_TRACE([build_cpu]) +m4trace:configure.ac:10: -1- m4_pattern_allow([^build_cpu$]) +m4trace:configure.ac:10: -1- AC_SUBST([build_vendor], [$[2]]) +m4trace:configure.ac:10: -1- AC_SUBST_TRACE([build_vendor]) +m4trace:configure.ac:10: -1- m4_pattern_allow([^build_vendor$]) +m4trace:configure.ac:10: -1- AC_SUBST([build_os]) +m4trace:configure.ac:10: -1- AC_SUBST_TRACE([build_os]) +m4trace:configure.ac:10: -1- m4_pattern_allow([^build_os$]) +m4trace:configure.ac:10: -1- AC_SUBST([host], [$ac_cv_host]) +m4trace:configure.ac:10: -1- AC_SUBST_TRACE([host]) +m4trace:configure.ac:10: -1- m4_pattern_allow([^host$]) +m4trace:configure.ac:10: -1- AC_SUBST([host_cpu], [$[1]]) +m4trace:configure.ac:10: -1- AC_SUBST_TRACE([host_cpu]) +m4trace:configure.ac:10: -1- m4_pattern_allow([^host_cpu$]) +m4trace:configure.ac:10: -1- AC_SUBST([host_vendor], [$[2]]) +m4trace:configure.ac:10: -1- AC_SUBST_TRACE([host_vendor]) +m4trace:configure.ac:10: -1- m4_pattern_allow([^host_vendor$]) +m4trace:configure.ac:10: -1- AC_SUBST([host_os]) +m4trace:configure.ac:10: -1- AC_SUBST_TRACE([host_os]) +m4trace:configure.ac:10: -1- m4_pattern_allow([^host_os$]) +m4trace:configure.ac:13: -1- AC_DEFINE_TRACE_LITERAL([_FILE_OFFSET_BITS]) +m4trace:configure.ac:13: -1- m4_pattern_allow([^_FILE_OFFSET_BITS$]) +m4trace:configure.ac:13: -1- AH_OUTPUT([_FILE_OFFSET_BITS], [/* Number of bits in a file offset, on hosts where this is settable. */ +@%:@undef _FILE_OFFSET_BITS]) +m4trace:configure.ac:13: -1- AC_DEFINE_TRACE_LITERAL([_LARGE_FILES]) +m4trace:configure.ac:13: -1- m4_pattern_allow([^_LARGE_FILES$]) +m4trace:configure.ac:13: -1- AH_OUTPUT([_LARGE_FILES], [/* Define for large files, on AIX-style hosts. */ +@%:@undef _LARGE_FILES]) +m4trace:configure.ac:23: -1- AC_SUBST([perl]) +m4trace:configure.ac:23: -1- AC_SUBST_TRACE([perl]) +m4trace:configure.ac:23: -1- m4_pattern_allow([^perl$]) +m4trace:configure.ac:24: -1- AC_SUBST([curl]) +m4trace:configure.ac:24: -1- AC_SUBST_TRACE([curl]) +m4trace:configure.ac:24: -1- m4_pattern_allow([^curl$]) +m4trace:configure.ac:25: -1- AC_SUBST([bzip2]) +m4trace:configure.ac:25: -1- AC_SUBST_TRACE([bzip2]) +m4trace:configure.ac:25: -1- m4_pattern_allow([^bzip2$]) +m4trace:configure.ac:26: -1- AC_SUBST([xz]) +m4trace:configure.ac:26: -1- AC_SUBST_TRACE([xz]) +m4trace:configure.ac:26: -1- m4_pattern_allow([^xz$]) +m4trace:configure.ac:41: -1- AC_SUBST([perllibdir], [${libdir}/perl5/site_perl/$perlversion/$perlarchname]) +m4trace:configure.ac:41: -1- AC_SUBST_TRACE([perllibdir]) +m4trace:configure.ac:41: -1- m4_pattern_allow([^perllibdir$]) +m4trace:configure.ac:50: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete. +You should run autoupdate.], [./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from... +configure.ac:50: the top level]) +m4trace:configure.ac:54: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete. +You should run autoupdate.], [./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from... +configure.ac:54: the top level]) +m4trace:configure.ac:65: -1- AC_SUBST([perlFlags]) +m4trace:configure.ac:65: -1- AC_SUBST_TRACE([perlFlags]) +m4trace:configure.ac:65: -1- m4_pattern_allow([^perlFlags$]) +m4trace:configure.ac:69: -1- AC_SUBST([NIX]) +m4trace:configure.ac:69: -1- AC_SUBST_TRACE([NIX]) +m4trace:configure.ac:69: -1- m4_pattern_allow([^NIX$]) +m4trace:configure.ac:83: -1- AC_CONFIG_FILES([]) +m4trace:configure.ac:84: -1- AC_SUBST([LIB@&t@OBJS], [$ac_libobjs]) +m4trace:configure.ac:84: -1- AC_SUBST_TRACE([LIB@&t@OBJS]) +m4trace:configure.ac:84: -1- m4_pattern_allow([^LIB@&t@OBJS$]) +m4trace:configure.ac:84: -1- AC_SUBST([LTLIBOBJS], [$ac_ltlibobjs]) +m4trace:configure.ac:84: -1- AC_SUBST_TRACE([LTLIBOBJS]) +m4trace:configure.ac:84: -1- m4_pattern_allow([^LTLIBOBJS$]) +m4trace:configure.ac:84: -1- AC_SUBST_TRACE([top_builddir]) +m4trace:configure.ac:84: -1- AC_SUBST_TRACE([top_build_prefix]) +m4trace:configure.ac:84: -1- AC_SUBST_TRACE([srcdir]) +m4trace:configure.ac:84: -1- AC_SUBST_TRACE([abs_srcdir]) +m4trace:configure.ac:84: -1- AC_SUBST_TRACE([top_srcdir]) +m4trace:configure.ac:84: -1- AC_SUBST_TRACE([abs_top_srcdir]) +m4trace:configure.ac:84: -1- AC_SUBST_TRACE([builddir]) +m4trace:configure.ac:84: -1- AC_SUBST_TRACE([abs_builddir]) +m4trace:configure.ac:84: -1- AC_SUBST_TRACE([abs_top_builddir]) diff --git a/perl/config.log b/perl/config.log new file mode 100644 index 00000000000..8e3fe375c9b --- /dev/null +++ b/perl/config.log @@ -0,0 +1,465 @@ +This file contains any messages produced by compilers while +running configure, to aid debugging if configure makes a mistake. + +It was created by nix-perl configure 2.14.0, which was +generated by GNU Autoconf 2.71. Invocation command line was + + $ ./configure --prefix=/home/andrea/code/nix/outputs/out --with-dbi=/nix/store/vih7n0nx0j7lbq7bxfs4vzv6dmmfy86y-perl5.36.0-DBI-1.643/lib/perl5/site_perl --with-dbd-sqlite=/nix/store/5rzc64laaxsip1draw5ib8mm3hzhv2qw-perl5.36.0-DBD-SQLite-1.70/lib/perl5/site_perl + +## --------- ## +## Platform. ## +## --------- ## + +hostname = fino.bedini.io +uname -m = x86_64 +uname -r = 6.1.10-1-default +uname -s = Linux +uname -v = #1 SMP PREEMPT_DYNAMIC Mon Feb 6 07:27:26 UTC 2023 (2a0570b) + +/usr/bin/uname -p = x86_64 +/bin/uname -X = unknown + +/bin/arch = x86_64 +/usr/bin/arch -k = unknown +/usr/convex/getsysinfo = unknown +/usr/bin/hostinfo = unknown +/bin/machine = unknown +/usr/bin/oslevel = unknown +/bin/universe = unknown + +PATH: /nix/store/760wf32r5vwm20fvyfg2dndrm8drjvrb-autoconf-2.71/bin/ +PATH: /nix/store/5my3yfyik7gwmbnqv12v6vhiq4qzlw74-automake-1.16.5/bin/ +PATH: /nix/store/ahb1jl345mpn3v8my8aj77df294q59ij-gettext-0.21/bin/ +PATH: /nix/store/lxkkp26hdr7fjndy7zs5j7344z6hlrkn-libtool-2.4.7/bin/ +PATH: /nix/store/56bgsgyv06l2d6yc7m5lg1hxbm0h3cy4-gnum4-1.4.19/bin/ +PATH: /nix/store/p4vpay6wkmraar8p626zk2421790vr62-file-5.43/bin/ +PATH: /nix/store/nyjxcn992aqcm00l7i1hw3fjqk6281n7-pkg-config-wrapper-0.29.2/bin/ +PATH: /nix/store/pr5n59mb4jzmfx6kanwxly0l07p861fg-patchelf-0.15.0/bin/ +PATH: /nix/store/dq0xwmsk1g0i2ayg6pb7y87na2knzylh-gcc-wrapper-11.3.0/bin/ +PATH: /nix/store/1gf2flfqnpqbr1b4p4qz2f72y42bs56r-gcc-11.3.0/bin/ +PATH: /nix/store/57xv61c5zi8pphjbcwxxjlgc34p61ic9-glibc-2.35-163-bin/bin/ +PATH: /nix/store/a7gvj343m05j2s32xcnwr35v31ynlypr-coreutils-9.1/bin/ +PATH: /nix/store/1d6ian3r8kdzspw8hacjhl3xkp40g1lj-binutils-wrapper-2.39/bin/ +PATH: /nix/store/039g378vc3pc3dvi9dzdlrd0i4q93qwf-binutils-2.39/bin/ +PATH: /nix/store/sy86g4sva5jjznbl7ir4lcbgc4b1n4s1-nix-2.14.0pre20230216_dirty/bin/ +PATH: /nix/store/hl5lsmyf6alwj91nv8kmg2iz1lbnxym9-curl-7.86.0-dev/bin/ +PATH: /nix/store/39m0xn31z7n44wflfxqq7fbjh1ik6xq7-brotli-1.0.9/bin/ +PATH: /nix/store/0lm4ygslgn65xi9pkw2kw29qiqqd80hz-libkrb5-1.20-dev/bin/ +PATH: /nix/store/r7gl900my2fw6k33nxh2r7rzv8nv0s25-libkrb5-1.20/bin/ +PATH: /nix/store/n8jl8q7kk4a03n4gjiymy4y4hpcp2apm-nghttp2-1.49.0-bin/bin/ +PATH: /nix/store/hfkdbq95wsm9a0zf2hz51ads25h657hx-libidn2-2.3.2-bin/bin/ +PATH: /nix/store/fq47cv26nb87hwz2678r6i8ym5b57lwf-openssl-3.0.7-bin/bin/ +PATH: /nix/store/mb0pcxkmrg0f6k0zaywlnvpk9q3j5ans-zstd-1.5.2-bin/bin/ +PATH: /nix/store/w10in9diaqrcqqxi5lg20n3q2jfpk6pq-zstd-1.5.2/bin/ +PATH: /nix/store/52fbv6j49khca4cfvwm35fqd984w2520-curl-7.86.0-bin/bin/ +PATH: /nix/store/a8mhcagrsly7c7mpjrpsnaahk4aax056-bzip2-1.0.8-bin/bin/ +PATH: /nix/store/zlcnmqq14jz5x9439jf937mvayyl63da-xz-5.2.7-bin/bin/ +PATH: /nix/store/1zlrx8g7xs6ar0ggca4h3p6hmapq2p2h-perl-5.36.0/bin/ +PATH: /nix/store/a7gvj343m05j2s32xcnwr35v31ynlypr-coreutils-9.1/bin/ +PATH: /nix/store/mydc6f4k2z73xlcz7ilif3v2lcaiqvza-findutils-4.9.0/bin/ +PATH: /nix/store/j9p3g8472iijd50vhdprx0nmk2fqn5gv-diffutils-3.8/bin/ +PATH: /nix/store/89zs7rms6x00xfq4dq6m7mjnhkr8a6r4-gnused-4.8/bin/ +PATH: /nix/store/86bp03jkmsl6f92w0yzg4s59g5mhxwmy-gnugrep-3.7/bin/ +PATH: /nix/store/hwcdqw4jrjnd37wxqgsd47hd0j8bnj09-gawk-5.1.1/bin/ +PATH: /nix/store/cfbhw8r8ags41vwqaz47r583d0p4h4a1-gnutar-1.34/bin/ +PATH: /nix/store/p3m1ndl1lapwrlh698bnb5lvvxh67378-gzip-1.12/bin/ +PATH: /nix/store/a8mhcagrsly7c7mpjrpsnaahk4aax056-bzip2-1.0.8-bin/bin/ +PATH: /nix/store/mblgz65m3zv9x548a3d5m96fj2pbwr09-gnumake-4.3/bin/ +PATH: /nix/store/dsd5gz46hdbdk2rfdimqddhq6m8m8fqs-bash-5.1-p16/bin/ +PATH: /nix/store/v7ljksji50mg3w61dykaa3n3y79n6nil-patch-2.7.6/bin/ +PATH: /nix/store/zlcnmqq14jz5x9439jf937mvayyl63da-xz-5.2.7-bin/bin/ +PATH: /nix/store/y6aj732zm9m87c82fpvf103a1xb22blp-file-5.43/bin/ +PATH: /home/andrea/.nix-profile/bin/ +PATH: /home/andrea/bin/ +PATH: /home/andrea/.npm/bin/ +PATH: /home/andrea/.local/bin/ +PATH: /home/andrea/.nix-profile/bin/ +PATH: /nix/var/nix/profiles/default/bin/ +PATH: /home/andrea/.nix-profile/bin/ +PATH: /home/andrea/bin/ +PATH: /home/andrea/.npm/bin/ +PATH: /home/andrea/.local/bin/ +PATH: /home/andrea/.nix-profile/bin/ +PATH: /home/andrea/bin/ +PATH: /home/andrea/.npm/bin/ +PATH: /home/andrea/.local/bin/ +PATH: /home/andrea/.nix-profile/bin/ +PATH: /home/andrea/.cabal/bin/ +PATH: /home/andrea/.ghcup/bin/ +PATH: /home/andrea/bin/ +PATH: /home/andrea/.npm/bin/ +PATH: /home/andrea/.local/bin/ +PATH: /home/andrea/.nix-profile/bin/ +PATH: /nix/var/nix/profiles/default/bin/ +PATH: /home/andrea/.local/bin/ +PATH: /home/andrea/bin/ +PATH: /usr/local/bin/ +PATH: /usr/bin/ +PATH: /bin/ +PATH: /usr/sbin/ +PATH: /sbin/ +PATH: /usr/sbin/ +PATH: /sbin/ + + +## ----------- ## +## Core tests. ## +## ----------- ## + +configure:1766: loading site script /usr/share/site/x86_64-pc-linux-gnu +| #!/bin/sh +| # Site script for configure. It is resourced via $CONFIG_SITE environment varaible. +| +| # If user did not specify libdir, guess the correct target: +| # Use lib64 for 64 bit bi-arch targets, keep the default for the rest. +| if test "$libdir" = '${exec_prefix}/lib' ; then +| +| ac_config_site_64bit_host=NONE +| +| case "$host" in +| "" ) +| # User did not specify host target. +| # The native platform x86_64 is a bi-arch platform. +| # Try to detect cross-compilation to inferior architecture. +| +| # We are trying to guess 32-bit target compilation. It's not as easy as +| # it sounds, as there is possible several intermediate combinations. +| ac_config_site_cross_to_32bit_host=NONE +| +| # User defined -m32 in CFLAGS or CXXFLAGS or CC or CXX: +| # (It's sufficient for 32-bit, but alone may cause mis-behavior of some checks.) +| case "$CFLAGS $CXXFLAGS $CC $CXX" in +| *-m32*) +| ac_config_site_cross_to_32bit_host=YES +| ;; +| esac +| +| # Running with linux32: +| # (Changes detected platform, but not the toolchain target.) +| case "`/bin/uname -i`" in +| x86_64 | ppc64 | s390x | aarch64 ) +| ;; +| * ) +| ac_config_site_cross_to_32bit_host=YES +| ;; +| esac +| +| if test "x$ac_config_site_cross_to_32bit_host" = xNONE; then +| ac_config_site_64bit_host=YES +| fi +| +| ;; +| *x86_64* | *ppc64* | *s390x* | *aarch64* ) +| ac_config_site_64bit_host=YES +| ;; +| esac +| +| if test "x$ac_config_site_64bit_host" = xYES; then +| libdir='${exec_prefix}/lib64' +| fi +| fi +| +| # Continue with the standard behavior of configure defined in AC_SITE_LOAD: +| if test "x$prefix" != xNONE; then +| ac_site_files="$prefix/share/config.site $prefix/etc/config.site" +| else +| ac_site_files="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site" +| fi +| +| for ac_site_file in $ac_site_files +| do +| case $ac_site_file in #( +| */*) : +| ;; #( +| *) : +| ac_site_file=./$ac_site_file ;; +| esac +| if test -f "$ac_site_file" && test -r "$ac_site_file"; then +| { printf "%s\n" "/usr/share/site/x86_64-pc-linux-gnu:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5 +| printf "%s\n" "/usr/share/site/x86_64-pc-linux-gnu: loading site script $ac_site_file" >&6;} +| sed 's/^/| /' "$ac_site_file" >&5 +| . "$ac_site_file" \ +| || { { printf "%s\n" "/usr/share/site/x86_64-pc-linux-gnu:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +| printf "%s\n" "/usr/share/site/x86_64-pc-linux-gnu: error: in \`$ac_pwd':" >&2;} +| as_fn_error $? "failed to load site script $ac_site_file +| See \`config.log' for more details" "$LINENO" 5; } +| fi +| done +configure:2332: looking for aux files: config.guess config.sub +configure:2345: trying ./../config/ +configure:2374: ./../config/config.guess found +configure:2374: ./../config/config.sub found +configure:2552: checking for gcc +configure:2584: result: gcc +configure:2937: checking for C compiler version +configure:2946: gcc --version >&5 +gcc (GCC) 11.3.0 +Copyright (C) 2021 Free Software Foundation, Inc. +This is free software; see the source for copying conditions. There is NO +warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + +configure:2957: $? = 0 +configure:2946: gcc -v >&5 +Using built-in specs. +COLLECT_GCC=/nix/store/1gf2flfqnpqbr1b4p4qz2f72y42bs56r-gcc-11.3.0/bin/gcc +COLLECT_LTO_WRAPPER=/nix/store/1gf2flfqnpqbr1b4p4qz2f72y42bs56r-gcc-11.3.0/libexec/gcc/x86_64-unknown-linux-gnu/11.3.0/lto-wrapper +Target: x86_64-unknown-linux-gnu +Configured with: +Thread model: posix +Supported LTO compression algorithms: zlib +gcc version 11.3.0 (GCC) +configure:2957: $? = 0 +configure:2946: gcc -V >&5 +gcc: error: unrecognized command-line option '-V' +gcc: fatal error: no input files +compilation terminated. +configure:2957: $? = 1 +configure:2946: gcc -qversion >&5 +gcc: error: unrecognized command-line option '-qversion'; did you mean '--version'? +gcc: fatal error: no input files +compilation terminated. +configure:2957: $? = 1 +configure:2946: gcc -version >&5 +gcc: error: unrecognized command-line option '-version' +gcc: fatal error: no input files +compilation terminated. +configure:2957: $? = 1 +configure:2977: checking whether the C compiler works +configure:2999: gcc conftest.c >&5 +configure:3003: $? = 0 +configure:3053: result: yes +configure:3056: checking for C compiler default output file name +configure:3058: result: a.out +configure:3064: checking for suffix of executables +configure:3071: gcc -o conftest conftest.c >&5 +configure:3075: $? = 0 +configure:3098: result: +configure:3120: checking whether we are cross compiling +configure:3128: gcc -o conftest conftest.c >&5 +configure:3132: $? = 0 +configure:3139: ./conftest +configure:3143: $? = 0 +configure:3158: result: no +configure:3163: checking for suffix of object files +configure:3186: gcc -c conftest.c >&5 +configure:3190: $? = 0 +configure:3212: result: o +configure:3216: checking whether the compiler supports GNU C +configure:3236: gcc -c conftest.c >&5 +configure:3236: $? = 0 +configure:3246: result: yes +configure:3257: checking whether gcc accepts -g +configure:3278: gcc -c -g conftest.c >&5 +configure:3278: $? = 0 +configure:3322: result: yes +configure:3342: checking for gcc option to enable C11 features +configure:3357: gcc -c conftest.c >&5 +configure:3357: $? = 0 +configure:3375: result: none needed +configure:3613: checking for C++ compiler version +configure:3622: g++ --version >&5 +g++ (GCC) 11.3.0 +Copyright (C) 2021 Free Software Foundation, Inc. +This is free software; see the source for copying conditions. There is NO +warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + +configure:3633: $? = 0 +configure:3622: g++ -v >&5 +Using built-in specs. +COLLECT_GCC=/nix/store/1gf2flfqnpqbr1b4p4qz2f72y42bs56r-gcc-11.3.0/bin/g++ +COLLECT_LTO_WRAPPER=/nix/store/1gf2flfqnpqbr1b4p4qz2f72y42bs56r-gcc-11.3.0/libexec/gcc/x86_64-unknown-linux-gnu/11.3.0/lto-wrapper +Target: x86_64-unknown-linux-gnu +Configured with: +Thread model: posix +Supported LTO compression algorithms: zlib +gcc version 11.3.0 (GCC) +configure:3633: $? = 0 +configure:3622: g++ -V >&5 +g++: error: unrecognized command-line option '-V' +g++: fatal error: no input files +compilation terminated. +configure:3633: $? = 1 +configure:3622: g++ -qversion >&5 +g++: error: unrecognized command-line option '-qversion'; did you mean '--version'? +g++: fatal error: no input files +compilation terminated. +configure:3633: $? = 1 +configure:3637: checking whether the compiler supports GNU C++ +configure:3657: g++ -c conftest.cpp >&5 +configure:3657: $? = 0 +configure:3667: result: yes +configure:3678: checking whether g++ accepts -g +configure:3699: g++ -c -g conftest.cpp >&5 +configure:3699: $? = 0 +configure:3743: result: yes +configure:3763: checking for g++ option to enable C++11 features +configure:3778: g++ -c conftest.cpp >&5 +conftest.cpp: In function 'int main(int, char**)': +conftest.cpp:175:25: warning: empty parentheses were disambiguated as a function declaration [-Wvexing-parse] + 175 | cxx11test::delegate d2(); + | ^~ +conftest.cpp:175:25: note: remove parentheses to default-initialize a variable + 175 | cxx11test::delegate d2(); + | ^~ + | -- +conftest.cpp:175:25: note: or replace parentheses with braces to value-initialize a variable +configure:3778: $? = 0 +configure:3796: result: none needed +configure:3868: checking build system type +configure:3883: result: x86_64-pc-linux-gnu +configure:3903: checking host system type +configure:3917: result: x86_64-pc-linux-gnu +configure:3948: checking for special C compiler options needed for large files +configure:3996: result: no +configure:4002: checking for _FILE_OFFSET_BITS value needed for large files +configure:4028: gcc -c conftest.c >&5 +configure:4028: $? = 0 +configure:4062: result: no +configure:4150: checking for perl +configure:4173: found /nix/store/1zlrx8g7xs6ar0ggca4h3p6hmapq2p2h-perl-5.36.0/bin/perl +configure:4185: result: /nix/store/1zlrx8g7xs6ar0ggca4h3p6hmapq2p2h-perl-5.36.0/bin/perl +configure:4200: checking for curl +configure:4223: found /nix/store/52fbv6j49khca4cfvwm35fqd984w2520-curl-7.86.0-bin/bin/curl +configure:4235: result: /nix/store/52fbv6j49khca4cfvwm35fqd984w2520-curl-7.86.0-bin/bin/curl +configure:4250: checking for bzip2 +configure:4273: found /nix/store/a8mhcagrsly7c7mpjrpsnaahk4aax056-bzip2-1.0.8-bin/bin/bzip2 +configure:4285: result: /nix/store/a8mhcagrsly7c7mpjrpsnaahk4aax056-bzip2-1.0.8-bin/bin/bzip2 +configure:4300: checking for xz +configure:4323: found /nix/store/zlcnmqq14jz5x9439jf937mvayyl63da-xz-5.2.7-bin/bin/xz +configure:4335: result: /nix/store/zlcnmqq14jz5x9439jf937mvayyl63da-xz-5.2.7-bin/bin/xz +configure:4349: checking whether Perl is recent enough +configure:4356: result: yes +configure:4361: checking for the Perl installation prefix +configure:4367: result: ${exec_prefix}/lib64/perl5/site_perl/5.36.0/x86_64-linux-thread-multi + +## ---------------- ## +## Cache variables. ## +## ---------------- ## + +ac_cv_build=x86_64-pc-linux-gnu +ac_cv_c_compiler_gnu=yes +ac_cv_cxx_compiler_gnu=yes +ac_cv_env_CCC_set= +ac_cv_env_CCC_value= +ac_cv_env_CC_set=set +ac_cv_env_CC_value=gcc +ac_cv_env_CFLAGS_set= +ac_cv_env_CFLAGS_value= +ac_cv_env_CPPFLAGS_set= +ac_cv_env_CPPFLAGS_value= +ac_cv_env_CXXFLAGS_set= +ac_cv_env_CXXFLAGS_value= +ac_cv_env_CXX_set=set +ac_cv_env_CXX_value=g++ +ac_cv_env_LDFLAGS_set= +ac_cv_env_LDFLAGS_value= +ac_cv_env_LIBS_set= +ac_cv_env_LIBS_value= +ac_cv_env_build_alias_set= +ac_cv_env_build_alias_value= +ac_cv_env_host_alias_set= +ac_cv_env_host_alias_value= +ac_cv_env_target_alias_set= +ac_cv_env_target_alias_value= +ac_cv_host=x86_64-pc-linux-gnu +ac_cv_objext=o +ac_cv_path_bzip2=/nix/store/a8mhcagrsly7c7mpjrpsnaahk4aax056-bzip2-1.0.8-bin/bin/bzip2 +ac_cv_path_curl=/nix/store/52fbv6j49khca4cfvwm35fqd984w2520-curl-7.86.0-bin/bin/curl +ac_cv_path_perl=/nix/store/1zlrx8g7xs6ar0ggca4h3p6hmapq2p2h-perl-5.36.0/bin/perl +ac_cv_path_xz=/nix/store/zlcnmqq14jz5x9439jf937mvayyl63da-xz-5.2.7-bin/bin/xz +ac_cv_prog_ac_ct_CC=gcc +ac_cv_prog_cc_c11= +ac_cv_prog_cc_g=yes +ac_cv_prog_cc_stdc= +ac_cv_prog_cxx_11=no +ac_cv_prog_cxx_cxx11= +ac_cv_prog_cxx_g=yes +ac_cv_prog_cxx_stdcxx= +ac_cv_sys_file_offset_bits=no +ac_cv_sys_largefile_CC=no +lt_cv_deplibs_check_method=pass_all + +## ----------------- ## +## Output variables. ## +## ----------------- ## + +CC='gcc' +CFLAGS='' +CPPFLAGS='' +CXX='g++' +CXXFLAGS='' +DEFS='' +ECHO_C='' +ECHO_N='-n' +ECHO_T='' +EXEEXT='' +LDFLAGS='' +LIBOBJS='' +LIBS='' +LTLIBOBJS='' +NIX='' +OBJEXT='o' +PACKAGE_BUGREPORT='' +PACKAGE_NAME='nix-perl' +PACKAGE_STRING='nix-perl 2.14.0' +PACKAGE_TARNAME='nix-perl' +PACKAGE_URL='' +PACKAGE_VERSION='2.14.0' +PATH_SEPARATOR=':' +SHELL='/nix/store/dsd5gz46hdbdk2rfdimqddhq6m8m8fqs-bash-5.1-p16/bin/bash' +ac_ct_CC='gcc' +ac_ct_CXX='' +bindir='${exec_prefix}/bin' +build='x86_64-pc-linux-gnu' +build_alias='' +build_cpu='x86_64' +build_os='linux-gnu' +build_vendor='pc' +bzip2='/nix/store/a8mhcagrsly7c7mpjrpsnaahk4aax056-bzip2-1.0.8-bin/bin/bzip2' +curl='/nix/store/52fbv6j49khca4cfvwm35fqd984w2520-curl-7.86.0-bin/bin/curl' +datadir='${datarootdir}' +datarootdir='${prefix}/share' +docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' +dvidir='${docdir}' +exec_prefix='NONE' +host='x86_64-pc-linux-gnu' +host_alias='' +host_cpu='x86_64' +host_os='linux-gnu' +host_vendor='pc' +htmldir='${docdir}' +includedir='${prefix}/include' +infodir='${datarootdir}/info' +libdir='${exec_prefix}/lib64' +libexecdir='${exec_prefix}/libexec' +localedir='${datarootdir}/locale' +localstatedir='${prefix}/var' +mandir='${datarootdir}/man' +oldincludedir='/usr/include' +pdfdir='${docdir}' +perl='/nix/store/1zlrx8g7xs6ar0ggca4h3p6hmapq2p2h-perl-5.36.0/bin/perl' +perlFlags='' +perllibdir='${exec_prefix}/lib64/perl5/site_perl/5.36.0/x86_64-linux-thread-multi' +prefix='/home/andrea/code/nix/outputs/out' +program_transform_name='s,x,x,' +psdir='${docdir}' +runstatedir='${localstatedir}/run' +sbindir='${exec_prefix}/sbin' +sharedstatedir='${prefix}/com' +sysconfdir='${prefix}/etc' +target_alias='' +xz='/nix/store/zlcnmqq14jz5x9439jf937mvayyl63da-xz-5.2.7-bin/bin/xz' + +## ----------- ## +## confdefs.h. ## +## ----------- ## + +/* confdefs.h */ +#define PACKAGE_NAME "nix-perl" +#define PACKAGE_TARNAME "nix-perl" +#define PACKAGE_VERSION "2.14.0" +#define PACKAGE_STRING "nix-perl 2.14.0" +#define PACKAGE_BUGREPORT "" +#define PACKAGE_URL "" + +configure: exit 2 diff --git a/perl/configure b/perl/configure new file mode 100755 index 00000000000..1c1bcc7eceb --- /dev/null +++ b/perl/configure @@ -0,0 +1,5623 @@ +#! /bin/sh +# Guess values for system-dependent variables and create Makefiles. +# Generated by GNU Autoconf 2.71 for nix-perl 2.14.0. +# +# +# Copyright (C) 1992-1996, 1998-2017, 2020-2021 Free Software Foundation, +# Inc. +# +# +# This configure script is free software; the Free Software Foundation +# gives unlimited permission to copy, distribute and modify it. +## -------------------- ## +## M4sh Initialization. ## +## -------------------- ## + +# Be more Bourne compatible +DUALCASE=1; export DUALCASE # for MKS sh +as_nop=: +if test ${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1 +then : + emulate sh + NULLCMD=: + # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which + # is contrary to our usage. Disable this feature. + alias -g '${1+"$@"}'='"$@"' + setopt NO_GLOB_SUBST +else $as_nop + case `(set -o) 2>/dev/null` in #( + *posix*) : + set -o posix ;; #( + *) : + ;; +esac +fi + + + +# Reset variables that may have inherited troublesome values from +# the environment. + +# IFS needs to be set, to space, tab, and newline, in precisely that order. +# (If _AS_PATH_WALK were called with IFS unset, it would have the +# side effect of setting IFS to empty, thus disabling word splitting.) +# Quoting is to prevent editors from complaining about space-tab. +as_nl=' +' +export as_nl +IFS=" "" $as_nl" + +PS1='$ ' +PS2='> ' +PS4='+ ' + +# Ensure predictable behavior from utilities with locale-dependent output. +LC_ALL=C +export LC_ALL +LANGUAGE=C +export LANGUAGE + +# We cannot yet rely on "unset" to work, but we need these variables +# to be unset--not just set to an empty or harmless value--now, to +# avoid bugs in old shells (e.g. pre-3.0 UWIN ksh). This construct +# also avoids known problems related to "unset" and subshell syntax +# in other old shells (e.g. bash 2.01 and pdksh 5.2.14). +for as_var in BASH_ENV ENV MAIL MAILPATH CDPATH +do eval test \${$as_var+y} \ + && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : +done + +# Ensure that fds 0, 1, and 2 are open. +if (exec 3>&0) 2>/dev/null; then :; else exec 0&1) 2>/dev/null; then :; else exec 1>/dev/null; fi +if (exec 3>&2) ; then :; else exec 2>/dev/null; fi + +# The user is always right. +if ${PATH_SEPARATOR+false} :; then + PATH_SEPARATOR=: + (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { + (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || + PATH_SEPARATOR=';' + } +fi + + +# Find who we are. Look in the path if we contain no directory separator. +as_myself= +case $0 in #(( + *[\\/]* ) as_myself=$0 ;; + *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + test -r "$as_dir$0" && as_myself=$as_dir$0 && break + done +IFS=$as_save_IFS + + ;; +esac +# We did not find ourselves, most probably we were run as `sh COMMAND' +# in which case we are not to be found in the path. +if test "x$as_myself" = x; then + as_myself=$0 +fi +if test ! -f "$as_myself"; then + printf "%s\n" "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 + exit 1 +fi + + +# Use a proper internal environment variable to ensure we don't fall + # into an infinite loop, continuously re-executing ourselves. + if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then + _as_can_reexec=no; export _as_can_reexec; + # We cannot yet assume a decent shell, so we have to provide a +# neutralization value for shells without unset; and this also +# works around shells that cannot unset nonexistent variables. +# Preserve -v and -x to the replacement shell. +BASH_ENV=/dev/null +ENV=/dev/null +(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV +case $- in # (((( + *v*x* | *x*v* ) as_opts=-vx ;; + *v* ) as_opts=-v ;; + *x* ) as_opts=-x ;; + * ) as_opts= ;; +esac +exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} +# Admittedly, this is quite paranoid, since all the known shells bail +# out after a failed `exec'. +printf "%s\n" "$0: could not re-execute with $CONFIG_SHELL" >&2 +exit 255 + fi + # We don't want this to propagate to other subprocesses. + { _as_can_reexec=; unset _as_can_reexec;} +if test "x$CONFIG_SHELL" = x; then + as_bourne_compatible="as_nop=: +if test \${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1 +then : + emulate sh + NULLCMD=: + # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which + # is contrary to our usage. Disable this feature. + alias -g '\${1+\"\$@\"}'='\"\$@\"' + setopt NO_GLOB_SUBST +else \$as_nop + case \`(set -o) 2>/dev/null\` in #( + *posix*) : + set -o posix ;; #( + *) : + ;; +esac +fi +" + as_required="as_fn_return () { (exit \$1); } +as_fn_success () { as_fn_return 0; } +as_fn_failure () { as_fn_return 1; } +as_fn_ret_success () { return 0; } +as_fn_ret_failure () { return 1; } + +exitcode=0 +as_fn_success || { exitcode=1; echo as_fn_success failed.; } +as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; } +as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; } +as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; } +if ( set x; as_fn_ret_success y && test x = \"\$1\" ) +then : + +else \$as_nop + exitcode=1; echo positional parameters were not saved. +fi +test x\$exitcode = x0 || exit 1 +blah=\$(echo \$(echo blah)) +test x\"\$blah\" = xblah || exit 1 +test -x / || exit 1" + as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO + as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO + eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && + test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1" + if (eval "$as_required") 2>/dev/null +then : + as_have_required=yes +else $as_nop + as_have_required=no +fi + if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null +then : + +else $as_nop + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +as_found=false +for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + as_found=: + case $as_dir in #( + /*) + for as_base in sh bash ksh sh5; do + # Try only shells that exist, to save several forks. + as_shell=$as_dir$as_base + if { test -f "$as_shell" || test -f "$as_shell.exe"; } && + as_run=a "$as_shell" -c "$as_bourne_compatible""$as_required" 2>/dev/null +then : + CONFIG_SHELL=$as_shell as_have_required=yes + if as_run=a "$as_shell" -c "$as_bourne_compatible""$as_suggested" 2>/dev/null +then : + break 2 +fi +fi + done;; + esac + as_found=false +done +IFS=$as_save_IFS +if $as_found +then : + +else $as_nop + if { test -f "$SHELL" || test -f "$SHELL.exe"; } && + as_run=a "$SHELL" -c "$as_bourne_compatible""$as_required" 2>/dev/null +then : + CONFIG_SHELL=$SHELL as_have_required=yes +fi +fi + + + if test "x$CONFIG_SHELL" != x +then : + export CONFIG_SHELL + # We cannot yet assume a decent shell, so we have to provide a +# neutralization value for shells without unset; and this also +# works around shells that cannot unset nonexistent variables. +# Preserve -v and -x to the replacement shell. +BASH_ENV=/dev/null +ENV=/dev/null +(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV +case $- in # (((( + *v*x* | *x*v* ) as_opts=-vx ;; + *v* ) as_opts=-v ;; + *x* ) as_opts=-x ;; + * ) as_opts= ;; +esac +exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} +# Admittedly, this is quite paranoid, since all the known shells bail +# out after a failed `exec'. +printf "%s\n" "$0: could not re-execute with $CONFIG_SHELL" >&2 +exit 255 +fi + + if test x$as_have_required = xno +then : + printf "%s\n" "$0: This script requires a shell more modern than all" + printf "%s\n" "$0: the shells that I found on your system." + if test ${ZSH_VERSION+y} ; then + printf "%s\n" "$0: In particular, zsh $ZSH_VERSION has bugs and should" + printf "%s\n" "$0: be upgraded to zsh 4.3.4 or later." + else + printf "%s\n" "$0: Please tell bug-autoconf@gnu.org about your system, +$0: including any error possibly output before this +$0: message. Then install a modern shell, or manually run +$0: the script under such a shell if you do have one." + fi + exit 1 +fi +fi +fi +SHELL=${CONFIG_SHELL-/bin/sh} +export SHELL +# Unset more variables known to interfere with behavior of common tools. +CLICOLOR_FORCE= GREP_OPTIONS= +unset CLICOLOR_FORCE GREP_OPTIONS + +## --------------------- ## +## M4sh Shell Functions. ## +## --------------------- ## +# as_fn_unset VAR +# --------------- +# Portably unset VAR. +as_fn_unset () +{ + { eval $1=; unset $1;} +} +as_unset=as_fn_unset + + +# as_fn_set_status STATUS +# ----------------------- +# Set $? to STATUS, without forking. +as_fn_set_status () +{ + return $1 +} # as_fn_set_status + +# as_fn_exit STATUS +# ----------------- +# Exit the shell with STATUS, even in a "trap 0" or "set -e" context. +as_fn_exit () +{ + set +e + as_fn_set_status $1 + exit $1 +} # as_fn_exit +# as_fn_nop +# --------- +# Do nothing but, unlike ":", preserve the value of $?. +as_fn_nop () +{ + return $? +} +as_nop=as_fn_nop + +# as_fn_mkdir_p +# ------------- +# Create "$as_dir" as a directory, including parents if necessary. +as_fn_mkdir_p () +{ + + case $as_dir in #( + -*) as_dir=./$as_dir;; + esac + test -d "$as_dir" || eval $as_mkdir_p || { + as_dirs= + while :; do + case $as_dir in #( + *\'*) as_qdir=`printf "%s\n" "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( + *) as_qdir=$as_dir;; + esac + as_dirs="'$as_qdir' $as_dirs" + as_dir=`$as_dirname -- "$as_dir" || +$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$as_dir" : 'X\(//\)[^/]' \| \ + X"$as_dir" : 'X\(//\)$' \| \ + X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || +printf "%s\n" X"$as_dir" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + test -d "$as_dir" && break + done + test -z "$as_dirs" || eval "mkdir $as_dirs" + } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" + + +} # as_fn_mkdir_p + +# as_fn_executable_p FILE +# ----------------------- +# Test if FILE is an executable regular file. +as_fn_executable_p () +{ + test -f "$1" && test -x "$1" +} # as_fn_executable_p +# as_fn_append VAR VALUE +# ---------------------- +# Append the text in VALUE to the end of the definition contained in VAR. Take +# advantage of any shell optimizations that allow amortized linear growth over +# repeated appends, instead of the typical quadratic growth present in naive +# implementations. +if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null +then : + eval 'as_fn_append () + { + eval $1+=\$2 + }' +else $as_nop + as_fn_append () + { + eval $1=\$$1\$2 + } +fi # as_fn_append + +# as_fn_arith ARG... +# ------------------ +# Perform arithmetic evaluation on the ARGs, and store the result in the +# global $as_val. Take advantage of shells that can avoid forks. The arguments +# must be portable across $(()) and expr. +if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null +then : + eval 'as_fn_arith () + { + as_val=$(( $* )) + }' +else $as_nop + as_fn_arith () + { + as_val=`expr "$@" || test $? -eq 1` + } +fi # as_fn_arith + +# as_fn_nop +# --------- +# Do nothing but, unlike ":", preserve the value of $?. +as_fn_nop () +{ + return $? +} +as_nop=as_fn_nop + +# as_fn_error STATUS ERROR [LINENO LOG_FD] +# ---------------------------------------- +# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are +# provided, also output the error to LOG_FD, referencing LINENO. Then exit the +# script with STATUS, using 1 if that was 0. +as_fn_error () +{ + as_status=$1; test $as_status -eq 0 && as_status=1 + if test "$4"; then + as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 + fi + printf "%s\n" "$as_me: error: $2" >&2 + as_fn_exit $as_status +} # as_fn_error + +if expr a : '\(a\)' >/dev/null 2>&1 && + test "X`expr 00001 : '.*\(...\)'`" = X001; then + as_expr=expr +else + as_expr=false +fi + +if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then + as_basename=basename +else + as_basename=false +fi + +if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then + as_dirname=dirname +else + as_dirname=false +fi + +as_me=`$as_basename -- "$0" || +$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ + X"$0" : 'X\(//\)$' \| \ + X"$0" : 'X\(/\)' \| . 2>/dev/null || +printf "%s\n" X/"$0" | + sed '/^.*\/\([^/][^/]*\)\/*$/{ + s//\1/ + q + } + /^X\/\(\/\/\)$/{ + s//\1/ + q + } + /^X\/\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + +# Avoid depending upon Character Ranges. +as_cr_letters='abcdefghijklmnopqrstuvwxyz' +as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' +as_cr_Letters=$as_cr_letters$as_cr_LETTERS +as_cr_digits='0123456789' +as_cr_alnum=$as_cr_Letters$as_cr_digits + + + as_lineno_1=$LINENO as_lineno_1a=$LINENO + as_lineno_2=$LINENO as_lineno_2a=$LINENO + eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" && + test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || { + # Blame Lee E. McMahon (1931-1989) for sed's syntax. :-) + sed -n ' + p + /[$]LINENO/= + ' <$as_myself | + sed ' + s/[$]LINENO.*/&-/ + t lineno + b + :lineno + N + :loop + s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/ + t loop + s/-\n.*// + ' >$as_me.lineno && + chmod +x "$as_me.lineno" || + { printf "%s\n" "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } + + # If we had to re-execute with $CONFIG_SHELL, we're ensured to have + # already done that, so ensure we don't try to do so again and fall + # in an infinite loop. This has already happened in practice. + _as_can_reexec=no; export _as_can_reexec + # Don't try to exec as it changes $[0], causing all sort of problems + # (the dirname of $[0] is not the place where we might find the + # original and so on. Autoconf is especially sensitive to this). + . "./$as_me.lineno" + # Exit status is that of the last command. + exit +} + + +# Determine whether it's possible to make 'echo' print without a newline. +# These variables are no longer used directly by Autoconf, but are AC_SUBSTed +# for compatibility with existing Makefiles. +ECHO_C= ECHO_N= ECHO_T= +case `echo -n x` in #((((( +-n*) + case `echo 'xy\c'` in + *c*) ECHO_T=' ';; # ECHO_T is single tab character. + xy) ECHO_C='\c';; + *) echo `echo ksh88 bug on AIX 6.1` > /dev/null + ECHO_T=' ';; + esac;; +*) + ECHO_N='-n';; +esac + +# For backward compatibility with old third-party macros, we provide +# the shell variables $as_echo and $as_echo_n. New code should use +# AS_ECHO(["message"]) and AS_ECHO_N(["message"]), respectively. +as_echo='printf %s\n' +as_echo_n='printf %s' + + +rm -f conf$$ conf$$.exe conf$$.file +if test -d conf$$.dir; then + rm -f conf$$.dir/conf$$.file +else + rm -f conf$$.dir + mkdir conf$$.dir 2>/dev/null +fi +if (echo >conf$$.file) 2>/dev/null; then + if ln -s conf$$.file conf$$ 2>/dev/null; then + as_ln_s='ln -s' + # ... but there are two gotchas: + # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. + # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. + # In both cases, we have to default to `cp -pR'. + ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || + as_ln_s='cp -pR' + elif ln conf$$.file conf$$ 2>/dev/null; then + as_ln_s=ln + else + as_ln_s='cp -pR' + fi +else + as_ln_s='cp -pR' +fi +rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file +rmdir conf$$.dir 2>/dev/null + +if mkdir -p . 2>/dev/null; then + as_mkdir_p='mkdir -p "$as_dir"' +else + test -d ./-p && rmdir ./-p + as_mkdir_p=false +fi + +as_test_x='test -x' +as_executable_p=as_fn_executable_p + +# Sed expression to map a string onto a valid CPP name. +as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" + +# Sed expression to map a string onto a valid variable name. +as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" + + +test -n "$DJDIR" || exec 7<&0 &1 + +# Name of the host. +# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status, +# so uname gets run too. +ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` + +# +# Initializations. +# +ac_default_prefix=/usr/local +ac_clean_files= +ac_config_libobj_dir=. +LIBOBJS= +cross_compiling=no +subdirs= +MFLAGS= +MAKEFLAGS= + +# Identity of this package. +PACKAGE_NAME='nix-perl' +PACKAGE_TARNAME='nix-perl' +PACKAGE_VERSION='2.14.0' +PACKAGE_STRING='nix-perl 2.14.0' +PACKAGE_BUGREPORT='' +PACKAGE_URL='' + +ac_unique_file="MANIFEST" +ac_subst_vars='LTLIBOBJS +LIBOBJS +NIX +perlFlags +perllibdir +xz +bzip2 +curl +perl +host_os +host_vendor +host_cpu +host +build_os +build_vendor +build_cpu +build +ac_ct_CXX +CXXFLAGS +CXX +OBJEXT +EXEEXT +ac_ct_CC +CPPFLAGS +LDFLAGS +CFLAGS +CC +target_alias +host_alias +build_alias +LIBS +ECHO_T +ECHO_N +ECHO_C +DEFS +mandir +localedir +libdir +psdir +pdfdir +dvidir +htmldir +infodir +docdir +oldincludedir +includedir +runstatedir +localstatedir +sharedstatedir +sysconfdir +datadir +datarootdir +libexecdir +sbindir +bindir +program_transform_name +prefix +exec_prefix +PACKAGE_URL +PACKAGE_BUGREPORT +PACKAGE_STRING +PACKAGE_VERSION +PACKAGE_TARNAME +PACKAGE_NAME +PATH_SEPARATOR +SHELL' +ac_subst_files='' +ac_user_opts=' +enable_option_checking +enable_largefile +with_dbi +with_dbd_sqlite +' + ac_precious_vars='build_alias +host_alias +target_alias +CC +CFLAGS +LDFLAGS +LIBS +CPPFLAGS +CXX +CXXFLAGS +CCC' + + +# Initialize some variables set by options. +ac_init_help= +ac_init_version=false +ac_unrecognized_opts= +ac_unrecognized_sep= +# The variables have the same names as the options, with +# dashes changed to underlines. +cache_file=/dev/null +exec_prefix=NONE +no_create= +no_recursion= +prefix=NONE +program_prefix=NONE +program_suffix=NONE +program_transform_name=s,x,x, +silent= +site= +srcdir= +verbose= +x_includes=NONE +x_libraries=NONE + +# Installation directory options. +# These are left unexpanded so users can "make install exec_prefix=/foo" +# and all the variables that are supposed to be based on exec_prefix +# by default will actually change. +# Use braces instead of parens because sh, perl, etc. also accept them. +# (The list follows the same order as the GNU Coding Standards.) +bindir='${exec_prefix}/bin' +sbindir='${exec_prefix}/sbin' +libexecdir='${exec_prefix}/libexec' +datarootdir='${prefix}/share' +datadir='${datarootdir}' +sysconfdir='${prefix}/etc' +sharedstatedir='${prefix}/com' +localstatedir='${prefix}/var' +runstatedir='${localstatedir}/run' +includedir='${prefix}/include' +oldincludedir='/usr/include' +docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' +infodir='${datarootdir}/info' +htmldir='${docdir}' +dvidir='${docdir}' +pdfdir='${docdir}' +psdir='${docdir}' +libdir='${exec_prefix}/lib' +localedir='${datarootdir}/locale' +mandir='${datarootdir}/man' + +ac_prev= +ac_dashdash= +for ac_option +do + # If the previous option needs an argument, assign it. + if test -n "$ac_prev"; then + eval $ac_prev=\$ac_option + ac_prev= + continue + fi + + case $ac_option in + *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; + *=) ac_optarg= ;; + *) ac_optarg=yes ;; + esac + + case $ac_dashdash$ac_option in + --) + ac_dashdash=yes ;; + + -bindir | --bindir | --bindi | --bind | --bin | --bi) + ac_prev=bindir ;; + -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*) + bindir=$ac_optarg ;; + + -build | --build | --buil | --bui | --bu) + ac_prev=build_alias ;; + -build=* | --build=* | --buil=* | --bui=* | --bu=*) + build_alias=$ac_optarg ;; + + -cache-file | --cache-file | --cache-fil | --cache-fi \ + | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c) + ac_prev=cache_file ;; + -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \ + | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*) + cache_file=$ac_optarg ;; + + --config-cache | -C) + cache_file=config.cache ;; + + -datadir | --datadir | --datadi | --datad) + ac_prev=datadir ;; + -datadir=* | --datadir=* | --datadi=* | --datad=*) + datadir=$ac_optarg ;; + + -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \ + | --dataroo | --dataro | --datar) + ac_prev=datarootdir ;; + -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \ + | --dataroot=* | --dataroo=* | --dataro=* | --datar=*) + datarootdir=$ac_optarg ;; + + -disable-* | --disable-*) + ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'` + # Reject names that are not valid shell variable names. + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && + as_fn_error $? "invalid feature name: \`$ac_useropt'" + ac_useropt_orig=$ac_useropt + ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'` + case $ac_user_opts in + *" +"enable_$ac_useropt" +"*) ;; + *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig" + ac_unrecognized_sep=', ';; + esac + eval enable_$ac_useropt=no ;; + + -docdir | --docdir | --docdi | --doc | --do) + ac_prev=docdir ;; + -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*) + docdir=$ac_optarg ;; + + -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv) + ac_prev=dvidir ;; + -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*) + dvidir=$ac_optarg ;; + + -enable-* | --enable-*) + ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` + # Reject names that are not valid shell variable names. + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && + as_fn_error $? "invalid feature name: \`$ac_useropt'" + ac_useropt_orig=$ac_useropt + ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'` + case $ac_user_opts in + *" +"enable_$ac_useropt" +"*) ;; + *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig" + ac_unrecognized_sep=', ';; + esac + eval enable_$ac_useropt=\$ac_optarg ;; + + -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \ + | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \ + | --exec | --exe | --ex) + ac_prev=exec_prefix ;; + -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \ + | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \ + | --exec=* | --exe=* | --ex=*) + exec_prefix=$ac_optarg ;; + + -gas | --gas | --ga | --g) + # Obsolete; use --with-gas. + with_gas=yes ;; + + -help | --help | --hel | --he | -h) + ac_init_help=long ;; + -help=r* | --help=r* | --hel=r* | --he=r* | -hr*) + ac_init_help=recursive ;; + -help=s* | --help=s* | --hel=s* | --he=s* | -hs*) + ac_init_help=short ;; + + -host | --host | --hos | --ho) + ac_prev=host_alias ;; + -host=* | --host=* | --hos=* | --ho=*) + host_alias=$ac_optarg ;; + + -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht) + ac_prev=htmldir ;; + -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \ + | --ht=*) + htmldir=$ac_optarg ;; + + -includedir | --includedir | --includedi | --included | --include \ + | --includ | --inclu | --incl | --inc) + ac_prev=includedir ;; + -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \ + | --includ=* | --inclu=* | --incl=* | --inc=*) + includedir=$ac_optarg ;; + + -infodir | --infodir | --infodi | --infod | --info | --inf) + ac_prev=infodir ;; + -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*) + infodir=$ac_optarg ;; + + -libdir | --libdir | --libdi | --libd) + ac_prev=libdir ;; + -libdir=* | --libdir=* | --libdi=* | --libd=*) + libdir=$ac_optarg ;; + + -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \ + | --libexe | --libex | --libe) + ac_prev=libexecdir ;; + -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \ + | --libexe=* | --libex=* | --libe=*) + libexecdir=$ac_optarg ;; + + -localedir | --localedir | --localedi | --localed | --locale) + ac_prev=localedir ;; + -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*) + localedir=$ac_optarg ;; + + -localstatedir | --localstatedir | --localstatedi | --localstated \ + | --localstate | --localstat | --localsta | --localst | --locals) + ac_prev=localstatedir ;; + -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \ + | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*) + localstatedir=$ac_optarg ;; + + -mandir | --mandir | --mandi | --mand | --man | --ma | --m) + ac_prev=mandir ;; + -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*) + mandir=$ac_optarg ;; + + -nfp | --nfp | --nf) + # Obsolete; use --without-fp. + with_fp=no ;; + + -no-create | --no-create | --no-creat | --no-crea | --no-cre \ + | --no-cr | --no-c | -n) + no_create=yes ;; + + -no-recursion | --no-recursion | --no-recursio | --no-recursi \ + | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) + no_recursion=yes ;; + + -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \ + | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \ + | --oldin | --oldi | --old | --ol | --o) + ac_prev=oldincludedir ;; + -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \ + | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \ + | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*) + oldincludedir=$ac_optarg ;; + + -prefix | --prefix | --prefi | --pref | --pre | --pr | --p) + ac_prev=prefix ;; + -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*) + prefix=$ac_optarg ;; + + -program-prefix | --program-prefix | --program-prefi | --program-pref \ + | --program-pre | --program-pr | --program-p) + ac_prev=program_prefix ;; + -program-prefix=* | --program-prefix=* | --program-prefi=* \ + | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*) + program_prefix=$ac_optarg ;; + + -program-suffix | --program-suffix | --program-suffi | --program-suff \ + | --program-suf | --program-su | --program-s) + ac_prev=program_suffix ;; + -program-suffix=* | --program-suffix=* | --program-suffi=* \ + | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*) + program_suffix=$ac_optarg ;; + + -program-transform-name | --program-transform-name \ + | --program-transform-nam | --program-transform-na \ + | --program-transform-n | --program-transform- \ + | --program-transform | --program-transfor \ + | --program-transfo | --program-transf \ + | --program-trans | --program-tran \ + | --progr-tra | --program-tr | --program-t) + ac_prev=program_transform_name ;; + -program-transform-name=* | --program-transform-name=* \ + | --program-transform-nam=* | --program-transform-na=* \ + | --program-transform-n=* | --program-transform-=* \ + | --program-transform=* | --program-transfor=* \ + | --program-transfo=* | --program-transf=* \ + | --program-trans=* | --program-tran=* \ + | --progr-tra=* | --program-tr=* | --program-t=*) + program_transform_name=$ac_optarg ;; + + -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd) + ac_prev=pdfdir ;; + -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*) + pdfdir=$ac_optarg ;; + + -psdir | --psdir | --psdi | --psd | --ps) + ac_prev=psdir ;; + -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*) + psdir=$ac_optarg ;; + + -q | -quiet | --quiet | --quie | --qui | --qu | --q \ + | -silent | --silent | --silen | --sile | --sil) + silent=yes ;; + + -runstatedir | --runstatedir | --runstatedi | --runstated \ + | --runstate | --runstat | --runsta | --runst | --runs \ + | --run | --ru | --r) + ac_prev=runstatedir ;; + -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \ + | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \ + | --run=* | --ru=* | --r=*) + runstatedir=$ac_optarg ;; + + -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) + ac_prev=sbindir ;; + -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ + | --sbi=* | --sb=*) + sbindir=$ac_optarg ;; + + -sharedstatedir | --sharedstatedir | --sharedstatedi \ + | --sharedstated | --sharedstate | --sharedstat | --sharedsta \ + | --sharedst | --shareds | --shared | --share | --shar \ + | --sha | --sh) + ac_prev=sharedstatedir ;; + -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \ + | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \ + | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \ + | --sha=* | --sh=*) + sharedstatedir=$ac_optarg ;; + + -site | --site | --sit) + ac_prev=site ;; + -site=* | --site=* | --sit=*) + site=$ac_optarg ;; + + -srcdir | --srcdir | --srcdi | --srcd | --src | --sr) + ac_prev=srcdir ;; + -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*) + srcdir=$ac_optarg ;; + + -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \ + | --syscon | --sysco | --sysc | --sys | --sy) + ac_prev=sysconfdir ;; + -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \ + | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*) + sysconfdir=$ac_optarg ;; + + -target | --target | --targe | --targ | --tar | --ta | --t) + ac_prev=target_alias ;; + -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*) + target_alias=$ac_optarg ;; + + -v | -verbose | --verbose | --verbos | --verbo | --verb) + verbose=yes ;; + + -version | --version | --versio | --versi | --vers | -V) + ac_init_version=: ;; + + -with-* | --with-*) + ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` + # Reject names that are not valid shell variable names. + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && + as_fn_error $? "invalid package name: \`$ac_useropt'" + ac_useropt_orig=$ac_useropt + ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'` + case $ac_user_opts in + *" +"with_$ac_useropt" +"*) ;; + *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig" + ac_unrecognized_sep=', ';; + esac + eval with_$ac_useropt=\$ac_optarg ;; + + -without-* | --without-*) + ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'` + # Reject names that are not valid shell variable names. + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && + as_fn_error $? "invalid package name: \`$ac_useropt'" + ac_useropt_orig=$ac_useropt + ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'` + case $ac_user_opts in + *" +"with_$ac_useropt" +"*) ;; + *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig" + ac_unrecognized_sep=', ';; + esac + eval with_$ac_useropt=no ;; + + --x) + # Obsolete; use --with-x. + with_x=yes ;; + + -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \ + | --x-incl | --x-inc | --x-in | --x-i) + ac_prev=x_includes ;; + -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \ + | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*) + x_includes=$ac_optarg ;; + + -x-libraries | --x-libraries | --x-librarie | --x-librari \ + | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l) + ac_prev=x_libraries ;; + -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \ + | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) + x_libraries=$ac_optarg ;; + + -*) as_fn_error $? "unrecognized option: \`$ac_option' +Try \`$0 --help' for more information" + ;; + + *=*) + ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='` + # Reject names that are not valid shell variable names. + case $ac_envvar in #( + '' | [0-9]* | *[!_$as_cr_alnum]* ) + as_fn_error $? "invalid variable name: \`$ac_envvar'" ;; + esac + eval $ac_envvar=\$ac_optarg + export $ac_envvar ;; + + *) + # FIXME: should be removed in autoconf 3.0. + printf "%s\n" "$as_me: WARNING: you should use --build, --host, --target" >&2 + expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && + printf "%s\n" "$as_me: WARNING: invalid host type: $ac_option" >&2 + : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}" + ;; + + esac +done + +if test -n "$ac_prev"; then + ac_option=--`echo $ac_prev | sed 's/_/-/g'` + as_fn_error $? "missing argument to $ac_option" +fi + +if test -n "$ac_unrecognized_opts"; then + case $enable_option_checking in + no) ;; + fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;; + *) printf "%s\n" "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; + esac +fi + +# Check all directory arguments for consistency. +for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ + datadir sysconfdir sharedstatedir localstatedir includedir \ + oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ + libdir localedir mandir runstatedir +do + eval ac_val=\$$ac_var + # Remove trailing slashes. + case $ac_val in + */ ) + ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'` + eval $ac_var=\$ac_val;; + esac + # Be sure to have absolute directory names. + case $ac_val in + [\\/$]* | ?:[\\/]* ) continue;; + NONE | '' ) case $ac_var in *prefix ) continue;; esac;; + esac + as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val" +done + +# There might be people who depend on the old broken behavior: `$host' +# used to hold the argument of --host etc. +# FIXME: To remove some day. +build=$build_alias +host=$host_alias +target=$target_alias + +# FIXME: To remove some day. +if test "x$host_alias" != x; then + if test "x$build_alias" = x; then + cross_compiling=maybe + elif test "x$build_alias" != "x$host_alias"; then + cross_compiling=yes + fi +fi + +ac_tool_prefix= +test -n "$host_alias" && ac_tool_prefix=$host_alias- + +test "$silent" = yes && exec 6>/dev/null + + +ac_pwd=`pwd` && test -n "$ac_pwd" && +ac_ls_di=`ls -di .` && +ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || + as_fn_error $? "working directory cannot be determined" +test "X$ac_ls_di" = "X$ac_pwd_ls_di" || + as_fn_error $? "pwd does not report name of working directory" + + +# Find the source files, if location was not specified. +if test -z "$srcdir"; then + ac_srcdir_defaulted=yes + # Try the directory containing this script, then the parent directory. + ac_confdir=`$as_dirname -- "$as_myself" || +$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$as_myself" : 'X\(//\)[^/]' \| \ + X"$as_myself" : 'X\(//\)$' \| \ + X"$as_myself" : 'X\(/\)' \| . 2>/dev/null || +printf "%s\n" X"$as_myself" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + srcdir=$ac_confdir + if test ! -r "$srcdir/$ac_unique_file"; then + srcdir=.. + fi +else + ac_srcdir_defaulted=no +fi +if test ! -r "$srcdir/$ac_unique_file"; then + test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." + as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir" +fi +ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" +ac_abs_confdir=`( + cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg" + pwd)` +# When building in place, set srcdir=. +if test "$ac_abs_confdir" = "$ac_pwd"; then + srcdir=. +fi +# Remove unnecessary trailing slashes from srcdir. +# Double slashes in file names in object file debugging info +# mess up M-x gdb in Emacs. +case $srcdir in +*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;; +esac +for ac_var in $ac_precious_vars; do + eval ac_env_${ac_var}_set=\${${ac_var}+set} + eval ac_env_${ac_var}_value=\$${ac_var} + eval ac_cv_env_${ac_var}_set=\${${ac_var}+set} + eval ac_cv_env_${ac_var}_value=\$${ac_var} +done + +# +# Report the --help message. +# +if test "$ac_init_help" = "long"; then + # Omit some internal or obsolete options to make the list less imposing. + # This message is too long to be a string in the A/UX 3.1 sh. + cat <<_ACEOF +\`configure' configures nix-perl 2.14.0 to adapt to many kinds of systems. + +Usage: $0 [OPTION]... [VAR=VALUE]... + +To assign environment variables (e.g., CC, CFLAGS...), specify them as +VAR=VALUE. See below for descriptions of some of the useful variables. + +Defaults for the options are specified in brackets. + +Configuration: + -h, --help display this help and exit + --help=short display options specific to this package + --help=recursive display the short help of all the included packages + -V, --version display version information and exit + -q, --quiet, --silent do not print \`checking ...' messages + --cache-file=FILE cache test results in FILE [disabled] + -C, --config-cache alias for \`--cache-file=config.cache' + -n, --no-create do not create output files + --srcdir=DIR find the sources in DIR [configure dir or \`..'] + +Installation directories: + --prefix=PREFIX install architecture-independent files in PREFIX + [$ac_default_prefix] + --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX + [PREFIX] + +By default, \`make install' will install all the files in +\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify +an installation prefix other than \`$ac_default_prefix' using \`--prefix', +for instance \`--prefix=\$HOME'. + +For better control, use the options below. + +Fine tuning of the installation directories: + --bindir=DIR user executables [EPREFIX/bin] + --sbindir=DIR system admin executables [EPREFIX/sbin] + --libexecdir=DIR program executables [EPREFIX/libexec] + --sysconfdir=DIR read-only single-machine data [PREFIX/etc] + --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] + --localstatedir=DIR modifiable single-machine data [PREFIX/var] + --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run] + --libdir=DIR object code libraries [EPREFIX/lib] + --includedir=DIR C header files [PREFIX/include] + --oldincludedir=DIR C header files for non-gcc [/usr/include] + --datarootdir=DIR read-only arch.-independent data root [PREFIX/share] + --datadir=DIR read-only architecture-independent data [DATAROOTDIR] + --infodir=DIR info documentation [DATAROOTDIR/info] + --localedir=DIR locale-dependent data [DATAROOTDIR/locale] + --mandir=DIR man documentation [DATAROOTDIR/man] + --docdir=DIR documentation root [DATAROOTDIR/doc/nix-perl] + --htmldir=DIR html documentation [DOCDIR] + --dvidir=DIR dvi documentation [DOCDIR] + --pdfdir=DIR pdf documentation [DOCDIR] + --psdir=DIR ps documentation [DOCDIR] +_ACEOF + + cat <<\_ACEOF + +System types: + --build=BUILD configure for building on BUILD [guessed] + --host=HOST cross-compile to build programs to run on HOST [BUILD] +_ACEOF +fi + +if test -n "$ac_init_help"; then + case $ac_init_help in + short | recursive ) echo "Configuration of nix-perl 2.14.0:";; + esac + cat <<\_ACEOF + +Optional Features: + --disable-option-checking ignore unrecognized --enable/--with options + --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) + --enable-FEATURE[=ARG] include FEATURE [ARG=yes] + --disable-largefile omit support for large files + +Optional Packages: + --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] + --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) + --with-dbi=PATH prefix of the Perl DBI library + --with-dbd-sqlite=PATH prefix of the Perl DBD::SQLite library + +Some influential environment variables: + CC C compiler command + CFLAGS C compiler flags + LDFLAGS linker flags, e.g. -L if you have libraries in a + nonstandard directory + LIBS libraries to pass to the linker, e.g. -l + CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I if + you have headers in a nonstandard directory + CXX C++ compiler command + CXXFLAGS C++ compiler flags + +Use these variables to override the choices made by `configure' or to help +it to find libraries and programs with nonstandard names/locations. + +Report bugs to the package provider. +_ACEOF +ac_status=$? +fi + +if test "$ac_init_help" = "recursive"; then + # If there are subdirs, report their specific --help. + for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue + test -d "$ac_dir" || + { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } || + continue + ac_builddir=. + +case "$ac_dir" in +.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; +*) + ac_dir_suffix=/`printf "%s\n" "$ac_dir" | sed 's|^\.[\\/]||'` + # A ".." for each directory in $ac_dir_suffix. + ac_top_builddir_sub=`printf "%s\n" "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` + case $ac_top_builddir_sub in + "") ac_top_builddir_sub=. ac_top_build_prefix= ;; + *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; + esac ;; +esac +ac_abs_top_builddir=$ac_pwd +ac_abs_builddir=$ac_pwd$ac_dir_suffix +# for backward compatibility: +ac_top_builddir=$ac_top_build_prefix + +case $srcdir in + .) # We are building in place. + ac_srcdir=. + ac_top_srcdir=$ac_top_builddir_sub + ac_abs_top_srcdir=$ac_pwd ;; + [\\/]* | ?:[\\/]* ) # Absolute name. + ac_srcdir=$srcdir$ac_dir_suffix; + ac_top_srcdir=$srcdir + ac_abs_top_srcdir=$srcdir ;; + *) # Relative name. + ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix + ac_top_srcdir=$ac_top_build_prefix$srcdir + ac_abs_top_srcdir=$ac_pwd/$srcdir ;; +esac +ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix + + cd "$ac_dir" || { ac_status=$?; continue; } + # Check for configure.gnu first; this name is used for a wrapper for + # Metaconfig's "Configure" on case-insensitive file systems. + if test -f "$ac_srcdir/configure.gnu"; then + echo && + $SHELL "$ac_srcdir/configure.gnu" --help=recursive + elif test -f "$ac_srcdir/configure"; then + echo && + $SHELL "$ac_srcdir/configure" --help=recursive + else + printf "%s\n" "$as_me: WARNING: no configuration information is in $ac_dir" >&2 + fi || ac_status=$? + cd "$ac_pwd" || { ac_status=$?; break; } + done +fi + +test -n "$ac_init_help" && exit $ac_status +if $ac_init_version; then + cat <<\_ACEOF +nix-perl configure 2.14.0 +generated by GNU Autoconf 2.71 + +Copyright (C) 2021 Free Software Foundation, Inc. +This configure script is free software; the Free Software Foundation +gives unlimited permission to copy, distribute and modify it. +_ACEOF + exit +fi + +## ------------------------ ## +## Autoconf initialization. ## +## ------------------------ ## + +# ac_fn_c_try_compile LINENO +# -------------------------- +# Try to compile conftest.$ac_ext, and return whether this succeeded. +ac_fn_c_try_compile () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + rm -f conftest.$ac_objext conftest.beam + if { { ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +printf "%s\n" "$ac_try_echo"; } >&5 + (eval "$ac_compile") 2>conftest.err + ac_status=$? + if test -s conftest.err; then + grep -v '^ *+' conftest.err >conftest.er1 + cat conftest.er1 >&5 + mv -f conftest.er1 conftest.err + fi + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext +then : + ac_retval=0 +else $as_nop + printf "%s\n" "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_retval=1 +fi + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + as_fn_set_status $ac_retval + +} # ac_fn_c_try_compile + +# ac_fn_cxx_try_compile LINENO +# ---------------------------- +# Try to compile conftest.$ac_ext, and return whether this succeeded. +ac_fn_cxx_try_compile () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + rm -f conftest.$ac_objext conftest.beam + if { { ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +printf "%s\n" "$ac_try_echo"; } >&5 + (eval "$ac_compile") 2>conftest.err + ac_status=$? + if test -s conftest.err; then + grep -v '^ *+' conftest.err >conftest.er1 + cat conftest.er1 >&5 + mv -f conftest.er1 conftest.err + fi + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext +then : + ac_retval=0 +else $as_nop + printf "%s\n" "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_retval=1 +fi + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + as_fn_set_status $ac_retval + +} # ac_fn_cxx_try_compile +ac_configure_args_raw= +for ac_arg +do + case $ac_arg in + *\'*) + ac_arg=`printf "%s\n" "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; + esac + as_fn_append ac_configure_args_raw " '$ac_arg'" +done + +case $ac_configure_args_raw in + *$as_nl*) + ac_safe_unquote= ;; + *) + ac_unsafe_z='|&;<>()$`\\"*?[ '' ' # This string ends in space, tab. + ac_unsafe_a="$ac_unsafe_z#~" + ac_safe_unquote="s/ '\\([^$ac_unsafe_a][^$ac_unsafe_z]*\\)'/ \\1/g" + ac_configure_args_raw=` printf "%s\n" "$ac_configure_args_raw" | sed "$ac_safe_unquote"`;; +esac + +cat >config.log <<_ACEOF +This file contains any messages produced by compilers while +running configure, to aid debugging if configure makes a mistake. + +It was created by nix-perl $as_me 2.14.0, which was +generated by GNU Autoconf 2.71. Invocation command line was + + $ $0$ac_configure_args_raw + +_ACEOF +exec 5>>config.log +{ +cat <<_ASUNAME +## --------- ## +## Platform. ## +## --------- ## + +hostname = `(hostname || uname -n) 2>/dev/null | sed 1q` +uname -m = `(uname -m) 2>/dev/null || echo unknown` +uname -r = `(uname -r) 2>/dev/null || echo unknown` +uname -s = `(uname -s) 2>/dev/null || echo unknown` +uname -v = `(uname -v) 2>/dev/null || echo unknown` + +/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown` +/bin/uname -X = `(/bin/uname -X) 2>/dev/null || echo unknown` + +/bin/arch = `(/bin/arch) 2>/dev/null || echo unknown` +/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown` +/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown` +/usr/bin/hostinfo = `(/usr/bin/hostinfo) 2>/dev/null || echo unknown` +/bin/machine = `(/bin/machine) 2>/dev/null || echo unknown` +/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown` +/bin/universe = `(/bin/universe) 2>/dev/null || echo unknown` + +_ASUNAME + +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + printf "%s\n" "PATH: $as_dir" + done +IFS=$as_save_IFS + +} >&5 + +cat >&5 <<_ACEOF + + +## ----------- ## +## Core tests. ## +## ----------- ## + +_ACEOF + + +# Keep a trace of the command line. +# Strip out --no-create and --no-recursion so they do not pile up. +# Strip out --silent because we don't want to record it for future runs. +# Also quote any args containing shell meta-characters. +# Make two passes to allow for proper duplicate-argument suppression. +ac_configure_args= +ac_configure_args0= +ac_configure_args1= +ac_must_keep_next=false +for ac_pass in 1 2 +do + for ac_arg + do + case $ac_arg in + -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;; + -q | -quiet | --quiet | --quie | --qui | --qu | --q \ + | -silent | --silent | --silen | --sile | --sil) + continue ;; + *\'*) + ac_arg=`printf "%s\n" "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; + esac + case $ac_pass in + 1) as_fn_append ac_configure_args0 " '$ac_arg'" ;; + 2) + as_fn_append ac_configure_args1 " '$ac_arg'" + if test $ac_must_keep_next = true; then + ac_must_keep_next=false # Got value, back to normal. + else + case $ac_arg in + *=* | --config-cache | -C | -disable-* | --disable-* \ + | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \ + | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \ + | -with-* | --with-* | -without-* | --without-* | --x) + case "$ac_configure_args0 " in + "$ac_configure_args1"*" '$ac_arg' "* ) continue ;; + esac + ;; + -* ) ac_must_keep_next=true ;; + esac + fi + as_fn_append ac_configure_args " '$ac_arg'" + ;; + esac + done +done +{ ac_configure_args0=; unset ac_configure_args0;} +{ ac_configure_args1=; unset ac_configure_args1;} + +# When interrupted or exit'd, cleanup temporary files, and complete +# config.log. We remove comments because anyway the quotes in there +# would cause problems or look ugly. +# WARNING: Use '\'' to represent an apostrophe within the trap. +# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug. +trap 'exit_status=$? + # Sanitize IFS. + IFS=" "" $as_nl" + # Save into config.log some information that might help in debugging. + { + echo + + printf "%s\n" "## ---------------- ## +## Cache variables. ## +## ---------------- ##" + echo + # The following way of writing the cache mishandles newlines in values, +( + for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do + eval ac_val=\$$ac_var + case $ac_val in #( + *${as_nl}*) + case $ac_var in #( + *_cv_*) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 +printf "%s\n" "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; + esac + case $ac_var in #( + _ | IFS | as_nl) ;; #( + BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( + *) { eval $ac_var=; unset $ac_var;} ;; + esac ;; + esac + done + (set) 2>&1 | + case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #( + *${as_nl}ac_space=\ *) + sed -n \ + "s/'\''/'\''\\\\'\'''\''/g; + s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p" + ;; #( + *) + sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" + ;; + esac | + sort +) + echo + + printf "%s\n" "## ----------------- ## +## Output variables. ## +## ----------------- ##" + echo + for ac_var in $ac_subst_vars + do + eval ac_val=\$$ac_var + case $ac_val in + *\'\''*) ac_val=`printf "%s\n" "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; + esac + printf "%s\n" "$ac_var='\''$ac_val'\''" + done | sort + echo + + if test -n "$ac_subst_files"; then + printf "%s\n" "## ------------------- ## +## File substitutions. ## +## ------------------- ##" + echo + for ac_var in $ac_subst_files + do + eval ac_val=\$$ac_var + case $ac_val in + *\'\''*) ac_val=`printf "%s\n" "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; + esac + printf "%s\n" "$ac_var='\''$ac_val'\''" + done | sort + echo + fi + + if test -s confdefs.h; then + printf "%s\n" "## ----------- ## +## confdefs.h. ## +## ----------- ##" + echo + cat confdefs.h + echo + fi + test "$ac_signal" != 0 && + printf "%s\n" "$as_me: caught signal $ac_signal" + printf "%s\n" "$as_me: exit $exit_status" + } >&5 + rm -f core *.core core.conftest.* && + rm -f -r conftest* confdefs* conf$$* $ac_clean_files && + exit $exit_status +' 0 +for ac_signal in 1 2 13 15; do + trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal +done +ac_signal=0 + +# confdefs.h avoids OS command line length limits that DEFS can exceed. +rm -f -r conftest* confdefs.h + +printf "%s\n" "/* confdefs.h */" > confdefs.h + +# Predefined preprocessor variables. + +printf "%s\n" "#define PACKAGE_NAME \"$PACKAGE_NAME\"" >>confdefs.h + +printf "%s\n" "#define PACKAGE_TARNAME \"$PACKAGE_TARNAME\"" >>confdefs.h + +printf "%s\n" "#define PACKAGE_VERSION \"$PACKAGE_VERSION\"" >>confdefs.h + +printf "%s\n" "#define PACKAGE_STRING \"$PACKAGE_STRING\"" >>confdefs.h + +printf "%s\n" "#define PACKAGE_BUGREPORT \"$PACKAGE_BUGREPORT\"" >>confdefs.h + +printf "%s\n" "#define PACKAGE_URL \"$PACKAGE_URL\"" >>confdefs.h + + +# Let the site file select an alternate cache file if it wants to. +# Prefer an explicitly selected file to automatically selected ones. +if test -n "$CONFIG_SITE"; then + ac_site_files="$CONFIG_SITE" +elif test "x$prefix" != xNONE; then + ac_site_files="$prefix/share/config.site $prefix/etc/config.site" +else + ac_site_files="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site" +fi + +for ac_site_file in $ac_site_files +do + case $ac_site_file in #( + */*) : + ;; #( + *) : + ac_site_file=./$ac_site_file ;; +esac + if test -f "$ac_site_file" && test -r "$ac_site_file"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5 +printf "%s\n" "$as_me: loading site script $ac_site_file" >&6;} + sed 's/^/| /' "$ac_site_file" >&5 + . "$ac_site_file" \ + || { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "failed to load site script $ac_site_file +See \`config.log' for more details" "$LINENO" 5; } + fi +done + +if test -r "$cache_file"; then + # Some versions of bash will fail to source /dev/null (special files + # actually), so we avoid doing that. DJGPP emulates it as a regular file. + if test /dev/null != "$cache_file" && test -f "$cache_file"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5 +printf "%s\n" "$as_me: loading cache $cache_file" >&6;} + case $cache_file in + [\\/]* | ?:[\\/]* ) . "$cache_file";; + *) . "./$cache_file";; + esac + fi +else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5 +printf "%s\n" "$as_me: creating cache $cache_file" >&6;} + >$cache_file +fi + +# Test code for whether the C compiler supports C89 (global declarations) +ac_c_conftest_c89_globals=' +/* Does the compiler advertise C89 conformance? + Do not test the value of __STDC__, because some compilers set it to 0 + while being otherwise adequately conformant. */ +#if !defined __STDC__ +# error "Compiler does not advertise C89 conformance" +#endif + +#include +#include +struct stat; +/* Most of the following tests are stolen from RCS 5.7 src/conf.sh. */ +struct buf { int x; }; +struct buf * (*rcsopen) (struct buf *, struct stat *, int); +static char *e (p, i) + char **p; + int i; +{ + return p[i]; +} +static char *f (char * (*g) (char **, int), char **p, ...) +{ + char *s; + va_list v; + va_start (v,p); + s = g (p, va_arg (v,int)); + va_end (v); + return s; +} + +/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has + function prototypes and stuff, but not \xHH hex character constants. + These do not provoke an error unfortunately, instead are silently treated + as an "x". The following induces an error, until -std is added to get + proper ANSI mode. Curiously \x00 != x always comes out true, for an + array size at least. It is necessary to write \x00 == 0 to get something + that is true only with -std. */ +int osf4_cc_array ['\''\x00'\'' == 0 ? 1 : -1]; + +/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters + inside strings and character constants. */ +#define FOO(x) '\''x'\'' +int xlc6_cc_array[FOO(a) == '\''x'\'' ? 1 : -1]; + +int test (int i, double x); +struct s1 {int (*f) (int a);}; +struct s2 {int (*f) (double a);}; +int pairnames (int, char **, int *(*)(struct buf *, struct stat *, int), + int, int);' + +# Test code for whether the C compiler supports C89 (body of main). +ac_c_conftest_c89_main=' +ok |= (argc == 0 || f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]); +' + +# Test code for whether the C compiler supports C99 (global declarations) +ac_c_conftest_c99_globals=' +// Does the compiler advertise C99 conformance? +#if !defined __STDC_VERSION__ || __STDC_VERSION__ < 199901L +# error "Compiler does not advertise C99 conformance" +#endif + +#include +extern int puts (const char *); +extern int printf (const char *, ...); +extern int dprintf (int, const char *, ...); +extern void *malloc (size_t); + +// Check varargs macros. These examples are taken from C99 6.10.3.5. +// dprintf is used instead of fprintf to avoid needing to declare +// FILE and stderr. +#define debug(...) dprintf (2, __VA_ARGS__) +#define showlist(...) puts (#__VA_ARGS__) +#define report(test,...) ((test) ? puts (#test) : printf (__VA_ARGS__)) +static void +test_varargs_macros (void) +{ + int x = 1234; + int y = 5678; + debug ("Flag"); + debug ("X = %d\n", x); + showlist (The first, second, and third items.); + report (x>y, "x is %d but y is %d", x, y); +} + +// Check long long types. +#define BIG64 18446744073709551615ull +#define BIG32 4294967295ul +#define BIG_OK (BIG64 / BIG32 == 4294967297ull && BIG64 % BIG32 == 0) +#if !BIG_OK + #error "your preprocessor is broken" +#endif +#if BIG_OK +#else + #error "your preprocessor is broken" +#endif +static long long int bignum = -9223372036854775807LL; +static unsigned long long int ubignum = BIG64; + +struct incomplete_array +{ + int datasize; + double data[]; +}; + +struct named_init { + int number; + const wchar_t *name; + double average; +}; + +typedef const char *ccp; + +static inline int +test_restrict (ccp restrict text) +{ + // See if C++-style comments work. + // Iterate through items via the restricted pointer. + // Also check for declarations in for loops. + for (unsigned int i = 0; *(text+i) != '\''\0'\''; ++i) + continue; + return 0; +} + +// Check varargs and va_copy. +static bool +test_varargs (const char *format, ...) +{ + va_list args; + va_start (args, format); + va_list args_copy; + va_copy (args_copy, args); + + const char *str = ""; + int number = 0; + float fnumber = 0; + + while (*format) + { + switch (*format++) + { + case '\''s'\'': // string + str = va_arg (args_copy, const char *); + break; + case '\''d'\'': // int + number = va_arg (args_copy, int); + break; + case '\''f'\'': // float + fnumber = va_arg (args_copy, double); + break; + default: + break; + } + } + va_end (args_copy); + va_end (args); + + return *str && number && fnumber; +} +' + +# Test code for whether the C compiler supports C99 (body of main). +ac_c_conftest_c99_main=' + // Check bool. + _Bool success = false; + success |= (argc != 0); + + // Check restrict. + if (test_restrict ("String literal") == 0) + success = true; + char *restrict newvar = "Another string"; + + // Check varargs. + success &= test_varargs ("s, d'\'' f .", "string", 65, 34.234); + test_varargs_macros (); + + // Check flexible array members. + struct incomplete_array *ia = + malloc (sizeof (struct incomplete_array) + (sizeof (double) * 10)); + ia->datasize = 10; + for (int i = 0; i < ia->datasize; ++i) + ia->data[i] = i * 1.234; + + // Check named initializers. + struct named_init ni = { + .number = 34, + .name = L"Test wide string", + .average = 543.34343, + }; + + ni.number = 58; + + int dynamic_array[ni.number]; + dynamic_array[0] = argv[0][0]; + dynamic_array[ni.number - 1] = 543; + + // work around unused variable warnings + ok |= (!success || bignum == 0LL || ubignum == 0uLL || newvar[0] == '\''x'\'' + || dynamic_array[ni.number - 1] != 543); +' + +# Test code for whether the C compiler supports C11 (global declarations) +ac_c_conftest_c11_globals=' +// Does the compiler advertise C11 conformance? +#if !defined __STDC_VERSION__ || __STDC_VERSION__ < 201112L +# error "Compiler does not advertise C11 conformance" +#endif + +// Check _Alignas. +char _Alignas (double) aligned_as_double; +char _Alignas (0) no_special_alignment; +extern char aligned_as_int; +char _Alignas (0) _Alignas (int) aligned_as_int; + +// Check _Alignof. +enum +{ + int_alignment = _Alignof (int), + int_array_alignment = _Alignof (int[100]), + char_alignment = _Alignof (char) +}; +_Static_assert (0 < -_Alignof (int), "_Alignof is signed"); + +// Check _Noreturn. +int _Noreturn does_not_return (void) { for (;;) continue; } + +// Check _Static_assert. +struct test_static_assert +{ + int x; + _Static_assert (sizeof (int) <= sizeof (long int), + "_Static_assert does not work in struct"); + long int y; +}; + +// Check UTF-8 literals. +#define u8 syntax error! +char const utf8_literal[] = u8"happens to be ASCII" "another string"; + +// Check duplicate typedefs. +typedef long *long_ptr; +typedef long int *long_ptr; +typedef long_ptr long_ptr; + +// Anonymous structures and unions -- taken from C11 6.7.2.1 Example 1. +struct anonymous +{ + union { + struct { int i; int j; }; + struct { int k; long int l; } w; + }; + int m; +} v1; +' + +# Test code for whether the C compiler supports C11 (body of main). +ac_c_conftest_c11_main=' + _Static_assert ((offsetof (struct anonymous, i) + == offsetof (struct anonymous, w.k)), + "Anonymous union alignment botch"); + v1.i = 2; + v1.w.k = 5; + ok |= v1.i != 5; +' + +# Test code for whether the C compiler supports C11 (complete). +ac_c_conftest_c11_program="${ac_c_conftest_c89_globals} +${ac_c_conftest_c99_globals} +${ac_c_conftest_c11_globals} + +int +main (int argc, char **argv) +{ + int ok = 0; + ${ac_c_conftest_c89_main} + ${ac_c_conftest_c99_main} + ${ac_c_conftest_c11_main} + return ok; +} +" + +# Test code for whether the C compiler supports C99 (complete). +ac_c_conftest_c99_program="${ac_c_conftest_c89_globals} +${ac_c_conftest_c99_globals} + +int +main (int argc, char **argv) +{ + int ok = 0; + ${ac_c_conftest_c89_main} + ${ac_c_conftest_c99_main} + return ok; +} +" + +# Test code for whether the C compiler supports C89 (complete). +ac_c_conftest_c89_program="${ac_c_conftest_c89_globals} + +int +main (int argc, char **argv) +{ + int ok = 0; + ${ac_c_conftest_c89_main} + return ok; +} +" + +# Test code for whether the C++ compiler supports C++98 (global declarations) +ac_cxx_conftest_cxx98_globals=' +// Does the compiler advertise C++98 conformance? +#if !defined __cplusplus || __cplusplus < 199711L +# error "Compiler does not advertise C++98 conformance" +#endif + +// These inclusions are to reject old compilers that +// lack the unsuffixed header files. +#include +#include + +// and are *not* freestanding headers in C++98. +extern void assert (int); +namespace std { + extern int strcmp (const char *, const char *); +} + +// Namespaces, exceptions, and templates were all added after "C++ 2.0". +using std::exception; +using std::strcmp; + +namespace { + +void test_exception_syntax() +{ + try { + throw "test"; + } catch (const char *s) { + // Extra parentheses suppress a warning when building autoconf itself, + // due to lint rules shared with more typical C programs. + assert (!(strcmp) (s, "test")); + } +} + +template struct test_template +{ + T const val; + explicit test_template(T t) : val(t) {} + template T add(U u) { return static_cast(u) + val; } +}; + +} // anonymous namespace +' + +# Test code for whether the C++ compiler supports C++98 (body of main) +ac_cxx_conftest_cxx98_main=' + assert (argc); + assert (! argv[0]); +{ + test_exception_syntax (); + test_template tt (2.0); + assert (tt.add (4) == 6.0); + assert (true && !false); +} +' + +# Test code for whether the C++ compiler supports C++11 (global declarations) +ac_cxx_conftest_cxx11_globals=' +// Does the compiler advertise C++ 2011 conformance? +#if !defined __cplusplus || __cplusplus < 201103L +# error "Compiler does not advertise C++11 conformance" +#endif + +namespace cxx11test +{ + constexpr int get_val() { return 20; } + + struct testinit + { + int i; + double d; + }; + + class delegate + { + public: + delegate(int n) : n(n) {} + delegate(): delegate(2354) {} + + virtual int getval() { return this->n; }; + protected: + int n; + }; + + class overridden : public delegate + { + public: + overridden(int n): delegate(n) {} + virtual int getval() override final { return this->n * 2; } + }; + + class nocopy + { + public: + nocopy(int i): i(i) {} + nocopy() = default; + nocopy(const nocopy&) = delete; + nocopy & operator=(const nocopy&) = delete; + private: + int i; + }; + + // for testing lambda expressions + template Ret eval(Fn f, Ret v) + { + return f(v); + } + + // for testing variadic templates and trailing return types + template auto sum(V first) -> V + { + return first; + } + template auto sum(V first, Args... rest) -> V + { + return first + sum(rest...); + } +} +' + +# Test code for whether the C++ compiler supports C++11 (body of main) +ac_cxx_conftest_cxx11_main=' +{ + // Test auto and decltype + auto a1 = 6538; + auto a2 = 48573953.4; + auto a3 = "String literal"; + + int total = 0; + for (auto i = a3; *i; ++i) { total += *i; } + + decltype(a2) a4 = 34895.034; +} +{ + // Test constexpr + short sa[cxx11test::get_val()] = { 0 }; +} +{ + // Test initializer lists + cxx11test::testinit il = { 4323, 435234.23544 }; +} +{ + // Test range-based for + int array[] = {9, 7, 13, 15, 4, 18, 12, 10, 5, 3, + 14, 19, 17, 8, 6, 20, 16, 2, 11, 1}; + for (auto &x : array) { x += 23; } +} +{ + // Test lambda expressions + using cxx11test::eval; + assert (eval ([](int x) { return x*2; }, 21) == 42); + double d = 2.0; + assert (eval ([&](double x) { return d += x; }, 3.0) == 5.0); + assert (d == 5.0); + assert (eval ([=](double x) mutable { return d += x; }, 4.0) == 9.0); + assert (d == 5.0); +} +{ + // Test use of variadic templates + using cxx11test::sum; + auto a = sum(1); + auto b = sum(1, 2); + auto c = sum(1.0, 2.0, 3.0); +} +{ + // Test constructor delegation + cxx11test::delegate d1; + cxx11test::delegate d2(); + cxx11test::delegate d3(45); +} +{ + // Test override and final + cxx11test::overridden o1(55464); +} +{ + // Test nullptr + char *c = nullptr; +} +{ + // Test template brackets + test_template<::test_template> v(test_template(12)); +} +{ + // Unicode literals + char const *utf8 = u8"UTF-8 string \u2500"; + char16_t const *utf16 = u"UTF-8 string \u2500"; + char32_t const *utf32 = U"UTF-32 string \u2500"; +} +' + +# Test code for whether the C compiler supports C++11 (complete). +ac_cxx_conftest_cxx11_program="${ac_cxx_conftest_cxx98_globals} +${ac_cxx_conftest_cxx11_globals} + +int +main (int argc, char **argv) +{ + int ok = 0; + ${ac_cxx_conftest_cxx98_main} + ${ac_cxx_conftest_cxx11_main} + return ok; +} +" + +# Test code for whether the C compiler supports C++98 (complete). +ac_cxx_conftest_cxx98_program="${ac_cxx_conftest_cxx98_globals} +int +main (int argc, char **argv) +{ + int ok = 0; + ${ac_cxx_conftest_cxx98_main} + return ok; +} +" + + +# Auxiliary files required by this configure script. +ac_aux_files="config.guess config.sub" + +# Locations in which to look for auxiliary files. +ac_aux_dir_candidates="${srcdir}/../config" + +# Search for a directory containing all of the required auxiliary files, +# $ac_aux_files, from the $PATH-style list $ac_aux_dir_candidates. +# If we don't find one directory that contains all the files we need, +# we report the set of missing files from the *first* directory in +# $ac_aux_dir_candidates and give up. +ac_missing_aux_files="" +ac_first_candidate=: +printf "%s\n" "$as_me:${as_lineno-$LINENO}: looking for aux files: $ac_aux_files" >&5 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +as_found=false +for as_dir in $ac_aux_dir_candidates +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + as_found=: + + printf "%s\n" "$as_me:${as_lineno-$LINENO}: trying $as_dir" >&5 + ac_aux_dir_found=yes + ac_install_sh= + for ac_aux in $ac_aux_files + do + # As a special case, if "install-sh" is required, that requirement + # can be satisfied by any of "install-sh", "install.sh", or "shtool", + # and $ac_install_sh is set appropriately for whichever one is found. + if test x"$ac_aux" = x"install-sh" + then + if test -f "${as_dir}install-sh"; then + printf "%s\n" "$as_me:${as_lineno-$LINENO}: ${as_dir}install-sh found" >&5 + ac_install_sh="${as_dir}install-sh -c" + elif test -f "${as_dir}install.sh"; then + printf "%s\n" "$as_me:${as_lineno-$LINENO}: ${as_dir}install.sh found" >&5 + ac_install_sh="${as_dir}install.sh -c" + elif test -f "${as_dir}shtool"; then + printf "%s\n" "$as_me:${as_lineno-$LINENO}: ${as_dir}shtool found" >&5 + ac_install_sh="${as_dir}shtool install -c" + else + ac_aux_dir_found=no + if $ac_first_candidate; then + ac_missing_aux_files="${ac_missing_aux_files} install-sh" + else + break + fi + fi + else + if test -f "${as_dir}${ac_aux}"; then + printf "%s\n" "$as_me:${as_lineno-$LINENO}: ${as_dir}${ac_aux} found" >&5 + else + ac_aux_dir_found=no + if $ac_first_candidate; then + ac_missing_aux_files="${ac_missing_aux_files} ${ac_aux}" + else + break + fi + fi + fi + done + if test "$ac_aux_dir_found" = yes; then + ac_aux_dir="$as_dir" + break + fi + ac_first_candidate=false + + as_found=false +done +IFS=$as_save_IFS +if $as_found +then : + +else $as_nop + as_fn_error $? "cannot find required auxiliary files:$ac_missing_aux_files" "$LINENO" 5 +fi + + +# These three variables are undocumented and unsupported, +# and are intended to be withdrawn in a future Autoconf release. +# They can cause serious problems if a builder's source tree is in a directory +# whose full name contains unusual characters. +if test -f "${ac_aux_dir}config.guess"; then + ac_config_guess="$SHELL ${ac_aux_dir}config.guess" +fi +if test -f "${ac_aux_dir}config.sub"; then + ac_config_sub="$SHELL ${ac_aux_dir}config.sub" +fi +if test -f "$ac_aux_dir/configure"; then + ac_configure="$SHELL ${ac_aux_dir}configure" +fi + +# Check that the precious variables saved in the cache have kept the same +# value. +ac_cache_corrupted=false +for ac_var in $ac_precious_vars; do + eval ac_old_set=\$ac_cv_env_${ac_var}_set + eval ac_new_set=\$ac_env_${ac_var}_set + eval ac_old_val=\$ac_cv_env_${ac_var}_value + eval ac_new_val=\$ac_env_${ac_var}_value + case $ac_old_set,$ac_new_set in + set,) + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 +printf "%s\n" "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} + ac_cache_corrupted=: ;; + ,set) + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5 +printf "%s\n" "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} + ac_cache_corrupted=: ;; + ,);; + *) + if test "x$ac_old_val" != "x$ac_new_val"; then + # differences in whitespace do not lead to failure. + ac_old_val_w=`echo x $ac_old_val` + ac_new_val_w=`echo x $ac_new_val` + if test "$ac_old_val_w" != "$ac_new_val_w"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5 +printf "%s\n" "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} + ac_cache_corrupted=: + else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5 +printf "%s\n" "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;} + eval $ac_var=\$ac_old_val + fi + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: former value: \`$ac_old_val'" >&5 +printf "%s\n" "$as_me: former value: \`$ac_old_val'" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: current value: \`$ac_new_val'" >&5 +printf "%s\n" "$as_me: current value: \`$ac_new_val'" >&2;} + fi;; + esac + # Pass precious variables to config.status. + if test "$ac_new_set" = set; then + case $ac_new_val in + *\'*) ac_arg=$ac_var=`printf "%s\n" "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; + *) ac_arg=$ac_var=$ac_new_val ;; + esac + case " $ac_configure_args " in + *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy. + *) as_fn_append ac_configure_args " '$ac_arg'" ;; + esac + fi +done +if $ac_cache_corrupted; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 +printf "%s\n" "$as_me: error: changes in the environment can compromise the build" >&2;} + as_fn_error $? "run \`${MAKE-make} distclean' and/or \`rm $cache_file' + and start over" "$LINENO" 5 +fi +## -------------------- ## +## Main body of script. ## +## -------------------- ## + +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + + + + +CFLAGS= +CXXFLAGS= + + + + + + + + + +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. +set dummy ${ac_tool_prefix}gcc; ac_word=$2 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_CC+y} +then : + printf %s "(cached) " >&6 +else $as_nop + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_prog_CC="${ac_tool_prefix}gcc" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +CC=$ac_cv_prog_CC +if test -n "$CC"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +printf "%s\n" "$CC" >&6; } +else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_CC"; then + ac_ct_CC=$CC + # Extract the first word of "gcc", so it can be a program name with args. +set dummy gcc; ac_word=$2 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_ac_ct_CC+y} +then : + printf %s "(cached) " >&6 +else $as_nop + if test -n "$ac_ct_CC"; then + ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_CC="gcc" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +ac_ct_CC=$ac_cv_prog_ac_ct_CC +if test -n "$ac_ct_CC"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 +printf "%s\n" "$ac_ct_CC" >&6; } +else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +fi + + if test "x$ac_ct_CC" = x; then + CC="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + CC=$ac_ct_CC + fi +else + CC="$ac_cv_prog_CC" +fi + +if test -z "$CC"; then + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. +set dummy ${ac_tool_prefix}cc; ac_word=$2 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_CC+y} +then : + printf %s "(cached) " >&6 +else $as_nop + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_prog_CC="${ac_tool_prefix}cc" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +CC=$ac_cv_prog_CC +if test -n "$CC"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +printf "%s\n" "$CC" >&6; } +else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +fi + + + fi +fi +if test -z "$CC"; then + # Extract the first word of "cc", so it can be a program name with args. +set dummy cc; ac_word=$2 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_CC+y} +then : + printf %s "(cached) " >&6 +else $as_nop + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +else + ac_prog_rejected=no +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + if test "$as_dir$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then + ac_prog_rejected=yes + continue + fi + ac_cv_prog_CC="cc" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +if test $ac_prog_rejected = yes; then + # We found a bogon in the path, so make sure we never use it. + set dummy $ac_cv_prog_CC + shift + if test $# != 0; then + # We chose a different compiler from the bogus one. + # However, it has the same basename, so the bogon will be chosen + # first if we set CC to just the basename; use the full file name. + shift + ac_cv_prog_CC="$as_dir$ac_word${1+' '}$@" + fi +fi +fi +fi +CC=$ac_cv_prog_CC +if test -n "$CC"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +printf "%s\n" "$CC" >&6; } +else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +fi + + +fi +if test -z "$CC"; then + if test -n "$ac_tool_prefix"; then + for ac_prog in cl.exe + do + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. +set dummy $ac_tool_prefix$ac_prog; ac_word=$2 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_CC+y} +then : + printf %s "(cached) " >&6 +else $as_nop + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_prog_CC="$ac_tool_prefix$ac_prog" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +CC=$ac_cv_prog_CC +if test -n "$CC"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +printf "%s\n" "$CC" >&6; } +else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +fi + + + test -n "$CC" && break + done +fi +if test -z "$CC"; then + ac_ct_CC=$CC + for ac_prog in cl.exe +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_ac_ct_CC+y} +then : + printf %s "(cached) " >&6 +else $as_nop + if test -n "$ac_ct_CC"; then + ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_CC="$ac_prog" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +ac_ct_CC=$ac_cv_prog_ac_ct_CC +if test -n "$ac_ct_CC"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 +printf "%s\n" "$ac_ct_CC" >&6; } +else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +fi + + + test -n "$ac_ct_CC" && break +done + + if test "x$ac_ct_CC" = x; then + CC="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + CC=$ac_ct_CC + fi +fi + +fi +if test -z "$CC"; then + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}clang", so it can be a program name with args. +set dummy ${ac_tool_prefix}clang; ac_word=$2 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_CC+y} +then : + printf %s "(cached) " >&6 +else $as_nop + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_prog_CC="${ac_tool_prefix}clang" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +CC=$ac_cv_prog_CC +if test -n "$CC"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +printf "%s\n" "$CC" >&6; } +else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_CC"; then + ac_ct_CC=$CC + # Extract the first word of "clang", so it can be a program name with args. +set dummy clang; ac_word=$2 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_ac_ct_CC+y} +then : + printf %s "(cached) " >&6 +else $as_nop + if test -n "$ac_ct_CC"; then + ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_CC="clang" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +ac_ct_CC=$ac_cv_prog_ac_ct_CC +if test -n "$ac_ct_CC"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 +printf "%s\n" "$ac_ct_CC" >&6; } +else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +fi + + if test "x$ac_ct_CC" = x; then + CC="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + CC=$ac_ct_CC + fi +else + CC="$ac_cv_prog_CC" +fi + +fi + + +test -z "$CC" && { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "no acceptable C compiler found in \$PATH +See \`config.log' for more details" "$LINENO" 5; } + +# Provide some information about the compiler. +printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 +set X $ac_compile +ac_compiler=$2 +for ac_option in --version -v -V -qversion -version; do + { { ac_try="$ac_compiler $ac_option >&5" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +printf "%s\n" "$ac_try_echo"; } >&5 + (eval "$ac_compiler $ac_option >&5") 2>conftest.err + ac_status=$? + if test -s conftest.err; then + sed '10a\ +... rest of stderr output deleted ... + 10q' conftest.err >conftest.er1 + cat conftest.er1 >&5 + fi + rm -f conftest.er1 conftest.err + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } +done + +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main (void) +{ + + ; + return 0; +} +_ACEOF +ac_clean_files_save=$ac_clean_files +ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out" +# Try to create an executable without -o first, disregard a.out. +# It will help us diagnose broken compilers, and finding out an intuition +# of exeext. +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5 +printf %s "checking whether the C compiler works... " >&6; } +ac_link_default=`printf "%s\n" "$ac_link" | sed 's/ -o *conftest[^ ]*//'` + +# The possible output files: +ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*" + +ac_rmfiles= +for ac_file in $ac_files +do + case $ac_file in + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;; + * ) ac_rmfiles="$ac_rmfiles $ac_file";; + esac +done +rm -f $ac_rmfiles + +if { { ac_try="$ac_link_default" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +printf "%s\n" "$ac_try_echo"; } >&5 + (eval "$ac_link_default") 2>&5 + ac_status=$? + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } +then : + # Autoconf-2.13 could set the ac_cv_exeext variable to `no'. +# So ignore a value of `no', otherwise this would lead to `EXEEXT = no' +# in a Makefile. We should not override ac_cv_exeext if it was cached, +# so that the user can short-circuit this test for compilers unknown to +# Autoconf. +for ac_file in $ac_files '' +do + test -f "$ac_file" || continue + case $ac_file in + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) + ;; + [ab].out ) + # We found the default executable, but exeext='' is most + # certainly right. + break;; + *.* ) + if test ${ac_cv_exeext+y} && test "$ac_cv_exeext" != no; + then :; else + ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` + fi + # We set ac_cv_exeext here because the later test for it is not + # safe: cross compilers may not add the suffix if given an `-o' + # argument, so we may need to know it at that point already. + # Even if this section looks crufty: it has the advantage of + # actually working. + break;; + * ) + break;; + esac +done +test "$ac_cv_exeext" = no && ac_cv_exeext= + +else $as_nop + ac_file='' +fi +if test -z "$ac_file" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +printf "%s\n" "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error 77 "C compiler cannot create executables +See \`config.log' for more details" "$LINENO" 5; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5 +printf %s "checking for C compiler default output file name... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5 +printf "%s\n" "$ac_file" >&6; } +ac_exeext=$ac_cv_exeext + +rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out +ac_clean_files=$ac_clean_files_save +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5 +printf %s "checking for suffix of executables... " >&6; } +if { { ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +printf "%s\n" "$ac_try_echo"; } >&5 + (eval "$ac_link") 2>&5 + ac_status=$? + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } +then : + # If both `conftest.exe' and `conftest' are `present' (well, observable) +# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will +# work properly (i.e., refer to `conftest.exe'), while it won't with +# `rm'. +for ac_file in conftest.exe conftest conftest.*; do + test -f "$ac_file" || continue + case $ac_file in + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;; + *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` + break;; + * ) break;; + esac +done +else $as_nop + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "cannot compute suffix of executables: cannot compile and link +See \`config.log' for more details" "$LINENO" 5; } +fi +rm -f conftest conftest$ac_cv_exeext +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 +printf "%s\n" "$ac_cv_exeext" >&6; } + +rm -f conftest.$ac_ext +EXEEXT=$ac_cv_exeext +ac_exeext=$EXEEXT +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +int +main (void) +{ +FILE *f = fopen ("conftest.out", "w"); + return ferror (f) || fclose (f) != 0; + + ; + return 0; +} +_ACEOF +ac_clean_files="$ac_clean_files conftest.out" +# Check that the compiler produces executables we can run. If not, either +# the compiler is broken, or we cross compile. +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5 +printf %s "checking whether we are cross compiling... " >&6; } +if test "$cross_compiling" != yes; then + { { ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +printf "%s\n" "$ac_try_echo"; } >&5 + (eval "$ac_link") 2>&5 + ac_status=$? + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + if { ac_try='./conftest$ac_cv_exeext' + { { case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +printf "%s\n" "$ac_try_echo"; } >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; }; then + cross_compiling=no + else + if test "$cross_compiling" = maybe; then + cross_compiling=yes + else + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error 77 "cannot run C compiled programs. +If you meant to cross compile, use \`--host'. +See \`config.log' for more details" "$LINENO" 5; } + fi + fi +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 +printf "%s\n" "$cross_compiling" >&6; } + +rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out +ac_clean_files=$ac_clean_files_save +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 +printf %s "checking for suffix of object files... " >&6; } +if test ${ac_cv_objext+y} +then : + printf %s "(cached) " >&6 +else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main (void) +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.o conftest.obj +if { { ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +printf "%s\n" "$ac_try_echo"; } >&5 + (eval "$ac_compile") 2>&5 + ac_status=$? + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } +then : + for ac_file in conftest.o conftest.obj conftest.*; do + test -f "$ac_file" || continue; + case $ac_file in + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;; + *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'` + break;; + esac +done +else $as_nop + printf "%s\n" "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "cannot compute suffix of object files: cannot compile +See \`config.log' for more details" "$LINENO" 5; } +fi +rm -f conftest.$ac_cv_objext conftest.$ac_ext +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5 +printf "%s\n" "$ac_cv_objext" >&6; } +OBJEXT=$ac_cv_objext +ac_objext=$OBJEXT +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports GNU C" >&5 +printf %s "checking whether the compiler supports GNU C... " >&6; } +if test ${ac_cv_c_compiler_gnu+y} +then : + printf %s "(cached) " >&6 +else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main (void) +{ +#ifndef __GNUC__ + choke me +#endif + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + ac_compiler_gnu=yes +else $as_nop + ac_compiler_gnu=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +ac_cv_c_compiler_gnu=$ac_compiler_gnu + +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5 +printf "%s\n" "$ac_cv_c_compiler_gnu" >&6; } +ac_compiler_gnu=$ac_cv_c_compiler_gnu + +if test $ac_compiler_gnu = yes; then + GCC=yes +else + GCC= +fi +ac_test_CFLAGS=${CFLAGS+y} +ac_save_CFLAGS=$CFLAGS +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 +printf %s "checking whether $CC accepts -g... " >&6; } +if test ${ac_cv_prog_cc_g+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_save_c_werror_flag=$ac_c_werror_flag + ac_c_werror_flag=yes + ac_cv_prog_cc_g=no + CFLAGS="-g" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main (void) +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + ac_cv_prog_cc_g=yes +else $as_nop + CFLAGS="" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main (void) +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + +else $as_nop + ac_c_werror_flag=$ac_save_c_werror_flag + CFLAGS="-g" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main (void) +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + ac_cv_prog_cc_g=yes +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext + ac_c_werror_flag=$ac_save_c_werror_flag +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5 +printf "%s\n" "$ac_cv_prog_cc_g" >&6; } +if test $ac_test_CFLAGS; then + CFLAGS=$ac_save_CFLAGS +elif test $ac_cv_prog_cc_g = yes; then + if test "$GCC" = yes; then + CFLAGS="-g -O2" + else + CFLAGS="-g" + fi +else + if test "$GCC" = yes; then + CFLAGS="-O2" + else + CFLAGS= + fi +fi +ac_prog_cc_stdc=no +if test x$ac_prog_cc_stdc = xno +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C11 features" >&5 +printf %s "checking for $CC option to enable C11 features... " >&6; } +if test ${ac_cv_prog_cc_c11+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_cv_prog_cc_c11=no +ac_save_CC=$CC +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$ac_c_conftest_c11_program +_ACEOF +for ac_arg in '' -std=gnu11 +do + CC="$ac_save_CC $ac_arg" + if ac_fn_c_try_compile "$LINENO" +then : + ac_cv_prog_cc_c11=$ac_arg +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam + test "x$ac_cv_prog_cc_c11" != "xno" && break +done +rm -f conftest.$ac_ext +CC=$ac_save_CC +fi + +if test "x$ac_cv_prog_cc_c11" = xno +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 +printf "%s\n" "unsupported" >&6; } +else $as_nop + if test "x$ac_cv_prog_cc_c11" = x +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 +printf "%s\n" "none needed" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c11" >&5 +printf "%s\n" "$ac_cv_prog_cc_c11" >&6; } + CC="$CC $ac_cv_prog_cc_c11" +fi + ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c11 + ac_prog_cc_stdc=c11 +fi +fi +if test x$ac_prog_cc_stdc = xno +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C99 features" >&5 +printf %s "checking for $CC option to enable C99 features... " >&6; } +if test ${ac_cv_prog_cc_c99+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_cv_prog_cc_c99=no +ac_save_CC=$CC +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$ac_c_conftest_c99_program +_ACEOF +for ac_arg in '' -std=gnu99 -std=c99 -c99 -qlanglvl=extc1x -qlanglvl=extc99 -AC99 -D_STDC_C99= +do + CC="$ac_save_CC $ac_arg" + if ac_fn_c_try_compile "$LINENO" +then : + ac_cv_prog_cc_c99=$ac_arg +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam + test "x$ac_cv_prog_cc_c99" != "xno" && break +done +rm -f conftest.$ac_ext +CC=$ac_save_CC +fi + +if test "x$ac_cv_prog_cc_c99" = xno +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 +printf "%s\n" "unsupported" >&6; } +else $as_nop + if test "x$ac_cv_prog_cc_c99" = x +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 +printf "%s\n" "none needed" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c99" >&5 +printf "%s\n" "$ac_cv_prog_cc_c99" >&6; } + CC="$CC $ac_cv_prog_cc_c99" +fi + ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c99 + ac_prog_cc_stdc=c99 +fi +fi +if test x$ac_prog_cc_stdc = xno +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C89 features" >&5 +printf %s "checking for $CC option to enable C89 features... " >&6; } +if test ${ac_cv_prog_cc_c89+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_cv_prog_cc_c89=no +ac_save_CC=$CC +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$ac_c_conftest_c89_program +_ACEOF +for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" +do + CC="$ac_save_CC $ac_arg" + if ac_fn_c_try_compile "$LINENO" +then : + ac_cv_prog_cc_c89=$ac_arg +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam + test "x$ac_cv_prog_cc_c89" != "xno" && break +done +rm -f conftest.$ac_ext +CC=$ac_save_CC +fi + +if test "x$ac_cv_prog_cc_c89" = xno +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 +printf "%s\n" "unsupported" >&6; } +else $as_nop + if test "x$ac_cv_prog_cc_c89" = x +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 +printf "%s\n" "none needed" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 +printf "%s\n" "$ac_cv_prog_cc_c89" >&6; } + CC="$CC $ac_cv_prog_cc_c89" +fi + ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c89 + ac_prog_cc_stdc=c89 +fi +fi + +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + + + + + + +ac_ext=cpp +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu +if test -z "$CXX"; then + if test -n "$CCC"; then + CXX=$CCC + else + if test -n "$ac_tool_prefix"; then + for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC clang++ + do + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. +set dummy $ac_tool_prefix$ac_prog; ac_word=$2 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_CXX+y} +then : + printf %s "(cached) " >&6 +else $as_nop + if test -n "$CXX"; then + ac_cv_prog_CXX="$CXX" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +CXX=$ac_cv_prog_CXX +if test -n "$CXX"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5 +printf "%s\n" "$CXX" >&6; } +else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +fi + + + test -n "$CXX" && break + done +fi +if test -z "$CXX"; then + ac_ct_CXX=$CXX + for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC clang++ +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_ac_ct_CXX+y} +then : + printf %s "(cached) " >&6 +else $as_nop + if test -n "$ac_ct_CXX"; then + ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_CXX="$ac_prog" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +ac_ct_CXX=$ac_cv_prog_ac_ct_CXX +if test -n "$ac_ct_CXX"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5 +printf "%s\n" "$ac_ct_CXX" >&6; } +else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +fi + + + test -n "$ac_ct_CXX" && break +done + + if test "x$ac_ct_CXX" = x; then + CXX="g++" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + CXX=$ac_ct_CXX + fi +fi + + fi +fi +# Provide some information about the compiler. +printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C++ compiler version" >&5 +set X $ac_compile +ac_compiler=$2 +for ac_option in --version -v -V -qversion; do + { { ac_try="$ac_compiler $ac_option >&5" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +printf "%s\n" "$ac_try_echo"; } >&5 + (eval "$ac_compiler $ac_option >&5") 2>conftest.err + ac_status=$? + if test -s conftest.err; then + sed '10a\ +... rest of stderr output deleted ... + 10q' conftest.err >conftest.er1 + cat conftest.er1 >&5 + fi + rm -f conftest.er1 conftest.err + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } +done + +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports GNU C++" >&5 +printf %s "checking whether the compiler supports GNU C++... " >&6; } +if test ${ac_cv_cxx_compiler_gnu+y} +then : + printf %s "(cached) " >&6 +else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main (void) +{ +#ifndef __GNUC__ + choke me +#endif + + ; + return 0; +} +_ACEOF +if ac_fn_cxx_try_compile "$LINENO" +then : + ac_compiler_gnu=yes +else $as_nop + ac_compiler_gnu=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +ac_cv_cxx_compiler_gnu=$ac_compiler_gnu + +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_compiler_gnu" >&5 +printf "%s\n" "$ac_cv_cxx_compiler_gnu" >&6; } +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + +if test $ac_compiler_gnu = yes; then + GXX=yes +else + GXX= +fi +ac_test_CXXFLAGS=${CXXFLAGS+y} +ac_save_CXXFLAGS=$CXXFLAGS +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5 +printf %s "checking whether $CXX accepts -g... " >&6; } +if test ${ac_cv_prog_cxx_g+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_save_cxx_werror_flag=$ac_cxx_werror_flag + ac_cxx_werror_flag=yes + ac_cv_prog_cxx_g=no + CXXFLAGS="-g" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main (void) +{ + + ; + return 0; +} +_ACEOF +if ac_fn_cxx_try_compile "$LINENO" +then : + ac_cv_prog_cxx_g=yes +else $as_nop + CXXFLAGS="" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main (void) +{ + + ; + return 0; +} +_ACEOF +if ac_fn_cxx_try_compile "$LINENO" +then : + +else $as_nop + ac_cxx_werror_flag=$ac_save_cxx_werror_flag + CXXFLAGS="-g" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main (void) +{ + + ; + return 0; +} +_ACEOF +if ac_fn_cxx_try_compile "$LINENO" +then : + ac_cv_prog_cxx_g=yes +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext + ac_cxx_werror_flag=$ac_save_cxx_werror_flag +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_g" >&5 +printf "%s\n" "$ac_cv_prog_cxx_g" >&6; } +if test $ac_test_CXXFLAGS; then + CXXFLAGS=$ac_save_CXXFLAGS +elif test $ac_cv_prog_cxx_g = yes; then + if test "$GXX" = yes; then + CXXFLAGS="-g -O2" + else + CXXFLAGS="-g" + fi +else + if test "$GXX" = yes; then + CXXFLAGS="-O2" + else + CXXFLAGS= + fi +fi +ac_prog_cxx_stdcxx=no +if test x$ac_prog_cxx_stdcxx = xno +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++11 features" >&5 +printf %s "checking for $CXX option to enable C++11 features... " >&6; } +if test ${ac_cv_prog_cxx_11+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_cv_prog_cxx_11=no +ac_save_CXX=$CXX +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$ac_cxx_conftest_cxx11_program +_ACEOF +for ac_arg in '' -std=gnu++11 -std=gnu++0x -std=c++11 -std=c++0x -qlanglvl=extended0x -AA +do + CXX="$ac_save_CXX $ac_arg" + if ac_fn_cxx_try_compile "$LINENO" +then : + ac_cv_prog_cxx_cxx11=$ac_arg +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam + test "x$ac_cv_prog_cxx_cxx11" != "xno" && break +done +rm -f conftest.$ac_ext +CXX=$ac_save_CXX +fi + +if test "x$ac_cv_prog_cxx_cxx11" = xno +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 +printf "%s\n" "unsupported" >&6; } +else $as_nop + if test "x$ac_cv_prog_cxx_cxx11" = x +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 +printf "%s\n" "none needed" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_cxx11" >&5 +printf "%s\n" "$ac_cv_prog_cxx_cxx11" >&6; } + CXX="$CXX $ac_cv_prog_cxx_cxx11" +fi + ac_cv_prog_cxx_stdcxx=$ac_cv_prog_cxx_cxx11 + ac_prog_cxx_stdcxx=cxx11 +fi +fi +if test x$ac_prog_cxx_stdcxx = xno +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++98 features" >&5 +printf %s "checking for $CXX option to enable C++98 features... " >&6; } +if test ${ac_cv_prog_cxx_98+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_cv_prog_cxx_98=no +ac_save_CXX=$CXX +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$ac_cxx_conftest_cxx98_program +_ACEOF +for ac_arg in '' -std=gnu++98 -std=c++98 -qlanglvl=extended -AA +do + CXX="$ac_save_CXX $ac_arg" + if ac_fn_cxx_try_compile "$LINENO" +then : + ac_cv_prog_cxx_cxx98=$ac_arg +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam + test "x$ac_cv_prog_cxx_cxx98" != "xno" && break +done +rm -f conftest.$ac_ext +CXX=$ac_save_CXX +fi + +if test "x$ac_cv_prog_cxx_cxx98" = xno +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 +printf "%s\n" "unsupported" >&6; } +else $as_nop + if test "x$ac_cv_prog_cxx_cxx98" = x +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 +printf "%s\n" "none needed" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_cxx98" >&5 +printf "%s\n" "$ac_cv_prog_cxx_cxx98" >&6; } + CXX="$CXX $ac_cv_prog_cxx_cxx98" +fi + ac_cv_prog_cxx_stdcxx=$ac_cv_prog_cxx_cxx98 + ac_prog_cxx_stdcxx=cxx98 +fi +fi + +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + + + + + # Make sure we can run config.sub. +$SHELL "${ac_aux_dir}config.sub" sun4 >/dev/null 2>&1 || + as_fn_error $? "cannot run $SHELL ${ac_aux_dir}config.sub" "$LINENO" 5 + +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 +printf %s "checking build system type... " >&6; } +if test ${ac_cv_build+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_build_alias=$build_alias +test "x$ac_build_alias" = x && + ac_build_alias=`$SHELL "${ac_aux_dir}config.guess"` +test "x$ac_build_alias" = x && + as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5 +ac_cv_build=`$SHELL "${ac_aux_dir}config.sub" $ac_build_alias` || + as_fn_error $? "$SHELL ${ac_aux_dir}config.sub $ac_build_alias failed" "$LINENO" 5 + +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5 +printf "%s\n" "$ac_cv_build" >&6; } +case $ac_cv_build in +*-*-*) ;; +*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;; +esac +build=$ac_cv_build +ac_save_IFS=$IFS; IFS='-' +set x $ac_cv_build +shift +build_cpu=$1 +build_vendor=$2 +shift; shift +# Remember, the first character of IFS is used to create $*, +# except with old shells: +build_os=$* +IFS=$ac_save_IFS +case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac + + +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking host system type" >&5 +printf %s "checking host system type... " >&6; } +if test ${ac_cv_host+y} +then : + printf %s "(cached) " >&6 +else $as_nop + if test "x$host_alias" = x; then + ac_cv_host=$ac_cv_build +else + ac_cv_host=`$SHELL "${ac_aux_dir}config.sub" $host_alias` || + as_fn_error $? "$SHELL ${ac_aux_dir}config.sub $host_alias failed" "$LINENO" 5 +fi + +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5 +printf "%s\n" "$ac_cv_host" >&6; } +case $ac_cv_host in +*-*-*) ;; +*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;; +esac +host=$ac_cv_host +ac_save_IFS=$IFS; IFS='-' +set x $ac_cv_host +shift +host_cpu=$1 +host_vendor=$2 +shift; shift +# Remember, the first character of IFS is used to create $*, +# except with old shells: +host_os=$* +IFS=$ac_save_IFS +case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac + + + +# Use 64-bit file system calls so that we can support files > 2 GiB. + +# Check whether --enable-largefile was given. +if test ${enable_largefile+y} +then : + enableval=$enable_largefile; +fi + +if test "$enable_largefile" != no; then + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for special C compiler options needed for large files" >&5 +printf %s "checking for special C compiler options needed for large files... " >&6; } +if test ${ac_cv_sys_largefile_CC+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_cv_sys_largefile_CC=no + if test "$GCC" != yes; then + ac_save_CC=$CC + while :; do + # IRIX 6.2 and later do not support large files by default, + # so use the C compiler's -n32 option if that helps. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include + /* Check that off_t can represent 2**63 - 1 correctly. + We can't simply define LARGE_OFF_T to be 9223372036854775807, + since some C++ compilers masquerading as C compilers + incorrectly reject 9223372036854775807. */ +#define LARGE_OFF_T (((off_t) 1 << 31 << 31) - 1 + ((off_t) 1 << 31 << 31)) + int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 + && LARGE_OFF_T % 2147483647 == 1) + ? 1 : -1]; +int +main (void) +{ + + ; + return 0; +} +_ACEOF + if ac_fn_c_try_compile "$LINENO" +then : + break +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam + CC="$CC -n32" + if ac_fn_c_try_compile "$LINENO" +then : + ac_cv_sys_largefile_CC=' -n32'; break +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam + break + done + CC=$ac_save_CC + rm -f conftest.$ac_ext + fi +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_largefile_CC" >&5 +printf "%s\n" "$ac_cv_sys_largefile_CC" >&6; } + if test "$ac_cv_sys_largefile_CC" != no; then + CC=$CC$ac_cv_sys_largefile_CC + fi + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for _FILE_OFFSET_BITS value needed for large files" >&5 +printf %s "checking for _FILE_OFFSET_BITS value needed for large files... " >&6; } +if test ${ac_cv_sys_file_offset_bits+y} +then : + printf %s "(cached) " >&6 +else $as_nop + while :; do + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include + /* Check that off_t can represent 2**63 - 1 correctly. + We can't simply define LARGE_OFF_T to be 9223372036854775807, + since some C++ compilers masquerading as C compilers + incorrectly reject 9223372036854775807. */ +#define LARGE_OFF_T (((off_t) 1 << 31 << 31) - 1 + ((off_t) 1 << 31 << 31)) + int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 + && LARGE_OFF_T % 2147483647 == 1) + ? 1 : -1]; +int +main (void) +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + ac_cv_sys_file_offset_bits=no; break +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#define _FILE_OFFSET_BITS 64 +#include + /* Check that off_t can represent 2**63 - 1 correctly. + We can't simply define LARGE_OFF_T to be 9223372036854775807, + since some C++ compilers masquerading as C compilers + incorrectly reject 9223372036854775807. */ +#define LARGE_OFF_T (((off_t) 1 << 31 << 31) - 1 + ((off_t) 1 << 31 << 31)) + int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 + && LARGE_OFF_T % 2147483647 == 1) + ? 1 : -1]; +int +main (void) +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + ac_cv_sys_file_offset_bits=64; break +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext + ac_cv_sys_file_offset_bits=unknown + break +done +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_file_offset_bits" >&5 +printf "%s\n" "$ac_cv_sys_file_offset_bits" >&6; } +case $ac_cv_sys_file_offset_bits in #( + no | unknown) ;; + *) +printf "%s\n" "#define _FILE_OFFSET_BITS $ac_cv_sys_file_offset_bits" >>confdefs.h +;; +esac +rm -rf conftest* + if test $ac_cv_sys_file_offset_bits = unknown; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for _LARGE_FILES value needed for large files" >&5 +printf %s "checking for _LARGE_FILES value needed for large files... " >&6; } +if test ${ac_cv_sys_large_files+y} +then : + printf %s "(cached) " >&6 +else $as_nop + while :; do + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include + /* Check that off_t can represent 2**63 - 1 correctly. + We can't simply define LARGE_OFF_T to be 9223372036854775807, + since some C++ compilers masquerading as C compilers + incorrectly reject 9223372036854775807. */ +#define LARGE_OFF_T (((off_t) 1 << 31 << 31) - 1 + ((off_t) 1 << 31 << 31)) + int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 + && LARGE_OFF_T % 2147483647 == 1) + ? 1 : -1]; +int +main (void) +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + ac_cv_sys_large_files=no; break +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#define _LARGE_FILES 1 +#include + /* Check that off_t can represent 2**63 - 1 correctly. + We can't simply define LARGE_OFF_T to be 9223372036854775807, + since some C++ compilers masquerading as C compilers + incorrectly reject 9223372036854775807. */ +#define LARGE_OFF_T (((off_t) 1 << 31 << 31) - 1 + ((off_t) 1 << 31 << 31)) + int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 + && LARGE_OFF_T % 2147483647 == 1) + ? 1 : -1]; +int +main (void) +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + ac_cv_sys_large_files=1; break +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext + ac_cv_sys_large_files=unknown + break +done +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_large_files" >&5 +printf "%s\n" "$ac_cv_sys_large_files" >&6; } +case $ac_cv_sys_large_files in #( + no | unknown) ;; + *) +printf "%s\n" "#define _LARGE_FILES $ac_cv_sys_large_files" >>confdefs.h +;; +esac +rm -rf conftest* + fi +fi + + + + + +# Extract the first word of "perl", so it can be a program name with args. +set dummy perl; ac_word=$2 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_perl+y} +then : + printf %s "(cached) " >&6 +else $as_nop + case $perl in + [\\/]* | ?:[\\/]*) + ac_cv_path_perl="$perl" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_perl="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + ;; +esac +fi +perl=$ac_cv_path_perl +if test -n "$perl"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $perl" >&5 +printf "%s\n" "$perl" >&6; } +else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +fi + + +if test -z "$perl"; then + as_fn_error $? "perl is required" "$LINENO" 5 +fi + + +# Extract the first word of "curl", so it can be a program name with args. +set dummy curl; ac_word=$2 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_curl+y} +then : + printf %s "(cached) " >&6 +else $as_nop + case $curl in + [\\/]* | ?:[\\/]*) + ac_cv_path_curl="$curl" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_curl="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + ;; +esac +fi +curl=$ac_cv_path_curl +if test -n "$curl"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $curl" >&5 +printf "%s\n" "$curl" >&6; } +else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +fi + + +if test -z "$curl"; then + as_fn_error $? "curl is required" "$LINENO" 5 +fi + + +# Extract the first word of "bzip2", so it can be a program name with args. +set dummy bzip2; ac_word=$2 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_bzip2+y} +then : + printf %s "(cached) " >&6 +else $as_nop + case $bzip2 in + [\\/]* | ?:[\\/]*) + ac_cv_path_bzip2="$bzip2" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_bzip2="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + ;; +esac +fi +bzip2=$ac_cv_path_bzip2 +if test -n "$bzip2"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $bzip2" >&5 +printf "%s\n" "$bzip2" >&6; } +else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +fi + + +if test -z "$bzip2"; then + as_fn_error $? "bzip2 is required" "$LINENO" 5 +fi + + +# Extract the first word of "xz", so it can be a program name with args. +set dummy xz; ac_word=$2 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_xz+y} +then : + printf %s "(cached) " >&6 +else $as_nop + case $xz in + [\\/]* | ?:[\\/]*) + ac_cv_path_xz="$xz" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_xz="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + ;; +esac +fi +xz=$ac_cv_path_xz +if test -n "$xz"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xz" >&5 +printf "%s\n" "$xz" >&6; } +else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +fi + + +if test -z "$xz"; then + as_fn_error $? "xz is required" "$LINENO" 5 +fi + + +# Test that Perl has the open/fork feature (Perl 5.8.0 and beyond). +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether Perl is recent enough" >&5 +printf %s "checking whether Perl is recent enough... " >&6; } +if ! $perl -e 'open(FOO, "-|", "true"); while () { print; }; close FOO or die;'; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + as_fn_error $? "Your Perl version is too old. Nix requires Perl 5.8.0 or newer." "$LINENO" 5 +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } + + +# Figure out where to install Perl modules. +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for the Perl installation prefix" >&5 +printf %s "checking for the Perl installation prefix... " >&6; } +perlversion=$($perl -e 'use Config; print $Config{version};') +perlarchname=$($perl -e 'use Config; print $Config{archname};') +perllibdir=${libdir}/perl5/site_perl/$perlversion/$perlarchname + +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $perllibdir" >&5 +printf "%s\n" "$perllibdir" >&6; } + +# Look for libsodium. +PKG_CHECK_MODULES(SODIUM, libsodium, CXXFLAGS="$SODIUM_CFLAGS $CXXFLAGS") + +# Check for the required Perl dependencies (DBI and DBD::SQLite). +perlFlags="-I$perllibdir" + + +# Check whether --with-dbi was given. +if test ${with_dbi+y} +then : + withval=$with_dbi; perlFlags="$perlFlags -I$withval" +fi + + + +# Check whether --with-dbd-sqlite was given. +if test ${with_dbd_sqlite+y} +then : + withval=$with_dbd_sqlite; perlFlags="$perlFlags -I$withval" +fi + + +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether DBD::SQLite works" >&5 +printf %s "checking whether DBD::SQLite works... " >&6; } +if ! $perl $perlFlags -e 'use DBI; use DBD::SQLite;' 2>&5; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "The Perl modules DBI and/or DBD::SQLite are missing. +See \`config.log' for more details" "$LINENO" 5; } +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } + + + +PKG_CHECK_MODULES(NIX, nix-store) + + +# Extract the first word of "nix", so it can be a program name with args. +set dummy nix; ac_word=$2 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_NIX+y} +then : + printf %s "(cached) " >&6 +else $as_nop + case $NIX in + [\\/]* | ?:[\\/]*) + ac_cv_path_NIX="$NIX" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_NIX="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + ;; +esac +fi +NIX=$ac_cv_path_NIX +if test -n "$NIX"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $NIX" >&5 +printf "%s\n" "$NIX" >&6; } +else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +fi + + +if test -z "$NIX"; then + as_fn_error $? "nix is required" "$LINENO" 5 +fi + + +# Expand all variables in config.status. +test "$prefix" = NONE && prefix=$ac_default_prefix +test "$exec_prefix" = NONE && exec_prefix='${prefix}' +for name in $ac_subst_vars; do + declare $name="$(eval echo "${!name}")" + declare $name="$(eval echo "${!name}")" + declare $name="$(eval echo "${!name}")" +done + +rm -f Makefile.config +ln -sfn ../mk mk + +ac_config_files="$ac_config_files " + +cat >confcache <<\_ACEOF +# This file is a shell script that caches the results of configure +# tests run on this system so they can be shared between configure +# scripts and configure runs, see configure's option --config-cache. +# It is not useful on other systems. If it contains results you don't +# want to keep, you may remove or edit it. +# +# config.status only pays attention to the cache file if you give it +# the --recheck option to rerun configure. +# +# `ac_cv_env_foo' variables (set or unset) will be overridden when +# loading this file, other *unset* `ac_cv_foo' will be assigned the +# following values. + +_ACEOF + +# The following way of writing the cache mishandles newlines in values, +# but we know of no workaround that is simple, portable, and efficient. +# So, we kill variables containing newlines. +# Ultrix sh set writes to stderr and can't be redirected directly, +# and sets the high bit in the cache file unless we assign to the vars. +( + for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do + eval ac_val=\$$ac_var + case $ac_val in #( + *${as_nl}*) + case $ac_var in #( + *_cv_*) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 +printf "%s\n" "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; + esac + case $ac_var in #( + _ | IFS | as_nl) ;; #( + BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( + *) { eval $ac_var=; unset $ac_var;} ;; + esac ;; + esac + done + + (set) 2>&1 | + case $as_nl`(ac_space=' '; set) 2>&1` in #( + *${as_nl}ac_space=\ *) + # `set' does not quote correctly, so add quotes: double-quote + # substitution turns \\\\ into \\, and sed turns \\ into \. + sed -n \ + "s/'/'\\\\''/g; + s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" + ;; #( + *) + # `set' quotes correctly as required by POSIX, so do not add quotes. + sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" + ;; + esac | + sort +) | + sed ' + /^ac_cv_env_/b end + t clear + :clear + s/^\([^=]*\)=\(.*[{}].*\)$/test ${\1+y} || &/ + t end + s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ + :end' >>confcache +if diff "$cache_file" confcache >/dev/null 2>&1; then :; else + if test -w "$cache_file"; then + if test "x$cache_file" != "x/dev/null"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 +printf "%s\n" "$as_me: updating cache $cache_file" >&6;} + if test ! -f "$cache_file" || test -h "$cache_file"; then + cat confcache >"$cache_file" + else + case $cache_file in #( + */* | ?:*) + mv -f confcache "$cache_file"$$ && + mv -f "$cache_file"$$ "$cache_file" ;; #( + *) + mv -f confcache "$cache_file" ;; + esac + fi + fi + else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 +printf "%s\n" "$as_me: not updating unwritable cache $cache_file" >&6;} + fi +fi +rm -f confcache + +test "x$prefix" = xNONE && prefix=$ac_default_prefix +# Let make expand exec_prefix. +test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' + +# Transform confdefs.h into DEFS. +# Protect against shell expansion while executing Makefile rules. +# Protect against Makefile macro expansion. +# +# If the first sed substitution is executed (which looks for macros that +# take arguments), then branch to the quote section. Otherwise, +# look for a macro that doesn't take arguments. +ac_script=' +:mline +/\\$/{ + N + s,\\\n,, + b mline +} +t clear +:clear +s/^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*([^)]*)\)[ ]*\(.*\)/-D\1=\2/g +t quote +s/^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\)/-D\1=\2/g +t quote +b any +:quote +s/[ `~#$^&*(){}\\|;'\''"<>?]/\\&/g +s/\[/\\&/g +s/\]/\\&/g +s/\$/$$/g +H +:any +${ + g + s/^\n// + s/\n/ /g + p +} +' +DEFS=`sed -n "$ac_script" confdefs.h` + + +ac_libobjs= +ac_ltlibobjs= +U= +for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue + # 1. Remove the extension, and $U if already installed. + ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' + ac_i=`printf "%s\n" "$ac_i" | sed "$ac_script"` + # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR + # will be set to the directory where LIBOBJS objects are built. + as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext" + as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo' +done +LIBOBJS=$ac_libobjs + +LTLIBOBJS=$ac_ltlibobjs + + + +: "${CONFIG_STATUS=./config.status}" +ac_write_fail=0 +ac_clean_files_save=$ac_clean_files +ac_clean_files="$ac_clean_files $CONFIG_STATUS" +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5 +printf "%s\n" "$as_me: creating $CONFIG_STATUS" >&6;} +as_write_fail=0 +cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1 +#! $SHELL +# Generated by $as_me. +# Run this file to recreate the current configuration. +# Compiler output produced by configure, useful for debugging +# configure, is in config.log if it exists. + +debug=false +ac_cs_recheck=false +ac_cs_silent=false + +SHELL=\${CONFIG_SHELL-$SHELL} +export SHELL +_ASEOF +cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1 +## -------------------- ## +## M4sh Initialization. ## +## -------------------- ## + +# Be more Bourne compatible +DUALCASE=1; export DUALCASE # for MKS sh +as_nop=: +if test ${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1 +then : + emulate sh + NULLCMD=: + # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which + # is contrary to our usage. Disable this feature. + alias -g '${1+"$@"}'='"$@"' + setopt NO_GLOB_SUBST +else $as_nop + case `(set -o) 2>/dev/null` in #( + *posix*) : + set -o posix ;; #( + *) : + ;; +esac +fi + + + +# Reset variables that may have inherited troublesome values from +# the environment. + +# IFS needs to be set, to space, tab, and newline, in precisely that order. +# (If _AS_PATH_WALK were called with IFS unset, it would have the +# side effect of setting IFS to empty, thus disabling word splitting.) +# Quoting is to prevent editors from complaining about space-tab. +as_nl=' +' +export as_nl +IFS=" "" $as_nl" + +PS1='$ ' +PS2='> ' +PS4='+ ' + +# Ensure predictable behavior from utilities with locale-dependent output. +LC_ALL=C +export LC_ALL +LANGUAGE=C +export LANGUAGE + +# We cannot yet rely on "unset" to work, but we need these variables +# to be unset--not just set to an empty or harmless value--now, to +# avoid bugs in old shells (e.g. pre-3.0 UWIN ksh). This construct +# also avoids known problems related to "unset" and subshell syntax +# in other old shells (e.g. bash 2.01 and pdksh 5.2.14). +for as_var in BASH_ENV ENV MAIL MAILPATH CDPATH +do eval test \${$as_var+y} \ + && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : +done + +# Ensure that fds 0, 1, and 2 are open. +if (exec 3>&0) 2>/dev/null; then :; else exec 0&1) 2>/dev/null; then :; else exec 1>/dev/null; fi +if (exec 3>&2) ; then :; else exec 2>/dev/null; fi + +# The user is always right. +if ${PATH_SEPARATOR+false} :; then + PATH_SEPARATOR=: + (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { + (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || + PATH_SEPARATOR=';' + } +fi + + +# Find who we are. Look in the path if we contain no directory separator. +as_myself= +case $0 in #(( + *[\\/]* ) as_myself=$0 ;; + *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + test -r "$as_dir$0" && as_myself=$as_dir$0 && break + done +IFS=$as_save_IFS + + ;; +esac +# We did not find ourselves, most probably we were run as `sh COMMAND' +# in which case we are not to be found in the path. +if test "x$as_myself" = x; then + as_myself=$0 +fi +if test ! -f "$as_myself"; then + printf "%s\n" "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 + exit 1 +fi + + + +# as_fn_error STATUS ERROR [LINENO LOG_FD] +# ---------------------------------------- +# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are +# provided, also output the error to LOG_FD, referencing LINENO. Then exit the +# script with STATUS, using 1 if that was 0. +as_fn_error () +{ + as_status=$1; test $as_status -eq 0 && as_status=1 + if test "$4"; then + as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 + fi + printf "%s\n" "$as_me: error: $2" >&2 + as_fn_exit $as_status +} # as_fn_error + + + +# as_fn_set_status STATUS +# ----------------------- +# Set $? to STATUS, without forking. +as_fn_set_status () +{ + return $1 +} # as_fn_set_status + +# as_fn_exit STATUS +# ----------------- +# Exit the shell with STATUS, even in a "trap 0" or "set -e" context. +as_fn_exit () +{ + set +e + as_fn_set_status $1 + exit $1 +} # as_fn_exit + +# as_fn_unset VAR +# --------------- +# Portably unset VAR. +as_fn_unset () +{ + { eval $1=; unset $1;} +} +as_unset=as_fn_unset + +# as_fn_append VAR VALUE +# ---------------------- +# Append the text in VALUE to the end of the definition contained in VAR. Take +# advantage of any shell optimizations that allow amortized linear growth over +# repeated appends, instead of the typical quadratic growth present in naive +# implementations. +if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null +then : + eval 'as_fn_append () + { + eval $1+=\$2 + }' +else $as_nop + as_fn_append () + { + eval $1=\$$1\$2 + } +fi # as_fn_append + +# as_fn_arith ARG... +# ------------------ +# Perform arithmetic evaluation on the ARGs, and store the result in the +# global $as_val. Take advantage of shells that can avoid forks. The arguments +# must be portable across $(()) and expr. +if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null +then : + eval 'as_fn_arith () + { + as_val=$(( $* )) + }' +else $as_nop + as_fn_arith () + { + as_val=`expr "$@" || test $? -eq 1` + } +fi # as_fn_arith + + +if expr a : '\(a\)' >/dev/null 2>&1 && + test "X`expr 00001 : '.*\(...\)'`" = X001; then + as_expr=expr +else + as_expr=false +fi + +if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then + as_basename=basename +else + as_basename=false +fi + +if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then + as_dirname=dirname +else + as_dirname=false +fi + +as_me=`$as_basename -- "$0" || +$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ + X"$0" : 'X\(//\)$' \| \ + X"$0" : 'X\(/\)' \| . 2>/dev/null || +printf "%s\n" X/"$0" | + sed '/^.*\/\([^/][^/]*\)\/*$/{ + s//\1/ + q + } + /^X\/\(\/\/\)$/{ + s//\1/ + q + } + /^X\/\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + +# Avoid depending upon Character Ranges. +as_cr_letters='abcdefghijklmnopqrstuvwxyz' +as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' +as_cr_Letters=$as_cr_letters$as_cr_LETTERS +as_cr_digits='0123456789' +as_cr_alnum=$as_cr_Letters$as_cr_digits + + +# Determine whether it's possible to make 'echo' print without a newline. +# These variables are no longer used directly by Autoconf, but are AC_SUBSTed +# for compatibility with existing Makefiles. +ECHO_C= ECHO_N= ECHO_T= +case `echo -n x` in #((((( +-n*) + case `echo 'xy\c'` in + *c*) ECHO_T=' ';; # ECHO_T is single tab character. + xy) ECHO_C='\c';; + *) echo `echo ksh88 bug on AIX 6.1` > /dev/null + ECHO_T=' ';; + esac;; +*) + ECHO_N='-n';; +esac + +# For backward compatibility with old third-party macros, we provide +# the shell variables $as_echo and $as_echo_n. New code should use +# AS_ECHO(["message"]) and AS_ECHO_N(["message"]), respectively. +as_echo='printf %s\n' +as_echo_n='printf %s' + +rm -f conf$$ conf$$.exe conf$$.file +if test -d conf$$.dir; then + rm -f conf$$.dir/conf$$.file +else + rm -f conf$$.dir + mkdir conf$$.dir 2>/dev/null +fi +if (echo >conf$$.file) 2>/dev/null; then + if ln -s conf$$.file conf$$ 2>/dev/null; then + as_ln_s='ln -s' + # ... but there are two gotchas: + # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. + # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. + # In both cases, we have to default to `cp -pR'. + ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || + as_ln_s='cp -pR' + elif ln conf$$.file conf$$ 2>/dev/null; then + as_ln_s=ln + else + as_ln_s='cp -pR' + fi +else + as_ln_s='cp -pR' +fi +rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file +rmdir conf$$.dir 2>/dev/null + + +# as_fn_mkdir_p +# ------------- +# Create "$as_dir" as a directory, including parents if necessary. +as_fn_mkdir_p () +{ + + case $as_dir in #( + -*) as_dir=./$as_dir;; + esac + test -d "$as_dir" || eval $as_mkdir_p || { + as_dirs= + while :; do + case $as_dir in #( + *\'*) as_qdir=`printf "%s\n" "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( + *) as_qdir=$as_dir;; + esac + as_dirs="'$as_qdir' $as_dirs" + as_dir=`$as_dirname -- "$as_dir" || +$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$as_dir" : 'X\(//\)[^/]' \| \ + X"$as_dir" : 'X\(//\)$' \| \ + X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || +printf "%s\n" X"$as_dir" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + test -d "$as_dir" && break + done + test -z "$as_dirs" || eval "mkdir $as_dirs" + } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" + + +} # as_fn_mkdir_p +if mkdir -p . 2>/dev/null; then + as_mkdir_p='mkdir -p "$as_dir"' +else + test -d ./-p && rmdir ./-p + as_mkdir_p=false +fi + + +# as_fn_executable_p FILE +# ----------------------- +# Test if FILE is an executable regular file. +as_fn_executable_p () +{ + test -f "$1" && test -x "$1" +} # as_fn_executable_p +as_test_x='test -x' +as_executable_p=as_fn_executable_p + +# Sed expression to map a string onto a valid CPP name. +as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" + +# Sed expression to map a string onto a valid variable name. +as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" + + +exec 6>&1 +## ----------------------------------- ## +## Main body of $CONFIG_STATUS script. ## +## ----------------------------------- ## +_ASEOF +test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1 + +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +# Save the log message, to keep $0 and so on meaningful, and to +# report actual input values of CONFIG_FILES etc. instead of their +# values after options handling. +ac_log=" +This file was extended by nix-perl $as_me 2.14.0, which was +generated by GNU Autoconf 2.71. Invocation command line was + + CONFIG_FILES = $CONFIG_FILES + CONFIG_HEADERS = $CONFIG_HEADERS + CONFIG_LINKS = $CONFIG_LINKS + CONFIG_COMMANDS = $CONFIG_COMMANDS + $ $0 $@ + +on `(hostname || uname -n) 2>/dev/null | sed 1q` +" + +_ACEOF + +case $ac_config_files in *" +"*) set x $ac_config_files; shift; ac_config_files=$*;; +esac + + + +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +# Files that config.status was made for. +config_files="$ac_config_files" + +_ACEOF + +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +ac_cs_usage="\ +\`$as_me' instantiates files and other configuration actions +from templates according to the current configuration. Unless the files +and actions are specified as TAGs, all are instantiated by default. + +Usage: $0 [OPTION]... [TAG]... + + -h, --help print this help, then exit + -V, --version print version number and configuration settings, then exit + --config print configuration, then exit + -q, --quiet, --silent + do not print progress messages + -d, --debug don't remove temporary files + --recheck update $as_me by reconfiguring in the same conditions + --file=FILE[:TEMPLATE] + instantiate the configuration file FILE + +Configuration files: +$config_files + +Report bugs to the package provider." + +_ACEOF +ac_cs_config=`printf "%s\n" "$ac_configure_args" | sed "$ac_safe_unquote"` +ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\''/g"` +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +ac_cs_config='$ac_cs_config_escaped' +ac_cs_version="\\ +nix-perl config.status 2.14.0 +configured by $0, generated by GNU Autoconf 2.71, + with options \\"\$ac_cs_config\\" + +Copyright (C) 2021 Free Software Foundation, Inc. +This config.status script is free software; the Free Software Foundation +gives unlimited permission to copy, distribute and modify it." + +ac_pwd='$ac_pwd' +srcdir='$srcdir' +test -n "\$AWK" || AWK=awk +_ACEOF + +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +# The default lists apply if the user does not specify any file. +ac_need_defaults=: +while test $# != 0 +do + case $1 in + --*=?*) + ac_option=`expr "X$1" : 'X\([^=]*\)='` + ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'` + ac_shift=: + ;; + --*=) + ac_option=`expr "X$1" : 'X\([^=]*\)='` + ac_optarg= + ac_shift=: + ;; + *) + ac_option=$1 + ac_optarg=$2 + ac_shift=shift + ;; + esac + + case $ac_option in + # Handling of the options. + -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) + ac_cs_recheck=: ;; + --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) + printf "%s\n" "$ac_cs_version"; exit ;; + --config | --confi | --conf | --con | --co | --c ) + printf "%s\n" "$ac_cs_config"; exit ;; + --debug | --debu | --deb | --de | --d | -d ) + debug=: ;; + --file | --fil | --fi | --f ) + $ac_shift + case $ac_optarg in + *\'*) ac_optarg=`printf "%s\n" "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; + '') as_fn_error $? "missing file argument" ;; + esac + as_fn_append CONFIG_FILES " '$ac_optarg'" + ac_need_defaults=false;; + --he | --h | --help | --hel | -h ) + printf "%s\n" "$ac_cs_usage"; exit ;; + -q | -quiet | --quiet | --quie | --qui | --qu | --q \ + | -silent | --silent | --silen | --sile | --sil | --si | --s) + ac_cs_silent=: ;; + + # This is an error. + -*) as_fn_error $? "unrecognized option: \`$1' +Try \`$0 --help' for more information." ;; + + *) as_fn_append ac_config_targets " $1" + ac_need_defaults=false ;; + + esac + shift +done + +ac_configure_extra_args= + +if $ac_cs_silent; then + exec 6>/dev/null + ac_configure_extra_args="$ac_configure_extra_args --silent" +fi + +_ACEOF +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +if \$ac_cs_recheck; then + set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion + shift + \printf "%s\n" "running CONFIG_SHELL=$SHELL \$*" >&6 + CONFIG_SHELL='$SHELL' + export CONFIG_SHELL + exec "\$@" +fi + +_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +exec 5>>config.log +{ + echo + sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX +## Running $as_me. ## +_ASBOX + printf "%s\n" "$ac_log" +} >&5 + +_ACEOF +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +_ACEOF + +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 + +# Handling of arguments. +for ac_config_target in $ac_config_targets +do + case $ac_config_target in + + *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; + esac +done + + +# If the user did not use the arguments to specify the items to instantiate, +# then the envvar interface is used. Set only those that are not. +# We use the long form for the default assignment because of an extremely +# bizarre bug on SunOS 4.1.3. +if $ac_need_defaults; then + test ${CONFIG_FILES+y} || CONFIG_FILES=$config_files +fi + +# Have a temporary directory for convenience. Make it in the build tree +# simply because there is no reason against having it here, and in addition, +# creating and moving files from /tmp can sometimes cause problems. +# Hook for its removal unless debugging. +# Note that there is a small window in which the directory will not be cleaned: +# after its creation but before its name has been assigned to `$tmp'. +$debug || +{ + tmp= ac_tmp= + trap 'exit_status=$? + : "${ac_tmp:=$tmp}" + { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status +' 0 + trap 'as_fn_exit 1' 1 2 13 15 +} +# Create a (secure) tmp directory for tmp files. + +{ + tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` && + test -d "$tmp" +} || +{ + tmp=./conf$$-$RANDOM + (umask 077 && mkdir "$tmp") +} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5 +ac_tmp=$tmp + +# Set up the scripts for CONFIG_FILES section. +# No need to generate them if there are no CONFIG_FILES. +# This happens for instance with `./config.status config.h'. +if test -n "$CONFIG_FILES"; then + + +ac_cr=`echo X | tr X '\015'` +# On cygwin, bash can eat \r inside `` if the user requested igncr. +# But we know of no other shell where ac_cr would be empty at this +# point, so we can use a bashism as a fallback. +if test "x$ac_cr" = x; then + eval ac_cr=\$\'\\r\' +fi +ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' /dev/null` +if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then + ac_cs_awk_cr='\\r' +else + ac_cs_awk_cr=$ac_cr +fi + +echo 'BEGIN {' >"$ac_tmp/subs1.awk" && +_ACEOF + + +{ + echo "cat >conf$$subs.awk <<_ACEOF" && + echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' && + echo "_ACEOF" +} >conf$$subs.sh || + as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 +ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'` +ac_delim='%!_!# ' +for ac_last_try in false false false false false :; do + . ./conf$$subs.sh || + as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 + + ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` + if test $ac_delim_n = $ac_delim_num; then + break + elif $ac_last_try; then + as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 + else + ac_delim="$ac_delim!$ac_delim _$ac_delim!! " + fi +done +rm -f conf$$subs.sh + +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK && +_ACEOF +sed -n ' +h +s/^/S["/; s/!.*/"]=/ +p +g +s/^[^!]*!// +:repl +t repl +s/'"$ac_delim"'$// +t delim +:nl +h +s/\(.\{148\}\)..*/\1/ +t more1 +s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/ +p +n +b repl +:more1 +s/["\\]/\\&/g; s/^/"/; s/$/"\\/ +p +g +s/.\{148\}// +t nl +:delim +h +s/\(.\{148\}\)..*/\1/ +t more2 +s/["\\]/\\&/g; s/^/"/; s/$/"/ +p +b +:more2 +s/["\\]/\\&/g; s/^/"/; s/$/"\\/ +p +g +s/.\{148\}// +t delim +' >$CONFIG_STATUS || ac_write_fail=1 +rm -f conf$$subs.awk +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +_ACAWK +cat >>"\$ac_tmp/subs1.awk" <<_ACAWK && + for (key in S) S_is_set[key] = 1 + FS = "" + +} +{ + line = $ 0 + nfields = split(line, field, "@") + substed = 0 + len = length(field[1]) + for (i = 2; i < nfields; i++) { + key = field[i] + keylen = length(key) + if (S_is_set[key]) { + value = S[key] + line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3) + len += length(value) + length(field[++i]) + substed = 1 + } else + len += 1 + keylen + } + + print line +} + +_ACAWK +_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then + sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g" +else + cat +fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \ + || as_fn_error $? "could not setup config files machinery" "$LINENO" 5 +_ACEOF + +# VPATH may cause trouble with some makes, so we remove sole $(srcdir), +# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and +# trailing colons and then remove the whole line if VPATH becomes empty +# (actually we leave an empty line to preserve line numbers). +if test "x$srcdir" = x.; then + ac_vpsub='/^[ ]*VPATH[ ]*=[ ]*/{ +h +s/// +s/^/:/ +s/[ ]*$/:/ +s/:\$(srcdir):/:/g +s/:\${srcdir}:/:/g +s/:@srcdir@:/:/g +s/^:*// +s/:*$// +x +s/\(=[ ]*\).*/\1/ +G +s/\n// +s/^[^=]*=[ ]*$// +}' +fi + +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +fi # test -n "$CONFIG_FILES" + + +eval set X " :F $CONFIG_FILES " +shift +for ac_tag +do + case $ac_tag in + :[FHLC]) ac_mode=$ac_tag; continue;; + esac + case $ac_mode$ac_tag in + :[FHL]*:*);; + :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;; + :[FH]-) ac_tag=-:-;; + :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; + esac + ac_save_IFS=$IFS + IFS=: + set x $ac_tag + IFS=$ac_save_IFS + shift + ac_file=$1 + shift + + case $ac_mode in + :L) ac_source=$1;; + :[FH]) + ac_file_inputs= + for ac_f + do + case $ac_f in + -) ac_f="$ac_tmp/stdin";; + *) # Look for the file first in the build tree, then in the source tree + # (if the path is not absolute). The absolute path cannot be DOS-style, + # because $ac_f cannot contain `:'. + test -f "$ac_f" || + case $ac_f in + [\\/$]*) false;; + *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; + esac || + as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;; + esac + case $ac_f in *\'*) ac_f=`printf "%s\n" "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac + as_fn_append ac_file_inputs " '$ac_f'" + done + + # Let's still pretend it is `configure' which instantiates (i.e., don't + # use $as_me), people would be surprised to read: + # /* config.h. Generated by config.status. */ + configure_input='Generated from '` + printf "%s\n" "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g' + `' by configure.' + if test x"$ac_file" != x-; then + configure_input="$ac_file. $configure_input" + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5 +printf "%s\n" "$as_me: creating $ac_file" >&6;} + fi + # Neutralize special characters interpreted by sed in replacement strings. + case $configure_input in #( + *\&* | *\|* | *\\* ) + ac_sed_conf_input=`printf "%s\n" "$configure_input" | + sed 's/[\\\\&|]/\\\\&/g'`;; #( + *) ac_sed_conf_input=$configure_input;; + esac + + case $ac_tag in + *:-:* | *:-) cat >"$ac_tmp/stdin" \ + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; + esac + ;; + esac + + ac_dir=`$as_dirname -- "$ac_file" || +$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$ac_file" : 'X\(//\)[^/]' \| \ + X"$ac_file" : 'X\(//\)$' \| \ + X"$ac_file" : 'X\(/\)' \| . 2>/dev/null || +printf "%s\n" X"$ac_file" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + as_dir="$ac_dir"; as_fn_mkdir_p + ac_builddir=. + +case "$ac_dir" in +.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; +*) + ac_dir_suffix=/`printf "%s\n" "$ac_dir" | sed 's|^\.[\\/]||'` + # A ".." for each directory in $ac_dir_suffix. + ac_top_builddir_sub=`printf "%s\n" "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` + case $ac_top_builddir_sub in + "") ac_top_builddir_sub=. ac_top_build_prefix= ;; + *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; + esac ;; +esac +ac_abs_top_builddir=$ac_pwd +ac_abs_builddir=$ac_pwd$ac_dir_suffix +# for backward compatibility: +ac_top_builddir=$ac_top_build_prefix + +case $srcdir in + .) # We are building in place. + ac_srcdir=. + ac_top_srcdir=$ac_top_builddir_sub + ac_abs_top_srcdir=$ac_pwd ;; + [\\/]* | ?:[\\/]* ) # Absolute name. + ac_srcdir=$srcdir$ac_dir_suffix; + ac_top_srcdir=$srcdir + ac_abs_top_srcdir=$srcdir ;; + *) # Relative name. + ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix + ac_top_srcdir=$ac_top_build_prefix$srcdir + ac_abs_top_srcdir=$ac_pwd/$srcdir ;; +esac +ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix + + + case $ac_mode in + :F) + # + # CONFIG_FILE + # + +_ACEOF + +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +# If the template does not know about datarootdir, expand it. +# FIXME: This hack should be removed a few years after 2.60. +ac_datarootdir_hack=; ac_datarootdir_seen= +ac_sed_dataroot=' +/datarootdir/ { + p + q +} +/@datadir@/p +/@docdir@/p +/@infodir@/p +/@localedir@/p +/@mandir@/p' +case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in +*datarootdir*) ac_datarootdir_seen=yes;; +*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*) + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 +printf "%s\n" "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} +_ACEOF +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 + ac_datarootdir_hack=' + s&@datadir@&$datadir&g + s&@docdir@&$docdir&g + s&@infodir@&$infodir&g + s&@localedir@&$localedir&g + s&@mandir@&$mandir&g + s&\\\${datarootdir}&$datarootdir&g' ;; +esac +_ACEOF + +# Neutralize VPATH when `$srcdir' = `.'. +# Shell code in configure.ac might set extrasub. +# FIXME: do we really want to maintain this feature? +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +ac_sed_extra="$ac_vpsub +$extrasub +_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +:t +/@[a-zA-Z_][a-zA-Z_0-9]*@/!b +s|@configure_input@|$ac_sed_conf_input|;t t +s&@top_builddir@&$ac_top_builddir_sub&;t t +s&@top_build_prefix@&$ac_top_build_prefix&;t t +s&@srcdir@&$ac_srcdir&;t t +s&@abs_srcdir@&$ac_abs_srcdir&;t t +s&@top_srcdir@&$ac_top_srcdir&;t t +s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t +s&@builddir@&$ac_builddir&;t t +s&@abs_builddir@&$ac_abs_builddir&;t t +s&@abs_top_builddir@&$ac_abs_top_builddir&;t t +$ac_datarootdir_hack +" +eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \ + >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5 + +test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && + { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } && + { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' \ + "$ac_tmp/out"`; test -z "$ac_out"; } && + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' +which seems to be undefined. Please make sure it is defined" >&5 +printf "%s\n" "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' +which seems to be undefined. Please make sure it is defined" >&2;} + + rm -f "$ac_tmp/stdin" + case $ac_file in + -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";; + *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";; + esac \ + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 + ;; + + + + esac + +done # for ac_tag + + +as_fn_exit 0 +_ACEOF +ac_clean_files=$ac_clean_files_save + +test $ac_write_fail = 0 || + as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5 + + +# configure is writing to config.log, and then calls config.status. +# config.status does its own redirection, appending to config.log. +# Unfortunately, on DOS this fails, as config.log is still kept open +# by configure, so config.status won't be able to write to it; its +# output is simply discarded. So we exec the FD to /dev/null, +# effectively closing config.log, so it can be properly (re)opened and +# appended to by config.status. When coming back to configure, we +# need to make the FD available again. +if test "$no_create" != yes; then + ac_cs_success=: + ac_config_status_args= + test "$silent" = yes && + ac_config_status_args="$ac_config_status_args --quiet" + exec 5>/dev/null + $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false + exec 5>>config.log + # Use ||, not &&, to avoid exiting from the if with $? = 1, which + # would make configure fail if this is the last instruction. + $ac_cs_success || as_fn_exit 1 +fi +if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 +printf "%s\n" "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} +fi + + diff --git a/perl/lib/Nix/Store.xs b/perl/lib/Nix/Store.xs index 7b7fb2fe6ab..9207c1d14aa 100644 --- a/perl/lib/Nix/Store.xs +++ b/perl/lib/Nix/Store.xs @@ -11,7 +11,7 @@ #include "nix/derivations.hh" #include "nix/globals.hh" #include "nix/store-api.hh" -#include "nix/util.hh" +#include "nix/util/util.hh" #include "nix/crypto.hh" #include diff --git a/src/build-remote/build-remote.cc b/src/build-remote/build-remote.cc index 6b81ecc493d..a196f1eab75 100644 --- a/src/build-remote/build-remote.cc +++ b/src/build-remote/build-remote.cc @@ -13,13 +13,13 @@ #include "shared.hh" #include "pathlocks.hh" #include "globals.hh" -#include "serialise.hh" +#include "nix/util/serialise.hh" #include "build-result.hh" #include "store-api.hh" #include "derivations.hh" #include "local-store.hh" #include "legacy.hh" -#include "experimental-features.hh" +#include "nix/util/experimental-features.hh" using namespace nix; using std::cin; diff --git a/src/libcmd/command.hh b/src/libcmd/command.hh index d16bdbc4bd4..90cc8333a82 100644 --- a/src/libcmd/command.hh +++ b/src/libcmd/command.hh @@ -1,7 +1,7 @@ #pragma once #include "installables.hh" -#include "args.hh" +#include "nix/util/args.hh" #include "common-eval-args.hh" #include "path.hh" #include "flake/lockfile.hh" diff --git a/src/libcmd/common-eval-args.cc b/src/libcmd/common-eval-args.cc index 908127b4d40..dda2d68c41d 100644 --- a/src/libcmd/common-eval-args.cc +++ b/src/libcmd/common-eval-args.cc @@ -1,7 +1,7 @@ #include "common-eval-args.hh" #include "shared.hh" #include "filetransfer.hh" -#include "util.hh" +#include "nix/util/util.hh" #include "eval.hh" #include "fetchers.hh" #include "registry.hh" diff --git a/src/libcmd/common-eval-args.hh b/src/libcmd/common-eval-args.hh index 1ec8006138b..62873677dad 100644 --- a/src/libcmd/common-eval-args.hh +++ b/src/libcmd/common-eval-args.hh @@ -1,6 +1,6 @@ #pragma once -#include "args.hh" +#include "nix/util/args.hh" namespace nix { diff --git a/src/libcmd/installables.cc b/src/libcmd/installables.cc index 85edc28cf61..fc512f9c27c 100644 --- a/src/libcmd/installables.cc +++ b/src/libcmd/installables.cc @@ -2,7 +2,7 @@ #include "installables.hh" #include "installable-derived-path.hh" #include "outputs-spec.hh" -#include "util.hh" +#include "nix/util/util.hh" #include "command.hh" #include "attr-path.hh" #include "common-eval-args.hh" @@ -14,7 +14,7 @@ #include "shared.hh" #include "flake/flake.hh" #include "eval-cache.hh" -#include "url.hh" +#include "nix/util/url.hh" #include "registry.hh" #include "build-result.hh" diff --git a/src/libcmd/installables.hh b/src/libcmd/installables.hh index da6a3addda4..7619d043628 100644 --- a/src/libcmd/installables.hh +++ b/src/libcmd/installables.hh @@ -1,6 +1,6 @@ #pragma once -#include "util.hh" +#include "nix/util/util.hh" #include "path.hh" #include "outputs-spec.hh" #include "derived-path.hh" diff --git a/src/libcmd/local.mk b/src/libcmd/local.mk index 152bc388dac..6ab221659ba 100644 --- a/src/libcmd/local.mk +++ b/src/libcmd/local.mk @@ -6,7 +6,13 @@ libcmd_DIR := $(d) libcmd_SOURCES := $(wildcard $(d)/*.cc) -libcmd_CXXFLAGS += -I src/libutil -I src/libstore -I src/libexpr -I src/libmain -I src/libfetchers -I src/nix +libcmd_CXXFLAGS += \ + -Isrc/libutil/include \ + -Isrc/libstore \ + -Isrc/libexpr \ + -Isrc/libmain \ + -Isrc/libfetchers \ + -Isrc/nix libcmd_LDFLAGS = $(EDITLINE_LIBS) $(LOWDOWN_LIBS) -pthread diff --git a/src/libcmd/markdown.cc b/src/libcmd/markdown.cc index 668a077632c..0900b128e8d 100644 --- a/src/libcmd/markdown.cc +++ b/src/libcmd/markdown.cc @@ -1,6 +1,6 @@ #include "markdown.hh" -#include "util.hh" -#include "finally.hh" +#include "nix/util/util.hh" +#include "nix/util/finally.hh" #include #include diff --git a/src/libcmd/markdown.hh b/src/libcmd/markdown.hh index 78320fcf554..c1ccde8b2b8 100644 --- a/src/libcmd/markdown.hh +++ b/src/libcmd/markdown.hh @@ -1,4 +1,4 @@ -#include "types.hh" +#include "nix/util/types.hh" namespace nix { diff --git a/src/libcmd/repl.cc b/src/libcmd/repl.cc index 4158439b652..ba86513d239 100644 --- a/src/libcmd/repl.cc +++ b/src/libcmd/repl.cc @@ -19,7 +19,7 @@ extern "C" { } #endif -#include "ansicolor.hh" +#include "nix/util/ansicolor.hh" #include "shared.hh" #include "eval.hh" #include "eval-cache.hh" @@ -32,7 +32,7 @@ extern "C" { #include "derivations.hh" #include "globals.hh" #include "command.hh" -#include "finally.hh" +#include "nix/util/finally.hh" #include "markdown.hh" #include "local-fs-store.hh" #include "progress-bar.hh" diff --git a/src/libexpr/attr-path.cc b/src/libexpr/attr-path.cc index 7c070509137..da45c7118f1 100644 --- a/src/libexpr/attr-path.cc +++ b/src/libexpr/attr-path.cc @@ -1,6 +1,6 @@ #include "attr-path.hh" #include "eval-inline.hh" -#include "util.hh" +#include "nix/util/util.hh" namespace nix { diff --git a/src/libexpr/eval-cache.hh b/src/libexpr/eval-cache.hh index c93e55b93d0..fe71cac9ce3 100644 --- a/src/libexpr/eval-cache.hh +++ b/src/libexpr/eval-cache.hh @@ -1,7 +1,7 @@ #pragma once -#include "sync.hh" -#include "hash.hh" +#include "nix/util/sync.hh" +#include "nix/util/hash.hh" #include "eval.hh" #include diff --git a/src/libexpr/eval.cc b/src/libexpr/eval.cc index 3e37c7f6076..8bc83a5bcd6 100644 --- a/src/libexpr/eval.cc +++ b/src/libexpr/eval.cc @@ -1,7 +1,7 @@ #include "eval.hh" -#include "hash.hh" -#include "types.hh" -#include "util.hh" +#include "nix/util/hash.hh" +#include "nix/util/types.hh" +#include "nix/util/util.hh" #include "store-api.hh" #include "derivations.hh" #include "globals.hh" diff --git a/src/libexpr/eval.hh b/src/libexpr/eval.hh index 2340ef67bd9..d5767e3bcf8 100644 --- a/src/libexpr/eval.hh +++ b/src/libexpr/eval.hh @@ -1,12 +1,12 @@ #pragma once #include "attr-set.hh" -#include "types.hh" +#include "nix/util/types.hh" #include "value.hh" #include "nixexpr.hh" #include "symbol-table.hh" -#include "config.hh" -#include "experimental-features.hh" +#include "nix/util/config.hh" +#include "nix/util/experimental-features.hh" #include #include diff --git a/src/libexpr/flake/flake.cc b/src/libexpr/flake/flake.cc index 336eb274d98..5d1660efad6 100644 --- a/src/libexpr/flake/flake.cc +++ b/src/libexpr/flake/flake.cc @@ -5,7 +5,7 @@ #include "eval-inline.hh" #include "store-api.hh" #include "fetchers.hh" -#include "finally.hh" +#include "nix/util/finally.hh" #include "fetch-settings.hh" namespace nix { diff --git a/src/libexpr/flake/flake.hh b/src/libexpr/flake/flake.hh index 10301d8aae4..d52b7351c4f 100644 --- a/src/libexpr/flake/flake.hh +++ b/src/libexpr/flake/flake.hh @@ -1,6 +1,6 @@ #pragma once -#include "types.hh" +#include "nix/util/types.hh" #include "flakeref.hh" #include "lockfile.hh" #include "value.hh" diff --git a/src/libexpr/flake/flakeref.cc b/src/libexpr/flake/flakeref.cc index 08adbe0c99d..71dbaa4b42e 100644 --- a/src/libexpr/flake/flakeref.cc +++ b/src/libexpr/flake/flakeref.cc @@ -1,7 +1,7 @@ #include "flakeref.hh" #include "store-api.hh" -#include "url.hh" -#include "url-parts.hh" +#include "nix/util/url.hh" +#include "nix/util/url-parts.hh" #include "fetchers.hh" #include "registry.hh" diff --git a/src/libexpr/flake/flakeref.hh b/src/libexpr/flake/flakeref.hh index c4142fc20ce..c8c0f86f1cc 100644 --- a/src/libexpr/flake/flakeref.hh +++ b/src/libexpr/flake/flakeref.hh @@ -1,7 +1,7 @@ #pragma once -#include "types.hh" -#include "hash.hh" +#include "nix/util/types.hh" +#include "nix/util/hash.hh" #include "fetchers.hh" #include "outputs-spec.hh" diff --git a/src/libexpr/flake/lockfile.cc b/src/libexpr/flake/lockfile.cc index a74e68c9c48..8d5d48d8726 100644 --- a/src/libexpr/flake/lockfile.cc +++ b/src/libexpr/flake/lockfile.cc @@ -1,6 +1,6 @@ #include "lockfile.hh" #include "store-api.hh" -#include "url-parts.hh" +#include "nix/util/url-parts.hh" #include diff --git a/src/libexpr/function-trace.cc b/src/libexpr/function-trace.cc index c6057b3842f..28180d3bee7 100644 --- a/src/libexpr/function-trace.cc +++ b/src/libexpr/function-trace.cc @@ -1,5 +1,5 @@ #include "function-trace.hh" -#include "logging.hh" +#include "nix/util/logging.hh" namespace nix { diff --git a/src/libexpr/get-drvs.cc b/src/libexpr/get-drvs.cc index 1602fbffb62..3f13a06b9da 100644 --- a/src/libexpr/get-drvs.cc +++ b/src/libexpr/get-drvs.cc @@ -1,5 +1,5 @@ #include "get-drvs.hh" -#include "util.hh" +#include "nix/util/util.hh" #include "eval-inline.hh" #include "derivations.hh" #include "store-api.hh" diff --git a/src/libexpr/local.mk b/src/libexpr/local.mk index 2171e769b4f..88f6f95e356 100644 --- a/src/libexpr/local.mk +++ b/src/libexpr/local.mk @@ -12,7 +12,12 @@ libexpr_SOURCES := \ $(d)/lexer-tab.cc \ $(d)/parser-tab.cc -libexpr_CXXFLAGS += -I src/libutil -I src/libstore -I src/libfetchers -I src/libmain -I src/libexpr +libexpr_CXXFLAGS += \ + -Isrc/libexpr \ + -Isrc/libfetchers \ + -Isrc/libmain \ + -Isrc/libstore \ + -Isrc/libutil/include libexpr_LIBS = libutil libstore libfetchers diff --git a/src/libexpr/nixexpr.cc b/src/libexpr/nixexpr.cc index eb6f062b427..17c0d463312 100644 --- a/src/libexpr/nixexpr.cc +++ b/src/libexpr/nixexpr.cc @@ -2,7 +2,7 @@ #include "derivations.hh" #include "eval.hh" #include "symbol-table.hh" -#include "util.hh" +#include "nix/util/util.hh" #include diff --git a/src/libexpr/nixexpr.hh b/src/libexpr/nixexpr.hh index ffe67f97dbb..ffb5db2922c 100644 --- a/src/libexpr/nixexpr.hh +++ b/src/libexpr/nixexpr.hh @@ -5,8 +5,8 @@ #include "value.hh" #include "symbol-table.hh" -#include "error.hh" -#include "chunked-vector.hh" +#include "nix/util/error.hh" +#include "nix/util/chunked-vector.hh" namespace nix { diff --git a/src/libexpr/parser.y b/src/libexpr/parser.y index ffb364a9009..9b26701c06d 100644 --- a/src/libexpr/parser.y +++ b/src/libexpr/parser.y @@ -18,7 +18,7 @@ #include -#include "util.hh" +#include "nix/util/util.hh" #include "nixexpr.hh" #include "eval.hh" diff --git a/src/libexpr/primops.cc b/src/libexpr/primops.cc index c6f41c4ca2d..b9dd7fd9fe7 100644 --- a/src/libexpr/primops.cc +++ b/src/libexpr/primops.cc @@ -1,4 +1,4 @@ -#include "archive.hh" +#include "nix/util/archive.hh" #include "derivations.hh" #include "eval-inline.hh" #include "eval.hh" @@ -7,7 +7,7 @@ #include "names.hh" #include "references.hh" #include "store-api.hh" -#include "util.hh" +#include "nix/util/util.hh" #include "value-to-json.hh" #include "value-to-xml.hh" #include "primops.hh" diff --git a/src/libexpr/primops/fetchClosure.cc b/src/libexpr/primops/fetchClosure.cc index 0dfa97fa33a..1f70c3ab872 100644 --- a/src/libexpr/primops/fetchClosure.cc +++ b/src/libexpr/primops/fetchClosure.cc @@ -1,7 +1,7 @@ #include "primops.hh" #include "store-api.hh" #include "make-content-addressed.hh" -#include "url.hh" +#include "nix/util/url.hh" namespace nix { diff --git a/src/libexpr/primops/fetchMercurial.cc b/src/libexpr/primops/fetchMercurial.cc index c41bd60b662..8702b25aaa1 100644 --- a/src/libexpr/primops/fetchMercurial.cc +++ b/src/libexpr/primops/fetchMercurial.cc @@ -2,8 +2,8 @@ #include "eval-inline.hh" #include "store-api.hh" #include "fetchers.hh" -#include "url.hh" -#include "url-parts.hh" +#include "nix/util/url.hh" +#include "nix/util/url-parts.hh" namespace nix { diff --git a/src/libexpr/symbol-table.hh b/src/libexpr/symbol-table.hh index 288c15602fe..dac85765334 100644 --- a/src/libexpr/symbol-table.hh +++ b/src/libexpr/symbol-table.hh @@ -4,8 +4,8 @@ #include #include -#include "types.hh" -#include "chunked-vector.hh" +#include "nix/util/types.hh" +#include "nix/util/chunked-vector.hh" namespace nix { diff --git a/src/libexpr/tests/local.mk b/src/libexpr/tests/local.mk index 3e5504f716a..856be611d4a 100644 --- a/src/libexpr/tests/local.mk +++ b/src/libexpr/tests/local.mk @@ -12,7 +12,11 @@ libexpr-tests_SOURCES := \ $(wildcard $(d)/*.cc) \ $(wildcard $(d)/value/*.cc) -libexpr-tests_CXXFLAGS += -I src/libexpr -I src/libutil -I src/libstore -I src/libexpr/tests +libexpr-tests_CXXFLAGS += \ + -Isrc/libexpr \ + -Isrc/libexpr/tests \ + -Isrc/libstore \ + -Isrc/libutil/include libexpr-tests_LIBS = libstore-tests libutils-tests libexpr libutil libstore libfetchers diff --git a/src/libexpr/value-to-json.cc b/src/libexpr/value-to-json.cc index c35c876e383..672715c2dfb 100644 --- a/src/libexpr/value-to-json.cc +++ b/src/libexpr/value-to-json.cc @@ -1,6 +1,6 @@ #include "value-to-json.hh" #include "eval-inline.hh" -#include "util.hh" +#include "nix/util/util.hh" #include "store-api.hh" #include diff --git a/src/libexpr/value-to-xml.cc b/src/libexpr/value-to-xml.cc index 3f6222768f4..9cacf3b8bf0 100644 --- a/src/libexpr/value-to-xml.cc +++ b/src/libexpr/value-to-xml.cc @@ -1,7 +1,7 @@ #include "value-to-xml.hh" -#include "xml-writer.hh" +#include "nix/util/xml-writer.hh" #include "eval-inline.hh" -#include "util.hh" +#include "nix/util/util.hh" #include diff --git a/src/libexpr/value/context.hh b/src/libexpr/value/context.hh index 721563cbaef..e70ead2f3dc 100644 --- a/src/libexpr/value/context.hh +++ b/src/libexpr/value/context.hh @@ -1,7 +1,7 @@ #pragma once -#include "util.hh" -#include "comparator.hh" +#include "nix/util/util.hh" +#include "nix/util/comparator.hh" #include "path.hh" #include diff --git a/src/libfetchers/attrs.hh b/src/libfetchers/attrs.hh index e4103763382..d58d025b2c6 100644 --- a/src/libfetchers/attrs.hh +++ b/src/libfetchers/attrs.hh @@ -1,6 +1,6 @@ #pragma once -#include "types.hh" +#include "nix/util/types.hh" #include diff --git a/src/libfetchers/cache.cc b/src/libfetchers/cache.cc index 0c8ecac9d48..9a239bbaac7 100644 --- a/src/libfetchers/cache.cc +++ b/src/libfetchers/cache.cc @@ -1,6 +1,6 @@ #include "cache.hh" #include "sqlite.hh" -#include "sync.hh" +#include "nix/util/sync.hh" #include "store-api.hh" #include diff --git a/src/libfetchers/fetch-settings.hh b/src/libfetchers/fetch-settings.hh index f33cbdcfc98..fce8caaea11 100644 --- a/src/libfetchers/fetch-settings.hh +++ b/src/libfetchers/fetch-settings.hh @@ -1,8 +1,8 @@ #pragma once -#include "types.hh" -#include "config.hh" -#include "util.hh" +#include "nix/util/types.hh" +#include "nix/util/config.hh" +#include "nix/util/util.hh" #include #include diff --git a/src/libfetchers/fetchers.hh b/src/libfetchers/fetchers.hh index 17da37f4796..eb1d2a21992 100644 --- a/src/libfetchers/fetchers.hh +++ b/src/libfetchers/fetchers.hh @@ -1,10 +1,10 @@ #pragma once -#include "types.hh" -#include "hash.hh" +#include "nix/util/types.hh" +#include "nix/util/hash.hh" #include "path.hh" #include "attrs.hh" -#include "url.hh" +#include "nix/util/url.hh" #include diff --git a/src/libfetchers/git.cc b/src/libfetchers/git.cc index 309a143f559..9e077dfe47e 100644 --- a/src/libfetchers/git.cc +++ b/src/libfetchers/git.cc @@ -1,12 +1,12 @@ #include "fetchers.hh" #include "cache.hh" #include "globals.hh" -#include "tarfile.hh" +#include "nix/util/tarfile.hh" #include "store-api.hh" -#include "url-parts.hh" +#include "nix/util/url-parts.hh" #include "pathlocks.hh" -#include "util.hh" -#include "git.hh" +#include "nix/util/util.hh" +#include "nix/util/git.hh" #include "fetch-settings.hh" diff --git a/src/libfetchers/github.cc b/src/libfetchers/github.cc index 1ed09d30d30..c953cd76271 100644 --- a/src/libfetchers/github.cc +++ b/src/libfetchers/github.cc @@ -2,9 +2,9 @@ #include "cache.hh" #include "globals.hh" #include "store-api.hh" -#include "types.hh" -#include "url-parts.hh" -#include "git.hh" +#include "nix/util/types.hh" +#include "nix/util/url-parts.hh" +#include "nix/util/git.hh" #include "fetchers.hh" #include "fetch-settings.hh" diff --git a/src/libfetchers/indirect.cc b/src/libfetchers/indirect.cc index b99504a1600..5aeee11f0d9 100644 --- a/src/libfetchers/indirect.cc +++ b/src/libfetchers/indirect.cc @@ -1,5 +1,5 @@ #include "fetchers.hh" -#include "url-parts.hh" +#include "nix/util/url-parts.hh" namespace nix::fetchers { diff --git a/src/libfetchers/local.mk b/src/libfetchers/local.mk index 2e8869d83fa..64227e1c0a0 100644 --- a/src/libfetchers/local.mk +++ b/src/libfetchers/local.mk @@ -6,7 +6,9 @@ libfetchers_DIR := $(d) libfetchers_SOURCES := $(wildcard $(d)/*.cc) -libfetchers_CXXFLAGS += -I src/libutil -I src/libstore +libfetchers_CXXFLAGS += \ + -Isrc/libutil/include \ + -Isrc/libstore libfetchers_LDFLAGS += -pthread diff --git a/src/libfetchers/mercurial.cc b/src/libfetchers/mercurial.cc index 86e8f81f44f..091249e9968 100644 --- a/src/libfetchers/mercurial.cc +++ b/src/libfetchers/mercurial.cc @@ -1,9 +1,9 @@ #include "fetchers.hh" #include "cache.hh" #include "globals.hh" -#include "tarfile.hh" +#include "nix/util/tarfile.hh" #include "store-api.hh" -#include "url-parts.hh" +#include "nix/util/url-parts.hh" #include "fetch-settings.hh" diff --git a/src/libfetchers/path.cc b/src/libfetchers/path.cc index 61541e69dfb..162ffa76c1f 100644 --- a/src/libfetchers/path.cc +++ b/src/libfetchers/path.cc @@ -1,6 +1,6 @@ #include "fetchers.hh" #include "store-api.hh" -#include "archive.hh" +#include "nix/util/archive.hh" namespace nix::fetchers { diff --git a/src/libfetchers/registry.cc b/src/libfetchers/registry.cc index 43c03beec17..e0863cb5185 100644 --- a/src/libfetchers/registry.cc +++ b/src/libfetchers/registry.cc @@ -1,6 +1,6 @@ #include "registry.hh" #include "fetchers.hh" -#include "util.hh" +#include "nix/util/util.hh" #include "globals.hh" #include "store-api.hh" #include "local-fs-store.hh" diff --git a/src/libfetchers/registry.hh b/src/libfetchers/registry.hh index 260a2c46016..35baf204426 100644 --- a/src/libfetchers/registry.hh +++ b/src/libfetchers/registry.hh @@ -1,6 +1,6 @@ #pragma once -#include "types.hh" +#include "nix/util/types.hh" #include "fetchers.hh" namespace nix { class Store; } diff --git a/src/libfetchers/tarball.cc b/src/libfetchers/tarball.cc index e9686262afb..fa82c204634 100644 --- a/src/libfetchers/tarball.cc +++ b/src/libfetchers/tarball.cc @@ -3,10 +3,10 @@ #include "filetransfer.hh" #include "globals.hh" #include "store-api.hh" -#include "archive.hh" -#include "tarfile.hh" -#include "types.hh" -#include "split.hh" +#include "nix/util/archive.hh" +#include "nix/util/tarfile.hh" +#include "nix/util/types.hh" +#include "nix/util/split.hh" namespace nix::fetchers { diff --git a/src/libmain/common-args.hh b/src/libmain/common-args.hh index f180d83ceca..e9ab7ddad36 100644 --- a/src/libmain/common-args.hh +++ b/src/libmain/common-args.hh @@ -1,6 +1,6 @@ #pragma once -#include "args.hh" +#include "nix/util/args.hh" namespace nix { diff --git a/src/libmain/local.mk b/src/libmain/local.mk index 99da95e2797..1b145d84ccb 100644 --- a/src/libmain/local.mk +++ b/src/libmain/local.mk @@ -6,7 +6,9 @@ libmain_DIR := $(d) libmain_SOURCES := $(wildcard $(d)/*.cc) -libmain_CXXFLAGS += -I src/libutil -I src/libstore +libmain_CXXFLAGS += \ + -Isrc/libutil/include \ + -Isrc/libstore libmain_LDFLAGS += $(OPENSSL_LIBS) diff --git a/src/libmain/loggers.cc b/src/libmain/loggers.cc index cda5cb939ac..64d774e226e 100644 --- a/src/libmain/loggers.cc +++ b/src/libmain/loggers.cc @@ -1,6 +1,6 @@ #include "loggers.hh" #include "progress-bar.hh" -#include "util.hh" +#include "nix/util/util.hh" namespace nix { diff --git a/src/libmain/loggers.hh b/src/libmain/loggers.hh index f3c759193f5..7fdef608422 100644 --- a/src/libmain/loggers.hh +++ b/src/libmain/loggers.hh @@ -1,6 +1,6 @@ #pragma once -#include "types.hh" +#include "nix/util/types.hh" namespace nix { diff --git a/src/libmain/progress-bar.cc b/src/libmain/progress-bar.cc index e9205a5e5ba..d2ec191b650 100644 --- a/src/libmain/progress-bar.cc +++ b/src/libmain/progress-bar.cc @@ -1,6 +1,6 @@ #include "progress-bar.hh" -#include "util.hh" -#include "sync.hh" +#include "nix/util/util.hh" +#include "nix/util/sync.hh" #include "store-api.hh" #include "names.hh" diff --git a/src/libmain/progress-bar.hh b/src/libmain/progress-bar.hh index 3a76f8448b2..d76ddad7d12 100644 --- a/src/libmain/progress-bar.hh +++ b/src/libmain/progress-bar.hh @@ -1,6 +1,6 @@ #pragma once -#include "logging.hh" +#include "nix/util/logging.hh" namespace nix { diff --git a/src/libmain/shared.cc b/src/libmain/shared.cc index d4871a8e223..b890c971df8 100644 --- a/src/libmain/shared.cc +++ b/src/libmain/shared.cc @@ -2,7 +2,7 @@ #include "shared.hh" #include "store-api.hh" #include "gc-store.hh" -#include "util.hh" +#include "nix/util/util.hh" #include "loggers.hh" #include "progress-bar.hh" diff --git a/src/libmain/shared.hh b/src/libmain/shared.hh index 1715374a638..3e277777439 100644 --- a/src/libmain/shared.hh +++ b/src/libmain/shared.hh @@ -1,7 +1,7 @@ #pragma once -#include "util.hh" -#include "args.hh" +#include "nix/util/util.hh" +#include "nix/util/args.hh" #include "common-args.hh" #include "path.hh" #include "derived-path.hh" diff --git a/src/libmain/stack.cc b/src/libmain/stack.cc index 10f71c1dcad..511eabfe10c 100644 --- a/src/libmain/stack.cc +++ b/src/libmain/stack.cc @@ -1,4 +1,4 @@ -#include "error.hh" +#include "nix/util/error.hh" #include "shared.hh" #include diff --git a/src/libstore/binary-cache-store.cc b/src/libstore/binary-cache-store.cc index 751cf8c3088..d98121430f9 100644 --- a/src/libstore/binary-cache-store.cc +++ b/src/libstore/binary-cache-store.cc @@ -1,16 +1,16 @@ -#include "archive.hh" +#include "nix/util/archive.hh" #include "binary-cache-store.hh" -#include "compression.hh" +#include "nix/util/compression.hh" #include "derivations.hh" #include "fs-accessor.hh" #include "globals.hh" #include "nar-info.hh" -#include "sync.hh" +#include "nix/util/sync.hh" #include "remote-fs-accessor.hh" #include "nar-info-disk-cache.hh" #include "nar-accessor.hh" -#include "thread-pool.hh" -#include "callback.hh" +#include "nix/util/thread-pool.hh" +#include "nix/util/callback.hh" #include #include diff --git a/src/libstore/binary-cache-store.hh b/src/libstore/binary-cache-store.hh index abd92a83cfc..97034fdcec7 100644 --- a/src/libstore/binary-cache-store.hh +++ b/src/libstore/binary-cache-store.hh @@ -4,7 +4,7 @@ #include "store-api.hh" #include "log-store.hh" -#include "pool.hh" +#include "nix/util/pool.hh" #include diff --git a/src/libstore/build/derivation-goal.cc b/src/libstore/build/derivation-goal.cc index 2021d002386..572e22a535f 100644 --- a/src/libstore/build/derivation-goal.cc +++ b/src/libstore/build/derivation-goal.cc @@ -4,13 +4,13 @@ #include "builtins.hh" #include "builtins/buildenv.hh" #include "references.hh" -#include "finally.hh" -#include "util.hh" -#include "archive.hh" -#include "compression.hh" +#include "nix/util/finally.hh" +#include "nix/util/util.hh" +#include "nix/util/archive.hh" +#include "nix/util/compression.hh" #include "worker-protocol.hh" -#include "topo-sort.hh" -#include "callback.hh" +#include "nix/util/topo-sort.hh" +#include "nix/util/callback.hh" #include "local-store.hh" // TODO remove, along with remaining downcasts #include diff --git a/src/libstore/build/drv-output-substitution-goal.cc b/src/libstore/build/drv-output-substitution-goal.cc index b7f7b5ab129..eb193d404e3 100644 --- a/src/libstore/build/drv-output-substitution-goal.cc +++ b/src/libstore/build/drv-output-substitution-goal.cc @@ -1,8 +1,8 @@ #include "drv-output-substitution-goal.hh" -#include "finally.hh" +#include "nix/util/finally.hh" #include "worker.hh" #include "substitution-goal.hh" -#include "callback.hh" +#include "nix/util/callback.hh" namespace nix { diff --git a/src/libstore/build/goal.hh b/src/libstore/build/goal.hh index 35121c5d9e7..8395e8d9b0c 100644 --- a/src/libstore/build/goal.hh +++ b/src/libstore/build/goal.hh @@ -1,6 +1,6 @@ #pragma once -#include "types.hh" +#include "nix/util/types.hh" #include "store-api.hh" #include "build-result.hh" diff --git a/src/libstore/build/hook-instance.hh b/src/libstore/build/hook-instance.hh index 9e8cff12880..fcecafdaae7 100644 --- a/src/libstore/build/hook-instance.hh +++ b/src/libstore/build/hook-instance.hh @@ -1,7 +1,7 @@ #pragma once -#include "logging.hh" -#include "serialise.hh" +#include "nix/util/logging.hh" +#include "nix/util/serialise.hh" namespace nix { diff --git a/src/libstore/build/local-derivation-goal.cc b/src/libstore/build/local-derivation-goal.cc index 7b125f5d20a..4096da7d9c2 100644 --- a/src/libstore/build/local-derivation-goal.cc +++ b/src/libstore/build/local-derivation-goal.cc @@ -5,18 +5,18 @@ #include "builtins.hh" #include "builtins/buildenv.hh" #include "references.hh" -#include "finally.hh" -#include "util.hh" -#include "archive.hh" -#include "compression.hh" +#include "nix/util/finally.hh" +#include "nix/util/util.hh" +#include "nix/util/archive.hh" +#include "nix/util/compression.hh" #include "daemon.hh" #include "worker-protocol.hh" -#include "topo-sort.hh" -#include "callback.hh" -#include "json-utils.hh" -#include "cgroup.hh" +#include "nix/util/topo-sort.hh" +#include "nix/util/callback.hh" +#include "nix/util/json-utils.hh" +#include "nix/util/cgroup.hh" #include "personality.hh" -#include "namespaces.hh" +#include "nix/util/namespaces.hh" #include #include diff --git a/src/libstore/build/substitution-goal.cc b/src/libstore/build/substitution-goal.cc index 2af105b4d31..a902ee5a952 100644 --- a/src/libstore/build/substitution-goal.cc +++ b/src/libstore/build/substitution-goal.cc @@ -1,7 +1,7 @@ #include "worker.hh" #include "substitution-goal.hh" #include "nar-info.hh" -#include "finally.hh" +#include "nix/util/finally.hh" namespace nix { diff --git a/src/libstore/build/worker.hh b/src/libstore/build/worker.hh index 6d68d3cf1b6..16fb5c56b53 100644 --- a/src/libstore/build/worker.hh +++ b/src/libstore/build/worker.hh @@ -1,6 +1,6 @@ #pragma once -#include "types.hh" +#include "nix/util/types.hh" #include "lock.hh" #include "store-api.hh" #include "goal.hh" diff --git a/src/libstore/builtins/fetchurl.cc b/src/libstore/builtins/fetchurl.cc index 7d7924d7733..2b922aec3e2 100644 --- a/src/libstore/builtins/fetchurl.cc +++ b/src/libstore/builtins/fetchurl.cc @@ -1,8 +1,8 @@ #include "builtins.hh" #include "filetransfer.hh" #include "store-api.hh" -#include "archive.hh" -#include "compression.hh" +#include "nix/util/archive.hh" +#include "nix/util/compression.hh" namespace nix { diff --git a/src/libstore/builtins/unpack-channel.cc b/src/libstore/builtins/unpack-channel.cc index ba04bb16cd8..c31d36aa5af 100644 --- a/src/libstore/builtins/unpack-channel.cc +++ b/src/libstore/builtins/unpack-channel.cc @@ -1,5 +1,5 @@ #include "builtins.hh" -#include "tarfile.hh" +#include "nix/util/tarfile.hh" namespace nix { diff --git a/src/libstore/content-address.cc b/src/libstore/content-address.cc index cf32ccdc461..be97acc6a65 100644 --- a/src/libstore/content-address.cc +++ b/src/libstore/content-address.cc @@ -1,6 +1,6 @@ -#include "args.hh" +#include "nix/util/args.hh" #include "content-address.hh" -#include "split.hh" +#include "nix/util/split.hh" namespace nix { diff --git a/src/libstore/content-address.hh b/src/libstore/content-address.hh index f6a6f514004..69136a414fb 100644 --- a/src/libstore/content-address.hh +++ b/src/libstore/content-address.hh @@ -1,7 +1,7 @@ #pragma once #include -#include "hash.hh" +#include "nix/util/hash.hh" namespace nix { diff --git a/src/libstore/crypto.cc b/src/libstore/crypto.cc index 1027469c9ee..b015764af12 100644 --- a/src/libstore/crypto.cc +++ b/src/libstore/crypto.cc @@ -1,5 +1,5 @@ #include "crypto.hh" -#include "util.hh" +#include "nix/util/util.hh" #include "globals.hh" #include diff --git a/src/libstore/crypto.hh b/src/libstore/crypto.hh index 03f85c10310..3a3603ae6df 100644 --- a/src/libstore/crypto.hh +++ b/src/libstore/crypto.hh @@ -1,6 +1,6 @@ #pragma once -#include "types.hh" +#include "nix/util/types.hh" #include diff --git a/src/libstore/daemon.cc b/src/libstore/daemon.cc index 5e6fd011fa7..dfd31681f80 100644 --- a/src/libstore/daemon.cc +++ b/src/libstore/daemon.cc @@ -1,5 +1,5 @@ #include "daemon.hh" -#include "monitor-fd.hh" +#include "nix/util/monitor-fd.hh" #include "worker-protocol.hh" #include "build-result.hh" #include "store-api.hh" @@ -7,10 +7,10 @@ #include "gc-store.hh" #include "log-store.hh" #include "path-with-outputs.hh" -#include "finally.hh" -#include "archive.hh" +#include "nix/util/finally.hh" +#include "nix/util/archive.hh" #include "derivations.hh" -#include "args.hh" +#include "nix/util/args.hh" namespace nix::daemon { diff --git a/src/libstore/daemon.hh b/src/libstore/daemon.hh index 8c765615cd2..c7f4e6d7028 100644 --- a/src/libstore/daemon.hh +++ b/src/libstore/daemon.hh @@ -1,6 +1,6 @@ #pragma once -#include "serialise.hh" +#include "nix/util/serialise.hh" #include "store-api.hh" namespace nix::daemon { diff --git a/src/libstore/derivations.cc b/src/libstore/derivations.cc index cf18724ef6b..19ef766ad53 100644 --- a/src/libstore/derivations.cc +++ b/src/libstore/derivations.cc @@ -1,7 +1,7 @@ #include "derivations.hh" #include "store-api.hh" #include "globals.hh" -#include "util.hh" +#include "nix/util/util.hh" #include "worker-protocol.hh" #include "fs-accessor.hh" #include diff --git a/src/libstore/derivations.hh b/src/libstore/derivations.hh index f42c13cdce5..c46ab211130 100644 --- a/src/libstore/derivations.hh +++ b/src/libstore/derivations.hh @@ -1,11 +1,11 @@ #pragma once #include "path.hh" -#include "types.hh" -#include "hash.hh" +#include "nix/util/types.hh" +#include "nix/util/hash.hh" #include "content-address.hh" #include "repair-flag.hh" -#include "sync.hh" +#include "nix/util/sync.hh" #include #include diff --git a/src/libstore/derived-path.hh b/src/libstore/derived-path.hh index 9e0cce377d2..0914ace4ecb 100644 --- a/src/libstore/derived-path.hh +++ b/src/libstore/derived-path.hh @@ -1,10 +1,10 @@ #pragma once -#include "util.hh" +#include "nix/util/util.hh" #include "path.hh" #include "realisation.hh" #include "outputs-spec.hh" -#include "comparator.hh" +#include "nix/util/comparator.hh" #include diff --git a/src/libstore/dummy-store.cc b/src/libstore/dummy-store.cc index b4fbe0b702c..81afdb2e99a 100644 --- a/src/libstore/dummy-store.cc +++ b/src/libstore/dummy-store.cc @@ -1,5 +1,5 @@ #include "store-api.hh" -#include "callback.hh" +#include "nix/util/callback.hh" namespace nix { diff --git a/src/libstore/export-import.cc b/src/libstore/export-import.cc index 9875da90906..a4f655787f4 100644 --- a/src/libstore/export-import.cc +++ b/src/libstore/export-import.cc @@ -1,6 +1,6 @@ -#include "serialise.hh" +#include "nix/util/serialise.hh" #include "store-api.hh" -#include "archive.hh" +#include "nix/util/archive.hh" #include "worker-protocol.hh" #include diff --git a/src/libstore/filetransfer.cc b/src/libstore/filetransfer.cc index b25089ec3ae..6428f056052 100644 --- a/src/libstore/filetransfer.cc +++ b/src/libstore/filetransfer.cc @@ -1,11 +1,11 @@ #include "filetransfer.hh" -#include "util.hh" +#include "nix/util/util.hh" #include "globals.hh" #include "store-api.hh" #include "s3.hh" -#include "compression.hh" -#include "finally.hh" -#include "callback.hh" +#include "nix/util/compression.hh" +#include "nix/util/finally.hh" +#include "nix/util/callback.hh" #if ENABLE_S3 #include diff --git a/src/libstore/filetransfer.hh b/src/libstore/filetransfer.hh index 07d58f53aa7..522ef49042e 100644 --- a/src/libstore/filetransfer.hh +++ b/src/libstore/filetransfer.hh @@ -1,8 +1,8 @@ #pragma once -#include "types.hh" -#include "hash.hh" -#include "config.hh" +#include "nix/util/types.hh" +#include "nix/util/hash.hh" +#include "nix/util/config.hh" #include #include diff --git a/src/libstore/fs-accessor.hh b/src/libstore/fs-accessor.hh index c825e84f2d7..f1d2b4a24fd 100644 --- a/src/libstore/fs-accessor.hh +++ b/src/libstore/fs-accessor.hh @@ -1,6 +1,6 @@ #pragma once -#include "types.hh" +#include "nix/util/types.hh" namespace nix { diff --git a/src/libstore/gc.cc b/src/libstore/gc.cc index 996f26a95c9..7ed3894bf91 100644 --- a/src/libstore/gc.cc +++ b/src/libstore/gc.cc @@ -2,7 +2,7 @@ #include "globals.hh" #include "local-store.hh" #include "local-fs-store.hh" -#include "finally.hh" +#include "nix/util/finally.hh" #include #include diff --git a/src/libstore/globals.cc b/src/libstore/globals.cc index 8e33a3deca6..f9a43e25be3 100644 --- a/src/libstore/globals.cc +++ b/src/libstore/globals.cc @@ -1,9 +1,9 @@ #include "globals.hh" -#include "util.hh" -#include "archive.hh" -#include "args.hh" -#include "abstract-setting-to-json.hh" -#include "compute-levels.hh" +#include "nix/util/util.hh" +#include "nix/util/archive.hh" +#include "nix/util/args.hh" +#include "nix/util/abstract-setting-to-json.hh" +#include "nix/util/compute-levels.hh" #include #include diff --git a/src/libstore/globals.hh b/src/libstore/globals.hh index 0a4912f67ad..ec891cf616c 100644 --- a/src/libstore/globals.hh +++ b/src/libstore/globals.hh @@ -1,9 +1,9 @@ #pragma once -#include "types.hh" -#include "config.hh" -#include "util.hh" -#include "experimental-features.hh" +#include "nix/util/types.hh" +#include "nix/util/config.hh" +#include "nix/util/util.hh" +#include "nix/util/experimental-features.hh" #include #include diff --git a/src/libstore/http-binary-cache-store.cc b/src/libstore/http-binary-cache-store.cc index 1479822a9f7..7c7384eeecb 100644 --- a/src/libstore/http-binary-cache-store.cc +++ b/src/libstore/http-binary-cache-store.cc @@ -2,7 +2,7 @@ #include "filetransfer.hh" #include "globals.hh" #include "nar-info-disk-cache.hh" -#include "callback.hh" +#include "nix/util/callback.hh" namespace nix { diff --git a/src/libstore/legacy-ssh-store.cc b/src/libstore/legacy-ssh-store.cc index 2c9dd26808a..08f0c1ee95f 100644 --- a/src/libstore/legacy-ssh-store.cc +++ b/src/libstore/legacy-ssh-store.cc @@ -1,5 +1,5 @@ -#include "archive.hh" -#include "pool.hh" +#include "nix/util/archive.hh" +#include "nix/util/pool.hh" #include "remote-store.hh" #include "serve-protocol.hh" #include "build-result.hh" @@ -8,7 +8,7 @@ #include "worker-protocol.hh" #include "ssh.hh" #include "derivations.hh" -#include "callback.hh" +#include "nix/util/callback.hh" namespace nix { diff --git a/src/libstore/local-fs-store.cc b/src/libstore/local-fs-store.cc index b224fc3e989..ae8faaeb640 100644 --- a/src/libstore/local-fs-store.cc +++ b/src/libstore/local-fs-store.cc @@ -1,9 +1,9 @@ -#include "archive.hh" +#include "nix/util/archive.hh" #include "fs-accessor.hh" #include "store-api.hh" #include "local-fs-store.hh" #include "globals.hh" -#include "compression.hh" +#include "nix/util/compression.hh" #include "derivations.hh" namespace nix { diff --git a/src/libstore/local-store.cc b/src/libstore/local-store.cc index 82edaa9bfaa..f728bd16b36 100644 --- a/src/libstore/local-store.cc +++ b/src/libstore/local-store.cc @@ -1,15 +1,15 @@ #include "local-store.hh" #include "globals.hh" -#include "archive.hh" +#include "nix/util/archive.hh" #include "pathlocks.hh" #include "worker-protocol.hh" #include "derivations.hh" #include "nar-info.hh" #include "references.hh" -#include "callback.hh" -#include "topo-sort.hh" -#include "finally.hh" -#include "compression.hh" +#include "nix/util/callback.hh" +#include "nix/util/topo-sort.hh" +#include "nix/util/finally.hh" +#include "nix/util/compression.hh" #include #include diff --git a/src/libstore/local-store.hh b/src/libstore/local-store.hh index a84eb7c26ef..7d20f10f602 100644 --- a/src/libstore/local-store.hh +++ b/src/libstore/local-store.hh @@ -6,8 +6,8 @@ #include "store-api.hh" #include "local-fs-store.hh" #include "gc-store.hh" -#include "sync.hh" -#include "util.hh" +#include "nix/util/sync.hh" +#include "nix/util/util.hh" #include #include diff --git a/src/libstore/local.mk b/src/libstore/local.mk index e5e24501e52..8ce107d4de8 100644 --- a/src/libstore/local.mk +++ b/src/libstore/local.mk @@ -28,7 +28,9 @@ ifeq ($(HAVE_SECCOMP), 1) endif libstore_CXXFLAGS += \ - -I src/libutil -I src/libstore -I src/libstore/build \ + -Isrc/libstore \ + -Isrc/libstore/build \ + -Isrc/libutil/include \ -DNIX_PREFIX=\"$(prefix)\" \ -DNIX_STORE_DIR=\"$(storedir)\" \ -DNIX_DATA_DIR=\"$(datadir)\" \ diff --git a/src/libstore/lock.hh b/src/libstore/lock.hh index 7f19345105a..9ae7299c956 100644 --- a/src/libstore/lock.hh +++ b/src/libstore/lock.hh @@ -1,6 +1,6 @@ #pragma once -#include "types.hh" +#include "nix/util/types.hh" #include diff --git a/src/libstore/machines.cc b/src/libstore/machines.cc index e87f469800d..db49edf7cf8 100644 --- a/src/libstore/machines.cc +++ b/src/libstore/machines.cc @@ -1,5 +1,5 @@ #include "machines.hh" -#include "util.hh" +#include "nix/util/util.hh" #include "globals.hh" #include "store-api.hh" diff --git a/src/libstore/machines.hh b/src/libstore/machines.hh index 834626de9cf..87d3952a929 100644 --- a/src/libstore/machines.hh +++ b/src/libstore/machines.hh @@ -1,6 +1,6 @@ #pragma once -#include "types.hh" +#include "nix/util/types.hh" namespace nix { diff --git a/src/libstore/misc.cc b/src/libstore/misc.cc index b28768459d1..25160068d5d 100644 --- a/src/libstore/misc.cc +++ b/src/libstore/misc.cc @@ -3,10 +3,10 @@ #include "globals.hh" #include "local-store.hh" #include "store-api.hh" -#include "thread-pool.hh" -#include "topo-sort.hh" -#include "callback.hh" -#include "closure.hh" +#include "nix/util/thread-pool.hh" +#include "nix/util/topo-sort.hh" +#include "nix/util/callback.hh" +#include "nix/util/closure.hh" #include "filetransfer.hh" namespace nix { diff --git a/src/libstore/names.cc b/src/libstore/names.cc index 277aabf0f93..a4d525a5b85 100644 --- a/src/libstore/names.cc +++ b/src/libstore/names.cc @@ -1,5 +1,5 @@ #include "names.hh" -#include "util.hh" +#include "nix/util/util.hh" #include diff --git a/src/libstore/names.hh b/src/libstore/names.hh index 3977fc6cc9b..cf8de20851a 100644 --- a/src/libstore/names.hh +++ b/src/libstore/names.hh @@ -2,7 +2,7 @@ #include -#include "types.hh" +#include "nix/util/types.hh" namespace nix { diff --git a/src/libstore/nar-accessor.cc b/src/libstore/nar-accessor.cc index 9a0003588ac..259cb1ebbb8 100644 --- a/src/libstore/nar-accessor.cc +++ b/src/libstore/nar-accessor.cc @@ -1,5 +1,5 @@ #include "nar-accessor.hh" -#include "archive.hh" +#include "nix/util/archive.hh" #include #include diff --git a/src/libstore/nar-info-disk-cache.cc b/src/libstore/nar-info-disk-cache.cc index 2645f468bb5..d2615a40f0a 100644 --- a/src/libstore/nar-info-disk-cache.cc +++ b/src/libstore/nar-info-disk-cache.cc @@ -1,5 +1,5 @@ #include "nar-info-disk-cache.hh" -#include "sync.hh" +#include "nix/util/sync.hh" #include "sqlite.hh" #include "globals.hh" diff --git a/src/libstore/nar-info-disk-cache.hh b/src/libstore/nar-info-disk-cache.hh index 4877f56d873..8570eff4d71 100644 --- a/src/libstore/nar-info-disk-cache.hh +++ b/src/libstore/nar-info-disk-cache.hh @@ -1,6 +1,6 @@ #pragma once -#include "ref.hh" +#include "nix/util/ref.hh" #include "nar-info.hh" #include "realisation.hh" diff --git a/src/libstore/nar-info.hh b/src/libstore/nar-info.hh index 01683ec731a..377f327e90b 100644 --- a/src/libstore/nar-info.hh +++ b/src/libstore/nar-info.hh @@ -1,7 +1,7 @@ #pragma once -#include "types.hh" -#include "hash.hh" +#include "nix/util/types.hh" +#include "nix/util/hash.hh" #include "path-info.hh" namespace nix { diff --git a/src/libstore/optimise-store.cc b/src/libstore/optimise-store.cc index 4d278118095..aaeb9d1dcf3 100644 --- a/src/libstore/optimise-store.cc +++ b/src/libstore/optimise-store.cc @@ -1,4 +1,4 @@ -#include "util.hh" +#include "nix/util/util.hh" #include "local-store.hh" #include "globals.hh" diff --git a/src/libstore/outputs-spec.cc b/src/libstore/outputs-spec.cc index e26c3813822..ec8b2b19994 100644 --- a/src/libstore/outputs-spec.cc +++ b/src/libstore/outputs-spec.cc @@ -1,8 +1,8 @@ #include #include -#include "util.hh" -#include "regex-combinators.hh" +#include "nix/util/util.hh" +#include "nix/util/regex-combinators.hh" #include "outputs-spec.hh" #include "path-regex.hh" diff --git a/src/libstore/outputs-spec.hh b/src/libstore/outputs-spec.hh index 46bc35ebcfb..4417fc84e2c 100644 --- a/src/libstore/outputs-spec.hh +++ b/src/libstore/outputs-spec.hh @@ -5,7 +5,7 @@ #include #include -#include "json-impls.hh" +#include "nix/util/json-impls.hh" namespace nix { diff --git a/src/libstore/path-info.hh b/src/libstore/path-info.hh index a7fcbd23264..359a589dfd1 100644 --- a/src/libstore/path-info.hh +++ b/src/libstore/path-info.hh @@ -2,7 +2,7 @@ #include "crypto.hh" #include "path.hh" -#include "hash.hh" +#include "nix/util/hash.hh" #include "content-address.hh" #include diff --git a/src/libstore/path.hh b/src/libstore/path.hh index 1e5579b906b..1fdaefd0f1c 100644 --- a/src/libstore/path.hh +++ b/src/libstore/path.hh @@ -2,7 +2,7 @@ #include -#include "types.hh" +#include "nix/util/types.hh" namespace nix { diff --git a/src/libstore/pathlocks.cc b/src/libstore/pathlocks.cc index 42023cd0a43..56cc5e1f6d3 100644 --- a/src/libstore/pathlocks.cc +++ b/src/libstore/pathlocks.cc @@ -1,6 +1,6 @@ #include "pathlocks.hh" -#include "util.hh" -#include "sync.hh" +#include "nix/util/util.hh" +#include "nix/util/sync.hh" #include #include diff --git a/src/libstore/pathlocks.hh b/src/libstore/pathlocks.hh index 5e3a734b437..973bf1390bd 100644 --- a/src/libstore/pathlocks.hh +++ b/src/libstore/pathlocks.hh @@ -1,6 +1,6 @@ #pragma once -#include "util.hh" +#include "nix/util/util.hh" namespace nix { diff --git a/src/libstore/profiles.cc b/src/libstore/profiles.cc index c551c5f3e83..5230419000f 100644 --- a/src/libstore/profiles.cc +++ b/src/libstore/profiles.cc @@ -1,7 +1,7 @@ #include "profiles.hh" #include "store-api.hh" #include "local-fs-store.hh" -#include "util.hh" +#include "nix/util/util.hh" #include #include diff --git a/src/libstore/profiles.hh b/src/libstore/profiles.hh index fbf95b850db..833f5e3c344 100644 --- a/src/libstore/profiles.hh +++ b/src/libstore/profiles.hh @@ -1,6 +1,6 @@ #pragma once -#include "types.hh" +#include "nix/util/types.hh" #include "pathlocks.hh" #include diff --git a/src/libstore/realisation.cc b/src/libstore/realisation.cc index d63ec5ea2a7..a575a58157b 100644 --- a/src/libstore/realisation.cc +++ b/src/libstore/realisation.cc @@ -1,6 +1,6 @@ #include "realisation.hh" #include "store-api.hh" -#include "closure.hh" +#include "nix/util/closure.hh" #include namespace nix { diff --git a/src/libstore/realisation.hh b/src/libstore/realisation.hh index 48d0283de1b..d265e878c02 100644 --- a/src/libstore/realisation.hh +++ b/src/libstore/realisation.hh @@ -2,10 +2,10 @@ #include -#include "hash.hh" +#include "nix/util/hash.hh" #include "path.hh" #include -#include "comparator.hh" +#include "nix/util/comparator.hh" #include "crypto.hh" namespace nix { diff --git a/src/libstore/references.cc b/src/libstore/references.cc index 3bb297fc80b..68ce114ebfb 100644 --- a/src/libstore/references.cc +++ b/src/libstore/references.cc @@ -1,7 +1,7 @@ #include "references.hh" -#include "hash.hh" -#include "util.hh" -#include "archive.hh" +#include "nix/util/hash.hh" +#include "nix/util/util.hh" +#include "nix/util/archive.hh" #include #include diff --git a/src/libstore/references.hh b/src/libstore/references.hh index 6f381f96cb9..86a865fe04d 100644 --- a/src/libstore/references.hh +++ b/src/libstore/references.hh @@ -1,6 +1,6 @@ #pragma once -#include "hash.hh" +#include "nix/util/hash.hh" #include "path.hh" namespace nix { diff --git a/src/libstore/remote-fs-accessor.hh b/src/libstore/remote-fs-accessor.hh index 99f5544ef08..4edbf2a2454 100644 --- a/src/libstore/remote-fs-accessor.hh +++ b/src/libstore/remote-fs-accessor.hh @@ -1,7 +1,7 @@ #pragma once #include "fs-accessor.hh" -#include "ref.hh" +#include "nix/util/ref.hh" #include "store-api.hh" namespace nix { diff --git a/src/libstore/remote-store.cc b/src/libstore/remote-store.cc index d1296627ac7..8b5ed56729e 100644 --- a/src/libstore/remote-store.cc +++ b/src/libstore/remote-store.cc @@ -1,18 +1,18 @@ -#include "serialise.hh" -#include "util.hh" +#include "nix/util/serialise.hh" +#include "nix/util/util.hh" #include "path-with-outputs.hh" #include "gc-store.hh" #include "remote-fs-accessor.hh" #include "build-result.hh" #include "remote-store.hh" #include "worker-protocol.hh" -#include "archive.hh" +#include "nix/util/archive.hh" #include "globals.hh" #include "derivations.hh" -#include "pool.hh" -#include "finally.hh" -#include "logging.hh" -#include "callback.hh" +#include "nix/util/pool.hh" +#include "nix/util/finally.hh" +#include "nix/util/logging.hh" +#include "nix/util/callback.hh" #include "filetransfer.hh" #include diff --git a/src/libstore/s3-binary-cache-store.cc b/src/libstore/s3-binary-cache-store.cc index 8d76eee9977..4c4fa180e80 100644 --- a/src/libstore/s3-binary-cache-store.cc +++ b/src/libstore/s3-binary-cache-store.cc @@ -5,7 +5,7 @@ #include "nar-info.hh" #include "nar-info-disk-cache.hh" #include "globals.hh" -#include "compression.hh" +#include "nix/util/compression.hh" #include "filetransfer.hh" #include diff --git a/src/libstore/s3.hh b/src/libstore/s3.hh index cdb3e59080e..9ac53c06880 100644 --- a/src/libstore/s3.hh +++ b/src/libstore/s3.hh @@ -2,7 +2,7 @@ #if ENABLE_S3 -#include "ref.hh" +#include "nix/util/ref.hh" #include #include diff --git a/src/libstore/sqlite.cc b/src/libstore/sqlite.cc index 871f2f3be83..15bca1cf1a9 100644 --- a/src/libstore/sqlite.cc +++ b/src/libstore/sqlite.cc @@ -1,6 +1,6 @@ #include "sqlite.hh" #include "globals.hh" -#include "util.hh" +#include "nix/util/util.hh" #include diff --git a/src/libstore/sqlite.hh b/src/libstore/sqlite.hh index 1853731a250..c7dd3890fb0 100644 --- a/src/libstore/sqlite.hh +++ b/src/libstore/sqlite.hh @@ -3,7 +3,7 @@ #include #include -#include "error.hh" +#include "nix/util/error.hh" struct sqlite3; struct sqlite3_stmt; diff --git a/src/libstore/ssh-store.cc b/src/libstore/ssh-store.cc index a1d4daafd6d..34ec1546104 100644 --- a/src/libstore/ssh-store.cc +++ b/src/libstore/ssh-store.cc @@ -1,9 +1,9 @@ #include "store-api.hh" #include "remote-store.hh" #include "remote-fs-accessor.hh" -#include "archive.hh" +#include "nix/util/archive.hh" #include "worker-protocol.hh" -#include "pool.hh" +#include "nix/util/pool.hh" #include "ssh.hh" namespace nix { diff --git a/src/libstore/ssh.hh b/src/libstore/ssh.hh index dabbcedda09..3cf3e90c620 100644 --- a/src/libstore/ssh.hh +++ b/src/libstore/ssh.hh @@ -1,7 +1,7 @@ #pragma once -#include "util.hh" -#include "sync.hh" +#include "nix/util/util.hh" +#include "nix/util/sync.hh" namespace nix { diff --git a/src/libstore/store-api.cc b/src/libstore/store-api.cc index 601efa1ccc4..15fd37bc0c8 100644 --- a/src/libstore/store-api.cc +++ b/src/libstore/store-api.cc @@ -3,12 +3,12 @@ #include "globals.hh" #include "derivations.hh" #include "store-api.hh" -#include "util.hh" +#include "nix/util/util.hh" #include "nar-info-disk-cache.hh" -#include "thread-pool.hh" -#include "url.hh" -#include "archive.hh" -#include "callback.hh" +#include "nix/util/thread-pool.hh" +#include "nix/util/url.hh" +#include "nix/util/archive.hh" +#include "nix/util/callback.hh" #include "remote-store.hh" #include diff --git a/src/libstore/store-api.hh b/src/libstore/store-api.hh index 4d8db35960d..353a7e2e131 100644 --- a/src/libstore/store-api.hh +++ b/src/libstore/store-api.hh @@ -4,13 +4,13 @@ #include "realisation.hh" #include "path.hh" #include "derived-path.hh" -#include "hash.hh" +#include "nix/util/hash.hh" #include "content-address.hh" -#include "serialise.hh" -#include "lru-cache.hh" -#include "sync.hh" +#include "nix/util/serialise.hh" +#include "nix/util/lru-cache.hh" +#include "nix/util/sync.hh" #include "globals.hh" -#include "config.hh" +#include "nix/util/config.hh" #include "path-info.hh" #include "repair-flag.hh" diff --git a/src/libstore/tests/local.mk b/src/libstore/tests/local.mk index 03becc7d11b..49a00124142 100644 --- a/src/libstore/tests/local.mk +++ b/src/libstore/tests/local.mk @@ -22,7 +22,10 @@ libstore-tests_INSTALL_DIR := libstore-tests_SOURCES := $(wildcard $(d)/*.cc) -libstore-tests_CXXFLAGS += -I src/libstore -I src/libutil +libstore-tests_CXXFLAGS += \ + -Isrc/libstore \ + -Isrc/libutil/include \ + -Isrc/libutil libstore-tests_LIBS = libutil-tests libstore libutil diff --git a/src/libstore/worker-protocol.hh b/src/libstore/worker-protocol.hh index 87088a3ac10..cb9272020c0 100644 --- a/src/libstore/worker-protocol.hh +++ b/src/libstore/worker-protocol.hh @@ -1,7 +1,7 @@ #pragma once #include "store-api.hh" -#include "serialise.hh" +#include "nix/util/serialise.hh" namespace nix { diff --git a/src/libutil/archive.cc b/src/libutil/archive.cc index 0e2b9d12c84..4f4a4acbccc 100644 --- a/src/libutil/archive.cc +++ b/src/libutil/archive.cc @@ -11,9 +11,9 @@ #include #include -#include "archive.hh" -#include "util.hh" -#include "config.hh" +#include "nix/util/archive.hh" +#include "nix/util/util.hh" +#include "nix/util/config.hh" namespace nix { diff --git a/src/libutil/args.cc b/src/libutil/args.cc index 35686a8aa4b..acf8748d92f 100644 --- a/src/libutil/args.cc +++ b/src/libutil/args.cc @@ -1,5 +1,5 @@ -#include "args.hh" -#include "hash.hh" +#include "nix/util/args.hh" +#include "nix/util/hash.hh" #include diff --git a/src/libutil/canon-path.cc b/src/libutil/canon-path.cc index b132b426223..430fcaefc92 100644 --- a/src/libutil/canon-path.cc +++ b/src/libutil/canon-path.cc @@ -1,5 +1,5 @@ -#include "canon-path.hh" -#include "util.hh" +#include "nix/util/canon-path.hh" +#include "nix/util/util.hh" namespace nix { diff --git a/src/libutil/cgroup.cc b/src/libutil/cgroup.cc index a008481caa9..c6fd4b00656 100644 --- a/src/libutil/cgroup.cc +++ b/src/libutil/cgroup.cc @@ -1,8 +1,8 @@ #if __linux__ -#include "cgroup.hh" -#include "util.hh" -#include "finally.hh" +#include "nix/util/cgroup.hh" +#include "nix/util/util.hh" +#include "nix/util/finally.hh" #include #include diff --git a/src/libutil/compression.cc b/src/libutil/compression.cc index 89180e7a756..d8ae044e18f 100644 --- a/src/libutil/compression.cc +++ b/src/libutil/compression.cc @@ -1,8 +1,8 @@ -#include "compression.hh" -#include "tarfile.hh" -#include "util.hh" -#include "finally.hh" -#include "logging.hh" +#include "nix/util/compression.hh" +#include "nix/util/tarfile.hh" +#include "nix/util/util.hh" +#include "nix/util/finally.hh" +#include "nix/util/logging.hh" #include #include diff --git a/src/libutil/compute-levels.cc b/src/libutil/compute-levels.cc index 19eaedfa8d1..e4e7d45324d 100644 --- a/src/libutil/compute-levels.cc +++ b/src/libutil/compute-levels.cc @@ -1,4 +1,4 @@ -#include "types.hh" +#include "nix/util/types.hh" #if HAVE_LIBCPUID #include diff --git a/src/libutil/config.cc b/src/libutil/config.cc index b349f2d80ed..7cc2b2a8938 100644 --- a/src/libutil/config.cc +++ b/src/libutil/config.cc @@ -1,7 +1,7 @@ -#include "config.hh" -#include "args.hh" -#include "abstract-setting-to-json.hh" -#include "experimental-features.hh" +#include "nix/util/config.hh" +#include "nix/util/args.hh" +#include "nix/util/abstract-setting-to-json.hh" +#include "nix/util/experimental-features.hh" #include diff --git a/src/libutil/error.cc b/src/libutil/error.cc index e4f0d46778d..71faf847ee5 100644 --- a/src/libutil/error.cc +++ b/src/libutil/error.cc @@ -1,8 +1,8 @@ -#include "error.hh" +#include "nix/util/error.hh" #include #include -#include "serialise.hh" +#include "nix/util/serialise.hh" #include namespace nix { diff --git a/src/libutil/experimental-features.cc b/src/libutil/experimental-features.cc index 58d762ebb26..682451e16c7 100644 --- a/src/libutil/experimental-features.cc +++ b/src/libutil/experimental-features.cc @@ -1,5 +1,5 @@ -#include "experimental-features.hh" -#include "util.hh" +#include "nix/util/experimental-features.hh" +#include "nix/util/util.hh" #include "nlohmann/json.hpp" diff --git a/src/libutil/filesystem.cc b/src/libutil/filesystem.cc index 3a732cff8c1..5760220635b 100644 --- a/src/libutil/filesystem.cc +++ b/src/libutil/filesystem.cc @@ -2,9 +2,9 @@ #include #include -#include "finally.hh" -#include "util.hh" -#include "types.hh" +#include "nix/util/finally.hh" +#include "nix/util/util.hh" +#include "nix/util/types.hh" namespace fs = std::filesystem; diff --git a/src/libutil/git.cc b/src/libutil/git.cc index f35c2fdb75c..2d83bef3251 100644 --- a/src/libutil/git.cc +++ b/src/libutil/git.cc @@ -1,4 +1,4 @@ -#include "git.hh" +#include "nix/util/git.hh" #include diff --git a/src/libutil/hash.cc b/src/libutil/hash.cc index d2fd0c15a1e..224805990f0 100644 --- a/src/libutil/hash.cc +++ b/src/libutil/hash.cc @@ -4,11 +4,11 @@ #include #include -#include "args.hh" -#include "hash.hh" -#include "archive.hh" -#include "split.hh" -#include "util.hh" +#include "nix/util/args.hh" +#include "nix/util/hash.hh" +#include "nix/util/archive.hh" +#include "nix/util/split.hh" +#include "nix/util/util.hh" #include #include diff --git a/src/libutil/hilite.cc b/src/libutil/hilite.cc index e5088230d7c..cfadd6af9c9 100644 --- a/src/libutil/hilite.cc +++ b/src/libutil/hilite.cc @@ -1,4 +1,4 @@ -#include "hilite.hh" +#include "nix/util/hilite.hh" namespace nix { diff --git a/src/libutil/abstract-setting-to-json.hh b/src/libutil/include/nix/util/abstract-setting-to-json.hh similarity index 92% rename from src/libutil/abstract-setting-to-json.hh rename to src/libutil/include/nix/util/abstract-setting-to-json.hh index 2d82b54e7f1..e24b221779b 100644 --- a/src/libutil/abstract-setting-to-json.hh +++ b/src/libutil/include/nix/util/abstract-setting-to-json.hh @@ -1,7 +1,7 @@ #pragma once #include -#include "config.hh" +#include "nix/util/config.hh" namespace nix { template diff --git a/src/libutil/ansicolor.hh b/src/libutil/include/nix/util/ansicolor.hh similarity index 100% rename from src/libutil/ansicolor.hh rename to src/libutil/include/nix/util/ansicolor.hh diff --git a/src/libutil/archive.hh b/src/libutil/include/nix/util/archive.hh similarity index 97% rename from src/libutil/archive.hh rename to src/libutil/include/nix/util/archive.hh index e42dea54074..74a9f52758f 100644 --- a/src/libutil/archive.hh +++ b/src/libutil/include/nix/util/archive.hh @@ -1,7 +1,7 @@ #pragma once -#include "types.hh" -#include "serialise.hh" +#include "nix/util/types.hh" +#include "nix/util/serialise.hh" namespace nix { diff --git a/src/libutil/args.hh b/src/libutil/include/nix/util/args.hh similarity index 99% rename from src/libutil/args.hh rename to src/libutil/include/nix/util/args.hh index 84866f12b4a..603179b74af 100644 --- a/src/libutil/args.hh +++ b/src/libutil/include/nix/util/args.hh @@ -6,7 +6,7 @@ #include -#include "util.hh" +#include "nix/util/util.hh" namespace nix { diff --git a/src/libutil/callback.hh b/src/libutil/include/nix/util/callback.hh similarity index 100% rename from src/libutil/callback.hh rename to src/libutil/include/nix/util/callback.hh diff --git a/src/libutil/canon-path.hh b/src/libutil/include/nix/util/canon-path.hh similarity index 100% rename from src/libutil/canon-path.hh rename to src/libutil/include/nix/util/canon-path.hh diff --git a/src/libutil/cgroup.hh b/src/libutil/include/nix/util/cgroup.hh similarity index 95% rename from src/libutil/cgroup.hh rename to src/libutil/include/nix/util/cgroup.hh index d08c8ad2924..7807d9b4ef4 100644 --- a/src/libutil/cgroup.hh +++ b/src/libutil/include/nix/util/cgroup.hh @@ -5,7 +5,7 @@ #include #include -#include "types.hh" +#include "nix/util/types.hh" namespace nix { diff --git a/src/libutil/chunked-vector.hh b/src/libutil/include/nix/util/chunked-vector.hh similarity index 100% rename from src/libutil/chunked-vector.hh rename to src/libutil/include/nix/util/chunked-vector.hh diff --git a/src/libutil/closure.hh b/src/libutil/include/nix/util/closure.hh similarity index 98% rename from src/libutil/closure.hh rename to src/libutil/include/nix/util/closure.hh index 779b9b2d54a..54c2957364c 100644 --- a/src/libutil/closure.hh +++ b/src/libutil/include/nix/util/closure.hh @@ -1,6 +1,6 @@ #include #include -#include "sync.hh" +#include "nix/util/sync.hh" using std::set; diff --git a/src/libutil/comparator.hh b/src/libutil/include/nix/util/comparator.hh similarity index 100% rename from src/libutil/comparator.hh rename to src/libutil/include/nix/util/comparator.hh diff --git a/src/libutil/compression.hh b/src/libutil/include/nix/util/compression.hh similarity index 88% rename from src/libutil/compression.hh rename to src/libutil/include/nix/util/compression.hh index c470b82a509..f4cdb3778e8 100644 --- a/src/libutil/compression.hh +++ b/src/libutil/include/nix/util/compression.hh @@ -1,8 +1,8 @@ #pragma once -#include "ref.hh" -#include "types.hh" -#include "serialise.hh" +#include "nix/util/ref.hh" +#include "nix/util/types.hh" +#include "nix/util/serialise.hh" #include diff --git a/src/libutil/compute-levels.hh b/src/libutil/include/nix/util/compute-levels.hh similarity index 62% rename from src/libutil/compute-levels.hh rename to src/libutil/include/nix/util/compute-levels.hh index 8ded295f9e2..4afe00f1a63 100644 --- a/src/libutil/compute-levels.hh +++ b/src/libutil/include/nix/util/compute-levels.hh @@ -1,4 +1,4 @@ -#include "types.hh" +#include "nix/util/types.hh" namespace nix { diff --git a/src/libutil/config.hh b/src/libutil/include/nix/util/config.hh similarity index 99% rename from src/libutil/config.hh rename to src/libutil/include/nix/util/config.hh index 7ac43c85475..b864c74e922 100644 --- a/src/libutil/config.hh +++ b/src/libutil/include/nix/util/config.hh @@ -2,7 +2,7 @@ #include #include -#include "types.hh" +#include "nix/util/types.hh" #include diff --git a/src/libutil/error.hh b/src/libutil/include/nix/util/error.hh similarity index 98% rename from src/libutil/error.hh rename to src/libutil/include/nix/util/error.hh index 0ebeaba6139..1856d07d8af 100644 --- a/src/libutil/error.hh +++ b/src/libutil/include/nix/util/error.hh @@ -1,8 +1,8 @@ #pragma once -#include "suggestions.hh" -#include "ref.hh" -#include "types.hh" +#include "nix/util/suggestions.hh" +#include "nix/util/ref.hh" +#include "nix/util/types.hh" #include "fmt.hh" #include diff --git a/src/libutil/experimental-features.hh b/src/libutil/include/nix/util/experimental-features.hh similarity index 94% rename from src/libutil/experimental-features.hh rename to src/libutil/include/nix/util/experimental-features.hh index ac372e03e93..ba26f1181e5 100644 --- a/src/libutil/experimental-features.hh +++ b/src/libutil/include/nix/util/experimental-features.hh @@ -1,9 +1,9 @@ #pragma once -#include "comparator.hh" -#include "error.hh" +#include "nix/util/comparator.hh" +#include "nix/util/error.hh" #include "nlohmann/json_fwd.hpp" -#include "types.hh" +#include "nix/util/types.hh" namespace nix { diff --git a/src/libutil/finally.hh b/src/libutil/include/nix/util/finally.hh similarity index 100% rename from src/libutil/finally.hh rename to src/libutil/include/nix/util/finally.hh diff --git a/src/libutil/fmt.hh b/src/libutil/include/nix/util/fmt.hh similarity index 99% rename from src/libutil/fmt.hh rename to src/libutil/include/nix/util/fmt.hh index e879fd3b824..7e96b2c1ec6 100644 --- a/src/libutil/fmt.hh +++ b/src/libutil/include/nix/util/fmt.hh @@ -2,7 +2,7 @@ #include #include -#include "ansicolor.hh" +#include "nix/util/ansicolor.hh" namespace nix { diff --git a/src/libutil/git.hh b/src/libutil/include/nix/util/git.hh similarity index 100% rename from src/libutil/git.hh rename to src/libutil/include/nix/util/git.hh diff --git a/src/libutil/hash.hh b/src/libutil/include/nix/util/hash.hh similarity index 98% rename from src/libutil/hash.hh rename to src/libutil/include/nix/util/hash.hh index 00f70a57295..43f5154bba9 100644 --- a/src/libutil/hash.hh +++ b/src/libutil/include/nix/util/hash.hh @@ -1,7 +1,7 @@ #pragma once -#include "types.hh" -#include "serialise.hh" +#include "nix/util/types.hh" +#include "nix/util/serialise.hh" namespace nix { diff --git a/src/libutil/hilite.hh b/src/libutil/include/nix/util/hilite.hh similarity index 100% rename from src/libutil/hilite.hh rename to src/libutil/include/nix/util/hilite.hh diff --git a/src/libutil/json-impls.hh b/src/libutil/include/nix/util/json-impls.hh similarity index 100% rename from src/libutil/json-impls.hh rename to src/libutil/include/nix/util/json-impls.hh diff --git a/src/libutil/json-utils.hh b/src/libutil/include/nix/util/json-utils.hh similarity index 100% rename from src/libutil/json-utils.hh rename to src/libutil/include/nix/util/json-utils.hh diff --git a/src/libutil/logging.hh b/src/libutil/include/nix/util/logging.hh similarity index 98% rename from src/libutil/logging.hh rename to src/libutil/include/nix/util/logging.hh index 4642c49f7ed..954a70c9861 100644 --- a/src/libutil/logging.hh +++ b/src/libutil/include/nix/util/logging.hh @@ -1,8 +1,8 @@ #pragma once -#include "types.hh" -#include "error.hh" -#include "config.hh" +#include "nix/util/types.hh" +#include "nix/util/error.hh" +#include "nix/util/config.hh" #include diff --git a/src/libutil/lru-cache.hh b/src/libutil/include/nix/util/lru-cache.hh similarity index 100% rename from src/libutil/lru-cache.hh rename to src/libutil/include/nix/util/lru-cache.hh diff --git a/src/libutil/monitor-fd.hh b/src/libutil/include/nix/util/monitor-fd.hh similarity index 100% rename from src/libutil/monitor-fd.hh rename to src/libutil/include/nix/util/monitor-fd.hh diff --git a/src/libutil/namespaces.hh b/src/libutil/include/nix/util/namespaces.hh similarity index 100% rename from src/libutil/namespaces.hh rename to src/libutil/include/nix/util/namespaces.hh diff --git a/src/libutil/pool.hh b/src/libutil/include/nix/util/pool.hh similarity index 98% rename from src/libutil/pool.hh rename to src/libutil/include/nix/util/pool.hh index d49067bb95d..d62a562a549 100644 --- a/src/libutil/pool.hh +++ b/src/libutil/include/nix/util/pool.hh @@ -6,8 +6,8 @@ #include #include -#include "sync.hh" -#include "ref.hh" +#include "nix/util/sync.hh" +#include "nix/util/ref.hh" namespace nix { diff --git a/src/libutil/ref.hh b/src/libutil/include/nix/util/ref.hh similarity index 100% rename from src/libutil/ref.hh rename to src/libutil/include/nix/util/ref.hh diff --git a/src/libutil/regex-combinators.hh b/src/libutil/include/nix/util/regex-combinators.hh similarity index 100% rename from src/libutil/regex-combinators.hh rename to src/libutil/include/nix/util/regex-combinators.hh diff --git a/src/libutil/serialise.hh b/src/libutil/include/nix/util/serialise.hh similarity index 99% rename from src/libutil/serialise.hh rename to src/libutil/include/nix/util/serialise.hh index 7da5b07fd33..4c9cc7233ff 100644 --- a/src/libutil/serialise.hh +++ b/src/libutil/include/nix/util/serialise.hh @@ -2,8 +2,8 @@ #include -#include "types.hh" -#include "util.hh" +#include "nix/util/types.hh" +#include "nix/util/util.hh" namespace boost::context { struct stack_context; } diff --git a/src/libutil/split.hh b/src/libutil/include/nix/util/split.hh similarity index 96% rename from src/libutil/split.hh rename to src/libutil/include/nix/util/split.hh index 87a23b13e3f..3ee1cb804bd 100644 --- a/src/libutil/split.hh +++ b/src/libutil/include/nix/util/split.hh @@ -3,7 +3,7 @@ #include #include -#include "util.hh" +#include "nix/util/util.hh" namespace nix { diff --git a/src/libutil/suggestions.hh b/src/libutil/include/nix/util/suggestions.hh similarity index 96% rename from src/libutil/suggestions.hh rename to src/libutil/include/nix/util/suggestions.hh index d54dd8e31ea..df2db275fc1 100644 --- a/src/libutil/suggestions.hh +++ b/src/libutil/include/nix/util/suggestions.hh @@ -1,7 +1,7 @@ #pragma once -#include "comparator.hh" -#include "types.hh" +#include "nix/util/comparator.hh" +#include "nix/util/types.hh" #include namespace nix { diff --git a/src/libutil/sync.hh b/src/libutil/include/nix/util/sync.hh similarity index 100% rename from src/libutil/sync.hh rename to src/libutil/include/nix/util/sync.hh diff --git a/src/libutil/tarfile.hh b/src/libutil/include/nix/util/tarfile.hh similarity index 94% rename from src/libutil/tarfile.hh rename to src/libutil/include/nix/util/tarfile.hh index 4d9141fd458..0782eedc7fd 100644 --- a/src/libutil/tarfile.hh +++ b/src/libutil/include/nix/util/tarfile.hh @@ -1,4 +1,4 @@ -#include "serialise.hh" +#include "nix/util/serialise.hh" #include namespace nix { diff --git a/src/libutil/thread-pool.hh b/src/libutil/include/nix/util/thread-pool.hh similarity index 98% rename from src/libutil/thread-pool.hh rename to src/libutil/include/nix/util/thread-pool.hh index b22e0d16225..1db18250ca7 100644 --- a/src/libutil/thread-pool.hh +++ b/src/libutil/include/nix/util/thread-pool.hh @@ -1,7 +1,7 @@ #pragma once -#include "sync.hh" -#include "util.hh" +#include "nix/util/sync.hh" +#include "nix/util/util.hh" #include #include diff --git a/src/libutil/topo-sort.hh b/src/libutil/include/nix/util/topo-sort.hh similarity index 97% rename from src/libutil/topo-sort.hh rename to src/libutil/include/nix/util/topo-sort.hh index 7418be5e088..fb21ac4399d 100644 --- a/src/libutil/topo-sort.hh +++ b/src/libutil/include/nix/util/topo-sort.hh @@ -1,6 +1,6 @@ #pragma once -#include "error.hh" +#include "nix/util/error.hh" namespace nix { diff --git a/src/libutil/types.hh b/src/libutil/include/nix/util/types.hh similarity index 99% rename from src/libutil/types.hh rename to src/libutil/include/nix/util/types.hh index 6bcbd7e1d5a..4fd6b829f95 100644 --- a/src/libutil/types.hh +++ b/src/libutil/include/nix/util/types.hh @@ -1,6 +1,6 @@ #pragma once -#include "ref.hh" +#include "nix/util/ref.hh" #include #include diff --git a/src/libutil/url-parts.hh b/src/libutil/include/nix/util/url-parts.hh similarity index 100% rename from src/libutil/url-parts.hh rename to src/libutil/include/nix/util/url-parts.hh diff --git a/src/libutil/url.hh b/src/libutil/include/nix/util/url.hh similarity index 97% rename from src/libutil/url.hh rename to src/libutil/include/nix/util/url.hh index 2a9fb34c1cf..9ace20cef83 100644 --- a/src/libutil/url.hh +++ b/src/libutil/include/nix/util/url.hh @@ -1,6 +1,6 @@ #pragma once -#include "error.hh" +#include "nix/util/error.hh" namespace nix { diff --git a/src/libutil/util.hh b/src/libutil/include/nix/util/util.hh similarity index 99% rename from src/libutil/util.hh rename to src/libutil/include/nix/util/util.hh index b5625ecefcf..ad831e5ba27 100644 --- a/src/libutil/util.hh +++ b/src/libutil/include/nix/util/util.hh @@ -1,9 +1,9 @@ #pragma once -#include "types.hh" -#include "error.hh" -#include "logging.hh" -#include "ansicolor.hh" +#include "nix/util/types.hh" +#include "nix/util/error.hh" +#include "nix/util/logging.hh" +#include "nix/util/ansicolor.hh" #include #include diff --git a/src/libutil/xml-writer.hh b/src/libutil/include/nix/util/xml-writer.hh similarity index 100% rename from src/libutil/xml-writer.hh rename to src/libutil/include/nix/util/xml-writer.hh diff --git a/src/libutil/local.mk b/src/libutil/local.mk index f880c0fc562..11538464f1b 100644 --- a/src/libutil/local.mk +++ b/src/libutil/local.mk @@ -6,6 +6,8 @@ libutil_DIR := $(d) libutil_SOURCES := $(wildcard $(d)/*.cc) +libutil_CXXFLAGS := -Isrc/libutil/include + libutil_LDFLAGS += -pthread $(OPENSSL_LIBS) $(LIBBROTLI_LIBS) $(LIBARCHIVE_LIBS) $(BOOST_LDFLAGS) -lboost_context ifeq ($(HAVE_LIBCPUID), 1) diff --git a/src/libutil/logging.cc b/src/libutil/logging.cc index 904ba6ebee4..a6659176bea 100644 --- a/src/libutil/logging.cc +++ b/src/libutil/logging.cc @@ -1,6 +1,6 @@ -#include "logging.hh" -#include "util.hh" -#include "config.hh" +#include "nix/util/logging.hh" +#include "nix/util/util.hh" +#include "nix/util/config.hh" #include #include diff --git a/src/libutil/namespaces.cc b/src/libutil/namespaces.cc index f66accb10ad..515e3558c91 100644 --- a/src/libutil/namespaces.cc +++ b/src/libutil/namespaces.cc @@ -1,8 +1,8 @@ #if __linux__ -#include "namespaces.hh" -#include "util.hh" -#include "finally.hh" +#include "nix/util/namespaces.hh" +#include "nix/util/util.hh" +#include "nix/util/finally.hh" #include diff --git a/src/libutil/serialise.cc b/src/libutil/serialise.cc index c653db9d05e..faf01ac9677 100644 --- a/src/libutil/serialise.cc +++ b/src/libutil/serialise.cc @@ -1,5 +1,5 @@ -#include "serialise.hh" -#include "util.hh" +#include "nix/util/serialise.hh" +#include "nix/util/util.hh" #include #include diff --git a/src/libutil/suggestions.cc b/src/libutil/suggestions.cc index 9510a5f0c41..c600928a1af 100644 --- a/src/libutil/suggestions.cc +++ b/src/libutil/suggestions.cc @@ -1,6 +1,6 @@ -#include "suggestions.hh" -#include "ansicolor.hh" -#include "util.hh" +#include "nix/util/suggestions.hh" +#include "nix/util/ansicolor.hh" +#include "nix/util/util.hh" #include namespace nix { diff --git a/src/libutil/tarfile.cc b/src/libutil/tarfile.cc index 238d0a7a617..582ccdf4021 100644 --- a/src/libutil/tarfile.cc +++ b/src/libutil/tarfile.cc @@ -1,8 +1,8 @@ #include #include -#include "serialise.hh" -#include "tarfile.hh" +#include "nix/util/serialise.hh" +#include "nix/util/tarfile.hh" namespace nix { diff --git a/src/libutil/tests/canon-path.cc b/src/libutil/tests/canon-path.cc index c1c5adadf49..1a5a12d4225 100644 --- a/src/libutil/tests/canon-path.cc +++ b/src/libutil/tests/canon-path.cc @@ -1,4 +1,4 @@ -#include "canon-path.hh" +#include "nix/util/canon-path.hh" #include diff --git a/src/libutil/tests/chunked-vector.cc b/src/libutil/tests/chunked-vector.cc index 868d11f6f37..658581c2af8 100644 --- a/src/libutil/tests/chunked-vector.cc +++ b/src/libutil/tests/chunked-vector.cc @@ -1,4 +1,4 @@ -#include "chunked-vector.hh" +#include "nix/util/chunked-vector.hh" #include diff --git a/src/libutil/tests/closure.cc b/src/libutil/tests/closure.cc index 7597e78073b..6bbc128c24e 100644 --- a/src/libutil/tests/closure.cc +++ b/src/libutil/tests/closure.cc @@ -1,4 +1,4 @@ -#include "closure.hh" +#include "nix/util/closure.hh" #include namespace nix { diff --git a/src/libutil/tests/compression.cc b/src/libutil/tests/compression.cc index bbbf3500fbf..de0c7cdb653 100644 --- a/src/libutil/tests/compression.cc +++ b/src/libutil/tests/compression.cc @@ -1,4 +1,4 @@ -#include "compression.hh" +#include "nix/util/compression.hh" #include namespace nix { diff --git a/src/libutil/tests/config.cc b/src/libutil/tests/config.cc index 8be6730dd8d..eebcbf295f4 100644 --- a/src/libutil/tests/config.cc +++ b/src/libutil/tests/config.cc @@ -1,5 +1,5 @@ -#include "config.hh" -#include "args.hh" +#include "nix/util/config.hh" +#include "nix/util/args.hh" #include #include diff --git a/src/libutil/tests/git.cc b/src/libutil/tests/git.cc index 5b5715fc26b..46e42dfa3e5 100644 --- a/src/libutil/tests/git.cc +++ b/src/libutil/tests/git.cc @@ -1,4 +1,4 @@ -#include "git.hh" +#include "nix/util/git.hh" #include namespace nix { diff --git a/src/libutil/tests/hash.cc b/src/libutil/tests/hash.cc index e4e928b3b40..1ae8b9fe1a4 100644 --- a/src/libutil/tests/hash.cc +++ b/src/libutil/tests/hash.cc @@ -4,9 +4,9 @@ #include #include -#include +#include "nix/util/hash.hh" -#include "tests/hash.hh" +#include "hash.hh" namespace nix { diff --git a/src/libutil/tests/hash.hh b/src/libutil/tests/hash.hh index 9e9650e6efb..e003f0a4135 100644 --- a/src/libutil/tests/hash.hh +++ b/src/libutil/tests/hash.hh @@ -2,7 +2,7 @@ #include -#include +#include "nix/util/hash.hh" namespace rc { using namespace nix; diff --git a/src/libutil/tests/hilite.cc b/src/libutil/tests/hilite.cc index 1ff5980d583..4f5afd8f563 100644 --- a/src/libutil/tests/hilite.cc +++ b/src/libutil/tests/hilite.cc @@ -1,4 +1,4 @@ -#include "hilite.hh" +#include "nix/util/hilite.hh" #include diff --git a/src/libutil/tests/local.mk b/src/libutil/tests/local.mk index 167915439fd..5390a0ce4eb 100644 --- a/src/libutil/tests/local.mk +++ b/src/libutil/tests/local.mk @@ -22,7 +22,7 @@ libutil-tests_INSTALL_DIR := libutil-tests_SOURCES := $(wildcard $(d)/*.cc) -libutil-tests_CXXFLAGS += -I src/libutil +libutil-tests_CXXFLAGS += -I src/libutil/include libutil-tests_LIBS = libutil diff --git a/src/libutil/tests/logging.cc b/src/libutil/tests/logging.cc index 2ffdc2e9b88..5d386c498d2 100644 --- a/src/libutil/tests/logging.cc +++ b/src/libutil/tests/logging.cc @@ -1,8 +1,8 @@ #if 0 -#include "logging.hh" +#include "nix/util/logging.hh" #include "nixexpr.hh" -#include "util.hh" +#include "nix/util/util.hh" #include #include diff --git a/src/libutil/tests/lru-cache.cc b/src/libutil/tests/lru-cache.cc index 091d3d5ede1..daa2a91fe87 100644 --- a/src/libutil/tests/lru-cache.cc +++ b/src/libutil/tests/lru-cache.cc @@ -1,4 +1,4 @@ -#include "lru-cache.hh" +#include "nix/util/lru-cache.hh" #include namespace nix { diff --git a/src/libutil/tests/pool.cc b/src/libutil/tests/pool.cc index 127e42dda2b..c9f31f9a086 100644 --- a/src/libutil/tests/pool.cc +++ b/src/libutil/tests/pool.cc @@ -1,4 +1,4 @@ -#include "pool.hh" +#include "nix/util/pool.hh" #include namespace nix { diff --git a/src/libutil/tests/suggestions.cc b/src/libutil/tests/suggestions.cc index 279994abc67..c58f033da83 100644 --- a/src/libutil/tests/suggestions.cc +++ b/src/libutil/tests/suggestions.cc @@ -1,4 +1,4 @@ -#include "suggestions.hh" +#include "nix/util/suggestions.hh" #include namespace nix { diff --git a/src/libutil/tests/tests.cc b/src/libutil/tests/tests.cc index 250e83a3894..a0e30f1cb3e 100644 --- a/src/libutil/tests/tests.cc +++ b/src/libutil/tests/tests.cc @@ -1,5 +1,5 @@ -#include "util.hh" -#include "types.hh" +#include "nix/util/util.hh" +#include "nix/util/types.hh" #include #include diff --git a/src/libutil/tests/url.cc b/src/libutil/tests/url.cc index e0c438b4dab..6bf17090416 100644 --- a/src/libutil/tests/url.cc +++ b/src/libutil/tests/url.cc @@ -1,4 +1,4 @@ -#include "url.hh" +#include "nix/util/url.hh" #include namespace nix { diff --git a/src/libutil/tests/xml-writer.cc b/src/libutil/tests/xml-writer.cc index adcde25c9f1..000af700c3a 100644 --- a/src/libutil/tests/xml-writer.cc +++ b/src/libutil/tests/xml-writer.cc @@ -1,4 +1,4 @@ -#include "xml-writer.hh" +#include "nix/util/xml-writer.hh" #include #include diff --git a/src/libutil/thread-pool.cc b/src/libutil/thread-pool.cc index dc4067f1b3a..1e26e7fafec 100644 --- a/src/libutil/thread-pool.cc +++ b/src/libutil/thread-pool.cc @@ -1,4 +1,4 @@ -#include "thread-pool.hh" +#include "nix/util/thread-pool.hh" namespace nix { diff --git a/src/libutil/url.cc b/src/libutil/url.cc index 4e43455e1ef..f0463fed127 100644 --- a/src/libutil/url.cc +++ b/src/libutil/url.cc @@ -1,7 +1,7 @@ -#include "url.hh" -#include "url-parts.hh" -#include "util.hh" -#include "split.hh" +#include "nix/util/url.hh" +#include "nix/util/url-parts.hh" +#include "nix/util/util.hh" +#include "nix/util/split.hh" namespace nix { diff --git a/src/libutil/util.cc b/src/libutil/util.cc index 885bae69c9b..236a8faccb7 100644 --- a/src/libutil/util.cc +++ b/src/libutil/util.cc @@ -1,8 +1,8 @@ -#include "util.hh" -#include "sync.hh" -#include "finally.hh" -#include "serialise.hh" -#include "cgroup.hh" +#include "nix/util/util.hh" +#include "nix/util/sync.hh" +#include "nix/util/finally.hh" +#include "nix/util/serialise.hh" +#include "nix/util/cgroup.hh" #include #include diff --git a/src/libutil/xml-writer.cc b/src/libutil/xml-writer.cc index 7993bee9af0..e460dd169cb 100644 --- a/src/libutil/xml-writer.cc +++ b/src/libutil/xml-writer.cc @@ -1,6 +1,6 @@ #include -#include "xml-writer.hh" +#include "nix/util/xml-writer.hh" namespace nix { diff --git a/src/nix-build/nix-build.cc b/src/nix-build/nix-build.cc index da76c2ace2d..d46db486512 100644 --- a/src/nix-build/nix-build.cc +++ b/src/nix-build/nix-build.cc @@ -14,7 +14,7 @@ #include "local-fs-store.hh" #include "globals.hh" #include "derivations.hh" -#include "util.hh" +#include "nix/util/util.hh" #include "shared.hh" #include "path-with-outputs.hh" #include "eval.hh" diff --git a/src/nix-channel/nix-channel.cc b/src/nix-channel/nix-channel.cc index 338a7d18e48..28016f77bd0 100755 --- a/src/nix-channel/nix-channel.cc +++ b/src/nix-channel/nix-channel.cc @@ -5,7 +5,7 @@ #include "store-api.hh" #include "legacy.hh" #include "fetchers.hh" -#include "util.hh" +#include "nix/util/util.hh" #include #include diff --git a/src/nix-env/nix-env.cc b/src/nix-env/nix-env.cc index 0daf374dece..1d33fd7489a 100644 --- a/src/nix-env/nix-env.cc +++ b/src/nix-env/nix-env.cc @@ -11,9 +11,9 @@ #include "store-api.hh" #include "local-fs-store.hh" #include "user-env.hh" -#include "util.hh" +#include "nix/util/util.hh" #include "value-to-json.hh" -#include "xml-writer.hh" +#include "nix/util/xml-writer.hh" #include "legacy.hh" #include diff --git a/src/nix-env/user-env.cc b/src/nix-env/user-env.cc index cad7f9c88f3..5e63af219ec 100644 --- a/src/nix-env/user-env.cc +++ b/src/nix-env/user-env.cc @@ -1,5 +1,5 @@ #include "user-env.hh" -#include "util.hh" +#include "nix/util/util.hh" #include "derivations.hh" #include "store-api.hh" #include "path-with-outputs.hh" diff --git a/src/nix-instantiate/nix-instantiate.cc b/src/nix-instantiate/nix-instantiate.cc index 6b5ba595d23..897891b95c4 100644 --- a/src/nix-instantiate/nix-instantiate.cc +++ b/src/nix-instantiate/nix-instantiate.cc @@ -6,7 +6,7 @@ #include "attr-path.hh" #include "value-to-xml.hh" #include "value-to-json.hh" -#include "util.hh" +#include "nix/util/util.hh" #include "store-api.hh" #include "local-fs-store.hh" #include "common-eval-args.hh" diff --git a/src/nix-store/dotgraph.cc b/src/nix-store/dotgraph.cc index 577cadceb31..b60bf0b37be 100644 --- a/src/nix-store/dotgraph.cc +++ b/src/nix-store/dotgraph.cc @@ -1,5 +1,5 @@ #include "dotgraph.hh" -#include "util.hh" +#include "nix/util/util.hh" #include "store-api.hh" #include diff --git a/src/nix-store/graphml.cc b/src/nix-store/graphml.cc index 425d61e53ed..1093513523c 100644 --- a/src/nix-store/graphml.cc +++ b/src/nix-store/graphml.cc @@ -1,5 +1,5 @@ #include "graphml.hh" -#include "util.hh" +#include "nix/util/util.hh" #include "store-api.hh" #include "derivations.hh" diff --git a/src/nix-store/nix-store.cc b/src/nix-store/nix-store.cc index 3bbefedbe07..5330af51ac9 100644 --- a/src/nix-store/nix-store.cc +++ b/src/nix-store/nix-store.cc @@ -1,4 +1,4 @@ -#include "archive.hh" +#include "nix/util/archive.hh" #include "derivations.hh" #include "dotgraph.hh" #include "globals.hh" @@ -7,10 +7,10 @@ #include "gc-store.hh" #include "log-store.hh" #include "local-store.hh" -#include "monitor-fd.hh" +#include "nix/util/monitor-fd.hh" #include "serve-protocol.hh" #include "shared.hh" -#include "util.hh" +#include "nix/util/util.hh" #include "worker-protocol.hh" #include "graphml.hh" #include "legacy.hh" diff --git a/src/nix/add-to-store.cc b/src/nix/add-to-store.cc index 5168413d2de..328bed4cd18 100644 --- a/src/nix/add-to-store.cc +++ b/src/nix/add-to-store.cc @@ -1,7 +1,7 @@ #include "command.hh" #include "common-args.hh" #include "store-api.hh" -#include "archive.hh" +#include "nix/util/archive.hh" using namespace nix; diff --git a/src/nix/daemon.cc b/src/nix/daemon.cc index a22bccba113..6a386a4f065 100644 --- a/src/nix/daemon.cc +++ b/src/nix/daemon.cc @@ -2,12 +2,12 @@ #include "shared.hh" #include "local-store.hh" #include "remote-store.hh" -#include "util.hh" -#include "serialise.hh" -#include "archive.hh" +#include "nix/util/util.hh" +#include "nix/util/serialise.hh" +#include "nix/util/archive.hh" #include "globals.hh" #include "derivations.hh" -#include "finally.hh" +#include "nix/util/finally.hh" #include "legacy.hh" #include "daemon.hh" diff --git a/src/nix/doctor.cc b/src/nix/doctor.cc index ea87e3d8744..bd25591074d 100644 --- a/src/nix/doctor.cc +++ b/src/nix/doctor.cc @@ -1,12 +1,12 @@ #include #include "command.hh" -#include "logging.hh" +#include "nix/util/logging.hh" #include "serve-protocol.hh" #include "shared.hh" #include "store-api.hh" #include "local-fs-store.hh" -#include "util.hh" +#include "nix/util/util.hh" #include "worker-protocol.hh" using namespace nix; diff --git a/src/nix/dump-path.cc b/src/nix/dump-path.cc index c4edc894b89..da82bffc1f8 100644 --- a/src/nix/dump-path.cc +++ b/src/nix/dump-path.cc @@ -1,6 +1,6 @@ #include "command.hh" #include "store-api.hh" -#include "archive.hh" +#include "nix/util/archive.hh" using namespace nix; diff --git a/src/nix/hash.cc b/src/nix/hash.cc index 60d9593a772..0e8d233ead7 100644 --- a/src/nix/hash.cc +++ b/src/nix/hash.cc @@ -1,10 +1,10 @@ #include "command.hh" -#include "hash.hh" +#include "nix/util/hash.hh" #include "content-address.hh" #include "legacy.hh" #include "shared.hh" #include "references.hh" -#include "archive.hh" +#include "nix/util/archive.hh" using namespace nix; diff --git a/src/nix/local.mk b/src/nix/local.mk index 0f2f016ec65..05a894d1dab 100644 --- a/src/nix/local.mk +++ b/src/nix/local.mk @@ -14,7 +14,14 @@ nix_SOURCES := \ $(wildcard src/nix-instantiate/*.cc) \ $(wildcard src/nix-store/*.cc) \ -nix_CXXFLAGS += -I src/libutil -I src/libstore -I src/libfetchers -I src/libexpr -I src/libmain -I src/libcmd -I doc/manual +nix_CXXFLAGS += \ + -Isrc/libutil/include \ + -Isrc/libstore \ + -Isrc/libfetchers \ + -Isrc/libexpr \ + -Isrc/libmain \ + -Isrc/libcmd \ + -Idoc/manual nix_LIBS = libexpr libmain libfetchers libstore libutil libcmd diff --git a/src/nix/main.cc b/src/nix/main.cc index d3d2f5b1658..6221d669a02 100644 --- a/src/nix/main.cc +++ b/src/nix/main.cc @@ -8,7 +8,7 @@ #include "shared.hh" #include "store-api.hh" #include "filetransfer.hh" -#include "finally.hh" +#include "nix/util/finally.hh" #include "loggers.hh" #include "markdown.hh" diff --git a/src/nix/ping-store.cc b/src/nix/ping-store.cc index 5c44510ab94..4dc982bcd80 100644 --- a/src/nix/ping-store.cc +++ b/src/nix/ping-store.cc @@ -1,7 +1,7 @@ #include "command.hh" #include "shared.hh" #include "store-api.hh" -#include "finally.hh" +#include "nix/util/finally.hh" #include diff --git a/src/nix/prefetch.cc b/src/nix/prefetch.cc index fc3823406a9..15abc6cc556 100644 --- a/src/nix/prefetch.cc +++ b/src/nix/prefetch.cc @@ -3,9 +3,9 @@ #include "shared.hh" #include "store-api.hh" #include "filetransfer.hh" -#include "finally.hh" +#include "nix/util/finally.hh" #include "progress-bar.hh" -#include "tarfile.hh" +#include "nix/util/tarfile.hh" #include "attr-path.hh" #include "eval-inline.hh" #include "legacy.hh" diff --git a/src/nix/profile.cc b/src/nix/profile.cc index 32364e720d7..2bc4935cabf 100644 --- a/src/nix/profile.cc +++ b/src/nix/profile.cc @@ -3,7 +3,7 @@ #include "shared.hh" #include "store-api.hh" #include "derivations.hh" -#include "archive.hh" +#include "nix/util/archive.hh" #include "builtins/buildenv.hh" #include "flake/flakeref.hh" #include "../nix-env/user-env.hh" diff --git a/src/nix/run.cc b/src/nix/run.cc index 6fca6804794..954a74fe757 100644 --- a/src/nix/run.cc +++ b/src/nix/run.cc @@ -5,7 +5,7 @@ #include "store-api.hh" #include "derivations.hh" #include "local-store.hh" -#include "finally.hh" +#include "nix/util/finally.hh" #include "fs-accessor.hh" #include "progress-bar.hh" #include "eval.hh" diff --git a/src/nix/search.cc b/src/nix/search.cc index 4fa1e783728..80bc5c47c9b 100644 --- a/src/nix/search.cc +++ b/src/nix/search.cc @@ -8,7 +8,7 @@ #include "shared.hh" #include "eval-cache.hh" #include "attr-path.hh" -#include "hilite.hh" +#include "nix/util/hilite.hh" #include #include diff --git a/src/nix/show-derivation.cc b/src/nix/show-derivation.cc index af2e676a4f7..511fc584ce3 100644 --- a/src/nix/show-derivation.cc +++ b/src/nix/show-derivation.cc @@ -4,7 +4,7 @@ #include "command.hh" #include "common-args.hh" #include "store-api.hh" -#include "archive.hh" +#include "nix/util/archive.hh" #include "derivations.hh" #include diff --git a/src/nix/sigs.cc b/src/nix/sigs.cc index 3d659d6d241..b0a748ee7e8 100644 --- a/src/nix/sigs.cc +++ b/src/nix/sigs.cc @@ -1,7 +1,7 @@ #include "command.hh" #include "shared.hh" #include "store-api.hh" -#include "thread-pool.hh" +#include "nix/util/thread-pool.hh" #include diff --git a/src/nix/store-copy-log.cc b/src/nix/store-copy-log.cc index d5fab5f2f38..5b4874727b3 100644 --- a/src/nix/store-copy-log.cc +++ b/src/nix/store-copy-log.cc @@ -3,8 +3,8 @@ #include "store-api.hh" #include "store-cast.hh" #include "log-store.hh" -#include "sync.hh" -#include "thread-pool.hh" +#include "nix/util/sync.hh" +#include "nix/util/thread-pool.hh" #include diff --git a/src/nix/verify.cc b/src/nix/verify.cc index 0b306cc1159..e9b66c228d2 100644 --- a/src/nix/verify.cc +++ b/src/nix/verify.cc @@ -1,8 +1,8 @@ #include "command.hh" #include "shared.hh" #include "store-api.hh" -#include "sync.hh" -#include "thread-pool.hh" +#include "nix/util/sync.hh" +#include "nix/util/thread-pool.hh" #include "references.hh" #include diff --git a/tests/plugins/local.mk b/tests/plugins/local.mk index 8182a6a8329..d0c6a511465 100644 --- a/tests/plugins/local.mk +++ b/tests/plugins/local.mk @@ -8,4 +8,7 @@ libplugintest_ALLOW_UNDEFINED := 1 libplugintest_EXCLUDE_FROM_LIBRARY_LIST := 1 -libplugintest_CXXFLAGS := -I src/libutil -I src/libstore -I src/libexpr +libplugintest_CXXFLAGS := \ + -Isrc/libexpr \ + -Isrc/libstore \ + -Isrc/libutil/include diff --git a/tests/plugins/plugintest.cc b/tests/plugins/plugintest.cc index 04b7910216b..306b974a678 100644 --- a/tests/plugins/plugintest.cc +++ b/tests/plugins/plugintest.cc @@ -1,4 +1,4 @@ -#include "config.hh" +#include "nix/util/config.hh" #include "primops.hh" using namespace nix; From 4fd6b6202bc24573407408cb0e95d306370bd297 Mon Sep 17 00:00:00 2001 From: Andrea Bedini Date: Fri, 17 Feb 2023 11:37:50 +0800 Subject: [PATCH 05/21] Move libcmd include files --- src/build-remote/build-remote.cc | 2 +- src/libcmd/command.cc | 2 +- src/libcmd/common-eval-args.cc | 4 ++-- src/libcmd/{ => include/nix/cmd}/command.hh | 4 ++-- src/libcmd/{ => include/nix/cmd}/common-eval-args.hh | 0 .../{ => include/nix/cmd}/installable-derived-path.hh | 2 +- src/libcmd/{ => include/nix/cmd}/installables.hh | 0 src/libcmd/{ => include/nix/cmd}/legacy.hh | 0 src/libcmd/{ => include/nix/cmd}/markdown.hh | 0 src/libcmd/installable-derived-path.cc | 2 +- src/libcmd/installables.cc | 8 ++++---- src/libcmd/legacy.cc | 2 +- src/libcmd/local.mk | 7 ++++--- src/libcmd/markdown.cc | 2 +- src/libcmd/repl.cc | 6 +++--- src/nix-build/nix-build.cc | 4 ++-- src/nix-channel/nix-channel.cc | 2 +- src/nix-collect-garbage/nix-collect-garbage.cc | 2 +- src/nix-copy-closure/nix-copy-closure.cc | 2 +- src/nix-env/nix-env.cc | 4 ++-- src/nix-instantiate/nix-instantiate.cc | 4 ++-- src/nix-store/nix-store.cc | 2 +- src/nix/add-to-store.cc | 2 +- src/nix/app.cc | 6 +++--- src/nix/build.cc | 2 +- src/nix/bundle.cc | 2 +- src/nix/cat.cc | 2 +- src/nix/copy.cc | 2 +- src/nix/daemon.cc | 4 ++-- src/nix/describe-stores.cc | 2 +- src/nix/develop.cc | 2 +- src/nix/diff-closures.cc | 2 +- src/nix/doctor.cc | 2 +- src/nix/dump-path.cc | 2 +- src/nix/edit.cc | 2 +- src/nix/eval.cc | 2 +- src/nix/flake.cc | 4 ++-- src/nix/fmt.cc | 2 +- src/nix/hash.cc | 4 ++-- src/nix/local.mk | 10 +++++----- src/nix/log.cc | 2 +- src/nix/ls.cc | 2 +- src/nix/main.cc | 6 +++--- src/nix/make-content-addressed.cc | 2 +- src/nix/nar.cc | 2 +- src/nix/optimise-store.cc | 2 +- src/nix/path-from-hash-part.cc | 2 +- src/nix/path-info.cc | 2 +- src/nix/ping-store.cc | 2 +- src/nix/prefetch.cc | 4 ++-- src/nix/profile.cc | 2 +- src/nix/realisation.cc | 2 +- src/nix/registry.cc | 2 +- src/nix/run.cc | 2 +- src/nix/search.cc | 2 +- src/nix/show-config.cc | 2 +- src/nix/show-derivation.cc | 2 +- src/nix/sigs.cc | 2 +- src/nix/store-copy-log.cc | 2 +- src/nix/store-delete.cc | 2 +- src/nix/store-gc.cc | 2 +- src/nix/store-repair.cc | 2 +- src/nix/store.cc | 2 +- src/nix/upgrade-nix.cc | 2 +- src/nix/verify.cc | 2 +- src/nix/why-depends.cc | 2 +- 66 files changed, 87 insertions(+), 86 deletions(-) rename src/libcmd/{ => include/nix/cmd}/command.hh (98%) rename src/libcmd/{ => include/nix/cmd}/common-eval-args.hh (100%) rename src/libcmd/{ => include/nix/cmd}/installable-derived-path.hh (94%) rename src/libcmd/{ => include/nix/cmd}/installables.hh (100%) rename src/libcmd/{ => include/nix/cmd}/legacy.hh (100%) rename src/libcmd/{ => include/nix/cmd}/markdown.hh (100%) diff --git a/src/build-remote/build-remote.cc b/src/build-remote/build-remote.cc index a196f1eab75..0382b872442 100644 --- a/src/build-remote/build-remote.cc +++ b/src/build-remote/build-remote.cc @@ -18,7 +18,7 @@ #include "store-api.hh" #include "derivations.hh" #include "local-store.hh" -#include "legacy.hh" +#include "nix/cmd/legacy.hh" #include "nix/util/experimental-features.hh" using namespace nix; diff --git a/src/libcmd/command.cc b/src/libcmd/command.cc index 517cdf617ab..d0a2776fd6f 100644 --- a/src/libcmd/command.cc +++ b/src/libcmd/command.cc @@ -1,4 +1,4 @@ -#include "command.hh" +#include "nix/cmd/command.hh" #include "store-api.hh" #include "local-fs-store.hh" #include "derivations.hh" diff --git a/src/libcmd/common-eval-args.cc b/src/libcmd/common-eval-args.cc index dda2d68c41d..7f997f894b1 100644 --- a/src/libcmd/common-eval-args.cc +++ b/src/libcmd/common-eval-args.cc @@ -1,4 +1,4 @@ -#include "common-eval-args.hh" +#include "nix/cmd/common-eval-args.hh" #include "shared.hh" #include "filetransfer.hh" #include "nix/util/util.hh" @@ -7,7 +7,7 @@ #include "registry.hh" #include "flake/flakeref.hh" #include "store-api.hh" -#include "command.hh" +#include "nix/cmd/command.hh" namespace nix { diff --git a/src/libcmd/command.hh b/src/libcmd/include/nix/cmd/command.hh similarity index 98% rename from src/libcmd/command.hh rename to src/libcmd/include/nix/cmd/command.hh index 90cc8333a82..fc95a6470ac 100644 --- a/src/libcmd/command.hh +++ b/src/libcmd/include/nix/cmd/command.hh @@ -1,8 +1,8 @@ #pragma once -#include "installables.hh" +#include "nix/cmd/installables.hh" #include "nix/util/args.hh" -#include "common-eval-args.hh" +#include "nix/cmd/common-eval-args.hh" #include "path.hh" #include "flake/lockfile.hh" diff --git a/src/libcmd/common-eval-args.hh b/src/libcmd/include/nix/cmd/common-eval-args.hh similarity index 100% rename from src/libcmd/common-eval-args.hh rename to src/libcmd/include/nix/cmd/common-eval-args.hh diff --git a/src/libcmd/installable-derived-path.hh b/src/libcmd/include/nix/cmd/installable-derived-path.hh similarity index 94% rename from src/libcmd/installable-derived-path.hh rename to src/libcmd/include/nix/cmd/installable-derived-path.hh index 042878b91c8..06cfe333ce2 100644 --- a/src/libcmd/installable-derived-path.hh +++ b/src/libcmd/include/nix/cmd/installable-derived-path.hh @@ -1,6 +1,6 @@ #pragma once -#include "installables.hh" +#include "nix/cmd/installables.hh" namespace nix { diff --git a/src/libcmd/installables.hh b/src/libcmd/include/nix/cmd/installables.hh similarity index 100% rename from src/libcmd/installables.hh rename to src/libcmd/include/nix/cmd/installables.hh diff --git a/src/libcmd/legacy.hh b/src/libcmd/include/nix/cmd/legacy.hh similarity index 100% rename from src/libcmd/legacy.hh rename to src/libcmd/include/nix/cmd/legacy.hh diff --git a/src/libcmd/markdown.hh b/src/libcmd/include/nix/cmd/markdown.hh similarity index 100% rename from src/libcmd/markdown.hh rename to src/libcmd/include/nix/cmd/markdown.hh diff --git a/src/libcmd/installable-derived-path.cc b/src/libcmd/installable-derived-path.cc index a9921b90125..26db3b4e656 100644 --- a/src/libcmd/installable-derived-path.cc +++ b/src/libcmd/installable-derived-path.cc @@ -1,4 +1,4 @@ -#include "installable-derived-path.hh" +#include "nix/cmd/installable-derived-path.hh" #include "derivations.hh" namespace nix { diff --git a/src/libcmd/installables.cc b/src/libcmd/installables.cc index fc512f9c27c..654dcb0cc73 100644 --- a/src/libcmd/installables.cc +++ b/src/libcmd/installables.cc @@ -1,11 +1,11 @@ #include "globals.hh" -#include "installables.hh" -#include "installable-derived-path.hh" +#include "nix/cmd/installables.hh" +#include "nix/cmd/installable-derived-path.hh" #include "outputs-spec.hh" #include "nix/util/util.hh" -#include "command.hh" +#include "nix/cmd/command.hh" #include "attr-path.hh" -#include "common-eval-args.hh" +#include "nix/cmd/common-eval-args.hh" #include "derivations.hh" #include "eval-inline.hh" #include "eval.hh" diff --git a/src/libcmd/legacy.cc b/src/libcmd/legacy.cc index 6df09ee37a5..69b06683141 100644 --- a/src/libcmd/legacy.cc +++ b/src/libcmd/legacy.cc @@ -1,4 +1,4 @@ -#include "legacy.hh" +#include "nix/cmd/legacy.hh" namespace nix { diff --git a/src/libcmd/local.mk b/src/libcmd/local.mk index 6ab221659ba..0525b87a597 100644 --- a/src/libcmd/local.mk +++ b/src/libcmd/local.mk @@ -7,11 +7,12 @@ libcmd_DIR := $(d) libcmd_SOURCES := $(wildcard $(d)/*.cc) libcmd_CXXFLAGS += \ - -Isrc/libutil/include \ - -Isrc/libstore \ + -Isrc/libcmd/include \ -Isrc/libexpr \ - -Isrc/libmain \ -Isrc/libfetchers \ + -Isrc/libmain \ + -Isrc/libstore \ + -Isrc/libutil/include \ -Isrc/nix libcmd_LDFLAGS = $(EDITLINE_LIBS) $(LOWDOWN_LIBS) -pthread diff --git a/src/libcmd/markdown.cc b/src/libcmd/markdown.cc index 0900b128e8d..83a490a19d7 100644 --- a/src/libcmd/markdown.cc +++ b/src/libcmd/markdown.cc @@ -1,4 +1,4 @@ -#include "markdown.hh" +#include "nix/cmd/markdown.hh" #include "nix/util/util.hh" #include "nix/util/finally.hh" diff --git a/src/libcmd/repl.cc b/src/libcmd/repl.cc index ba86513d239..c609c4f0f4b 100644 --- a/src/libcmd/repl.cc +++ b/src/libcmd/repl.cc @@ -27,13 +27,13 @@ extern "C" { #include "attr-path.hh" #include "store-api.hh" #include "log-store.hh" -#include "common-eval-args.hh" +#include "nix/cmd/common-eval-args.hh" #include "get-drvs.hh" #include "derivations.hh" #include "globals.hh" -#include "command.hh" +#include "nix/cmd/command.hh" #include "nix/util/finally.hh" -#include "markdown.hh" +#include "nix/cmd/markdown.hh" #include "local-fs-store.hh" #include "progress-bar.hh" diff --git a/src/nix-build/nix-build.cc b/src/nix-build/nix-build.cc index d46db486512..753956d7c25 100644 --- a/src/nix-build/nix-build.cc +++ b/src/nix-build/nix-build.cc @@ -20,9 +20,9 @@ #include "eval.hh" #include "eval-inline.hh" #include "get-drvs.hh" -#include "common-eval-args.hh" +#include "nix/cmd/common-eval-args.hh" #include "attr-path.hh" -#include "legacy.hh" +#include "nix/cmd/legacy.hh" using namespace nix; using namespace std::string_literals; diff --git a/src/nix-channel/nix-channel.cc b/src/nix-channel/nix-channel.cc index 28016f77bd0..2c26b912039 100755 --- a/src/nix-channel/nix-channel.cc +++ b/src/nix-channel/nix-channel.cc @@ -3,7 +3,7 @@ #include "globals.hh" #include "filetransfer.hh" #include "store-api.hh" -#include "legacy.hh" +#include "nix/cmd/legacy.hh" #include "fetchers.hh" #include "nix/util/util.hh" diff --git a/src/nix-collect-garbage/nix-collect-garbage.cc b/src/nix-collect-garbage/nix-collect-garbage.cc index e413faffe87..e2779e1b3c5 100644 --- a/src/nix-collect-garbage/nix-collect-garbage.cc +++ b/src/nix-collect-garbage/nix-collect-garbage.cc @@ -4,7 +4,7 @@ #include "profiles.hh" #include "shared.hh" #include "globals.hh" -#include "legacy.hh" +#include "nix/cmd/legacy.hh" #include #include diff --git a/src/nix-copy-closure/nix-copy-closure.cc b/src/nix-copy-closure/nix-copy-closure.cc index 841d50fd307..5e82a2265b7 100755 --- a/src/nix-copy-closure/nix-copy-closure.cc +++ b/src/nix-copy-closure/nix-copy-closure.cc @@ -1,6 +1,6 @@ #include "shared.hh" #include "store-api.hh" -#include "legacy.hh" +#include "nix/cmd/legacy.hh" using namespace nix; diff --git a/src/nix-env/nix-env.cc b/src/nix-env/nix-env.cc index 1d33fd7489a..41d31ca1218 100644 --- a/src/nix-env/nix-env.cc +++ b/src/nix-env/nix-env.cc @@ -1,5 +1,5 @@ #include "attr-path.hh" -#include "common-eval-args.hh" +#include "nix/cmd/common-eval-args.hh" #include "derivations.hh" #include "eval.hh" #include "get-drvs.hh" @@ -14,7 +14,7 @@ #include "nix/util/util.hh" #include "value-to-json.hh" #include "nix/util/xml-writer.hh" -#include "legacy.hh" +#include "nix/cmd/legacy.hh" #include #include diff --git a/src/nix-instantiate/nix-instantiate.cc b/src/nix-instantiate/nix-instantiate.cc index 897891b95c4..b3234465b4e 100644 --- a/src/nix-instantiate/nix-instantiate.cc +++ b/src/nix-instantiate/nix-instantiate.cc @@ -9,8 +9,8 @@ #include "nix/util/util.hh" #include "store-api.hh" #include "local-fs-store.hh" -#include "common-eval-args.hh" -#include "legacy.hh" +#include "nix/cmd/common-eval-args.hh" +#include "nix/cmd/legacy.hh" #include #include diff --git a/src/nix-store/nix-store.cc b/src/nix-store/nix-store.cc index 5330af51ac9..04ff71a5015 100644 --- a/src/nix-store/nix-store.cc +++ b/src/nix-store/nix-store.cc @@ -13,7 +13,7 @@ #include "nix/util/util.hh" #include "worker-protocol.hh" #include "graphml.hh" -#include "legacy.hh" +#include "nix/cmd/legacy.hh" #include "path-with-outputs.hh" #include diff --git a/src/nix/add-to-store.cc b/src/nix/add-to-store.cc index 328bed4cd18..b6df49c1b81 100644 --- a/src/nix/add-to-store.cc +++ b/src/nix/add-to-store.cc @@ -1,4 +1,4 @@ -#include "command.hh" +#include "nix/cmd/command.hh" #include "common-args.hh" #include "store-api.hh" #include "nix/util/archive.hh" diff --git a/src/nix/app.cc b/src/nix/app.cc index 5cd65136f53..d76f4187077 100644 --- a/src/nix/app.cc +++ b/src/nix/app.cc @@ -1,10 +1,10 @@ -#include "installables.hh" -#include "installable-derived-path.hh" +#include "nix/cmd/installables.hh" +#include "nix/cmd/installable-derived-path.hh" #include "store-api.hh" #include "eval-inline.hh" #include "eval-cache.hh" #include "names.hh" -#include "command.hh" +#include "nix/cmd/command.hh" #include "derivations.hh" namespace nix { diff --git a/src/nix/build.cc b/src/nix/build.cc index 12b22d999a3..9a23e94ffdd 100644 --- a/src/nix/build.cc +++ b/src/nix/build.cc @@ -1,5 +1,5 @@ #include "eval.hh" -#include "command.hh" +#include "nix/cmd/command.hh" #include "common-args.hh" #include "shared.hh" #include "store-api.hh" diff --git a/src/nix/bundle.cc b/src/nix/bundle.cc index 6ae9460f60f..0cbe0e72d78 100644 --- a/src/nix/bundle.cc +++ b/src/nix/bundle.cc @@ -1,4 +1,4 @@ -#include "command.hh" +#include "nix/cmd/command.hh" #include "common-args.hh" #include "shared.hh" #include "store-api.hh" diff --git a/src/nix/cat.cc b/src/nix/cat.cc index 6420a0f7989..3a508ad1bc9 100644 --- a/src/nix/cat.cc +++ b/src/nix/cat.cc @@ -1,4 +1,4 @@ -#include "command.hh" +#include "nix/cmd/command.hh" #include "store-api.hh" #include "fs-accessor.hh" #include "nar-accessor.hh" diff --git a/src/nix/copy.cc b/src/nix/copy.cc index 8730a9a5c33..807b5264b1f 100644 --- a/src/nix/copy.cc +++ b/src/nix/copy.cc @@ -1,4 +1,4 @@ -#include "command.hh" +#include "nix/cmd/command.hh" #include "shared.hh" #include "store-api.hh" diff --git a/src/nix/daemon.cc b/src/nix/daemon.cc index 6a386a4f065..09eb01b92bb 100644 --- a/src/nix/daemon.cc +++ b/src/nix/daemon.cc @@ -1,4 +1,4 @@ -#include "command.hh" +#include "nix/cmd/command.hh" #include "shared.hh" #include "local-store.hh" #include "remote-store.hh" @@ -8,7 +8,7 @@ #include "globals.hh" #include "derivations.hh" #include "nix/util/finally.hh" -#include "legacy.hh" +#include "nix/cmd/legacy.hh" #include "daemon.hh" #include diff --git a/src/nix/describe-stores.cc b/src/nix/describe-stores.cc index 1dd384c0e34..9080f697c56 100644 --- a/src/nix/describe-stores.cc +++ b/src/nix/describe-stores.cc @@ -1,4 +1,4 @@ -#include "command.hh" +#include "nix/cmd/command.hh" #include "common-args.hh" #include "shared.hh" #include "store-api.hh" diff --git a/src/nix/develop.cc b/src/nix/develop.cc index 16bbd8613aa..107bca6244a 100644 --- a/src/nix/develop.cc +++ b/src/nix/develop.cc @@ -1,5 +1,5 @@ #include "eval.hh" -#include "command.hh" +#include "nix/cmd/command.hh" #include "common-args.hh" #include "shared.hh" #include "store-api.hh" diff --git a/src/nix/diff-closures.cc b/src/nix/diff-closures.cc index 3489cc13268..0fce8d762c9 100644 --- a/src/nix/diff-closures.cc +++ b/src/nix/diff-closures.cc @@ -1,4 +1,4 @@ -#include "command.hh" +#include "nix/cmd/command.hh" #include "shared.hh" #include "store-api.hh" #include "common-args.hh" diff --git a/src/nix/doctor.cc b/src/nix/doctor.cc index bd25591074d..97804b9ef65 100644 --- a/src/nix/doctor.cc +++ b/src/nix/doctor.cc @@ -1,6 +1,6 @@ #include -#include "command.hh" +#include "nix/cmd/command.hh" #include "nix/util/logging.hh" #include "serve-protocol.hh" #include "shared.hh" diff --git a/src/nix/dump-path.cc b/src/nix/dump-path.cc index da82bffc1f8..e9a2944d380 100644 --- a/src/nix/dump-path.cc +++ b/src/nix/dump-path.cc @@ -1,4 +1,4 @@ -#include "command.hh" +#include "nix/cmd/command.hh" #include "store-api.hh" #include "nix/util/archive.hh" diff --git a/src/nix/edit.cc b/src/nix/edit.cc index 76a134b1f67..45e52823855 100644 --- a/src/nix/edit.cc +++ b/src/nix/edit.cc @@ -1,4 +1,4 @@ -#include "command.hh" +#include "nix/cmd/command.hh" #include "shared.hh" #include "eval.hh" #include "attr-path.hh" diff --git a/src/nix/eval.cc b/src/nix/eval.cc index ccee074e948..66a21c5a679 100644 --- a/src/nix/eval.cc +++ b/src/nix/eval.cc @@ -1,4 +1,4 @@ -#include "command.hh" +#include "nix/cmd/command.hh" #include "common-args.hh" #include "shared.hh" #include "store-api.hh" diff --git a/src/nix/flake.cc b/src/nix/flake.cc index c025bc7a602..cdcccf6ae72 100644 --- a/src/nix/flake.cc +++ b/src/nix/flake.cc @@ -1,4 +1,4 @@ -#include "command.hh" +#include "nix/cmd/command.hh" #include "common-args.hh" #include "shared.hh" #include "eval.hh" @@ -12,7 +12,7 @@ #include "fetchers.hh" #include "registry.hh" #include "eval-cache.hh" -#include "markdown.hh" +#include "nix/cmd/markdown.hh" #include #include diff --git a/src/nix/fmt.cc b/src/nix/fmt.cc index 6f6a4a63227..aca94b5f73e 100644 --- a/src/nix/fmt.cc +++ b/src/nix/fmt.cc @@ -1,4 +1,4 @@ -#include "command.hh" +#include "nix/cmd/command.hh" #include "run.hh" using namespace nix; diff --git a/src/nix/hash.cc b/src/nix/hash.cc index 0e8d233ead7..1bc49262e48 100644 --- a/src/nix/hash.cc +++ b/src/nix/hash.cc @@ -1,7 +1,7 @@ -#include "command.hh" +#include "nix/cmd/command.hh" #include "nix/util/hash.hh" #include "content-address.hh" -#include "legacy.hh" +#include "nix/cmd/legacy.hh" #include "shared.hh" #include "references.hh" #include "nix/util/archive.hh" diff --git a/src/nix/local.mk b/src/nix/local.mk index 05a894d1dab..74d695eb099 100644 --- a/src/nix/local.mk +++ b/src/nix/local.mk @@ -15,13 +15,13 @@ nix_SOURCES := \ $(wildcard src/nix-store/*.cc) \ nix_CXXFLAGS += \ - -Isrc/libutil/include \ - -Isrc/libstore \ - -Isrc/libfetchers \ + -Idoc/manual \ + -Isrc/libcmd/include \ -Isrc/libexpr \ + -Isrc/libfetchers \ -Isrc/libmain \ - -Isrc/libcmd \ - -Idoc/manual + -Isrc/libstore \ + -Isrc/libutil/include nix_LIBS = libexpr libmain libfetchers libstore libutil libcmd diff --git a/src/nix/log.cc b/src/nix/log.cc index a0598ca1333..a8b64a95e1d 100644 --- a/src/nix/log.cc +++ b/src/nix/log.cc @@ -1,4 +1,4 @@ -#include "command.hh" +#include "nix/cmd/command.hh" #include "common-args.hh" #include "shared.hh" #include "store-api.hh" diff --git a/src/nix/ls.cc b/src/nix/ls.cc index e964b01b3b0..e6e3eca8724 100644 --- a/src/nix/ls.cc +++ b/src/nix/ls.cc @@ -1,4 +1,4 @@ -#include "command.hh" +#include "nix/cmd/command.hh" #include "store-api.hh" #include "fs-accessor.hh" #include "nar-accessor.hh" diff --git a/src/nix/main.cc b/src/nix/main.cc index 6221d669a02..5ded9301bfa 100644 --- a/src/nix/main.cc +++ b/src/nix/main.cc @@ -1,16 +1,16 @@ #include -#include "command.hh" +#include "nix/cmd/command.hh" #include "common-args.hh" #include "eval.hh" #include "globals.hh" -#include "legacy.hh" +#include "nix/cmd/legacy.hh" #include "shared.hh" #include "store-api.hh" #include "filetransfer.hh" #include "nix/util/finally.hh" #include "loggers.hh" -#include "markdown.hh" +#include "nix/cmd/markdown.hh" #include #include diff --git a/src/nix/make-content-addressed.cc b/src/nix/make-content-addressed.cc index d86b90fc7c4..df2eced9e99 100644 --- a/src/nix/make-content-addressed.cc +++ b/src/nix/make-content-addressed.cc @@ -1,4 +1,4 @@ -#include "command.hh" +#include "nix/cmd/command.hh" #include "store-api.hh" #include "make-content-addressed.hh" #include "common-args.hh" diff --git a/src/nix/nar.cc b/src/nix/nar.cc index dbb043d9b9d..6dd308d2b71 100644 --- a/src/nix/nar.cc +++ b/src/nix/nar.cc @@ -1,4 +1,4 @@ -#include "command.hh" +#include "nix/cmd/command.hh" using namespace nix; diff --git a/src/nix/optimise-store.cc b/src/nix/optimise-store.cc index 985006e5a54..137f8416dd4 100644 --- a/src/nix/optimise-store.cc +++ b/src/nix/optimise-store.cc @@ -1,4 +1,4 @@ -#include "command.hh" +#include "nix/cmd/command.hh" #include "shared.hh" #include "store-api.hh" diff --git a/src/nix/path-from-hash-part.cc b/src/nix/path-from-hash-part.cc index 7f7cda8d3d3..17dc1f97d2e 100644 --- a/src/nix/path-from-hash-part.cc +++ b/src/nix/path-from-hash-part.cc @@ -1,4 +1,4 @@ -#include "command.hh" +#include "nix/cmd/command.hh" #include "store-api.hh" using namespace nix; diff --git a/src/nix/path-info.cc b/src/nix/path-info.cc index 613c5b1918d..ff5f8bd7337 100644 --- a/src/nix/path-info.cc +++ b/src/nix/path-info.cc @@ -1,4 +1,4 @@ -#include "command.hh" +#include "nix/cmd/command.hh" #include "shared.hh" #include "store-api.hh" #include "common-args.hh" diff --git a/src/nix/ping-store.cc b/src/nix/ping-store.cc index 4dc982bcd80..0a7b2fc5e7c 100644 --- a/src/nix/ping-store.cc +++ b/src/nix/ping-store.cc @@ -1,4 +1,4 @@ -#include "command.hh" +#include "nix/cmd/command.hh" #include "shared.hh" #include "store-api.hh" #include "nix/util/finally.hh" diff --git a/src/nix/prefetch.cc b/src/nix/prefetch.cc index 15abc6cc556..91b206685d3 100644 --- a/src/nix/prefetch.cc +++ b/src/nix/prefetch.cc @@ -1,4 +1,4 @@ -#include "command.hh" +#include "nix/cmd/command.hh" #include "common-args.hh" #include "shared.hh" #include "store-api.hh" @@ -8,7 +8,7 @@ #include "nix/util/tarfile.hh" #include "attr-path.hh" #include "eval-inline.hh" -#include "legacy.hh" +#include "nix/cmd/legacy.hh" #include diff --git a/src/nix/profile.cc b/src/nix/profile.cc index 2bc4935cabf..f5ef0ec97f3 100644 --- a/src/nix/profile.cc +++ b/src/nix/profile.cc @@ -1,4 +1,4 @@ -#include "command.hh" +#include "nix/cmd/command.hh" #include "common-args.hh" #include "shared.hh" #include "store-api.hh" diff --git a/src/nix/realisation.cc b/src/nix/realisation.cc index c9a7157cdcd..bf4a268ff9c 100644 --- a/src/nix/realisation.cc +++ b/src/nix/realisation.cc @@ -1,4 +1,4 @@ -#include "command.hh" +#include "nix/cmd/command.hh" #include "common-args.hh" #include diff --git a/src/nix/registry.cc b/src/nix/registry.cc index b5bdfba9517..2a0eca8927f 100644 --- a/src/nix/registry.cc +++ b/src/nix/registry.cc @@ -1,4 +1,4 @@ -#include "command.hh" +#include "nix/cmd/command.hh" #include "common-args.hh" #include "shared.hh" #include "eval.hh" diff --git a/src/nix/run.cc b/src/nix/run.cc index 954a74fe757..34560b1201d 100644 --- a/src/nix/run.cc +++ b/src/nix/run.cc @@ -1,5 +1,5 @@ #include "run.hh" -#include "command.hh" +#include "nix/cmd/command.hh" #include "common-args.hh" #include "shared.hh" #include "store-api.hh" diff --git a/src/nix/search.cc b/src/nix/search.cc index 80bc5c47c9b..c6331b5c635 100644 --- a/src/nix/search.cc +++ b/src/nix/search.cc @@ -1,4 +1,4 @@ -#include "command.hh" +#include "nix/cmd/command.hh" #include "globals.hh" #include "eval.hh" #include "eval-inline.hh" diff --git a/src/nix/show-config.cc b/src/nix/show-config.cc index 3530584f9b7..d3781ee6024 100644 --- a/src/nix/show-config.cc +++ b/src/nix/show-config.cc @@ -1,4 +1,4 @@ -#include "command.hh" +#include "nix/cmd/command.hh" #include "common-args.hh" #include "shared.hh" #include "store-api.hh" diff --git a/src/nix/show-derivation.cc b/src/nix/show-derivation.cc index 511fc584ce3..4245ec3aeec 100644 --- a/src/nix/show-derivation.cc +++ b/src/nix/show-derivation.cc @@ -1,7 +1,7 @@ // FIXME: integrate this with nix path-info? // FIXME: rename to 'nix store show-derivation' or 'nix debug show-derivation'? -#include "command.hh" +#include "nix/cmd/command.hh" #include "common-args.hh" #include "store-api.hh" #include "nix/util/archive.hh" diff --git a/src/nix/sigs.cc b/src/nix/sigs.cc index b0a748ee7e8..7c1b67cf10f 100644 --- a/src/nix/sigs.cc +++ b/src/nix/sigs.cc @@ -1,4 +1,4 @@ -#include "command.hh" +#include "nix/cmd/command.hh" #include "shared.hh" #include "store-api.hh" #include "nix/util/thread-pool.hh" diff --git a/src/nix/store-copy-log.cc b/src/nix/store-copy-log.cc index 5b4874727b3..44467278d3d 100644 --- a/src/nix/store-copy-log.cc +++ b/src/nix/store-copy-log.cc @@ -1,4 +1,4 @@ -#include "command.hh" +#include "nix/cmd/command.hh" #include "shared.hh" #include "store-api.hh" #include "store-cast.hh" diff --git a/src/nix/store-delete.cc b/src/nix/store-delete.cc index ca43f1530ee..bd8fbdcf5eb 100644 --- a/src/nix/store-delete.cc +++ b/src/nix/store-delete.cc @@ -1,4 +1,4 @@ -#include "command.hh" +#include "nix/cmd/command.hh" #include "common-args.hh" #include "shared.hh" #include "store-api.hh" diff --git a/src/nix/store-gc.cc b/src/nix/store-gc.cc index 8b9b5d1642a..b4e67706ae1 100644 --- a/src/nix/store-gc.cc +++ b/src/nix/store-gc.cc @@ -1,4 +1,4 @@ -#include "command.hh" +#include "nix/cmd/command.hh" #include "common-args.hh" #include "shared.hh" #include "store-api.hh" diff --git a/src/nix/store-repair.cc b/src/nix/store-repair.cc index 8fcb3639a43..b5437ad664b 100644 --- a/src/nix/store-repair.cc +++ b/src/nix/store-repair.cc @@ -1,4 +1,4 @@ -#include "command.hh" +#include "nix/cmd/command.hh" #include "store-api.hh" using namespace nix; diff --git a/src/nix/store.cc b/src/nix/store.cc index 44e53c7c758..33651509090 100644 --- a/src/nix/store.cc +++ b/src/nix/store.cc @@ -1,4 +1,4 @@ -#include "command.hh" +#include "nix/cmd/command.hh" using namespace nix; diff --git a/src/nix/upgrade-nix.cc b/src/nix/upgrade-nix.cc index 17796d6b8bb..cb240195cc6 100644 --- a/src/nix/upgrade-nix.cc +++ b/src/nix/upgrade-nix.cc @@ -1,4 +1,4 @@ -#include "command.hh" +#include "nix/cmd/command.hh" #include "common-args.hh" #include "store-api.hh" #include "filetransfer.hh" diff --git a/src/nix/verify.cc b/src/nix/verify.cc index e9b66c228d2..e2d0a60fcb8 100644 --- a/src/nix/verify.cc +++ b/src/nix/verify.cc @@ -1,4 +1,4 @@ -#include "command.hh" +#include "nix/cmd/command.hh" #include "shared.hh" #include "store-api.hh" #include "nix/util/sync.hh" diff --git a/src/nix/why-depends.cc b/src/nix/why-depends.cc index a3a9dc69889..66244d83ef6 100644 --- a/src/nix/why-depends.cc +++ b/src/nix/why-depends.cc @@ -1,4 +1,4 @@ -#include "command.hh" +#include "nix/cmd/command.hh" #include "store-api.hh" #include "progress-bar.hh" #include "fs-accessor.hh" From c6bc00ccabb1c37aa70b9ecb2f9bf1b8390bbadd Mon Sep 17 00:00:00 2001 From: Andrea Bedini Date: Fri, 17 Feb 2023 13:35:53 +0800 Subject: [PATCH 06/21] Move libexpr include files --- src/libcmd/command.cc | 2 +- src/libcmd/common-eval-args.cc | 4 ++-- src/libcmd/include/nix/cmd/command.hh | 2 +- src/libcmd/include/nix/cmd/installables.hh | 4 ++-- src/libcmd/installables.cc | 12 ++++++------ src/libcmd/local.mk | 2 +- src/libcmd/repl.cc | 10 +++++----- src/libexpr/attr-path.cc | 4 ++-- src/libexpr/attr-set.cc | 4 ++-- src/libexpr/eval-cache.cc | 6 +++--- src/libexpr/eval.cc | 6 +++--- src/libexpr/flake/config.cc | 2 +- src/libexpr/flake/flake.cc | 10 +++++----- src/libexpr/flake/flakeref.cc | 2 +- src/libexpr/flake/lockfile.cc | 2 +- src/libexpr/function-trace.cc | 2 +- src/libexpr/get-drvs.cc | 4 ++-- src/libexpr/{ => include/nix/expr}/attr-path.hh | 2 +- src/libexpr/{ => include/nix/expr}/attr-set.hh | 4 ++-- src/libexpr/{ => include/nix/expr}/eval-cache.hh | 2 +- src/libexpr/{ => include/nix/expr}/eval-inline.hh | 2 +- src/libexpr/{ => include/nix/expr}/eval.hh | 10 +++++----- src/libexpr/{ => include/nix/expr}/flake/flake.hh | 6 +++--- src/libexpr/{ => include/nix/expr}/flake/flakeref.hh | 0 src/libexpr/{ => include/nix/expr}/flake/lockfile.hh | 2 +- src/libexpr/{ => include/nix/expr}/function-trace.hh | 2 +- src/libexpr/{ => include/nix/expr}/get-drvs.hh | 2 +- src/libexpr/{ => include/nix/expr}/json-to-value.hh | 2 +- src/libexpr/{ => include/nix/expr}/nixexpr.hh | 4 ++-- src/libexpr/{ => include/nix/expr}/primops.hh | 2 +- src/libexpr/{ => include/nix/expr}/symbol-table.hh | 0 src/libexpr/{ => include/nix/expr}/value-to-json.hh | 4 ++-- src/libexpr/{ => include/nix/expr}/value-to-xml.hh | 4 ++-- src/libexpr/{ => include/nix/expr}/value.hh | 4 ++-- src/libexpr/{ => include/nix/expr}/value/context.hh | 0 src/libexpr/json-to-value.cc | 2 +- src/libexpr/lexer.l | 2 +- src/libexpr/local.mk | 2 +- src/libexpr/nixexpr.cc | 6 +++--- src/libexpr/parser.y | 8 ++++---- src/libexpr/primops.cc | 12 ++++++------ src/libexpr/primops/context.cc | 4 ++-- src/libexpr/primops/fetchClosure.cc | 2 +- src/libexpr/primops/fetchMercurial.cc | 4 ++-- src/libexpr/primops/fetchTree.cc | 4 ++-- src/libexpr/primops/fromTOML.cc | 4 ++-- src/libexpr/tests/json.cc | 2 +- src/libexpr/tests/libexpr.hh | 8 ++++---- src/libexpr/tests/local.mk | 2 +- src/libexpr/tests/value/context.hh | 2 +- src/libexpr/value-to-json.cc | 4 ++-- src/libexpr/value-to-xml.cc | 4 ++-- src/libexpr/value/context.cc | 2 +- src/libutil/tests/logging.cc | 2 +- src/nix-build/nix-build.cc | 8 ++++---- src/nix-env/nix-env.cc | 8 ++++---- src/nix-env/user-env.cc | 4 ++-- src/nix-env/user-env.hh | 2 +- src/nix-instantiate/nix-instantiate.cc | 12 ++++++------ src/nix/app.cc | 4 ++-- src/nix/build.cc | 2 +- src/nix/develop.cc | 2 +- src/nix/edit.cc | 4 ++-- src/nix/eval.cc | 6 +++--- src/nix/flake.cc | 12 ++++++------ src/nix/local.mk | 2 +- src/nix/main.cc | 2 +- src/nix/prefetch.cc | 4 ++-- src/nix/profile.cc | 2 +- src/nix/registry.cc | 4 ++-- src/nix/run.cc | 2 +- src/nix/search.cc | 10 +++++----- src/nix/upgrade-nix.cc | 4 ++-- tests/plugins/local.mk | 2 +- tests/plugins/plugintest.cc | 2 +- 75 files changed, 152 insertions(+), 152 deletions(-) rename src/libexpr/{ => include/nix/expr}/attr-path.hh (94%) rename src/libexpr/{ => include/nix/expr}/attr-set.hh (98%) rename src/libexpr/{ => include/nix/expr}/eval-cache.hh (99%) rename src/libexpr/{ => include/nix/expr}/eval-inline.hh (99%) rename src/libexpr/{ => include/nix/expr}/eval.hh (99%) rename src/libexpr/{ => include/nix/expr}/flake/flake.hh (97%) rename src/libexpr/{ => include/nix/expr}/flake/flakeref.hh (100%) rename src/libexpr/{ => include/nix/expr}/flake/lockfile.hh (98%) rename src/libexpr/{ => include/nix/expr}/function-trace.hh (85%) rename src/libexpr/{ => include/nix/expr}/get-drvs.hh (98%) rename src/libexpr/{ => include/nix/expr}/json-to-value.hh (85%) rename src/libexpr/{ => include/nix/expr}/nixexpr.hh (99%) rename src/libexpr/{ => include/nix/expr}/primops.hh (97%) rename src/libexpr/{ => include/nix/expr}/symbol-table.hh (100%) rename src/libexpr/{ => include/nix/expr}/value-to-json.hh (87%) rename src/libexpr/{ => include/nix/expr}/value-to-xml.hh (78%) rename src/libexpr/{ => include/nix/expr}/value.hh (99%) rename src/libexpr/{ => include/nix/expr}/value/context.hh (100%) diff --git a/src/libcmd/command.cc b/src/libcmd/command.cc index d0a2776fd6f..ed57a98d3a7 100644 --- a/src/libcmd/command.cc +++ b/src/libcmd/command.cc @@ -2,7 +2,7 @@ #include "store-api.hh" #include "local-fs-store.hh" #include "derivations.hh" -#include "nixexpr.hh" +#include "nix/expr/nixexpr.hh" #include "profiles.hh" #include diff --git a/src/libcmd/common-eval-args.cc b/src/libcmd/common-eval-args.cc index 7f997f894b1..2b531d32434 100644 --- a/src/libcmd/common-eval-args.cc +++ b/src/libcmd/common-eval-args.cc @@ -2,10 +2,10 @@ #include "shared.hh" #include "filetransfer.hh" #include "nix/util/util.hh" -#include "eval.hh" +#include "nix/expr/eval.hh" #include "fetchers.hh" #include "registry.hh" -#include "flake/flakeref.hh" +#include "nix/expr/flake/flakeref.hh" #include "store-api.hh" #include "nix/cmd/command.hh" diff --git a/src/libcmd/include/nix/cmd/command.hh b/src/libcmd/include/nix/cmd/command.hh index fc95a6470ac..0b652629729 100644 --- a/src/libcmd/include/nix/cmd/command.hh +++ b/src/libcmd/include/nix/cmd/command.hh @@ -4,7 +4,7 @@ #include "nix/util/args.hh" #include "nix/cmd/common-eval-args.hh" #include "path.hh" -#include "flake/lockfile.hh" +#include "nix/expr/flake/lockfile.hh" #include diff --git a/src/libcmd/include/nix/cmd/installables.hh b/src/libcmd/include/nix/cmd/installables.hh index 7619d043628..3b6a397c698 100644 --- a/src/libcmd/include/nix/cmd/installables.hh +++ b/src/libcmd/include/nix/cmd/installables.hh @@ -4,9 +4,9 @@ #include "path.hh" #include "outputs-spec.hh" #include "derived-path.hh" -#include "eval.hh" +#include "nix/expr/eval.hh" #include "store-api.hh" -#include "flake/flake.hh" +#include "nix/expr/flake/flake.hh" #include "build-result.hh" #include diff --git a/src/libcmd/installables.cc b/src/libcmd/installables.cc index 654dcb0cc73..c681cbdfa72 100644 --- a/src/libcmd/installables.cc +++ b/src/libcmd/installables.cc @@ -4,16 +4,16 @@ #include "outputs-spec.hh" #include "nix/util/util.hh" #include "nix/cmd/command.hh" -#include "attr-path.hh" +#include "nix/expr/attr-path.hh" #include "nix/cmd/common-eval-args.hh" #include "derivations.hh" -#include "eval-inline.hh" -#include "eval.hh" -#include "get-drvs.hh" +#include "nix/expr/eval-inline.hh" +#include "nix/expr/eval.hh" +#include "nix/expr/get-drvs.hh" #include "store-api.hh" #include "shared.hh" -#include "flake/flake.hh" -#include "eval-cache.hh" +#include "nix/expr/flake/flake.hh" +#include "nix/expr/eval-cache.hh" #include "nix/util/url.hh" #include "registry.hh" #include "build-result.hh" diff --git a/src/libcmd/local.mk b/src/libcmd/local.mk index 0525b87a597..d2855d2d07b 100644 --- a/src/libcmd/local.mk +++ b/src/libcmd/local.mk @@ -8,7 +8,7 @@ libcmd_SOURCES := $(wildcard $(d)/*.cc) libcmd_CXXFLAGS += \ -Isrc/libcmd/include \ - -Isrc/libexpr \ + -Isrc/libexpr/include \ -Isrc/libfetchers \ -Isrc/libmain \ -Isrc/libstore \ diff --git a/src/libcmd/repl.cc b/src/libcmd/repl.cc index c609c4f0f4b..5d273a54297 100644 --- a/src/libcmd/repl.cc +++ b/src/libcmd/repl.cc @@ -21,14 +21,14 @@ extern "C" { #include "nix/util/ansicolor.hh" #include "shared.hh" -#include "eval.hh" -#include "eval-cache.hh" -#include "eval-inline.hh" -#include "attr-path.hh" +#include "nix/expr/eval.hh" +#include "nix/expr/eval-cache.hh" +#include "nix/expr/eval-inline.hh" +#include "nix/expr/attr-path.hh" #include "store-api.hh" #include "log-store.hh" #include "nix/cmd/common-eval-args.hh" -#include "get-drvs.hh" +#include "nix/expr/get-drvs.hh" #include "derivations.hh" #include "globals.hh" #include "nix/cmd/command.hh" diff --git a/src/libexpr/attr-path.cc b/src/libexpr/attr-path.cc index da45c7118f1..bb6fb661503 100644 --- a/src/libexpr/attr-path.cc +++ b/src/libexpr/attr-path.cc @@ -1,5 +1,5 @@ -#include "attr-path.hh" -#include "eval-inline.hh" +#include "nix/expr/attr-path.hh" +#include "nix/expr/eval-inline.hh" #include "nix/util/util.hh" diff --git a/src/libexpr/attr-set.cc b/src/libexpr/attr-set.cc index 877116f1f9c..7989ed783e0 100644 --- a/src/libexpr/attr-set.cc +++ b/src/libexpr/attr-set.cc @@ -1,5 +1,5 @@ -#include "attr-set.hh" -#include "eval-inline.hh" +#include "nix/expr/attr-set.hh" +#include "nix/expr/eval-inline.hh" #include diff --git a/src/libexpr/eval-cache.cc b/src/libexpr/eval-cache.cc index 1219b2471b6..c0bdaebbf11 100644 --- a/src/libexpr/eval-cache.cc +++ b/src/libexpr/eval-cache.cc @@ -1,7 +1,7 @@ -#include "eval-cache.hh" +#include "nix/expr/eval-cache.hh" #include "sqlite.hh" -#include "eval.hh" -#include "eval-inline.hh" +#include "nix/expr/eval.hh" +#include "nix/expr/eval-inline.hh" #include "store-api.hh" namespace nix::eval_cache { diff --git a/src/libexpr/eval.cc b/src/libexpr/eval.cc index 8bc83a5bcd6..27406b7a640 100644 --- a/src/libexpr/eval.cc +++ b/src/libexpr/eval.cc @@ -1,13 +1,13 @@ -#include "eval.hh" +#include "nix/expr/eval.hh" #include "nix/util/hash.hh" #include "nix/util/types.hh" #include "nix/util/util.hh" #include "store-api.hh" #include "derivations.hh" #include "globals.hh" -#include "eval-inline.hh" +#include "nix/expr/eval-inline.hh" #include "filetransfer.hh" -#include "function-trace.hh" +#include "nix/expr/function-trace.hh" #include #include diff --git a/src/libexpr/flake/config.cc b/src/libexpr/flake/config.cc index 89ddbde7e56..7990baf0bf6 100644 --- a/src/libexpr/flake/config.cc +++ b/src/libexpr/flake/config.cc @@ -1,4 +1,4 @@ -#include "flake.hh" +#include "nix/expr/flake/flake.hh" #include "globals.hh" #include "fetch-settings.hh" diff --git a/src/libexpr/flake/flake.cc b/src/libexpr/flake/flake.cc index 5d1660efad6..fe8de38a402 100644 --- a/src/libexpr/flake/flake.cc +++ b/src/libexpr/flake/flake.cc @@ -1,8 +1,8 @@ -#include "flake.hh" -#include "eval.hh" -#include "lockfile.hh" -#include "primops.hh" -#include "eval-inline.hh" +#include "nix/expr/flake/flake.hh" +#include "nix/expr/eval.hh" +#include "nix/expr/flake/lockfile.hh" +#include "nix/expr/primops.hh" +#include "nix/expr/eval-inline.hh" #include "store-api.hh" #include "fetchers.hh" #include "nix/util/finally.hh" diff --git a/src/libexpr/flake/flakeref.cc b/src/libexpr/flake/flakeref.cc index 71dbaa4b42e..88e056d4765 100644 --- a/src/libexpr/flake/flakeref.cc +++ b/src/libexpr/flake/flakeref.cc @@ -1,4 +1,4 @@ -#include "flakeref.hh" +#include "nix/expr/flake/flakeref.hh" #include "store-api.hh" #include "nix/util/url.hh" #include "nix/util/url-parts.hh" diff --git a/src/libexpr/flake/lockfile.cc b/src/libexpr/flake/lockfile.cc index 8d5d48d8726..fd30d796b1e 100644 --- a/src/libexpr/flake/lockfile.cc +++ b/src/libexpr/flake/lockfile.cc @@ -1,4 +1,4 @@ -#include "lockfile.hh" +#include "nix/expr/flake/lockfile.hh" #include "store-api.hh" #include "nix/util/url-parts.hh" diff --git a/src/libexpr/function-trace.cc b/src/libexpr/function-trace.cc index 28180d3bee7..1dce5172688 100644 --- a/src/libexpr/function-trace.cc +++ b/src/libexpr/function-trace.cc @@ -1,4 +1,4 @@ -#include "function-trace.hh" +#include "nix/expr/function-trace.hh" #include "nix/util/logging.hh" namespace nix { diff --git a/src/libexpr/get-drvs.cc b/src/libexpr/get-drvs.cc index 3f13a06b9da..8dbb1bab662 100644 --- a/src/libexpr/get-drvs.cc +++ b/src/libexpr/get-drvs.cc @@ -1,6 +1,6 @@ -#include "get-drvs.hh" +#include "nix/expr/get-drvs.hh" #include "nix/util/util.hh" -#include "eval-inline.hh" +#include "nix/expr/eval-inline.hh" #include "derivations.hh" #include "store-api.hh" #include "path-with-outputs.hh" diff --git a/src/libexpr/attr-path.hh b/src/libexpr/include/nix/expr/attr-path.hh similarity index 94% rename from src/libexpr/attr-path.hh rename to src/libexpr/include/nix/expr/attr-path.hh index 117e0051bb8..39dc0645bd6 100644 --- a/src/libexpr/attr-path.hh +++ b/src/libexpr/include/nix/expr/attr-path.hh @@ -1,6 +1,6 @@ #pragma once -#include "eval.hh" +#include "nix/expr/eval.hh" #include #include diff --git a/src/libexpr/attr-set.hh b/src/libexpr/include/nix/expr/attr-set.hh similarity index 98% rename from src/libexpr/attr-set.hh rename to src/libexpr/include/nix/expr/attr-set.hh index dcc73b50691..89ff7450c62 100644 --- a/src/libexpr/attr-set.hh +++ b/src/libexpr/include/nix/expr/attr-set.hh @@ -1,7 +1,7 @@ #pragma once -#include "nixexpr.hh" -#include "symbol-table.hh" +#include "nix/expr/nixexpr.hh" +#include "nix/expr/symbol-table.hh" #include #include diff --git a/src/libexpr/eval-cache.hh b/src/libexpr/include/nix/expr/eval-cache.hh similarity index 99% rename from src/libexpr/eval-cache.hh rename to src/libexpr/include/nix/expr/eval-cache.hh index fe71cac9ce3..1522e78ea88 100644 --- a/src/libexpr/eval-cache.hh +++ b/src/libexpr/include/nix/expr/eval-cache.hh @@ -2,7 +2,7 @@ #include "nix/util/sync.hh" #include "nix/util/hash.hh" -#include "eval.hh" +#include "nix/expr/eval.hh" #include #include diff --git a/src/libexpr/eval-inline.hh b/src/libexpr/include/nix/expr/eval-inline.hh similarity index 99% rename from src/libexpr/eval-inline.hh rename to src/libexpr/include/nix/expr/eval-inline.hh index f0da688db5d..391c1385669 100644 --- a/src/libexpr/eval-inline.hh +++ b/src/libexpr/include/nix/expr/eval-inline.hh @@ -1,6 +1,6 @@ #pragma once -#include "eval.hh" +#include "nix/expr/eval.hh" namespace nix { diff --git a/src/libexpr/eval.hh b/src/libexpr/include/nix/expr/eval.hh similarity index 99% rename from src/libexpr/eval.hh rename to src/libexpr/include/nix/expr/eval.hh index d5767e3bcf8..4785dedd0df 100644 --- a/src/libexpr/eval.hh +++ b/src/libexpr/include/nix/expr/eval.hh @@ -1,10 +1,10 @@ #pragma once -#include "attr-set.hh" +#include "nix/expr/attr-set.hh" #include "nix/util/types.hh" -#include "value.hh" -#include "nixexpr.hh" -#include "symbol-table.hh" +#include "nix/expr/value.hh" +#include "nix/expr/nixexpr.hh" +#include "nix/expr/symbol-table.hh" #include "nix/util/config.hh" #include "nix/util/experimental-features.hh" @@ -664,4 +664,4 @@ void ErrorBuilder::debugThrow() } -#include "eval-inline.hh" +#include "nix/expr/eval-inline.hh" diff --git a/src/libexpr/flake/flake.hh b/src/libexpr/include/nix/expr/flake/flake.hh similarity index 97% rename from src/libexpr/flake/flake.hh rename to src/libexpr/include/nix/expr/flake/flake.hh index d52b7351c4f..bd653b7ef80 100644 --- a/src/libexpr/flake/flake.hh +++ b/src/libexpr/include/nix/expr/flake/flake.hh @@ -1,9 +1,9 @@ #pragma once #include "nix/util/types.hh" -#include "flakeref.hh" -#include "lockfile.hh" -#include "value.hh" +#include "nix/expr/flake/flakeref.hh" +#include "nix/expr/flake/lockfile.hh" +#include "nix/expr/value.hh" namespace nix { diff --git a/src/libexpr/flake/flakeref.hh b/src/libexpr/include/nix/expr/flake/flakeref.hh similarity index 100% rename from src/libexpr/flake/flakeref.hh rename to src/libexpr/include/nix/expr/flake/flakeref.hh diff --git a/src/libexpr/flake/lockfile.hh b/src/libexpr/include/nix/expr/flake/lockfile.hh similarity index 98% rename from src/libexpr/flake/lockfile.hh rename to src/libexpr/include/nix/expr/flake/lockfile.hh index 02e9bdfbcd2..12961238dfd 100644 --- a/src/libexpr/flake/lockfile.hh +++ b/src/libexpr/include/nix/expr/flake/lockfile.hh @@ -1,6 +1,6 @@ #pragma once -#include "flakeref.hh" +#include "nix/expr/flake/flakeref.hh" #include diff --git a/src/libexpr/function-trace.hh b/src/libexpr/include/nix/expr/function-trace.hh similarity index 85% rename from src/libexpr/function-trace.hh rename to src/libexpr/include/nix/expr/function-trace.hh index e9a2526bde8..0f0a8dc56b5 100644 --- a/src/libexpr/function-trace.hh +++ b/src/libexpr/include/nix/expr/function-trace.hh @@ -1,6 +1,6 @@ #pragma once -#include "eval.hh" +#include "nix/expr/eval.hh" #include diff --git a/src/libexpr/get-drvs.hh b/src/libexpr/include/nix/expr/get-drvs.hh similarity index 98% rename from src/libexpr/get-drvs.hh rename to src/libexpr/include/nix/expr/get-drvs.hh index bbd2d3c477b..a01ab5aae15 100644 --- a/src/libexpr/get-drvs.hh +++ b/src/libexpr/include/nix/expr/get-drvs.hh @@ -1,6 +1,6 @@ #pragma once -#include "eval.hh" +#include "nix/expr/eval.hh" #include "path.hh" #include diff --git a/src/libexpr/json-to-value.hh b/src/libexpr/include/nix/expr/json-to-value.hh similarity index 85% rename from src/libexpr/json-to-value.hh rename to src/libexpr/include/nix/expr/json-to-value.hh index 84bec4ebaea..961b4930179 100644 --- a/src/libexpr/json-to-value.hh +++ b/src/libexpr/include/nix/expr/json-to-value.hh @@ -1,6 +1,6 @@ #pragma once -#include "eval.hh" +#include "nix/expr/eval.hh" #include diff --git a/src/libexpr/nixexpr.hh b/src/libexpr/include/nix/expr/nixexpr.hh similarity index 99% rename from src/libexpr/nixexpr.hh rename to src/libexpr/include/nix/expr/nixexpr.hh index ffb5db2922c..aafc707b0fb 100644 --- a/src/libexpr/nixexpr.hh +++ b/src/libexpr/include/nix/expr/nixexpr.hh @@ -3,8 +3,8 @@ #include #include -#include "value.hh" -#include "symbol-table.hh" +#include "nix/expr/value.hh" +#include "nix/expr/symbol-table.hh" #include "nix/util/error.hh" #include "nix/util/chunked-vector.hh" diff --git a/src/libexpr/primops.hh b/src/libexpr/include/nix/expr/primops.hh similarity index 97% rename from src/libexpr/primops.hh rename to src/libexpr/include/nix/expr/primops.hh index 1cfb4356b27..ffa4ce63c54 100644 --- a/src/libexpr/primops.hh +++ b/src/libexpr/include/nix/expr/primops.hh @@ -1,6 +1,6 @@ #pragma once -#include "eval.hh" +#include "nix/expr/eval.hh" #include #include diff --git a/src/libexpr/symbol-table.hh b/src/libexpr/include/nix/expr/symbol-table.hh similarity index 100% rename from src/libexpr/symbol-table.hh rename to src/libexpr/include/nix/expr/symbol-table.hh diff --git a/src/libexpr/value-to-json.hh b/src/libexpr/include/nix/expr/value-to-json.hh similarity index 87% rename from src/libexpr/value-to-json.hh rename to src/libexpr/include/nix/expr/value-to-json.hh index 22f26b79092..d74642516a2 100644 --- a/src/libexpr/value-to-json.hh +++ b/src/libexpr/include/nix/expr/value-to-json.hh @@ -1,7 +1,7 @@ #pragma once -#include "nixexpr.hh" -#include "eval.hh" +#include "nix/expr/nixexpr.hh" +#include "nix/expr/eval.hh" #include #include diff --git a/src/libexpr/value-to-xml.hh b/src/libexpr/include/nix/expr/value-to-xml.hh similarity index 78% rename from src/libexpr/value-to-xml.hh rename to src/libexpr/include/nix/expr/value-to-xml.hh index 506f32b6b70..5e1f3ab3281 100644 --- a/src/libexpr/value-to-xml.hh +++ b/src/libexpr/include/nix/expr/value-to-xml.hh @@ -1,7 +1,7 @@ #pragma once -#include "nixexpr.hh" -#include "eval.hh" +#include "nix/expr/nixexpr.hh" +#include "nix/expr/eval.hh" #include #include diff --git a/src/libexpr/value.hh b/src/libexpr/include/nix/expr/value.hh similarity index 99% rename from src/libexpr/value.hh rename to src/libexpr/include/nix/expr/value.hh index 508dbe21803..b87bc19d650 100644 --- a/src/libexpr/value.hh +++ b/src/libexpr/include/nix/expr/value.hh @@ -2,8 +2,8 @@ #include -#include "symbol-table.hh" -#include "value/context.hh" +#include "nix/expr/symbol-table.hh" +#include "nix/expr/value/context.hh" #if HAVE_BOEHMGC #include diff --git a/src/libexpr/value/context.hh b/src/libexpr/include/nix/expr/value/context.hh similarity index 100% rename from src/libexpr/value/context.hh rename to src/libexpr/include/nix/expr/value/context.hh diff --git a/src/libexpr/json-to-value.cc b/src/libexpr/json-to-value.cc index 99a475ff987..5aa6318ec4c 100644 --- a/src/libexpr/json-to-value.cc +++ b/src/libexpr/json-to-value.cc @@ -1,4 +1,4 @@ -#include "json-to-value.hh" +#include "nix/expr/json-to-value.hh" #include #include diff --git a/src/libexpr/lexer.l b/src/libexpr/lexer.l index 462b3b60211..25b70ff1b12 100644 --- a/src/libexpr/lexer.l +++ b/src/libexpr/lexer.l @@ -21,7 +21,7 @@ #include -#include "nixexpr.hh" +#include "nix/expr/nixexpr.hh" #include "parser-tab.hh" using namespace nix; diff --git a/src/libexpr/local.mk b/src/libexpr/local.mk index 88f6f95e356..386bca7060d 100644 --- a/src/libexpr/local.mk +++ b/src/libexpr/local.mk @@ -13,7 +13,7 @@ libexpr_SOURCES := \ $(d)/parser-tab.cc libexpr_CXXFLAGS += \ - -Isrc/libexpr \ + -Isrc/libexpr/include \ -Isrc/libfetchers \ -Isrc/libmain \ -Isrc/libstore \ diff --git a/src/libexpr/nixexpr.cc b/src/libexpr/nixexpr.cc index 17c0d463312..8ebb6437dce 100644 --- a/src/libexpr/nixexpr.cc +++ b/src/libexpr/nixexpr.cc @@ -1,7 +1,7 @@ -#include "nixexpr.hh" +#include "nix/expr/nixexpr.hh" #include "derivations.hh" -#include "eval.hh" -#include "symbol-table.hh" +#include "nix/expr/eval.hh" +#include "nix/expr/symbol-table.hh" #include "nix/util/util.hh" #include diff --git a/src/libexpr/parser.y b/src/libexpr/parser.y index 9b26701c06d..72bc334427b 100644 --- a/src/libexpr/parser.y +++ b/src/libexpr/parser.y @@ -20,8 +20,8 @@ #include "nix/util/util.hh" -#include "nixexpr.hh" -#include "eval.hh" +#include "nix/expr/nixexpr.hh" +#include "nix/expr/eval.hh" #include "globals.hh" namespace nix { @@ -634,11 +634,11 @@ formal #include #include -#include "eval.hh" +#include "nix/expr/eval.hh" #include "filetransfer.hh" #include "fetchers.hh" #include "store-api.hh" -#include "flake/flake.hh" +#include "nix/expr/flake/flake.hh" namespace nix { diff --git a/src/libexpr/primops.cc b/src/libexpr/primops.cc index b9dd7fd9fe7..21123fb8135 100644 --- a/src/libexpr/primops.cc +++ b/src/libexpr/primops.cc @@ -1,16 +1,16 @@ #include "nix/util/archive.hh" #include "derivations.hh" -#include "eval-inline.hh" -#include "eval.hh" +#include "nix/expr/eval-inline.hh" +#include "nix/expr/eval.hh" #include "globals.hh" -#include "json-to-value.hh" +#include "nix/expr/json-to-value.hh" #include "names.hh" #include "references.hh" #include "store-api.hh" #include "nix/util/util.hh" -#include "value-to-json.hh" -#include "value-to-xml.hh" -#include "primops.hh" +#include "nix/expr/value-to-json.hh" +#include "nix/expr/value-to-xml.hh" +#include "nix/expr/primops.hh" #include #include diff --git a/src/libexpr/primops/context.cc b/src/libexpr/primops/context.cc index db43e577134..4dbbb2f3a9f 100644 --- a/src/libexpr/primops/context.cc +++ b/src/libexpr/primops/context.cc @@ -1,5 +1,5 @@ -#include "primops.hh" -#include "eval-inline.hh" +#include "nix/expr/primops.hh" +#include "nix/expr/eval-inline.hh" #include "derivations.hh" #include "store-api.hh" diff --git a/src/libexpr/primops/fetchClosure.cc b/src/libexpr/primops/fetchClosure.cc index 1f70c3ab872..2c59252bc6b 100644 --- a/src/libexpr/primops/fetchClosure.cc +++ b/src/libexpr/primops/fetchClosure.cc @@ -1,4 +1,4 @@ -#include "primops.hh" +#include "nix/expr/primops.hh" #include "store-api.hh" #include "make-content-addressed.hh" #include "nix/util/url.hh" diff --git a/src/libexpr/primops/fetchMercurial.cc b/src/libexpr/primops/fetchMercurial.cc index 8702b25aaa1..67494a746e8 100644 --- a/src/libexpr/primops/fetchMercurial.cc +++ b/src/libexpr/primops/fetchMercurial.cc @@ -1,5 +1,5 @@ -#include "primops.hh" -#include "eval-inline.hh" +#include "nix/expr/primops.hh" +#include "nix/expr/eval-inline.hh" #include "store-api.hh" #include "fetchers.hh" #include "nix/util/url.hh" diff --git a/src/libexpr/primops/fetchTree.cc b/src/libexpr/primops/fetchTree.cc index 2e924c30295..ce91f4606c7 100644 --- a/src/libexpr/primops/fetchTree.cc +++ b/src/libexpr/primops/fetchTree.cc @@ -1,5 +1,5 @@ -#include "primops.hh" -#include "eval-inline.hh" +#include "nix/expr/primops.hh" +#include "nix/expr/eval-inline.hh" #include "store-api.hh" #include "fetchers.hh" #include "filetransfer.hh" diff --git a/src/libexpr/primops/fromTOML.cc b/src/libexpr/primops/fromTOML.cc index 8a523178126..d93ce272308 100644 --- a/src/libexpr/primops/fromTOML.cc +++ b/src/libexpr/primops/fromTOML.cc @@ -1,5 +1,5 @@ -#include "primops.hh" -#include "eval-inline.hh" +#include "nix/expr/primops.hh" +#include "nix/expr/eval-inline.hh" #include "../../toml11/toml.hpp" diff --git a/src/libexpr/tests/json.cc b/src/libexpr/tests/json.cc index 411bc0ac334..710ee309267 100644 --- a/src/libexpr/tests/json.cc +++ b/src/libexpr/tests/json.cc @@ -1,5 +1,5 @@ #include "tests/libexpr.hh" -#include "value-to-json.hh" +#include "nix/expr/value-to-json.hh" namespace nix { // Testing the conversion to JSON diff --git a/src/libexpr/tests/libexpr.hh b/src/libexpr/tests/libexpr.hh index 8534d9567d6..49842c8aa36 100644 --- a/src/libexpr/tests/libexpr.hh +++ b/src/libexpr/tests/libexpr.hh @@ -1,10 +1,10 @@ #include #include -#include "value.hh" -#include "nixexpr.hh" -#include "eval.hh" -#include "eval-inline.hh" +#include "nix/expr/value.hh" +#include "nix/expr/nixexpr.hh" +#include "nix/expr/eval.hh" +#include "nix/expr/eval-inline.hh" #include "store-api.hh" #include "tests/libstore.hh" diff --git a/src/libexpr/tests/local.mk b/src/libexpr/tests/local.mk index 856be611d4a..bd6ae40c219 100644 --- a/src/libexpr/tests/local.mk +++ b/src/libexpr/tests/local.mk @@ -14,7 +14,7 @@ libexpr-tests_SOURCES := \ libexpr-tests_CXXFLAGS += \ -Isrc/libexpr \ - -Isrc/libexpr/tests \ + -Isrc/libexpr/include \ -Isrc/libstore \ -Isrc/libutil/include diff --git a/src/libexpr/tests/value/context.hh b/src/libexpr/tests/value/context.hh index 54d21760ed3..ed3da5775b3 100644 --- a/src/libexpr/tests/value/context.hh +++ b/src/libexpr/tests/value/context.hh @@ -2,7 +2,7 @@ #include -#include +#include "nix/expr/value/context.hh" namespace rc { using namespace nix; diff --git a/src/libexpr/value-to-json.cc b/src/libexpr/value-to-json.cc index 672715c2dfb..22b84158599 100644 --- a/src/libexpr/value-to-json.cc +++ b/src/libexpr/value-to-json.cc @@ -1,5 +1,5 @@ -#include "value-to-json.hh" -#include "eval-inline.hh" +#include "nix/expr/value-to-json.hh" +#include "nix/expr/eval-inline.hh" #include "nix/util/util.hh" #include "store-api.hh" diff --git a/src/libexpr/value-to-xml.cc b/src/libexpr/value-to-xml.cc index 9cacf3b8bf0..f71a707eb0f 100644 --- a/src/libexpr/value-to-xml.cc +++ b/src/libexpr/value-to-xml.cc @@ -1,6 +1,6 @@ -#include "value-to-xml.hh" +#include "nix/expr/value-to-xml.hh" #include "nix/util/xml-writer.hh" -#include "eval-inline.hh" +#include "nix/expr/eval-inline.hh" #include "nix/util/util.hh" #include diff --git a/src/libexpr/value/context.cc b/src/libexpr/value/context.cc index 61d9c53dfd7..02ceed45e96 100644 --- a/src/libexpr/value/context.cc +++ b/src/libexpr/value/context.cc @@ -1,4 +1,4 @@ -#include "value/context.hh" +#include "nix/expr/value/context.hh" #include "store-api.hh" #include diff --git a/src/libutil/tests/logging.cc b/src/libutil/tests/logging.cc index 5d386c498d2..2b3b6a8b711 100644 --- a/src/libutil/tests/logging.cc +++ b/src/libutil/tests/logging.cc @@ -1,7 +1,7 @@ #if 0 #include "nix/util/logging.hh" -#include "nixexpr.hh" +#include "nix/expr/nixexpr.hh" #include "nix/util/util.hh" #include diff --git a/src/nix-build/nix-build.cc b/src/nix-build/nix-build.cc index 753956d7c25..9c182e81e1c 100644 --- a/src/nix-build/nix-build.cc +++ b/src/nix-build/nix-build.cc @@ -17,11 +17,11 @@ #include "nix/util/util.hh" #include "shared.hh" #include "path-with-outputs.hh" -#include "eval.hh" -#include "eval-inline.hh" -#include "get-drvs.hh" +#include "nix/expr/eval.hh" +#include "nix/expr/eval-inline.hh" +#include "nix/expr/get-drvs.hh" #include "nix/cmd/common-eval-args.hh" -#include "attr-path.hh" +#include "nix/expr/attr-path.hh" #include "nix/cmd/legacy.hh" using namespace nix; diff --git a/src/nix-env/nix-env.cc b/src/nix-env/nix-env.cc index 41d31ca1218..695a129f1cf 100644 --- a/src/nix-env/nix-env.cc +++ b/src/nix-env/nix-env.cc @@ -1,8 +1,8 @@ -#include "attr-path.hh" +#include "nix/expr/attr-path.hh" #include "nix/cmd/common-eval-args.hh" #include "derivations.hh" -#include "eval.hh" -#include "get-drvs.hh" +#include "nix/expr/eval.hh" +#include "nix/expr/get-drvs.hh" #include "globals.hh" #include "names.hh" #include "profiles.hh" @@ -12,7 +12,7 @@ #include "local-fs-store.hh" #include "user-env.hh" #include "nix/util/util.hh" -#include "value-to-json.hh" +#include "nix/expr/value-to-json.hh" #include "nix/util/xml-writer.hh" #include "nix/cmd/legacy.hh" diff --git a/src/nix-env/user-env.cc b/src/nix-env/user-env.cc index 5e63af219ec..5d9a4c5c5e4 100644 --- a/src/nix-env/user-env.cc +++ b/src/nix-env/user-env.cc @@ -6,8 +6,8 @@ #include "local-fs-store.hh" #include "globals.hh" #include "shared.hh" -#include "eval.hh" -#include "eval-inline.hh" +#include "nix/expr/eval.hh" +#include "nix/expr/eval-inline.hh" #include "profiles.hh" diff --git a/src/nix-env/user-env.hh b/src/nix-env/user-env.hh index 10646f71313..20c67ebf3ac 100644 --- a/src/nix-env/user-env.hh +++ b/src/nix-env/user-env.hh @@ -1,6 +1,6 @@ #pragma once -#include "get-drvs.hh" +#include "nix/expr/get-drvs.hh" namespace nix { diff --git a/src/nix-instantiate/nix-instantiate.cc b/src/nix-instantiate/nix-instantiate.cc index b3234465b4e..9f78352bc61 100644 --- a/src/nix-instantiate/nix-instantiate.cc +++ b/src/nix-instantiate/nix-instantiate.cc @@ -1,11 +1,11 @@ #include "globals.hh" #include "shared.hh" -#include "eval.hh" -#include "eval-inline.hh" -#include "get-drvs.hh" -#include "attr-path.hh" -#include "value-to-xml.hh" -#include "value-to-json.hh" +#include "nix/expr/eval.hh" +#include "nix/expr/eval-inline.hh" +#include "nix/expr/get-drvs.hh" +#include "nix/expr/attr-path.hh" +#include "nix/expr/value-to-xml.hh" +#include "nix/expr/value-to-json.hh" #include "nix/util/util.hh" #include "store-api.hh" #include "local-fs-store.hh" diff --git a/src/nix/app.cc b/src/nix/app.cc index d76f4187077..8754ba813dd 100644 --- a/src/nix/app.cc +++ b/src/nix/app.cc @@ -1,8 +1,8 @@ #include "nix/cmd/installables.hh" #include "nix/cmd/installable-derived-path.hh" #include "store-api.hh" -#include "eval-inline.hh" -#include "eval-cache.hh" +#include "nix/expr/eval-inline.hh" +#include "nix/expr/eval-cache.hh" #include "names.hh" #include "nix/cmd/command.hh" #include "derivations.hh" diff --git a/src/nix/build.cc b/src/nix/build.cc index 9a23e94ffdd..94c45e8fe7b 100644 --- a/src/nix/build.cc +++ b/src/nix/build.cc @@ -1,4 +1,4 @@ -#include "eval.hh" +#include "nix/expr/eval.hh" #include "nix/cmd/command.hh" #include "common-args.hh" #include "shared.hh" diff --git a/src/nix/develop.cc b/src/nix/develop.cc index 107bca6244a..427307c3fab 100644 --- a/src/nix/develop.cc +++ b/src/nix/develop.cc @@ -1,4 +1,4 @@ -#include "eval.hh" +#include "nix/expr/eval.hh" #include "nix/cmd/command.hh" #include "common-args.hh" #include "shared.hh" diff --git a/src/nix/edit.cc b/src/nix/edit.cc index 45e52823855..19c05040d3d 100644 --- a/src/nix/edit.cc +++ b/src/nix/edit.cc @@ -1,7 +1,7 @@ #include "nix/cmd/command.hh" #include "shared.hh" -#include "eval.hh" -#include "attr-path.hh" +#include "nix/expr/eval.hh" +#include "nix/expr/attr-path.hh" #include "progress-bar.hh" #include diff --git a/src/nix/eval.cc b/src/nix/eval.cc index 66a21c5a679..a616878e752 100644 --- a/src/nix/eval.cc +++ b/src/nix/eval.cc @@ -2,9 +2,9 @@ #include "common-args.hh" #include "shared.hh" #include "store-api.hh" -#include "eval.hh" -#include "eval-inline.hh" -#include "value-to-json.hh" +#include "nix/expr/eval.hh" +#include "nix/expr/eval-inline.hh" +#include "nix/expr/value-to-json.hh" #include "progress-bar.hh" #include diff --git a/src/nix/flake.cc b/src/nix/flake.cc index cdcccf6ae72..22b220a0c1c 100644 --- a/src/nix/flake.cc +++ b/src/nix/flake.cc @@ -1,17 +1,17 @@ #include "nix/cmd/command.hh" #include "common-args.hh" #include "shared.hh" -#include "eval.hh" -#include "eval-inline.hh" -#include "flake/flake.hh" -#include "get-drvs.hh" +#include "nix/expr/eval.hh" +#include "nix/expr/eval-inline.hh" +#include "nix/expr/flake/flake.hh" +#include "nix/expr/get-drvs.hh" #include "store-api.hh" #include "derivations.hh" #include "outputs-spec.hh" -#include "attr-path.hh" +#include "nix/expr/attr-path.hh" #include "fetchers.hh" #include "registry.hh" -#include "eval-cache.hh" +#include "nix/expr/eval-cache.hh" #include "nix/cmd/markdown.hh" #include diff --git a/src/nix/local.mk b/src/nix/local.mk index 74d695eb099..247b832231a 100644 --- a/src/nix/local.mk +++ b/src/nix/local.mk @@ -17,7 +17,7 @@ nix_SOURCES := \ nix_CXXFLAGS += \ -Idoc/manual \ -Isrc/libcmd/include \ - -Isrc/libexpr \ + -Isrc/libexpr/include \ -Isrc/libfetchers \ -Isrc/libmain \ -Isrc/libstore \ diff --git a/src/nix/main.cc b/src/nix/main.cc index 5ded9301bfa..10db8a81364 100644 --- a/src/nix/main.cc +++ b/src/nix/main.cc @@ -2,7 +2,7 @@ #include "nix/cmd/command.hh" #include "common-args.hh" -#include "eval.hh" +#include "nix/expr/eval.hh" #include "globals.hh" #include "nix/cmd/legacy.hh" #include "shared.hh" diff --git a/src/nix/prefetch.cc b/src/nix/prefetch.cc index 91b206685d3..db8b6e6f548 100644 --- a/src/nix/prefetch.cc +++ b/src/nix/prefetch.cc @@ -6,8 +6,8 @@ #include "nix/util/finally.hh" #include "progress-bar.hh" #include "nix/util/tarfile.hh" -#include "attr-path.hh" -#include "eval-inline.hh" +#include "nix/expr/attr-path.hh" +#include "nix/expr/eval-inline.hh" #include "nix/cmd/legacy.hh" #include diff --git a/src/nix/profile.cc b/src/nix/profile.cc index f5ef0ec97f3..e54b5dee90f 100644 --- a/src/nix/profile.cc +++ b/src/nix/profile.cc @@ -5,7 +5,7 @@ #include "derivations.hh" #include "nix/util/archive.hh" #include "builtins/buildenv.hh" -#include "flake/flakeref.hh" +#include "nix/expr/flake/flakeref.hh" #include "../nix-env/user-env.hh" #include "profiles.hh" #include "names.hh" diff --git a/src/nix/registry.cc b/src/nix/registry.cc index 2a0eca8927f..d58aacd8cd2 100644 --- a/src/nix/registry.cc +++ b/src/nix/registry.cc @@ -1,8 +1,8 @@ #include "nix/cmd/command.hh" #include "common-args.hh" #include "shared.hh" -#include "eval.hh" -#include "flake/flake.hh" +#include "nix/expr/eval.hh" +#include "nix/expr/flake/flake.hh" #include "store-api.hh" #include "fetchers.hh" #include "registry.hh" diff --git a/src/nix/run.cc b/src/nix/run.cc index 34560b1201d..cb0df68eb25 100644 --- a/src/nix/run.cc +++ b/src/nix/run.cc @@ -8,7 +8,7 @@ #include "nix/util/finally.hh" #include "fs-accessor.hh" #include "progress-bar.hh" -#include "eval.hh" +#include "nix/expr/eval.hh" #include "build/personality.hh" #if __linux__ diff --git a/src/nix/search.cc b/src/nix/search.cc index c6331b5c635..5ec7c9b87d3 100644 --- a/src/nix/search.cc +++ b/src/nix/search.cc @@ -1,13 +1,13 @@ #include "nix/cmd/command.hh" #include "globals.hh" -#include "eval.hh" -#include "eval-inline.hh" +#include "nix/expr/eval.hh" +#include "nix/expr/eval-inline.hh" #include "names.hh" -#include "get-drvs.hh" +#include "nix/expr/get-drvs.hh" #include "common-args.hh" #include "shared.hh" -#include "eval-cache.hh" -#include "attr-path.hh" +#include "nix/expr/eval-cache.hh" +#include "nix/expr/attr-path.hh" #include "nix/util/hilite.hh" #include diff --git a/src/nix/upgrade-nix.cc b/src/nix/upgrade-nix.cc index cb240195cc6..6f98ae446fc 100644 --- a/src/nix/upgrade-nix.cc +++ b/src/nix/upgrade-nix.cc @@ -2,8 +2,8 @@ #include "common-args.hh" #include "store-api.hh" #include "filetransfer.hh" -#include "eval.hh" -#include "attr-path.hh" +#include "nix/expr/eval.hh" +#include "nix/expr/attr-path.hh" #include "names.hh" #include "progress-bar.hh" diff --git a/tests/plugins/local.mk b/tests/plugins/local.mk index d0c6a511465..b0ef05f9a3b 100644 --- a/tests/plugins/local.mk +++ b/tests/plugins/local.mk @@ -9,6 +9,6 @@ libplugintest_ALLOW_UNDEFINED := 1 libplugintest_EXCLUDE_FROM_LIBRARY_LIST := 1 libplugintest_CXXFLAGS := \ - -Isrc/libexpr \ + -Isrc/libexpr/include \ -Isrc/libstore \ -Isrc/libutil/include diff --git a/tests/plugins/plugintest.cc b/tests/plugins/plugintest.cc index 306b974a678..dae5b561513 100644 --- a/tests/plugins/plugintest.cc +++ b/tests/plugins/plugintest.cc @@ -1,5 +1,5 @@ #include "nix/util/config.hh" -#include "primops.hh" +#include "nix/expr/primops.hh" using namespace nix; From c3c9cf5c5d0753bb7fd94f146a1842ee7458c054 Mon Sep 17 00:00:00 2001 From: Andrea Bedini Date: Fri, 17 Feb 2023 14:07:21 +0800 Subject: [PATCH 07/21] Move libfetchers include files --- src/libcmd/common-eval-args.cc | 4 ++-- src/libcmd/installables.cc | 2 +- src/libcmd/local.mk | 2 +- src/libexpr/flake/config.cc | 2 +- src/libexpr/flake/flake.cc | 4 ++-- src/libexpr/flake/flakeref.cc | 4 ++-- src/libexpr/include/nix/expr/flake/flakeref.hh | 2 +- src/libexpr/local.mk | 2 +- src/libexpr/parser.y | 2 +- src/libexpr/primops/fetchMercurial.cc | 2 +- src/libexpr/primops/fetchTree.cc | 4 ++-- src/libfetchers/attrs.cc | 4 ++-- src/libfetchers/cache.cc | 2 +- src/libfetchers/fetch-settings.cc | 2 +- src/libfetchers/fetchers.cc | 2 +- src/libfetchers/git.cc | 6 +++--- src/libfetchers/github.cc | 6 +++--- src/libfetchers/{ => include/nix/fetchers}/attrs.hh | 0 src/libfetchers/{ => include/nix/fetchers}/cache.hh | 2 +- .../{ => include/nix/fetchers}/fetch-settings.hh | 0 src/libfetchers/{ => include/nix/fetchers}/fetchers.hh | 2 +- src/libfetchers/{ => include/nix/fetchers}/registry.hh | 2 +- src/libfetchers/indirect.cc | 2 +- src/libfetchers/local.mk | 1 + src/libfetchers/mercurial.cc | 6 +++--- src/libfetchers/path.cc | 2 +- src/libfetchers/registry.cc | 6 +++--- src/libfetchers/tarball.cc | 4 ++-- src/nix-channel/nix-channel.cc | 2 +- src/nix/flake.cc | 4 ++-- src/nix/local.mk | 2 +- src/nix/registry.cc | 4 ++-- 32 files changed, 46 insertions(+), 45 deletions(-) rename src/libfetchers/{ => include/nix/fetchers}/attrs.hh (100%) rename src/libfetchers/{ => include/nix/fetchers}/cache.hh (94%) rename src/libfetchers/{ => include/nix/fetchers}/fetch-settings.hh (100%) rename src/libfetchers/{ => include/nix/fetchers}/fetchers.hh (99%) rename src/libfetchers/{ => include/nix/fetchers}/registry.hh (97%) diff --git a/src/libcmd/common-eval-args.cc b/src/libcmd/common-eval-args.cc index 2b531d32434..c3ce43452d9 100644 --- a/src/libcmd/common-eval-args.cc +++ b/src/libcmd/common-eval-args.cc @@ -3,8 +3,8 @@ #include "filetransfer.hh" #include "nix/util/util.hh" #include "nix/expr/eval.hh" -#include "fetchers.hh" -#include "registry.hh" +#include "nix/fetchers/fetchers.hh" +#include "nix/fetchers/registry.hh" #include "nix/expr/flake/flakeref.hh" #include "store-api.hh" #include "nix/cmd/command.hh" diff --git a/src/libcmd/installables.cc b/src/libcmd/installables.cc index c681cbdfa72..3823c0945cd 100644 --- a/src/libcmd/installables.cc +++ b/src/libcmd/installables.cc @@ -15,7 +15,7 @@ #include "nix/expr/flake/flake.hh" #include "nix/expr/eval-cache.hh" #include "nix/util/url.hh" -#include "registry.hh" +#include "nix/fetchers/registry.hh" #include "build-result.hh" #include diff --git a/src/libcmd/local.mk b/src/libcmd/local.mk index d2855d2d07b..78178b777a8 100644 --- a/src/libcmd/local.mk +++ b/src/libcmd/local.mk @@ -9,7 +9,7 @@ libcmd_SOURCES := $(wildcard $(d)/*.cc) libcmd_CXXFLAGS += \ -Isrc/libcmd/include \ -Isrc/libexpr/include \ - -Isrc/libfetchers \ + -Isrc/libfetchers/include \ -Isrc/libmain \ -Isrc/libstore \ -Isrc/libutil/include \ diff --git a/src/libexpr/flake/config.cc b/src/libexpr/flake/config.cc index 7990baf0bf6..d4d61bf4d2f 100644 --- a/src/libexpr/flake/config.cc +++ b/src/libexpr/flake/config.cc @@ -1,6 +1,6 @@ #include "nix/expr/flake/flake.hh" #include "globals.hh" -#include "fetch-settings.hh" +#include "nix/fetchers/fetch-settings.hh" #include diff --git a/src/libexpr/flake/flake.cc b/src/libexpr/flake/flake.cc index fe8de38a402..49a475faf75 100644 --- a/src/libexpr/flake/flake.cc +++ b/src/libexpr/flake/flake.cc @@ -4,9 +4,9 @@ #include "nix/expr/primops.hh" #include "nix/expr/eval-inline.hh" #include "store-api.hh" -#include "fetchers.hh" +#include "nix/fetchers/fetchers.hh" #include "nix/util/finally.hh" -#include "fetch-settings.hh" +#include "nix/fetchers/fetch-settings.hh" namespace nix { diff --git a/src/libexpr/flake/flakeref.cc b/src/libexpr/flake/flakeref.cc index 88e056d4765..ef627559775 100644 --- a/src/libexpr/flake/flakeref.cc +++ b/src/libexpr/flake/flakeref.cc @@ -2,8 +2,8 @@ #include "store-api.hh" #include "nix/util/url.hh" #include "nix/util/url-parts.hh" -#include "fetchers.hh" -#include "registry.hh" +#include "nix/fetchers/fetchers.hh" +#include "nix/fetchers/registry.hh" namespace nix { diff --git a/src/libexpr/include/nix/expr/flake/flakeref.hh b/src/libexpr/include/nix/expr/flake/flakeref.hh index c8c0f86f1cc..16298a434d6 100644 --- a/src/libexpr/include/nix/expr/flake/flakeref.hh +++ b/src/libexpr/include/nix/expr/flake/flakeref.hh @@ -2,7 +2,7 @@ #include "nix/util/types.hh" #include "nix/util/hash.hh" -#include "fetchers.hh" +#include "nix/fetchers/fetchers.hh" #include "outputs-spec.hh" #include diff --git a/src/libexpr/local.mk b/src/libexpr/local.mk index 386bca7060d..bcb1ae2fc9f 100644 --- a/src/libexpr/local.mk +++ b/src/libexpr/local.mk @@ -14,7 +14,7 @@ libexpr_SOURCES := \ libexpr_CXXFLAGS += \ -Isrc/libexpr/include \ - -Isrc/libfetchers \ + -Isrc/libfetchers/include \ -Isrc/libmain \ -Isrc/libstore \ -Isrc/libutil/include diff --git a/src/libexpr/parser.y b/src/libexpr/parser.y index 72bc334427b..f2b944aa9ba 100644 --- a/src/libexpr/parser.y +++ b/src/libexpr/parser.y @@ -636,7 +636,7 @@ formal #include "nix/expr/eval.hh" #include "filetransfer.hh" -#include "fetchers.hh" +#include "nix/fetchers/fetchers.hh" #include "store-api.hh" #include "nix/expr/flake/flake.hh" diff --git a/src/libexpr/primops/fetchMercurial.cc b/src/libexpr/primops/fetchMercurial.cc index 67494a746e8..23fd7acb988 100644 --- a/src/libexpr/primops/fetchMercurial.cc +++ b/src/libexpr/primops/fetchMercurial.cc @@ -1,7 +1,7 @@ #include "nix/expr/primops.hh" #include "nix/expr/eval-inline.hh" #include "store-api.hh" -#include "fetchers.hh" +#include "nix/fetchers/fetchers.hh" #include "nix/util/url.hh" #include "nix/util/url-parts.hh" diff --git a/src/libexpr/primops/fetchTree.cc b/src/libexpr/primops/fetchTree.cc index ce91f4606c7..6e7149da1c0 100644 --- a/src/libexpr/primops/fetchTree.cc +++ b/src/libexpr/primops/fetchTree.cc @@ -1,9 +1,9 @@ #include "nix/expr/primops.hh" #include "nix/expr/eval-inline.hh" #include "store-api.hh" -#include "fetchers.hh" +#include "nix/fetchers/fetchers.hh" #include "filetransfer.hh" -#include "registry.hh" +#include "nix/fetchers/registry.hh" #include #include diff --git a/src/libfetchers/attrs.cc b/src/libfetchers/attrs.cc index a565d19d4e7..24384cabf4e 100644 --- a/src/libfetchers/attrs.cc +++ b/src/libfetchers/attrs.cc @@ -1,5 +1,5 @@ -#include "attrs.hh" -#include "fetchers.hh" +#include "nix/fetchers/attrs.hh" +#include "nix/fetchers/fetchers.hh" #include diff --git a/src/libfetchers/cache.cc b/src/libfetchers/cache.cc index 9a239bbaac7..f65d09df1d2 100644 --- a/src/libfetchers/cache.cc +++ b/src/libfetchers/cache.cc @@ -1,4 +1,4 @@ -#include "cache.hh" +#include "nix/fetchers/cache.hh" #include "sqlite.hh" #include "nix/util/sync.hh" #include "store-api.hh" diff --git a/src/libfetchers/fetch-settings.cc b/src/libfetchers/fetch-settings.cc index e7d5244dc2c..ac1d7cdca4c 100644 --- a/src/libfetchers/fetch-settings.cc +++ b/src/libfetchers/fetch-settings.cc @@ -1,4 +1,4 @@ -#include "fetch-settings.hh" +#include "nix/fetchers/fetch-settings.hh" namespace nix { diff --git a/src/libfetchers/fetchers.cc b/src/libfetchers/fetchers.cc index c767e72e5d5..dd25fa6b071 100644 --- a/src/libfetchers/fetchers.cc +++ b/src/libfetchers/fetchers.cc @@ -1,4 +1,4 @@ -#include "fetchers.hh" +#include "nix/fetchers/fetchers.hh" #include "store-api.hh" #include diff --git a/src/libfetchers/git.cc b/src/libfetchers/git.cc index 9e077dfe47e..5aa0adc7d87 100644 --- a/src/libfetchers/git.cc +++ b/src/libfetchers/git.cc @@ -1,5 +1,5 @@ -#include "fetchers.hh" -#include "cache.hh" +#include "nix/fetchers/fetchers.hh" +#include "nix/fetchers/cache.hh" #include "globals.hh" #include "nix/util/tarfile.hh" #include "store-api.hh" @@ -8,7 +8,7 @@ #include "nix/util/util.hh" #include "nix/util/git.hh" -#include "fetch-settings.hh" +#include "nix/fetchers/fetch-settings.hh" #include #include diff --git a/src/libfetchers/github.cc b/src/libfetchers/github.cc index c953cd76271..8e2c74abb20 100644 --- a/src/libfetchers/github.cc +++ b/src/libfetchers/github.cc @@ -1,12 +1,12 @@ #include "filetransfer.hh" -#include "cache.hh" +#include "nix/fetchers/cache.hh" #include "globals.hh" #include "store-api.hh" #include "nix/util/types.hh" #include "nix/util/url-parts.hh" #include "nix/util/git.hh" -#include "fetchers.hh" -#include "fetch-settings.hh" +#include "nix/fetchers/fetchers.hh" +#include "nix/fetchers/fetch-settings.hh" #include #include diff --git a/src/libfetchers/attrs.hh b/src/libfetchers/include/nix/fetchers/attrs.hh similarity index 100% rename from src/libfetchers/attrs.hh rename to src/libfetchers/include/nix/fetchers/attrs.hh diff --git a/src/libfetchers/cache.hh b/src/libfetchers/include/nix/fetchers/cache.hh similarity index 94% rename from src/libfetchers/cache.hh rename to src/libfetchers/include/nix/fetchers/cache.hh index 3763ee2a630..4b474c633c4 100644 --- a/src/libfetchers/cache.hh +++ b/src/libfetchers/include/nix/fetchers/cache.hh @@ -1,6 +1,6 @@ #pragma once -#include "fetchers.hh" +#include "nix/fetchers/fetchers.hh" namespace nix::fetchers { diff --git a/src/libfetchers/fetch-settings.hh b/src/libfetchers/include/nix/fetchers/fetch-settings.hh similarity index 100% rename from src/libfetchers/fetch-settings.hh rename to src/libfetchers/include/nix/fetchers/fetch-settings.hh diff --git a/src/libfetchers/fetchers.hh b/src/libfetchers/include/nix/fetchers/fetchers.hh similarity index 99% rename from src/libfetchers/fetchers.hh rename to src/libfetchers/include/nix/fetchers/fetchers.hh index eb1d2a21992..23b7df0084b 100644 --- a/src/libfetchers/fetchers.hh +++ b/src/libfetchers/include/nix/fetchers/fetchers.hh @@ -3,7 +3,7 @@ #include "nix/util/types.hh" #include "nix/util/hash.hh" #include "path.hh" -#include "attrs.hh" +#include "nix/fetchers/attrs.hh" #include "nix/util/url.hh" #include diff --git a/src/libfetchers/registry.hh b/src/libfetchers/include/nix/fetchers/registry.hh similarity index 97% rename from src/libfetchers/registry.hh rename to src/libfetchers/include/nix/fetchers/registry.hh index 35baf204426..bdf95eda30e 100644 --- a/src/libfetchers/registry.hh +++ b/src/libfetchers/include/nix/fetchers/registry.hh @@ -1,7 +1,7 @@ #pragma once #include "nix/util/types.hh" -#include "fetchers.hh" +#include "nix/fetchers/fetchers.hh" namespace nix { class Store; } diff --git a/src/libfetchers/indirect.cc b/src/libfetchers/indirect.cc index 5aeee11f0d9..4c4aeb8bd89 100644 --- a/src/libfetchers/indirect.cc +++ b/src/libfetchers/indirect.cc @@ -1,4 +1,4 @@ -#include "fetchers.hh" +#include "nix/fetchers/fetchers.hh" #include "nix/util/url-parts.hh" namespace nix::fetchers { diff --git a/src/libfetchers/local.mk b/src/libfetchers/local.mk index 64227e1c0a0..1e442a8b271 100644 --- a/src/libfetchers/local.mk +++ b/src/libfetchers/local.mk @@ -7,6 +7,7 @@ libfetchers_DIR := $(d) libfetchers_SOURCES := $(wildcard $(d)/*.cc) libfetchers_CXXFLAGS += \ + -Isrc/libfetchers/include \ -Isrc/libutil/include \ -Isrc/libstore diff --git a/src/libfetchers/mercurial.cc b/src/libfetchers/mercurial.cc index 091249e9968..e6008a05613 100644 --- a/src/libfetchers/mercurial.cc +++ b/src/libfetchers/mercurial.cc @@ -1,11 +1,11 @@ -#include "fetchers.hh" -#include "cache.hh" +#include "nix/fetchers/fetchers.hh" +#include "nix/fetchers/cache.hh" #include "globals.hh" #include "nix/util/tarfile.hh" #include "store-api.hh" #include "nix/util/url-parts.hh" -#include "fetch-settings.hh" +#include "nix/fetchers/fetch-settings.hh" #include diff --git a/src/libfetchers/path.cc b/src/libfetchers/path.cc index 162ffa76c1f..c2d6df3c830 100644 --- a/src/libfetchers/path.cc +++ b/src/libfetchers/path.cc @@ -1,4 +1,4 @@ -#include "fetchers.hh" +#include "nix/fetchers/fetchers.hh" #include "store-api.hh" #include "nix/util/archive.hh" diff --git a/src/libfetchers/registry.cc b/src/libfetchers/registry.cc index e0863cb5185..8f85147617c 100644 --- a/src/libfetchers/registry.cc +++ b/src/libfetchers/registry.cc @@ -1,11 +1,11 @@ -#include "registry.hh" -#include "fetchers.hh" +#include "nix/fetchers/registry.hh" +#include "nix/fetchers/fetchers.hh" #include "nix/util/util.hh" #include "globals.hh" #include "store-api.hh" #include "local-fs-store.hh" -#include "fetch-settings.hh" +#include "nix/fetchers/fetch-settings.hh" #include diff --git a/src/libfetchers/tarball.cc b/src/libfetchers/tarball.cc index fa82c204634..b2598e691b7 100644 --- a/src/libfetchers/tarball.cc +++ b/src/libfetchers/tarball.cc @@ -1,5 +1,5 @@ -#include "fetchers.hh" -#include "cache.hh" +#include "nix/fetchers/fetchers.hh" +#include "nix/fetchers/cache.hh" #include "filetransfer.hh" #include "globals.hh" #include "store-api.hh" diff --git a/src/nix-channel/nix-channel.cc b/src/nix-channel/nix-channel.cc index 2c26b912039..8bfbcdfc1f2 100755 --- a/src/nix-channel/nix-channel.cc +++ b/src/nix-channel/nix-channel.cc @@ -4,7 +4,7 @@ #include "filetransfer.hh" #include "store-api.hh" #include "nix/cmd/legacy.hh" -#include "fetchers.hh" +#include "nix/fetchers/fetchers.hh" #include "nix/util/util.hh" #include diff --git a/src/nix/flake.cc b/src/nix/flake.cc index 22b220a0c1c..e0d509ce2cf 100644 --- a/src/nix/flake.cc +++ b/src/nix/flake.cc @@ -9,8 +9,8 @@ #include "derivations.hh" #include "outputs-spec.hh" #include "nix/expr/attr-path.hh" -#include "fetchers.hh" -#include "registry.hh" +#include "nix/fetchers/fetchers.hh" +#include "nix/fetchers/registry.hh" #include "nix/expr/eval-cache.hh" #include "nix/cmd/markdown.hh" diff --git a/src/nix/local.mk b/src/nix/local.mk index 247b832231a..a27835d8910 100644 --- a/src/nix/local.mk +++ b/src/nix/local.mk @@ -18,7 +18,7 @@ nix_CXXFLAGS += \ -Idoc/manual \ -Isrc/libcmd/include \ -Isrc/libexpr/include \ - -Isrc/libfetchers \ + -Isrc/libfetchers/include \ -Isrc/libmain \ -Isrc/libstore \ -Isrc/libutil/include diff --git a/src/nix/registry.cc b/src/nix/registry.cc index d58aacd8cd2..b1920ca7df7 100644 --- a/src/nix/registry.cc +++ b/src/nix/registry.cc @@ -4,8 +4,8 @@ #include "nix/expr/eval.hh" #include "nix/expr/flake/flake.hh" #include "store-api.hh" -#include "fetchers.hh" -#include "registry.hh" +#include "nix/fetchers/fetchers.hh" +#include "nix/fetchers/registry.hh" using namespace nix; using namespace nix::flake; From fecba419b5c0181664d4507e248523642885506a Mon Sep 17 00:00:00 2001 From: Andrea Bedini Date: Fri, 17 Feb 2023 14:35:57 +0800 Subject: [PATCH 08/21] Move libmain include files --- src/build-remote/build-remote.cc | 2 +- src/libcmd/common-eval-args.cc | 2 +- src/libcmd/installables.cc | 2 +- src/libcmd/local.mk | 2 +- src/libcmd/repl.cc | 4 ++-- src/libmain/common-args.cc | 4 ++-- src/libmain/{ => include/nix/main}/common-args.hh | 0 src/libmain/{ => include/nix/main}/loggers.hh | 0 src/libmain/{ => include/nix/main}/progress-bar.hh | 0 src/libmain/{ => include/nix/main}/shared.hh | 2 +- src/libmain/local.mk | 5 +++-- src/libmain/loggers.cc | 4 ++-- src/libmain/progress-bar.cc | 2 +- src/libmain/shared.cc | 6 +++--- src/libmain/stack.cc | 2 +- src/nix-build/nix-build.cc | 2 +- src/nix-channel/nix-channel.cc | 2 +- src/nix-collect-garbage/nix-collect-garbage.cc | 2 +- src/nix-copy-closure/nix-copy-closure.cc | 2 +- src/nix-env/nix-env.cc | 2 +- src/nix-env/user-env.cc | 2 +- src/nix-instantiate/nix-instantiate.cc | 2 +- src/nix-store/nix-store.cc | 2 +- src/nix/add-to-store.cc | 2 +- src/nix/build.cc | 6 +++--- src/nix/bundle.cc | 4 ++-- src/nix/copy.cc | 2 +- src/nix/daemon.cc | 2 +- src/nix/describe-stores.cc | 4 ++-- src/nix/develop.cc | 6 +++--- src/nix/diff-closures.cc | 4 ++-- src/nix/doctor.cc | 2 +- src/nix/edit.cc | 4 ++-- src/nix/eval.cc | 6 +++--- src/nix/flake.cc | 4 ++-- src/nix/hash.cc | 2 +- src/nix/local.mk | 2 +- src/nix/log.cc | 6 +++--- src/nix/ls.cc | 2 +- src/nix/main.cc | 6 +++--- src/nix/make-content-addressed.cc | 2 +- src/nix/optimise-store.cc | 2 +- src/nix/path-info.cc | 4 ++-- src/nix/ping-store.cc | 2 +- src/nix/prefetch.cc | 6 +++--- src/nix/profile.cc | 4 ++-- src/nix/realisation.cc | 2 +- src/nix/registry.cc | 4 ++-- src/nix/run.cc | 6 +++--- src/nix/search.cc | 4 ++-- src/nix/show-config.cc | 4 ++-- src/nix/show-derivation.cc | 2 +- src/nix/sigs.cc | 2 +- src/nix/store-copy-log.cc | 2 +- src/nix/store-delete.cc | 4 ++-- src/nix/store-gc.cc | 4 ++-- src/nix/upgrade-nix.cc | 4 ++-- src/nix/verify.cc | 2 +- src/nix/why-depends.cc | 4 ++-- .../resolve-system-dependencies.cc | 2 +- 60 files changed, 92 insertions(+), 91 deletions(-) rename src/libmain/{ => include/nix/main}/common-args.hh (100%) rename src/libmain/{ => include/nix/main}/loggers.hh (100%) rename src/libmain/{ => include/nix/main}/progress-bar.hh (100%) rename src/libmain/{ => include/nix/main}/shared.hh (99%) diff --git a/src/build-remote/build-remote.cc b/src/build-remote/build-remote.cc index 0382b872442..02818af1085 100644 --- a/src/build-remote/build-remote.cc +++ b/src/build-remote/build-remote.cc @@ -10,7 +10,7 @@ #endif #include "machines.hh" -#include "shared.hh" +#include "nix/main/shared.hh" #include "pathlocks.hh" #include "globals.hh" #include "nix/util/serialise.hh" diff --git a/src/libcmd/common-eval-args.cc b/src/libcmd/common-eval-args.cc index c3ce43452d9..60b6e066849 100644 --- a/src/libcmd/common-eval-args.cc +++ b/src/libcmd/common-eval-args.cc @@ -1,5 +1,5 @@ #include "nix/cmd/common-eval-args.hh" -#include "shared.hh" +#include "nix/main/shared.hh" #include "filetransfer.hh" #include "nix/util/util.hh" #include "nix/expr/eval.hh" diff --git a/src/libcmd/installables.cc b/src/libcmd/installables.cc index 3823c0945cd..fcc1b59b3c9 100644 --- a/src/libcmd/installables.cc +++ b/src/libcmd/installables.cc @@ -11,7 +11,7 @@ #include "nix/expr/eval.hh" #include "nix/expr/get-drvs.hh" #include "store-api.hh" -#include "shared.hh" +#include "nix/main/shared.hh" #include "nix/expr/flake/flake.hh" #include "nix/expr/eval-cache.hh" #include "nix/util/url.hh" diff --git a/src/libcmd/local.mk b/src/libcmd/local.mk index 78178b777a8..058b284a12b 100644 --- a/src/libcmd/local.mk +++ b/src/libcmd/local.mk @@ -10,7 +10,7 @@ libcmd_CXXFLAGS += \ -Isrc/libcmd/include \ -Isrc/libexpr/include \ -Isrc/libfetchers/include \ - -Isrc/libmain \ + -Isrc/libmain/include \ -Isrc/libstore \ -Isrc/libutil/include \ -Isrc/nix diff --git a/src/libcmd/repl.cc b/src/libcmd/repl.cc index 5d273a54297..f77d922977a 100644 --- a/src/libcmd/repl.cc +++ b/src/libcmd/repl.cc @@ -20,7 +20,7 @@ extern "C" { #endif #include "nix/util/ansicolor.hh" -#include "shared.hh" +#include "nix/main/shared.hh" #include "nix/expr/eval.hh" #include "nix/expr/eval-cache.hh" #include "nix/expr/eval-inline.hh" @@ -35,7 +35,7 @@ extern "C" { #include "nix/util/finally.hh" #include "nix/cmd/markdown.hh" #include "local-fs-store.hh" -#include "progress-bar.hh" +#include "nix/main/progress-bar.hh" #if HAVE_BOEHMGC #define GC_INCLUDE_NEW diff --git a/src/libmain/common-args.cc b/src/libmain/common-args.cc index f92920d18e5..298a6a7dcea 100644 --- a/src/libmain/common-args.cc +++ b/src/libmain/common-args.cc @@ -1,6 +1,6 @@ -#include "common-args.hh" +#include "nix/main/common-args.hh" #include "globals.hh" -#include "loggers.hh" +#include "nix/main/loggers.hh" namespace nix { diff --git a/src/libmain/common-args.hh b/src/libmain/include/nix/main/common-args.hh similarity index 100% rename from src/libmain/common-args.hh rename to src/libmain/include/nix/main/common-args.hh diff --git a/src/libmain/loggers.hh b/src/libmain/include/nix/main/loggers.hh similarity index 100% rename from src/libmain/loggers.hh rename to src/libmain/include/nix/main/loggers.hh diff --git a/src/libmain/progress-bar.hh b/src/libmain/include/nix/main/progress-bar.hh similarity index 100% rename from src/libmain/progress-bar.hh rename to src/libmain/include/nix/main/progress-bar.hh diff --git a/src/libmain/shared.hh b/src/libmain/include/nix/main/shared.hh similarity index 99% rename from src/libmain/shared.hh rename to src/libmain/include/nix/main/shared.hh index 3e277777439..95bed97c661 100644 --- a/src/libmain/shared.hh +++ b/src/libmain/include/nix/main/shared.hh @@ -2,7 +2,7 @@ #include "nix/util/util.hh" #include "nix/util/args.hh" -#include "common-args.hh" +#include "nix/main/common-args.hh" #include "path.hh" #include "derived-path.hh" diff --git a/src/libmain/local.mk b/src/libmain/local.mk index 1b145d84ccb..d78e09fb2c9 100644 --- a/src/libmain/local.mk +++ b/src/libmain/local.mk @@ -7,8 +7,9 @@ libmain_DIR := $(d) libmain_SOURCES := $(wildcard $(d)/*.cc) libmain_CXXFLAGS += \ - -Isrc/libutil/include \ - -Isrc/libstore + -Isrc/libmain/include \ + -Isrc/libstore \ + -Isrc/libutil/include libmain_LDFLAGS += $(OPENSSL_LIBS) diff --git a/src/libmain/loggers.cc b/src/libmain/loggers.cc index 64d774e226e..c2bd82f7069 100644 --- a/src/libmain/loggers.cc +++ b/src/libmain/loggers.cc @@ -1,5 +1,5 @@ -#include "loggers.hh" -#include "progress-bar.hh" +#include "nix/main/loggers.hh" +#include "nix/main/progress-bar.hh" #include "nix/util/util.hh" namespace nix { diff --git a/src/libmain/progress-bar.cc b/src/libmain/progress-bar.cc index d2ec191b650..986ab262e1b 100644 --- a/src/libmain/progress-bar.cc +++ b/src/libmain/progress-bar.cc @@ -1,4 +1,4 @@ -#include "progress-bar.hh" +#include "nix/main/progress-bar.hh" #include "nix/util/util.hh" #include "nix/util/sync.hh" #include "store-api.hh" diff --git a/src/libmain/shared.cc b/src/libmain/shared.cc index b890c971df8..047022178e2 100644 --- a/src/libmain/shared.cc +++ b/src/libmain/shared.cc @@ -1,10 +1,10 @@ #include "globals.hh" -#include "shared.hh" +#include "nix/main/shared.hh" #include "store-api.hh" #include "gc-store.hh" #include "nix/util/util.hh" -#include "loggers.hh" -#include "progress-bar.hh" +#include "nix/main/loggers.hh" +#include "nix/main/progress-bar.hh" #include #include diff --git a/src/libmain/stack.cc b/src/libmain/stack.cc index 511eabfe10c..cee21d2a21c 100644 --- a/src/libmain/stack.cc +++ b/src/libmain/stack.cc @@ -1,5 +1,5 @@ #include "nix/util/error.hh" -#include "shared.hh" +#include "nix/main/shared.hh" #include #include diff --git a/src/nix-build/nix-build.cc b/src/nix-build/nix-build.cc index 9c182e81e1c..ffa2254b9d9 100644 --- a/src/nix-build/nix-build.cc +++ b/src/nix-build/nix-build.cc @@ -15,7 +15,7 @@ #include "globals.hh" #include "derivations.hh" #include "nix/util/util.hh" -#include "shared.hh" +#include "nix/main/shared.hh" #include "path-with-outputs.hh" #include "nix/expr/eval.hh" #include "nix/expr/eval-inline.hh" diff --git a/src/nix-channel/nix-channel.cc b/src/nix-channel/nix-channel.cc index 8bfbcdfc1f2..f7949e7cbf2 100755 --- a/src/nix-channel/nix-channel.cc +++ b/src/nix-channel/nix-channel.cc @@ -1,5 +1,5 @@ #include "profiles.hh" -#include "shared.hh" +#include "nix/main/shared.hh" #include "globals.hh" #include "filetransfer.hh" #include "store-api.hh" diff --git a/src/nix-collect-garbage/nix-collect-garbage.cc b/src/nix-collect-garbage/nix-collect-garbage.cc index e2779e1b3c5..cb3d72d88b0 100644 --- a/src/nix-collect-garbage/nix-collect-garbage.cc +++ b/src/nix-collect-garbage/nix-collect-garbage.cc @@ -2,7 +2,7 @@ #include "store-cast.hh" #include "gc-store.hh" #include "profiles.hh" -#include "shared.hh" +#include "nix/main/shared.hh" #include "globals.hh" #include "nix/cmd/legacy.hh" diff --git a/src/nix-copy-closure/nix-copy-closure.cc b/src/nix-copy-closure/nix-copy-closure.cc index 5e82a2265b7..b8269000fb5 100755 --- a/src/nix-copy-closure/nix-copy-closure.cc +++ b/src/nix-copy-closure/nix-copy-closure.cc @@ -1,4 +1,4 @@ -#include "shared.hh" +#include "nix/main/shared.hh" #include "store-api.hh" #include "nix/cmd/legacy.hh" diff --git a/src/nix-env/nix-env.cc b/src/nix-env/nix-env.cc index 695a129f1cf..f97a4623009 100644 --- a/src/nix-env/nix-env.cc +++ b/src/nix-env/nix-env.cc @@ -7,7 +7,7 @@ #include "names.hh" #include "profiles.hh" #include "path-with-outputs.hh" -#include "shared.hh" +#include "nix/main/shared.hh" #include "store-api.hh" #include "local-fs-store.hh" #include "user-env.hh" diff --git a/src/nix-env/user-env.cc b/src/nix-env/user-env.cc index 5d9a4c5c5e4..57161a8e9ea 100644 --- a/src/nix-env/user-env.cc +++ b/src/nix-env/user-env.cc @@ -5,7 +5,7 @@ #include "path-with-outputs.hh" #include "local-fs-store.hh" #include "globals.hh" -#include "shared.hh" +#include "nix/main/shared.hh" #include "nix/expr/eval.hh" #include "nix/expr/eval-inline.hh" #include "profiles.hh" diff --git a/src/nix-instantiate/nix-instantiate.cc b/src/nix-instantiate/nix-instantiate.cc index 9f78352bc61..e4db9e9f353 100644 --- a/src/nix-instantiate/nix-instantiate.cc +++ b/src/nix-instantiate/nix-instantiate.cc @@ -1,5 +1,5 @@ #include "globals.hh" -#include "shared.hh" +#include "nix/main/shared.hh" #include "nix/expr/eval.hh" #include "nix/expr/eval-inline.hh" #include "nix/expr/get-drvs.hh" diff --git a/src/nix-store/nix-store.cc b/src/nix-store/nix-store.cc index 04ff71a5015..f9d9ea50472 100644 --- a/src/nix-store/nix-store.cc +++ b/src/nix-store/nix-store.cc @@ -9,7 +9,7 @@ #include "local-store.hh" #include "nix/util/monitor-fd.hh" #include "serve-protocol.hh" -#include "shared.hh" +#include "nix/main/shared.hh" #include "nix/util/util.hh" #include "worker-protocol.hh" #include "graphml.hh" diff --git a/src/nix/add-to-store.cc b/src/nix/add-to-store.cc index b6df49c1b81..694590942c8 100644 --- a/src/nix/add-to-store.cc +++ b/src/nix/add-to-store.cc @@ -1,5 +1,5 @@ #include "nix/cmd/command.hh" -#include "common-args.hh" +#include "nix/main/common-args.hh" #include "store-api.hh" #include "nix/util/archive.hh" diff --git a/src/nix/build.cc b/src/nix/build.cc index 94c45e8fe7b..b2c1c7be35f 100644 --- a/src/nix/build.cc +++ b/src/nix/build.cc @@ -1,10 +1,10 @@ #include "nix/expr/eval.hh" #include "nix/cmd/command.hh" -#include "common-args.hh" -#include "shared.hh" +#include "nix/main/common-args.hh" +#include "nix/main/shared.hh" #include "store-api.hh" #include "local-fs-store.hh" -#include "progress-bar.hh" +#include "nix/main/progress-bar.hh" #include diff --git a/src/nix/bundle.cc b/src/nix/bundle.cc index 0cbe0e72d78..73ce79cd3af 100644 --- a/src/nix/bundle.cc +++ b/src/nix/bundle.cc @@ -1,6 +1,6 @@ #include "nix/cmd/command.hh" -#include "common-args.hh" -#include "shared.hh" +#include "nix/main/common-args.hh" +#include "nix/main/shared.hh" #include "store-api.hh" #include "local-fs-store.hh" #include "fs-accessor.hh" diff --git a/src/nix/copy.cc b/src/nix/copy.cc index 807b5264b1f..95746798298 100644 --- a/src/nix/copy.cc +++ b/src/nix/copy.cc @@ -1,5 +1,5 @@ #include "nix/cmd/command.hh" -#include "shared.hh" +#include "nix/main/shared.hh" #include "store-api.hh" using namespace nix; diff --git a/src/nix/daemon.cc b/src/nix/daemon.cc index 09eb01b92bb..1e8f5761d2c 100644 --- a/src/nix/daemon.cc +++ b/src/nix/daemon.cc @@ -1,5 +1,5 @@ #include "nix/cmd/command.hh" -#include "shared.hh" +#include "nix/main/shared.hh" #include "local-store.hh" #include "remote-store.hh" #include "nix/util/util.hh" diff --git a/src/nix/describe-stores.cc b/src/nix/describe-stores.cc index 9080f697c56..791bda05d0e 100644 --- a/src/nix/describe-stores.cc +++ b/src/nix/describe-stores.cc @@ -1,6 +1,6 @@ #include "nix/cmd/command.hh" -#include "common-args.hh" -#include "shared.hh" +#include "nix/main/common-args.hh" +#include "nix/main/shared.hh" #include "store-api.hh" #include diff --git a/src/nix/develop.cc b/src/nix/develop.cc index 427307c3fab..ad5e7d06f63 100644 --- a/src/nix/develop.cc +++ b/src/nix/develop.cc @@ -1,11 +1,11 @@ #include "nix/expr/eval.hh" #include "nix/cmd/command.hh" -#include "common-args.hh" -#include "shared.hh" +#include "nix/main/common-args.hh" +#include "nix/main/shared.hh" #include "store-api.hh" #include "outputs-spec.hh" #include "derivations.hh" -#include "progress-bar.hh" +#include "nix/main/progress-bar.hh" #include "run.hh" #include diff --git a/src/nix/diff-closures.cc b/src/nix/diff-closures.cc index 0fce8d762c9..79d3be31e19 100644 --- a/src/nix/diff-closures.cc +++ b/src/nix/diff-closures.cc @@ -1,7 +1,7 @@ #include "nix/cmd/command.hh" -#include "shared.hh" +#include "nix/main/shared.hh" #include "store-api.hh" -#include "common-args.hh" +#include "nix/main/common-args.hh" #include "names.hh" #include diff --git a/src/nix/doctor.cc b/src/nix/doctor.cc index 97804b9ef65..4aee14baea1 100644 --- a/src/nix/doctor.cc +++ b/src/nix/doctor.cc @@ -3,7 +3,7 @@ #include "nix/cmd/command.hh" #include "nix/util/logging.hh" #include "serve-protocol.hh" -#include "shared.hh" +#include "nix/main/shared.hh" #include "store-api.hh" #include "local-fs-store.hh" #include "nix/util/util.hh" diff --git a/src/nix/edit.cc b/src/nix/edit.cc index 19c05040d3d..a6bd851a08e 100644 --- a/src/nix/edit.cc +++ b/src/nix/edit.cc @@ -1,8 +1,8 @@ #include "nix/cmd/command.hh" -#include "shared.hh" +#include "nix/main/shared.hh" #include "nix/expr/eval.hh" #include "nix/expr/attr-path.hh" -#include "progress-bar.hh" +#include "nix/main/progress-bar.hh" #include diff --git a/src/nix/eval.cc b/src/nix/eval.cc index a616878e752..fd08a590612 100644 --- a/src/nix/eval.cc +++ b/src/nix/eval.cc @@ -1,11 +1,11 @@ #include "nix/cmd/command.hh" -#include "common-args.hh" -#include "shared.hh" +#include "nix/main/common-args.hh" +#include "nix/main/shared.hh" #include "store-api.hh" #include "nix/expr/eval.hh" #include "nix/expr/eval-inline.hh" #include "nix/expr/value-to-json.hh" -#include "progress-bar.hh" +#include "nix/main/progress-bar.hh" #include diff --git a/src/nix/flake.cc b/src/nix/flake.cc index e0d509ce2cf..36a2d7d6684 100644 --- a/src/nix/flake.cc +++ b/src/nix/flake.cc @@ -1,6 +1,6 @@ #include "nix/cmd/command.hh" -#include "common-args.hh" -#include "shared.hh" +#include "nix/main/common-args.hh" +#include "nix/main/shared.hh" #include "nix/expr/eval.hh" #include "nix/expr/eval-inline.hh" #include "nix/expr/flake/flake.hh" diff --git a/src/nix/hash.cc b/src/nix/hash.cc index 1bc49262e48..e18b5327fc1 100644 --- a/src/nix/hash.cc +++ b/src/nix/hash.cc @@ -2,7 +2,7 @@ #include "nix/util/hash.hh" #include "content-address.hh" #include "nix/cmd/legacy.hh" -#include "shared.hh" +#include "nix/main/shared.hh" #include "references.hh" #include "nix/util/archive.hh" diff --git a/src/nix/local.mk b/src/nix/local.mk index a27835d8910..355f56b4bdc 100644 --- a/src/nix/local.mk +++ b/src/nix/local.mk @@ -19,7 +19,7 @@ nix_CXXFLAGS += \ -Isrc/libcmd/include \ -Isrc/libexpr/include \ -Isrc/libfetchers/include \ - -Isrc/libmain \ + -Isrc/libmain/include \ -Isrc/libstore \ -Isrc/libutil/include diff --git a/src/nix/log.cc b/src/nix/log.cc index a8b64a95e1d..d802e491d21 100644 --- a/src/nix/log.cc +++ b/src/nix/log.cc @@ -1,9 +1,9 @@ #include "nix/cmd/command.hh" -#include "common-args.hh" -#include "shared.hh" +#include "nix/main/common-args.hh" +#include "nix/main/shared.hh" #include "store-api.hh" #include "log-store.hh" -#include "progress-bar.hh" +#include "nix/main/progress-bar.hh" using namespace nix; diff --git a/src/nix/ls.cc b/src/nix/ls.cc index e6e3eca8724..4226295b3ca 100644 --- a/src/nix/ls.cc +++ b/src/nix/ls.cc @@ -2,7 +2,7 @@ #include "store-api.hh" #include "fs-accessor.hh" #include "nar-accessor.hh" -#include "common-args.hh" +#include "nix/main/common-args.hh" #include using namespace nix; diff --git a/src/nix/main.cc b/src/nix/main.cc index 10db8a81364..766446c8a9b 100644 --- a/src/nix/main.cc +++ b/src/nix/main.cc @@ -1,15 +1,15 @@ #include #include "nix/cmd/command.hh" -#include "common-args.hh" +#include "nix/main/common-args.hh" #include "nix/expr/eval.hh" #include "globals.hh" #include "nix/cmd/legacy.hh" -#include "shared.hh" +#include "nix/main/shared.hh" #include "store-api.hh" #include "filetransfer.hh" #include "nix/util/finally.hh" -#include "loggers.hh" +#include "nix/main/loggers.hh" #include "nix/cmd/markdown.hh" #include diff --git a/src/nix/make-content-addressed.cc b/src/nix/make-content-addressed.cc index df2eced9e99..a690a010d2a 100644 --- a/src/nix/make-content-addressed.cc +++ b/src/nix/make-content-addressed.cc @@ -1,7 +1,7 @@ #include "nix/cmd/command.hh" #include "store-api.hh" #include "make-content-addressed.hh" -#include "common-args.hh" +#include "nix/main/common-args.hh" #include diff --git a/src/nix/optimise-store.cc b/src/nix/optimise-store.cc index 137f8416dd4..a23ec4d1c30 100644 --- a/src/nix/optimise-store.cc +++ b/src/nix/optimise-store.cc @@ -1,5 +1,5 @@ #include "nix/cmd/command.hh" -#include "shared.hh" +#include "nix/main/shared.hh" #include "store-api.hh" #include diff --git a/src/nix/path-info.cc b/src/nix/path-info.cc index ff5f8bd7337..36c06ff2b3a 100644 --- a/src/nix/path-info.cc +++ b/src/nix/path-info.cc @@ -1,7 +1,7 @@ #include "nix/cmd/command.hh" -#include "shared.hh" +#include "nix/main/shared.hh" #include "store-api.hh" -#include "common-args.hh" +#include "nix/main/common-args.hh" #include #include diff --git a/src/nix/ping-store.cc b/src/nix/ping-store.cc index 0a7b2fc5e7c..46a0cb44c50 100644 --- a/src/nix/ping-store.cc +++ b/src/nix/ping-store.cc @@ -1,5 +1,5 @@ #include "nix/cmd/command.hh" -#include "shared.hh" +#include "nix/main/shared.hh" #include "store-api.hh" #include "nix/util/finally.hh" diff --git a/src/nix/prefetch.cc b/src/nix/prefetch.cc index db8b6e6f548..e11ce047a13 100644 --- a/src/nix/prefetch.cc +++ b/src/nix/prefetch.cc @@ -1,10 +1,10 @@ #include "nix/cmd/command.hh" -#include "common-args.hh" -#include "shared.hh" +#include "nix/main/common-args.hh" +#include "nix/main/shared.hh" #include "store-api.hh" #include "filetransfer.hh" #include "nix/util/finally.hh" -#include "progress-bar.hh" +#include "nix/main/progress-bar.hh" #include "nix/util/tarfile.hh" #include "nix/expr/attr-path.hh" #include "nix/expr/eval-inline.hh" diff --git a/src/nix/profile.cc b/src/nix/profile.cc index e54b5dee90f..7f1e7d3613f 100644 --- a/src/nix/profile.cc +++ b/src/nix/profile.cc @@ -1,6 +1,6 @@ #include "nix/cmd/command.hh" -#include "common-args.hh" -#include "shared.hh" +#include "nix/main/common-args.hh" +#include "nix/main/shared.hh" #include "store-api.hh" #include "derivations.hh" #include "nix/util/archive.hh" diff --git a/src/nix/realisation.cc b/src/nix/realisation.cc index bf4a268ff9c..6c5612a7fdb 100644 --- a/src/nix/realisation.cc +++ b/src/nix/realisation.cc @@ -1,5 +1,5 @@ #include "nix/cmd/command.hh" -#include "common-args.hh" +#include "nix/main/common-args.hh" #include diff --git a/src/nix/registry.cc b/src/nix/registry.cc index b1920ca7df7..8edff0ff8aa 100644 --- a/src/nix/registry.cc +++ b/src/nix/registry.cc @@ -1,6 +1,6 @@ #include "nix/cmd/command.hh" -#include "common-args.hh" -#include "shared.hh" +#include "nix/main/common-args.hh" +#include "nix/main/shared.hh" #include "nix/expr/eval.hh" #include "nix/expr/flake/flake.hh" #include "store-api.hh" diff --git a/src/nix/run.cc b/src/nix/run.cc index cb0df68eb25..4b11c98f695 100644 --- a/src/nix/run.cc +++ b/src/nix/run.cc @@ -1,13 +1,13 @@ #include "run.hh" #include "nix/cmd/command.hh" -#include "common-args.hh" -#include "shared.hh" +#include "nix/main/common-args.hh" +#include "nix/main/shared.hh" #include "store-api.hh" #include "derivations.hh" #include "local-store.hh" #include "nix/util/finally.hh" #include "fs-accessor.hh" -#include "progress-bar.hh" +#include "nix/main/progress-bar.hh" #include "nix/expr/eval.hh" #include "build/personality.hh" diff --git a/src/nix/search.cc b/src/nix/search.cc index 5ec7c9b87d3..aa77d1071e7 100644 --- a/src/nix/search.cc +++ b/src/nix/search.cc @@ -4,8 +4,8 @@ #include "nix/expr/eval-inline.hh" #include "names.hh" #include "nix/expr/get-drvs.hh" -#include "common-args.hh" -#include "shared.hh" +#include "nix/main/common-args.hh" +#include "nix/main/shared.hh" #include "nix/expr/eval-cache.hh" #include "nix/expr/attr-path.hh" #include "nix/util/hilite.hh" diff --git a/src/nix/show-config.cc b/src/nix/show-config.cc index d3781ee6024..56e9b19aa7e 100644 --- a/src/nix/show-config.cc +++ b/src/nix/show-config.cc @@ -1,6 +1,6 @@ #include "nix/cmd/command.hh" -#include "common-args.hh" -#include "shared.hh" +#include "nix/main/common-args.hh" +#include "nix/main/shared.hh" #include "store-api.hh" #include diff --git a/src/nix/show-derivation.cc b/src/nix/show-derivation.cc index 4245ec3aeec..ce0fbc3dca8 100644 --- a/src/nix/show-derivation.cc +++ b/src/nix/show-derivation.cc @@ -2,7 +2,7 @@ // FIXME: rename to 'nix store show-derivation' or 'nix debug show-derivation'? #include "nix/cmd/command.hh" -#include "common-args.hh" +#include "nix/main/common-args.hh" #include "store-api.hh" #include "nix/util/archive.hh" #include "derivations.hh" diff --git a/src/nix/sigs.cc b/src/nix/sigs.cc index 7c1b67cf10f..22d3682a054 100644 --- a/src/nix/sigs.cc +++ b/src/nix/sigs.cc @@ -1,5 +1,5 @@ #include "nix/cmd/command.hh" -#include "shared.hh" +#include "nix/main/shared.hh" #include "store-api.hh" #include "nix/util/thread-pool.hh" diff --git a/src/nix/store-copy-log.cc b/src/nix/store-copy-log.cc index 44467278d3d..78e47b7b5b7 100644 --- a/src/nix/store-copy-log.cc +++ b/src/nix/store-copy-log.cc @@ -1,5 +1,5 @@ #include "nix/cmd/command.hh" -#include "shared.hh" +#include "nix/main/shared.hh" #include "store-api.hh" #include "store-cast.hh" #include "log-store.hh" diff --git a/src/nix/store-delete.cc b/src/nix/store-delete.cc index bd8fbdcf5eb..ddb06f0199a 100644 --- a/src/nix/store-delete.cc +++ b/src/nix/store-delete.cc @@ -1,6 +1,6 @@ #include "nix/cmd/command.hh" -#include "common-args.hh" -#include "shared.hh" +#include "nix/main/common-args.hh" +#include "nix/main/shared.hh" #include "store-api.hh" #include "store-cast.hh" #include "gc-store.hh" diff --git a/src/nix/store-gc.cc b/src/nix/store-gc.cc index b4e67706ae1..2e7122b4391 100644 --- a/src/nix/store-gc.cc +++ b/src/nix/store-gc.cc @@ -1,6 +1,6 @@ #include "nix/cmd/command.hh" -#include "common-args.hh" -#include "shared.hh" +#include "nix/main/common-args.hh" +#include "nix/main/shared.hh" #include "store-api.hh" #include "store-cast.hh" #include "gc-store.hh" diff --git a/src/nix/upgrade-nix.cc b/src/nix/upgrade-nix.cc index 6f98ae446fc..2b94945d16b 100644 --- a/src/nix/upgrade-nix.cc +++ b/src/nix/upgrade-nix.cc @@ -1,11 +1,11 @@ #include "nix/cmd/command.hh" -#include "common-args.hh" +#include "nix/main/common-args.hh" #include "store-api.hh" #include "filetransfer.hh" #include "nix/expr/eval.hh" #include "nix/expr/attr-path.hh" #include "names.hh" -#include "progress-bar.hh" +#include "nix/main/progress-bar.hh" using namespace nix; diff --git a/src/nix/verify.cc b/src/nix/verify.cc index e2d0a60fcb8..5d4950247f0 100644 --- a/src/nix/verify.cc +++ b/src/nix/verify.cc @@ -1,5 +1,5 @@ #include "nix/cmd/command.hh" -#include "shared.hh" +#include "nix/main/shared.hh" #include "store-api.hh" #include "nix/util/sync.hh" #include "nix/util/thread-pool.hh" diff --git a/src/nix/why-depends.cc b/src/nix/why-depends.cc index 66244d83ef6..f07376b2087 100644 --- a/src/nix/why-depends.cc +++ b/src/nix/why-depends.cc @@ -1,8 +1,8 @@ #include "nix/cmd/command.hh" #include "store-api.hh" -#include "progress-bar.hh" +#include "nix/main/progress-bar.hh" #include "fs-accessor.hh" -#include "shared.hh" +#include "nix/main/shared.hh" #include diff --git a/src/resolve-system-dependencies/resolve-system-dependencies.cc b/src/resolve-system-dependencies/resolve-system-dependencies.cc index c6023eb0387..5c209883dcd 100644 --- a/src/resolve-system-dependencies/resolve-system-dependencies.cc +++ b/src/resolve-system-dependencies/resolve-system-dependencies.cc @@ -1,6 +1,6 @@ #include "derivations.hh" #include "globals.hh" -#include "shared.hh" +#include "nix/main/shared.hh" #include "store-api.hh" #include #include From 76ad0059f176c5407cfe99963462249c8ac38ff8 Mon Sep 17 00:00:00 2001 From: Andrea Bedini Date: Fri, 17 Feb 2023 17:37:24 +0800 Subject: [PATCH 09/21] Move libstore include files --- src/build-remote/build-remote.cc | 14 ++++++------- src/libcmd/command.cc | 8 ++++---- src/libcmd/common-eval-args.cc | 4 ++-- src/libcmd/include/nix/cmd/command.hh | 2 +- src/libcmd/include/nix/cmd/installables.hh | 10 +++++----- src/libcmd/installable-derived-path.cc | 2 +- src/libcmd/installables.cc | 10 +++++----- src/libcmd/local.mk | 2 +- src/libcmd/repl.cc | 10 +++++----- src/libexpr/eval-cache.cc | 4 ++-- src/libexpr/eval.cc | 8 ++++---- src/libexpr/flake/config.cc | 2 +- src/libexpr/flake/flake.cc | 2 +- src/libexpr/flake/flakeref.cc | 2 +- src/libexpr/flake/lockfile.cc | 2 +- src/libexpr/get-drvs.cc | 6 +++--- .../include/nix/expr/flake/flakeref.hh | 2 +- src/libexpr/include/nix/expr/get-drvs.hh | 2 +- src/libexpr/include/nix/expr/value/context.hh | 2 +- src/libexpr/local.mk | 3 +-- src/libexpr/nixexpr.cc | 2 +- src/libexpr/parser.y | 6 +++--- src/libexpr/primops.cc | 10 +++++----- src/libexpr/primops/context.cc | 4 ++-- src/libexpr/primops/fetchClosure.cc | 4 ++-- src/libexpr/primops/fetchMercurial.cc | 2 +- src/libexpr/primops/fetchTree.cc | 4 ++-- src/libexpr/tests/libexpr.hh | 2 +- src/libexpr/tests/local.mk | 3 ++- src/libexpr/value-to-json.cc | 2 +- src/libexpr/value/context.cc | 2 +- src/libfetchers/cache.cc | 4 ++-- src/libfetchers/fetchers.cc | 2 +- src/libfetchers/git.cc | 6 +++--- src/libfetchers/github.cc | 6 +++--- .../include/nix/fetchers/fetchers.hh | 2 +- src/libfetchers/local.mk | 2 +- src/libfetchers/mercurial.cc | 4 ++-- src/libfetchers/path.cc | 2 +- src/libfetchers/registry.cc | 6 +++--- src/libfetchers/tarball.cc | 6 +++--- src/libmain/common-args.cc | 2 +- src/libmain/include/nix/main/shared.hh | 4 ++-- src/libmain/local.mk | 2 +- src/libmain/progress-bar.cc | 4 ++-- src/libmain/shared.cc | 6 +++--- src/libstore/binary-cache-store.cc | 16 +++++++-------- src/libstore/build/derivation-goal.cc | 16 +++++++-------- .../build/drv-output-substitution-goal.cc | 6 +++--- src/libstore/build/entry-points.cc | 8 ++++---- src/libstore/build/goal.cc | 4 ++-- src/libstore/build/hook-instance.cc | 4 ++-- src/libstore/build/local-derivation-goal.cc | 20 +++++++++---------- src/libstore/build/personality.cc | 4 ++-- src/libstore/build/substitution-goal.cc | 6 +++--- src/libstore/build/worker.cc | 12 +++++------ src/libstore/builtins/buildenv.cc | 2 +- src/libstore/builtins/fetchurl.cc | 6 +++--- src/libstore/builtins/unpack-channel.cc | 2 +- src/libstore/content-address.cc | 2 +- src/libstore/crypto.cc | 4 ++-- src/libstore/daemon.cc | 18 ++++++++--------- src/libstore/derivations.cc | 10 +++++----- src/libstore/derived-path.cc | 6 +++--- src/libstore/dummy-store.cc | 2 +- src/libstore/export-import.cc | 4 ++-- src/libstore/filetransfer.cc | 8 ++++---- src/libstore/gc.cc | 8 ++++---- src/libstore/globals.cc | 2 +- src/libstore/http-binary-cache-store.cc | 8 ++++---- .../nix/store}/binary-cache-store.hh | 6 +++--- .../{ => include/nix/store}/build-result.hh | 4 ++-- .../nix/store}/build/derivation-goal.hh | 12 +++++------ .../build/drv-output-substitution-goal.hh | 6 +++--- .../{ => include/nix/store}/build/goal.hh | 4 ++-- .../nix/store}/build/hook-instance.hh | 0 .../nix/store}/build/local-derivation-goal.hh | 4 ++-- .../nix/store}/build/personality.hh | 0 .../nix/store}/build/substitution-goal.hh | 6 +++--- .../{ => include/nix/store}/build/worker.hh | 8 ++++---- .../{ => include/nix/store}/builtins.hh | 2 +- .../nix/store}/builtins/buildenv.hh | 4 ++-- .../nix/store}/content-address.hh | 0 .../{ => include/nix/store}/crypto.hh | 0 .../{ => include/nix/store}/daemon.hh | 2 +- .../{ => include/nix/store}/derivations.hh | 4 ++-- .../{ => include/nix/store}/derived-path.hh | 6 +++--- .../{ => include/nix/store}/filetransfer.hh | 0 .../{ => include/nix/store}/fs-accessor.hh | 0 .../{ => include/nix/store}/gc-store.hh | 2 +- .../{ => include/nix/store}/globals.hh | 0 .../{ => include/nix/store}/local-fs-store.hh | 6 +++--- .../{ => include/nix/store}/local-store.hh | 10 +++++----- src/libstore/{ => include/nix/store}/lock.hh | 0 .../{ => include/nix/store}/log-store.hh | 2 +- .../{ => include/nix/store}/machines.hh | 0 .../nix/store}/make-content-addressed.hh | 2 +- src/libstore/{ => include/nix/store}/names.hh | 0 .../{ => include/nix/store}/nar-accessor.hh | 2 +- .../nix/store}/nar-info-disk-cache.hh | 4 ++-- .../{ => include/nix/store}/nar-info.hh | 2 +- .../{ => include/nix/store}/outputs-spec.hh | 0 .../nix/store}/parsed-derivations.hh | 4 ++-- .../{ => include/nix/store}/path-info.hh | 6 +++--- .../{ => include/nix/store}/path-regex.hh | 0 .../nix/store}/path-with-outputs.hh | 4 ++-- src/libstore/{ => include/nix/store}/path.hh | 0 .../{ => include/nix/store}/pathlocks.hh | 0 .../{ => include/nix/store}/profiles.hh | 2 +- .../{ => include/nix/store}/realisation.hh | 4 ++-- .../{ => include/nix/store}/references.hh | 2 +- .../nix/store}/remote-fs-accessor.hh | 4 ++-- .../{ => include/nix/store}/remote-store.hh | 6 +++--- .../{ => include/nix/store}/repair-flag.hh | 0 .../nix/store}/s3-binary-cache-store.hh | 2 +- src/libstore/{ => include/nix/store}/s3.hh | 0 .../{ => include/nix/store}/serve-protocol.hh | 0 .../{ => include/nix/store}/sqlite.hh | 0 src/libstore/{ => include/nix/store}/ssh.hh | 0 .../{ => include/nix/store}/store-api.hh | 14 ++++++------- .../{ => include/nix/store}/store-cast.hh | 2 +- .../nix/store}/uds-remote-store.hh | 4 ++-- .../nix/store}/worker-protocol.hh | 2 +- src/libstore/legacy-ssh-store.cc | 16 +++++++-------- src/libstore/local-binary-cache-store.cc | 6 +++--- src/libstore/local-fs-store.cc | 10 +++++----- src/libstore/local-store.cc | 14 ++++++------- src/libstore/local.mk | 3 +-- src/libstore/lock.cc | 6 +++--- src/libstore/log-store.cc | 2 +- src/libstore/machines.cc | 6 +++--- src/libstore/make-content-addressed.cc | 4 ++-- src/libstore/misc.cc | 12 +++++------ src/libstore/names.cc | 2 +- src/libstore/nar-accessor.cc | 2 +- src/libstore/nar-info-disk-cache.cc | 6 +++--- src/libstore/nar-info.cc | 6 +++--- src/libstore/optimise-store.cc | 4 ++-- src/libstore/outputs-spec.cc | 4 ++-- src/libstore/parsed-derivations.cc | 2 +- src/libstore/path-info.cc | 4 ++-- src/libstore/path-with-outputs.cc | 4 ++-- src/libstore/path.cc | 2 +- src/libstore/pathlocks.cc | 2 +- src/libstore/profiles.cc | 6 +++--- src/libstore/realisation.cc | 4 ++-- src/libstore/references.cc | 2 +- src/libstore/remote-fs-accessor.cc | 4 ++-- src/libstore/remote-store.cc | 18 ++++++++--------- src/libstore/s3-binary-cache-store.cc | 12 +++++------ src/libstore/sqlite.cc | 4 ++-- src/libstore/ssh-store.cc | 10 +++++----- src/libstore/ssh.cc | 2 +- src/libstore/store-api.cc | 18 ++++++++--------- src/libstore/tests/derived-path.hh | 2 +- src/libstore/tests/libstore.hh | 2 +- src/libstore/tests/local.mk | 3 ++- src/libstore/tests/machines.cc | 4 ++-- src/libstore/tests/nar-info-disk-cache.cc | 4 ++-- src/libstore/tests/outputs-spec.cc | 2 +- src/libstore/tests/outputs-spec.hh | 4 ++-- src/libstore/tests/path.cc | 4 ++-- src/libstore/tests/path.hh | 2 +- src/libstore/tests/references.cc | 2 +- src/libstore/uds-remote-store.cc | 2 +- src/nix-build/nix-build.cc | 12 +++++------ src/nix-channel/nix-channel.cc | 8 ++++---- .../nix-collect-garbage.cc | 10 +++++----- src/nix-copy-closure/nix-copy-closure.cc | 2 +- src/nix-env/nix-env.cc | 14 ++++++------- src/nix-env/user-env.cc | 12 +++++------ src/nix-instantiate/nix-instantiate.cc | 6 +++--- src/nix-store/dotgraph.cc | 2 +- src/nix-store/dotgraph.hh | 2 +- src/nix-store/graphml.cc | 4 ++-- src/nix-store/graphml.hh | 2 +- src/nix-store/nix-store.cc | 20 +++++++++---------- src/nix/add-to-store.cc | 2 +- src/nix/app.cc | 6 +++--- src/nix/build.cc | 4 ++-- src/nix/bundle.cc | 6 +++--- src/nix/cat.cc | 6 +++--- src/nix/copy.cc | 2 +- src/nix/daemon.cc | 10 +++++----- src/nix/describe-stores.cc | 2 +- src/nix/develop.cc | 6 +++--- src/nix/diff-closures.cc | 4 ++-- src/nix/doctor.cc | 8 ++++---- src/nix/dump-path.cc | 2 +- src/nix/eval.cc | 2 +- src/nix/flake.cc | 6 +++--- src/nix/hash.cc | 4 ++-- src/nix/local.mk | 2 +- src/nix/log.cc | 4 ++-- src/nix/ls.cc | 6 +++--- src/nix/main.cc | 6 +++--- src/nix/make-content-addressed.cc | 4 ++-- src/nix/optimise-store.cc | 2 +- src/nix/path-from-hash-part.cc | 2 +- src/nix/path-info.cc | 2 +- src/nix/ping-store.cc | 2 +- src/nix/prefetch.cc | 4 ++-- src/nix/profile.cc | 10 +++++----- src/nix/registry.cc | 2 +- src/nix/run.cc | 10 +++++----- src/nix/run.hh | 2 +- src/nix/search.cc | 4 ++-- src/nix/show-config.cc | 2 +- src/nix/show-derivation.cc | 4 ++-- src/nix/sigs.cc | 2 +- src/nix/store-copy-log.cc | 6 +++--- src/nix/store-delete.cc | 6 +++--- src/nix/store-gc.cc | 6 +++--- src/nix/store-repair.cc | 2 +- src/nix/upgrade-nix.cc | 6 +++--- src/nix/verify.cc | 4 ++-- src/nix/why-depends.cc | 4 ++-- .../resolve-system-dependencies.cc | 6 +++--- 218 files changed, 515 insertions(+), 515 deletions(-) rename src/libstore/{ => include/nix/store}/binary-cache-store.hh (97%) rename src/libstore/{ => include/nix/store}/build-result.hh (97%) rename src/libstore/{ => include/nix/store}/build/derivation-goal.hh (96%) rename src/libstore/{ => include/nix/store}/build/drv-output-substitution-goal.hh (92%) rename src/libstore/{ => include/nix/store}/build/goal.hh (97%) rename src/libstore/{ => include/nix/store}/build/hook-instance.hh (100%) rename src/libstore/{ => include/nix/store}/build/local-derivation-goal.hh (98%) rename src/libstore/{ => include/nix/store}/build/personality.hh (100%) rename src/libstore/{ => include/nix/store}/build/substitution-goal.hh (96%) rename src/libstore/{ => include/nix/store}/build/worker.hh (98%) rename src/libstore/{ => include/nix/store}/builtins.hh (84%) rename src/libstore/{ => include/nix/store}/builtins/buildenv.hh (83%) rename src/libstore/{ => include/nix/store}/content-address.hh (100%) rename src/libstore/{ => include/nix/store}/crypto.hh (100%) rename src/libstore/{ => include/nix/store}/daemon.hh (91%) rename src/libstore/{ => include/nix/store}/derivations.hh (99%) rename src/libstore/{ => include/nix/store}/derived-path.hh (97%) rename src/libstore/{ => include/nix/store}/filetransfer.hh (100%) rename src/libstore/{ => include/nix/store}/fs-accessor.hh (100%) rename src/libstore/{ => include/nix/store}/gc-store.hh (98%) rename src/libstore/{ => include/nix/store}/globals.hh (100%) rename src/libstore/{ => include/nix/store}/local-fs-store.hh (94%) rename src/libstore/{ => include/nix/store}/local-store.hh (98%) rename src/libstore/{ => include/nix/store}/lock.hh (100%) rename src/libstore/{ => include/nix/store}/log-store.hh (94%) rename src/libstore/{ => include/nix/store}/machines.hh (100%) rename src/libstore/{ => include/nix/store}/make-content-addressed.hh (83%) rename src/libstore/{ => include/nix/store}/names.hh (100%) rename src/libstore/{ => include/nix/store}/nar-accessor.hh (95%) rename src/libstore/{ => include/nix/store}/nar-info-disk-cache.hh (95%) rename src/libstore/{ => include/nix/store}/nar-info.hh (94%) rename src/libstore/{ => include/nix/store}/outputs-spec.hh (100%) rename src/libstore/{ => include/nix/store}/parsed-derivations.hh (93%) rename src/libstore/{ => include/nix/store}/path-info.hh (97%) rename src/libstore/{ => include/nix/store}/path-regex.hh (100%) rename src/libstore/{ => include/nix/store}/path-with-outputs.hh (94%) rename src/libstore/{ => include/nix/store}/path.hh (100%) rename src/libstore/{ => include/nix/store}/pathlocks.hh (100%) rename src/libstore/{ => include/nix/store}/profiles.hh (98%) rename src/libstore/{ => include/nix/store}/realisation.hh (97%) rename src/libstore/{ => include/nix/store}/references.hh (97%) rename src/libstore/{ => include/nix/store}/remote-fs-accessor.hh (92%) rename src/libstore/{ => include/nix/store}/remote-store.hh (98%) rename src/libstore/{ => include/nix/store}/repair-flag.hh (100%) rename src/libstore/{ => include/nix/store}/s3-binary-cache-store.hh (92%) rename src/libstore/{ => include/nix/store}/s3.hh (100%) rename src/libstore/{ => include/nix/store}/serve-protocol.hh (100%) rename src/libstore/{ => include/nix/store}/sqlite.hh (100%) rename src/libstore/{ => include/nix/store}/ssh.hh (100%) rename src/libstore/{ => include/nix/store}/store-api.hh (99%) rename src/libstore/{ => include/nix/store}/store-cast.hh (89%) rename src/libstore/{ => include/nix/store}/uds-remote-store.hh (94%) rename src/libstore/{ => include/nix/store}/worker-protocol.hh (99%) diff --git a/src/build-remote/build-remote.cc b/src/build-remote/build-remote.cc index 02818af1085..6f4ed408d33 100644 --- a/src/build-remote/build-remote.cc +++ b/src/build-remote/build-remote.cc @@ -9,15 +9,15 @@ #include #endif -#include "machines.hh" +#include "nix/store/machines.hh" #include "nix/main/shared.hh" -#include "pathlocks.hh" -#include "globals.hh" +#include "nix/store/pathlocks.hh" +#include "nix/store/globals.hh" #include "nix/util/serialise.hh" -#include "build-result.hh" -#include "store-api.hh" -#include "derivations.hh" -#include "local-store.hh" +#include "nix/store/build-result.hh" +#include "nix/store/store-api.hh" +#include "nix/store/derivations.hh" +#include "nix/store/local-store.hh" #include "nix/cmd/legacy.hh" #include "nix/util/experimental-features.hh" diff --git a/src/libcmd/command.cc b/src/libcmd/command.cc index ed57a98d3a7..bf4347d22b8 100644 --- a/src/libcmd/command.cc +++ b/src/libcmd/command.cc @@ -1,9 +1,9 @@ #include "nix/cmd/command.hh" -#include "store-api.hh" -#include "local-fs-store.hh" -#include "derivations.hh" +#include "nix/store/store-api.hh" +#include "nix/store/local-fs-store.hh" +#include "nix/store/derivations.hh" #include "nix/expr/nixexpr.hh" -#include "profiles.hh" +#include "nix/store/profiles.hh" #include diff --git a/src/libcmd/common-eval-args.cc b/src/libcmd/common-eval-args.cc index 60b6e066849..ef9536e59b2 100644 --- a/src/libcmd/common-eval-args.cc +++ b/src/libcmd/common-eval-args.cc @@ -1,12 +1,12 @@ #include "nix/cmd/common-eval-args.hh" #include "nix/main/shared.hh" -#include "filetransfer.hh" +#include "nix/store/filetransfer.hh" #include "nix/util/util.hh" #include "nix/expr/eval.hh" #include "nix/fetchers/fetchers.hh" #include "nix/fetchers/registry.hh" #include "nix/expr/flake/flakeref.hh" -#include "store-api.hh" +#include "nix/store/store-api.hh" #include "nix/cmd/command.hh" namespace nix { diff --git a/src/libcmd/include/nix/cmd/command.hh b/src/libcmd/include/nix/cmd/command.hh index 0b652629729..ee4b945258b 100644 --- a/src/libcmd/include/nix/cmd/command.hh +++ b/src/libcmd/include/nix/cmd/command.hh @@ -3,7 +3,7 @@ #include "nix/cmd/installables.hh" #include "nix/util/args.hh" #include "nix/cmd/common-eval-args.hh" -#include "path.hh" +#include "nix/store/path.hh" #include "nix/expr/flake/lockfile.hh" #include diff --git a/src/libcmd/include/nix/cmd/installables.hh b/src/libcmd/include/nix/cmd/installables.hh index 3b6a397c698..c38521e921e 100644 --- a/src/libcmd/include/nix/cmd/installables.hh +++ b/src/libcmd/include/nix/cmd/installables.hh @@ -1,13 +1,13 @@ #pragma once #include "nix/util/util.hh" -#include "path.hh" -#include "outputs-spec.hh" -#include "derived-path.hh" +#include "nix/store/path.hh" +#include "nix/store/outputs-spec.hh" +#include "nix/store/derived-path.hh" #include "nix/expr/eval.hh" -#include "store-api.hh" +#include "nix/store/store-api.hh" #include "nix/expr/flake/flake.hh" -#include "build-result.hh" +#include "nix/store/build-result.hh" #include diff --git a/src/libcmd/installable-derived-path.cc b/src/libcmd/installable-derived-path.cc index 26db3b4e656..c2428549635 100644 --- a/src/libcmd/installable-derived-path.cc +++ b/src/libcmd/installable-derived-path.cc @@ -1,5 +1,5 @@ #include "nix/cmd/installable-derived-path.hh" -#include "derivations.hh" +#include "nix/store/derivations.hh" namespace nix { diff --git a/src/libcmd/installables.cc b/src/libcmd/installables.cc index fcc1b59b3c9..1f74888e00f 100644 --- a/src/libcmd/installables.cc +++ b/src/libcmd/installables.cc @@ -1,22 +1,22 @@ -#include "globals.hh" +#include "nix/store/globals.hh" #include "nix/cmd/installables.hh" #include "nix/cmd/installable-derived-path.hh" -#include "outputs-spec.hh" +#include "nix/store/outputs-spec.hh" #include "nix/util/util.hh" #include "nix/cmd/command.hh" #include "nix/expr/attr-path.hh" #include "nix/cmd/common-eval-args.hh" -#include "derivations.hh" +#include "nix/store/derivations.hh" #include "nix/expr/eval-inline.hh" #include "nix/expr/eval.hh" #include "nix/expr/get-drvs.hh" -#include "store-api.hh" +#include "nix/store/store-api.hh" #include "nix/main/shared.hh" #include "nix/expr/flake/flake.hh" #include "nix/expr/eval-cache.hh" #include "nix/util/url.hh" #include "nix/fetchers/registry.hh" -#include "build-result.hh" +#include "nix/store/build-result.hh" #include #include diff --git a/src/libcmd/local.mk b/src/libcmd/local.mk index 058b284a12b..8fbddcb4738 100644 --- a/src/libcmd/local.mk +++ b/src/libcmd/local.mk @@ -11,7 +11,7 @@ libcmd_CXXFLAGS += \ -Isrc/libexpr/include \ -Isrc/libfetchers/include \ -Isrc/libmain/include \ - -Isrc/libstore \ + -Isrc/libstore/include \ -Isrc/libutil/include \ -Isrc/nix diff --git a/src/libcmd/repl.cc b/src/libcmd/repl.cc index f77d922977a..8a0cfc2a5cd 100644 --- a/src/libcmd/repl.cc +++ b/src/libcmd/repl.cc @@ -25,16 +25,16 @@ extern "C" { #include "nix/expr/eval-cache.hh" #include "nix/expr/eval-inline.hh" #include "nix/expr/attr-path.hh" -#include "store-api.hh" -#include "log-store.hh" +#include "nix/store/store-api.hh" +#include "nix/store/log-store.hh" #include "nix/cmd/common-eval-args.hh" #include "nix/expr/get-drvs.hh" -#include "derivations.hh" -#include "globals.hh" +#include "nix/store/derivations.hh" +#include "nix/store/globals.hh" #include "nix/cmd/command.hh" #include "nix/util/finally.hh" #include "nix/cmd/markdown.hh" -#include "local-fs-store.hh" +#include "nix/store/local-fs-store.hh" #include "nix/main/progress-bar.hh" #if HAVE_BOEHMGC diff --git a/src/libexpr/eval-cache.cc b/src/libexpr/eval-cache.cc index c0bdaebbf11..14893fa908a 100644 --- a/src/libexpr/eval-cache.cc +++ b/src/libexpr/eval-cache.cc @@ -1,8 +1,8 @@ #include "nix/expr/eval-cache.hh" -#include "sqlite.hh" +#include "nix/store/sqlite.hh" #include "nix/expr/eval.hh" #include "nix/expr/eval-inline.hh" -#include "store-api.hh" +#include "nix/store/store-api.hh" namespace nix::eval_cache { diff --git a/src/libexpr/eval.cc b/src/libexpr/eval.cc index 27406b7a640..340ccd48561 100644 --- a/src/libexpr/eval.cc +++ b/src/libexpr/eval.cc @@ -2,11 +2,11 @@ #include "nix/util/hash.hh" #include "nix/util/types.hh" #include "nix/util/util.hh" -#include "store-api.hh" -#include "derivations.hh" -#include "globals.hh" +#include "nix/store/store-api.hh" +#include "nix/store/derivations.hh" +#include "nix/store/globals.hh" #include "nix/expr/eval-inline.hh" -#include "filetransfer.hh" +#include "nix/store/filetransfer.hh" #include "nix/expr/function-trace.hh" #include diff --git a/src/libexpr/flake/config.cc b/src/libexpr/flake/config.cc index d4d61bf4d2f..8c0f2d36db6 100644 --- a/src/libexpr/flake/config.cc +++ b/src/libexpr/flake/config.cc @@ -1,5 +1,5 @@ #include "nix/expr/flake/flake.hh" -#include "globals.hh" +#include "nix/store/globals.hh" #include "nix/fetchers/fetch-settings.hh" #include diff --git a/src/libexpr/flake/flake.cc b/src/libexpr/flake/flake.cc index 49a475faf75..46a3df9b620 100644 --- a/src/libexpr/flake/flake.cc +++ b/src/libexpr/flake/flake.cc @@ -3,7 +3,7 @@ #include "nix/expr/flake/lockfile.hh" #include "nix/expr/primops.hh" #include "nix/expr/eval-inline.hh" -#include "store-api.hh" +#include "nix/store/store-api.hh" #include "nix/fetchers/fetchers.hh" #include "nix/util/finally.hh" #include "nix/fetchers/fetch-settings.hh" diff --git a/src/libexpr/flake/flakeref.cc b/src/libexpr/flake/flakeref.cc index ef627559775..90bc2db752e 100644 --- a/src/libexpr/flake/flakeref.cc +++ b/src/libexpr/flake/flakeref.cc @@ -1,5 +1,5 @@ #include "nix/expr/flake/flakeref.hh" -#include "store-api.hh" +#include "nix/store/store-api.hh" #include "nix/util/url.hh" #include "nix/util/url-parts.hh" #include "nix/fetchers/fetchers.hh" diff --git a/src/libexpr/flake/lockfile.cc b/src/libexpr/flake/lockfile.cc index fd30d796b1e..950bf2099e1 100644 --- a/src/libexpr/flake/lockfile.cc +++ b/src/libexpr/flake/lockfile.cc @@ -1,5 +1,5 @@ #include "nix/expr/flake/lockfile.hh" -#include "store-api.hh" +#include "nix/store/store-api.hh" #include "nix/util/url-parts.hh" #include diff --git a/src/libexpr/get-drvs.cc b/src/libexpr/get-drvs.cc index 8dbb1bab662..9aa116c13b0 100644 --- a/src/libexpr/get-drvs.cc +++ b/src/libexpr/get-drvs.cc @@ -1,9 +1,9 @@ #include "nix/expr/get-drvs.hh" #include "nix/util/util.hh" #include "nix/expr/eval-inline.hh" -#include "derivations.hh" -#include "store-api.hh" -#include "path-with-outputs.hh" +#include "nix/store/derivations.hh" +#include "nix/store/store-api.hh" +#include "nix/store/path-with-outputs.hh" #include #include diff --git a/src/libexpr/include/nix/expr/flake/flakeref.hh b/src/libexpr/include/nix/expr/flake/flakeref.hh index 16298a434d6..100f13d6dd3 100644 --- a/src/libexpr/include/nix/expr/flake/flakeref.hh +++ b/src/libexpr/include/nix/expr/flake/flakeref.hh @@ -3,7 +3,7 @@ #include "nix/util/types.hh" #include "nix/util/hash.hh" #include "nix/fetchers/fetchers.hh" -#include "outputs-spec.hh" +#include "nix/store/outputs-spec.hh" #include diff --git a/src/libexpr/include/nix/expr/get-drvs.hh b/src/libexpr/include/nix/expr/get-drvs.hh index a01ab5aae15..dd52d8419ce 100644 --- a/src/libexpr/include/nix/expr/get-drvs.hh +++ b/src/libexpr/include/nix/expr/get-drvs.hh @@ -1,7 +1,7 @@ #pragma once #include "nix/expr/eval.hh" -#include "path.hh" +#include "nix/store/path.hh" #include #include diff --git a/src/libexpr/include/nix/expr/value/context.hh b/src/libexpr/include/nix/expr/value/context.hh index e70ead2f3dc..ad2c2b949be 100644 --- a/src/libexpr/include/nix/expr/value/context.hh +++ b/src/libexpr/include/nix/expr/value/context.hh @@ -2,7 +2,7 @@ #include "nix/util/util.hh" #include "nix/util/comparator.hh" -#include "path.hh" +#include "nix/store/path.hh" #include diff --git a/src/libexpr/local.mk b/src/libexpr/local.mk index bcb1ae2fc9f..28f2958be0f 100644 --- a/src/libexpr/local.mk +++ b/src/libexpr/local.mk @@ -15,8 +15,7 @@ libexpr_SOURCES := \ libexpr_CXXFLAGS += \ -Isrc/libexpr/include \ -Isrc/libfetchers/include \ - -Isrc/libmain \ - -Isrc/libstore \ + -Isrc/libstore/include \ -Isrc/libutil/include libexpr_LIBS = libutil libstore libfetchers diff --git a/src/libexpr/nixexpr.cc b/src/libexpr/nixexpr.cc index 8ebb6437dce..194d98a44aa 100644 --- a/src/libexpr/nixexpr.cc +++ b/src/libexpr/nixexpr.cc @@ -1,5 +1,5 @@ #include "nix/expr/nixexpr.hh" -#include "derivations.hh" +#include "nix/store/derivations.hh" #include "nix/expr/eval.hh" #include "nix/expr/symbol-table.hh" #include "nix/util/util.hh" diff --git a/src/libexpr/parser.y b/src/libexpr/parser.y index f2b944aa9ba..e2cae19967b 100644 --- a/src/libexpr/parser.y +++ b/src/libexpr/parser.y @@ -22,7 +22,7 @@ #include "nix/expr/nixexpr.hh" #include "nix/expr/eval.hh" -#include "globals.hh" +#include "nix/store/globals.hh" namespace nix { @@ -635,9 +635,9 @@ formal #include #include "nix/expr/eval.hh" -#include "filetransfer.hh" +#include "nix/store/filetransfer.hh" #include "nix/fetchers/fetchers.hh" -#include "store-api.hh" +#include "nix/store/store-api.hh" #include "nix/expr/flake/flake.hh" diff --git a/src/libexpr/primops.cc b/src/libexpr/primops.cc index 21123fb8135..3dccead86d9 100644 --- a/src/libexpr/primops.cc +++ b/src/libexpr/primops.cc @@ -1,12 +1,12 @@ #include "nix/util/archive.hh" -#include "derivations.hh" +#include "nix/store/derivations.hh" #include "nix/expr/eval-inline.hh" #include "nix/expr/eval.hh" -#include "globals.hh" +#include "nix/store/globals.hh" #include "nix/expr/json-to-value.hh" -#include "names.hh" -#include "references.hh" -#include "store-api.hh" +#include "nix/store/names.hh" +#include "nix/store/references.hh" +#include "nix/store/store-api.hh" #include "nix/util/util.hh" #include "nix/expr/value-to-json.hh" #include "nix/expr/value-to-xml.hh" diff --git a/src/libexpr/primops/context.cc b/src/libexpr/primops/context.cc index 4dbbb2f3a9f..36456a76508 100644 --- a/src/libexpr/primops/context.cc +++ b/src/libexpr/primops/context.cc @@ -1,7 +1,7 @@ #include "nix/expr/primops.hh" #include "nix/expr/eval-inline.hh" -#include "derivations.hh" -#include "store-api.hh" +#include "nix/store/derivations.hh" +#include "nix/store/store-api.hh" namespace nix { diff --git a/src/libexpr/primops/fetchClosure.cc b/src/libexpr/primops/fetchClosure.cc index 2c59252bc6b..66f759a3074 100644 --- a/src/libexpr/primops/fetchClosure.cc +++ b/src/libexpr/primops/fetchClosure.cc @@ -1,6 +1,6 @@ #include "nix/expr/primops.hh" -#include "store-api.hh" -#include "make-content-addressed.hh" +#include "nix/store/store-api.hh" +#include "nix/store/make-content-addressed.hh" #include "nix/util/url.hh" namespace nix { diff --git a/src/libexpr/primops/fetchMercurial.cc b/src/libexpr/primops/fetchMercurial.cc index 23fd7acb988..436c9c86fab 100644 --- a/src/libexpr/primops/fetchMercurial.cc +++ b/src/libexpr/primops/fetchMercurial.cc @@ -1,6 +1,6 @@ #include "nix/expr/primops.hh" #include "nix/expr/eval-inline.hh" -#include "store-api.hh" +#include "nix/store/store-api.hh" #include "nix/fetchers/fetchers.hh" #include "nix/util/url.hh" #include "nix/util/url-parts.hh" diff --git a/src/libexpr/primops/fetchTree.cc b/src/libexpr/primops/fetchTree.cc index 6e7149da1c0..7c978f82a56 100644 --- a/src/libexpr/primops/fetchTree.cc +++ b/src/libexpr/primops/fetchTree.cc @@ -1,8 +1,8 @@ #include "nix/expr/primops.hh" #include "nix/expr/eval-inline.hh" -#include "store-api.hh" +#include "nix/store/store-api.hh" #include "nix/fetchers/fetchers.hh" -#include "filetransfer.hh" +#include "nix/store/filetransfer.hh" #include "nix/fetchers/registry.hh" #include diff --git a/src/libexpr/tests/libexpr.hh b/src/libexpr/tests/libexpr.hh index 49842c8aa36..6c66ccee63b 100644 --- a/src/libexpr/tests/libexpr.hh +++ b/src/libexpr/tests/libexpr.hh @@ -5,7 +5,7 @@ #include "nix/expr/nixexpr.hh" #include "nix/expr/eval.hh" #include "nix/expr/eval-inline.hh" -#include "store-api.hh" +#include "nix/store/store-api.hh" #include "tests/libstore.hh" diff --git a/src/libexpr/tests/local.mk b/src/libexpr/tests/local.mk index bd6ae40c219..9f196b39668 100644 --- a/src/libexpr/tests/local.mk +++ b/src/libexpr/tests/local.mk @@ -13,9 +13,10 @@ libexpr-tests_SOURCES := \ $(wildcard $(d)/value/*.cc) libexpr-tests_CXXFLAGS += \ - -Isrc/libexpr \ + -Isrc/libexpr \ -Isrc/libexpr/include \ -Isrc/libstore \ + -Isrc/libstore/include \ -Isrc/libutil/include libexpr-tests_LIBS = libstore-tests libutils-tests libexpr libutil libstore libfetchers diff --git a/src/libexpr/value-to-json.cc b/src/libexpr/value-to-json.cc index 22b84158599..32886d87623 100644 --- a/src/libexpr/value-to-json.cc +++ b/src/libexpr/value-to-json.cc @@ -1,7 +1,7 @@ #include "nix/expr/value-to-json.hh" #include "nix/expr/eval-inline.hh" #include "nix/util/util.hh" -#include "store-api.hh" +#include "nix/store/store-api.hh" #include #include diff --git a/src/libexpr/value/context.cc b/src/libexpr/value/context.cc index 02ceed45e96..159cb45e9df 100644 --- a/src/libexpr/value/context.cc +++ b/src/libexpr/value/context.cc @@ -1,5 +1,5 @@ #include "nix/expr/value/context.hh" -#include "store-api.hh" +#include "nix/store/store-api.hh" #include diff --git a/src/libfetchers/cache.cc b/src/libfetchers/cache.cc index f65d09df1d2..fe1c7a79dee 100644 --- a/src/libfetchers/cache.cc +++ b/src/libfetchers/cache.cc @@ -1,7 +1,7 @@ #include "nix/fetchers/cache.hh" -#include "sqlite.hh" +#include "nix/store/sqlite.hh" #include "nix/util/sync.hh" -#include "store-api.hh" +#include "nix/store/store-api.hh" #include diff --git a/src/libfetchers/fetchers.cc b/src/libfetchers/fetchers.cc index dd25fa6b071..9a0ece57e04 100644 --- a/src/libfetchers/fetchers.cc +++ b/src/libfetchers/fetchers.cc @@ -1,5 +1,5 @@ #include "nix/fetchers/fetchers.hh" -#include "store-api.hh" +#include "nix/store/store-api.hh" #include diff --git a/src/libfetchers/git.cc b/src/libfetchers/git.cc index 5aa0adc7d87..2cccc994878 100644 --- a/src/libfetchers/git.cc +++ b/src/libfetchers/git.cc @@ -1,10 +1,10 @@ #include "nix/fetchers/fetchers.hh" #include "nix/fetchers/cache.hh" -#include "globals.hh" +#include "nix/store/globals.hh" #include "nix/util/tarfile.hh" -#include "store-api.hh" +#include "nix/store/store-api.hh" #include "nix/util/url-parts.hh" -#include "pathlocks.hh" +#include "nix/store/pathlocks.hh" #include "nix/util/util.hh" #include "nix/util/git.hh" diff --git a/src/libfetchers/github.cc b/src/libfetchers/github.cc index 8e2c74abb20..36c3f1c566f 100644 --- a/src/libfetchers/github.cc +++ b/src/libfetchers/github.cc @@ -1,7 +1,7 @@ -#include "filetransfer.hh" +#include "nix/store/filetransfer.hh" #include "nix/fetchers/cache.hh" -#include "globals.hh" -#include "store-api.hh" +#include "nix/store/globals.hh" +#include "nix/store/store-api.hh" #include "nix/util/types.hh" #include "nix/util/url-parts.hh" #include "nix/util/git.hh" diff --git a/src/libfetchers/include/nix/fetchers/fetchers.hh b/src/libfetchers/include/nix/fetchers/fetchers.hh index 23b7df0084b..57380dd7bc1 100644 --- a/src/libfetchers/include/nix/fetchers/fetchers.hh +++ b/src/libfetchers/include/nix/fetchers/fetchers.hh @@ -2,7 +2,7 @@ #include "nix/util/types.hh" #include "nix/util/hash.hh" -#include "path.hh" +#include "nix/store/path.hh" #include "nix/fetchers/attrs.hh" #include "nix/util/url.hh" diff --git a/src/libfetchers/local.mk b/src/libfetchers/local.mk index 1e442a8b271..16ddafb06e5 100644 --- a/src/libfetchers/local.mk +++ b/src/libfetchers/local.mk @@ -9,7 +9,7 @@ libfetchers_SOURCES := $(wildcard $(d)/*.cc) libfetchers_CXXFLAGS += \ -Isrc/libfetchers/include \ -Isrc/libutil/include \ - -Isrc/libstore + -Isrc/libstore/include libfetchers_LDFLAGS += -pthread diff --git a/src/libfetchers/mercurial.cc b/src/libfetchers/mercurial.cc index e6008a05613..1042e781984 100644 --- a/src/libfetchers/mercurial.cc +++ b/src/libfetchers/mercurial.cc @@ -1,8 +1,8 @@ #include "nix/fetchers/fetchers.hh" #include "nix/fetchers/cache.hh" -#include "globals.hh" +#include "nix/store/globals.hh" #include "nix/util/tarfile.hh" -#include "store-api.hh" +#include "nix/store/store-api.hh" #include "nix/util/url-parts.hh" #include "nix/fetchers/fetch-settings.hh" diff --git a/src/libfetchers/path.cc b/src/libfetchers/path.cc index c2d6df3c830..f13ee56d06e 100644 --- a/src/libfetchers/path.cc +++ b/src/libfetchers/path.cc @@ -1,5 +1,5 @@ #include "nix/fetchers/fetchers.hh" -#include "store-api.hh" +#include "nix/store/store-api.hh" #include "nix/util/archive.hh" namespace nix::fetchers { diff --git a/src/libfetchers/registry.cc b/src/libfetchers/registry.cc index 8f85147617c..dc394cb185e 100644 --- a/src/libfetchers/registry.cc +++ b/src/libfetchers/registry.cc @@ -1,9 +1,9 @@ #include "nix/fetchers/registry.hh" #include "nix/fetchers/fetchers.hh" #include "nix/util/util.hh" -#include "globals.hh" -#include "store-api.hh" -#include "local-fs-store.hh" +#include "nix/store/globals.hh" +#include "nix/store/store-api.hh" +#include "nix/store/local-fs-store.hh" #include "nix/fetchers/fetch-settings.hh" diff --git a/src/libfetchers/tarball.cc b/src/libfetchers/tarball.cc index b2598e691b7..d90c993b0a7 100644 --- a/src/libfetchers/tarball.cc +++ b/src/libfetchers/tarball.cc @@ -1,8 +1,8 @@ #include "nix/fetchers/fetchers.hh" #include "nix/fetchers/cache.hh" -#include "filetransfer.hh" -#include "globals.hh" -#include "store-api.hh" +#include "nix/store/filetransfer.hh" +#include "nix/store/globals.hh" +#include "nix/store/store-api.hh" #include "nix/util/archive.hh" #include "nix/util/tarfile.hh" #include "nix/util/types.hh" diff --git a/src/libmain/common-args.cc b/src/libmain/common-args.cc index 298a6a7dcea..ff631498027 100644 --- a/src/libmain/common-args.cc +++ b/src/libmain/common-args.cc @@ -1,5 +1,5 @@ #include "nix/main/common-args.hh" -#include "globals.hh" +#include "nix/store/globals.hh" #include "nix/main/loggers.hh" namespace nix { diff --git a/src/libmain/include/nix/main/shared.hh b/src/libmain/include/nix/main/shared.hh index 95bed97c661..2cbe99a241c 100644 --- a/src/libmain/include/nix/main/shared.hh +++ b/src/libmain/include/nix/main/shared.hh @@ -3,8 +3,8 @@ #include "nix/util/util.hh" #include "nix/util/args.hh" #include "nix/main/common-args.hh" -#include "path.hh" -#include "derived-path.hh" +#include "nix/store/path.hh" +#include "nix/store/derived-path.hh" #include diff --git a/src/libmain/local.mk b/src/libmain/local.mk index d78e09fb2c9..2931e14e6be 100644 --- a/src/libmain/local.mk +++ b/src/libmain/local.mk @@ -8,7 +8,7 @@ libmain_SOURCES := $(wildcard $(d)/*.cc) libmain_CXXFLAGS += \ -Isrc/libmain/include \ - -Isrc/libstore \ + -Isrc/libstore/include \ -Isrc/libutil/include libmain_LDFLAGS += $(OPENSSL_LIBS) diff --git a/src/libmain/progress-bar.cc b/src/libmain/progress-bar.cc index 986ab262e1b..5c3f76ff88d 100644 --- a/src/libmain/progress-bar.cc +++ b/src/libmain/progress-bar.cc @@ -1,8 +1,8 @@ #include "nix/main/progress-bar.hh" #include "nix/util/util.hh" #include "nix/util/sync.hh" -#include "store-api.hh" -#include "names.hh" +#include "nix/store/store-api.hh" +#include "nix/store/names.hh" #include #include diff --git a/src/libmain/shared.cc b/src/libmain/shared.cc index 047022178e2..617d1200835 100644 --- a/src/libmain/shared.cc +++ b/src/libmain/shared.cc @@ -1,7 +1,7 @@ -#include "globals.hh" +#include "nix/store/globals.hh" #include "nix/main/shared.hh" -#include "store-api.hh" -#include "gc-store.hh" +#include "nix/store/store-api.hh" +#include "nix/store/gc-store.hh" #include "nix/util/util.hh" #include "nix/main/loggers.hh" #include "nix/main/progress-bar.hh" diff --git a/src/libstore/binary-cache-store.cc b/src/libstore/binary-cache-store.cc index d98121430f9..ff8b2fa4f9f 100644 --- a/src/libstore/binary-cache-store.cc +++ b/src/libstore/binary-cache-store.cc @@ -1,14 +1,14 @@ #include "nix/util/archive.hh" -#include "binary-cache-store.hh" +#include "nix/store/binary-cache-store.hh" #include "nix/util/compression.hh" -#include "derivations.hh" -#include "fs-accessor.hh" -#include "globals.hh" -#include "nar-info.hh" +#include "nix/store/derivations.hh" +#include "nix/store/fs-accessor.hh" +#include "nix/store/globals.hh" +#include "nix/store/nar-info.hh" #include "nix/util/sync.hh" -#include "remote-fs-accessor.hh" -#include "nar-info-disk-cache.hh" -#include "nar-accessor.hh" +#include "nix/store/remote-fs-accessor.hh" +#include "nix/store/nar-info-disk-cache.hh" +#include "nix/store/nar-accessor.hh" #include "nix/util/thread-pool.hh" #include "nix/util/callback.hh" diff --git a/src/libstore/build/derivation-goal.cc b/src/libstore/build/derivation-goal.cc index 572e22a535f..04cf7aa19b5 100644 --- a/src/libstore/build/derivation-goal.cc +++ b/src/libstore/build/derivation-goal.cc @@ -1,17 +1,17 @@ -#include "derivation-goal.hh" -#include "hook-instance.hh" -#include "worker.hh" -#include "builtins.hh" -#include "builtins/buildenv.hh" -#include "references.hh" +#include "nix/store/build/derivation-goal.hh" +#include "nix/store/build/hook-instance.hh" +#include "nix/store/build/worker.hh" +#include "nix/store/builtins.hh" +#include "nix/store/builtins/buildenv.hh" +#include "nix/store/references.hh" #include "nix/util/finally.hh" #include "nix/util/util.hh" #include "nix/util/archive.hh" #include "nix/util/compression.hh" -#include "worker-protocol.hh" +#include "nix/store/worker-protocol.hh" #include "nix/util/topo-sort.hh" #include "nix/util/callback.hh" -#include "local-store.hh" // TODO remove, along with remaining downcasts +#include "nix/store/local-store.hh" // TODO remove, along with remaining downcasts #include #include diff --git a/src/libstore/build/drv-output-substitution-goal.cc b/src/libstore/build/drv-output-substitution-goal.cc index eb193d404e3..b331c4dd1a1 100644 --- a/src/libstore/build/drv-output-substitution-goal.cc +++ b/src/libstore/build/drv-output-substitution-goal.cc @@ -1,7 +1,7 @@ -#include "drv-output-substitution-goal.hh" +#include "nix/store/build/drv-output-substitution-goal.hh" #include "nix/util/finally.hh" -#include "worker.hh" -#include "substitution-goal.hh" +#include "nix/store/build/worker.hh" +#include "nix/store/build/substitution-goal.hh" #include "nix/util/callback.hh" namespace nix { diff --git a/src/libstore/build/entry-points.cc b/src/libstore/build/entry-points.cc index 2925fe3ca4d..4381269d580 100644 --- a/src/libstore/build/entry-points.cc +++ b/src/libstore/build/entry-points.cc @@ -1,7 +1,7 @@ -#include "worker.hh" -#include "substitution-goal.hh" -#include "derivation-goal.hh" -#include "local-store.hh" +#include "nix/store/build/worker.hh" +#include "nix/store/build/substitution-goal.hh" +#include "nix/store/build/derivation-goal.hh" +#include "nix/store/local-store.hh" namespace nix { diff --git a/src/libstore/build/goal.cc b/src/libstore/build/goal.cc index 58e805f5507..4f77dd2fdba 100644 --- a/src/libstore/build/goal.cc +++ b/src/libstore/build/goal.cc @@ -1,5 +1,5 @@ -#include "goal.hh" -#include "worker.hh" +#include "nix/store/build/goal.hh" +#include "nix/store/build/worker.hh" namespace nix { diff --git a/src/libstore/build/hook-instance.cc b/src/libstore/build/hook-instance.cc index cb58a1f0246..4274704fbbb 100644 --- a/src/libstore/build/hook-instance.cc +++ b/src/libstore/build/hook-instance.cc @@ -1,5 +1,5 @@ -#include "globals.hh" -#include "hook-instance.hh" +#include "nix/store/globals.hh" +#include "nix/store/build/hook-instance.hh" namespace nix { diff --git a/src/libstore/build/local-derivation-goal.cc b/src/libstore/build/local-derivation-goal.cc index 4096da7d9c2..cc91ef95162 100644 --- a/src/libstore/build/local-derivation-goal.cc +++ b/src/libstore/build/local-derivation-goal.cc @@ -1,21 +1,21 @@ -#include "local-derivation-goal.hh" -#include "gc-store.hh" -#include "hook-instance.hh" -#include "worker.hh" -#include "builtins.hh" -#include "builtins/buildenv.hh" -#include "references.hh" +#include "nix/store/build/local-derivation-goal.hh" +#include "nix/store/gc-store.hh" +#include "nix/store/build/hook-instance.hh" +#include "nix/store/build/worker.hh" +#include "nix/store/builtins.hh" +#include "nix/store/builtins/buildenv.hh" +#include "nix/store/references.hh" #include "nix/util/finally.hh" #include "nix/util/util.hh" #include "nix/util/archive.hh" #include "nix/util/compression.hh" -#include "daemon.hh" -#include "worker-protocol.hh" +#include "nix/store/daemon.hh" +#include "nix/store/worker-protocol.hh" #include "nix/util/topo-sort.hh" #include "nix/util/callback.hh" #include "nix/util/json-utils.hh" #include "nix/util/cgroup.hh" -#include "personality.hh" +#include "nix/store/build/personality.hh" #include "nix/util/namespaces.hh" #include diff --git a/src/libstore/build/personality.cc b/src/libstore/build/personality.cc index 4ad47786953..de270dec862 100644 --- a/src/libstore/build/personality.cc +++ b/src/libstore/build/personality.cc @@ -1,5 +1,5 @@ -#include "personality.hh" -#include "globals.hh" +#include "nix/store/build/personality.hh" +#include "nix/store/globals.hh" #if __linux__ #include diff --git a/src/libstore/build/substitution-goal.cc b/src/libstore/build/substitution-goal.cc index a902ee5a952..45e83f56eb2 100644 --- a/src/libstore/build/substitution-goal.cc +++ b/src/libstore/build/substitution-goal.cc @@ -1,6 +1,6 @@ -#include "worker.hh" -#include "substitution-goal.hh" -#include "nar-info.hh" +#include "nix/store/build/worker.hh" +#include "nix/store/build/substitution-goal.hh" +#include "nix/store/nar-info.hh" #include "nix/util/finally.hh" namespace nix { diff --git a/src/libstore/build/worker.cc b/src/libstore/build/worker.cc index f775f8486a0..c63cb3b2ebc 100644 --- a/src/libstore/build/worker.cc +++ b/src/libstore/build/worker.cc @@ -1,9 +1,9 @@ -#include "machines.hh" -#include "worker.hh" -#include "substitution-goal.hh" -#include "drv-output-substitution-goal.hh" -#include "local-derivation-goal.hh" -#include "hook-instance.hh" +#include "nix/store/machines.hh" +#include "nix/store/build/worker.hh" +#include "nix/store/build/substitution-goal.hh" +#include "nix/store/build/drv-output-substitution-goal.hh" +#include "nix/store/build/local-derivation-goal.hh" +#include "nix/store/build/hook-instance.hh" #include diff --git a/src/libstore/builtins/buildenv.cc b/src/libstore/builtins/buildenv.cc index b1fbda13d12..32066f81336 100644 --- a/src/libstore/builtins/buildenv.cc +++ b/src/libstore/builtins/buildenv.cc @@ -1,4 +1,4 @@ -#include "buildenv.hh" +#include "nix/store/builtins/buildenv.hh" #include #include diff --git a/src/libstore/builtins/fetchurl.cc b/src/libstore/builtins/fetchurl.cc index 2b922aec3e2..6ed97aed5b7 100644 --- a/src/libstore/builtins/fetchurl.cc +++ b/src/libstore/builtins/fetchurl.cc @@ -1,6 +1,6 @@ -#include "builtins.hh" -#include "filetransfer.hh" -#include "store-api.hh" +#include "nix/store/builtins.hh" +#include "nix/store/filetransfer.hh" +#include "nix/store/store-api.hh" #include "nix/util/archive.hh" #include "nix/util/compression.hh" diff --git a/src/libstore/builtins/unpack-channel.cc b/src/libstore/builtins/unpack-channel.cc index c31d36aa5af..09b5ff158a5 100644 --- a/src/libstore/builtins/unpack-channel.cc +++ b/src/libstore/builtins/unpack-channel.cc @@ -1,4 +1,4 @@ -#include "builtins.hh" +#include "nix/store/builtins.hh" #include "nix/util/tarfile.hh" namespace nix { diff --git a/src/libstore/content-address.cc b/src/libstore/content-address.cc index be97acc6a65..8567014cbc5 100644 --- a/src/libstore/content-address.cc +++ b/src/libstore/content-address.cc @@ -1,5 +1,5 @@ #include "nix/util/args.hh" -#include "content-address.hh" +#include "nix/store/content-address.hh" #include "nix/util/split.hh" namespace nix { diff --git a/src/libstore/crypto.cc b/src/libstore/crypto.cc index b015764af12..dbd5f8bc8cd 100644 --- a/src/libstore/crypto.cc +++ b/src/libstore/crypto.cc @@ -1,6 +1,6 @@ -#include "crypto.hh" +#include "nix/store/crypto.hh" #include "nix/util/util.hh" -#include "globals.hh" +#include "nix/store/globals.hh" #include diff --git a/src/libstore/daemon.cc b/src/libstore/daemon.cc index dfd31681f80..6c36bc420cc 100644 --- a/src/libstore/daemon.cc +++ b/src/libstore/daemon.cc @@ -1,15 +1,15 @@ -#include "daemon.hh" +#include "nix/store/daemon.hh" #include "nix/util/monitor-fd.hh" -#include "worker-protocol.hh" -#include "build-result.hh" -#include "store-api.hh" -#include "store-cast.hh" -#include "gc-store.hh" -#include "log-store.hh" -#include "path-with-outputs.hh" +#include "nix/store/worker-protocol.hh" +#include "nix/store/build-result.hh" +#include "nix/store/store-api.hh" +#include "nix/store/store-cast.hh" +#include "nix/store/gc-store.hh" +#include "nix/store/log-store.hh" +#include "nix/store/path-with-outputs.hh" #include "nix/util/finally.hh" #include "nix/util/archive.hh" -#include "derivations.hh" +#include "nix/store/derivations.hh" #include "nix/util/args.hh" namespace nix::daemon { diff --git a/src/libstore/derivations.cc b/src/libstore/derivations.cc index 19ef766ad53..15455febeb0 100644 --- a/src/libstore/derivations.cc +++ b/src/libstore/derivations.cc @@ -1,9 +1,9 @@ -#include "derivations.hh" -#include "store-api.hh" -#include "globals.hh" +#include "nix/store/derivations.hh" +#include "nix/store/store-api.hh" +#include "nix/store/globals.hh" #include "nix/util/util.hh" -#include "worker-protocol.hh" -#include "fs-accessor.hh" +#include "nix/store/worker-protocol.hh" +#include "nix/store/fs-accessor.hh" #include namespace nix { diff --git a/src/libstore/derived-path.cc b/src/libstore/derived-path.cc index e0d86a42f24..5e8523596a9 100644 --- a/src/libstore/derived-path.cc +++ b/src/libstore/derived-path.cc @@ -1,6 +1,6 @@ -#include "derived-path.hh" -#include "derivations.hh" -#include "store-api.hh" +#include "nix/store/derived-path.hh" +#include "nix/store/derivations.hh" +#include "nix/store/store-api.hh" #include diff --git a/src/libstore/dummy-store.cc b/src/libstore/dummy-store.cc index 81afdb2e99a..2e6eb2409ff 100644 --- a/src/libstore/dummy-store.cc +++ b/src/libstore/dummy-store.cc @@ -1,4 +1,4 @@ -#include "store-api.hh" +#include "nix/store/store-api.hh" #include "nix/util/callback.hh" namespace nix { diff --git a/src/libstore/export-import.cc b/src/libstore/export-import.cc index a4f655787f4..5d89720b866 100644 --- a/src/libstore/export-import.cc +++ b/src/libstore/export-import.cc @@ -1,7 +1,7 @@ #include "nix/util/serialise.hh" -#include "store-api.hh" +#include "nix/store/store-api.hh" #include "nix/util/archive.hh" -#include "worker-protocol.hh" +#include "nix/store/worker-protocol.hh" #include diff --git a/src/libstore/filetransfer.cc b/src/libstore/filetransfer.cc index 6428f056052..194ac854f3f 100644 --- a/src/libstore/filetransfer.cc +++ b/src/libstore/filetransfer.cc @@ -1,8 +1,8 @@ -#include "filetransfer.hh" +#include "nix/store/filetransfer.hh" #include "nix/util/util.hh" -#include "globals.hh" -#include "store-api.hh" -#include "s3.hh" +#include "nix/store/globals.hh" +#include "nix/store/store-api.hh" +#include "nix/store/s3.hh" #include "nix/util/compression.hh" #include "nix/util/finally.hh" #include "nix/util/callback.hh" diff --git a/src/libstore/gc.cc b/src/libstore/gc.cc index 7ed3894bf91..704aee2df40 100644 --- a/src/libstore/gc.cc +++ b/src/libstore/gc.cc @@ -1,7 +1,7 @@ -#include "derivations.hh" -#include "globals.hh" -#include "local-store.hh" -#include "local-fs-store.hh" +#include "nix/store/derivations.hh" +#include "nix/store/globals.hh" +#include "nix/store/local-store.hh" +#include "nix/store/local-fs-store.hh" #include "nix/util/finally.hh" #include diff --git a/src/libstore/globals.cc b/src/libstore/globals.cc index f9a43e25be3..48f30965c7d 100644 --- a/src/libstore/globals.cc +++ b/src/libstore/globals.cc @@ -1,4 +1,4 @@ -#include "globals.hh" +#include "nix/store/globals.hh" #include "nix/util/util.hh" #include "nix/util/archive.hh" #include "nix/util/args.hh" diff --git a/src/libstore/http-binary-cache-store.cc b/src/libstore/http-binary-cache-store.cc index 7c7384eeecb..f6829f19e31 100644 --- a/src/libstore/http-binary-cache-store.cc +++ b/src/libstore/http-binary-cache-store.cc @@ -1,7 +1,7 @@ -#include "binary-cache-store.hh" -#include "filetransfer.hh" -#include "globals.hh" -#include "nar-info-disk-cache.hh" +#include "nix/store/binary-cache-store.hh" +#include "nix/store/filetransfer.hh" +#include "nix/store/globals.hh" +#include "nix/store/nar-info-disk-cache.hh" #include "nix/util/callback.hh" namespace nix { diff --git a/src/libstore/binary-cache-store.hh b/src/libstore/include/nix/store/binary-cache-store.hh similarity index 97% rename from src/libstore/binary-cache-store.hh rename to src/libstore/include/nix/store/binary-cache-store.hh index 97034fdcec7..9fa353650b8 100644 --- a/src/libstore/binary-cache-store.hh +++ b/src/libstore/include/nix/store/binary-cache-store.hh @@ -1,8 +1,8 @@ #pragma once -#include "crypto.hh" -#include "store-api.hh" -#include "log-store.hh" +#include "nix/store/crypto.hh" +#include "nix/store/store-api.hh" +#include "nix/store/log-store.hh" #include "nix/util/pool.hh" diff --git a/src/libstore/build-result.hh b/src/libstore/include/nix/store/build-result.hh similarity index 97% rename from src/libstore/build-result.hh rename to src/libstore/include/nix/store/build-result.hh index a5749cf33ca..bc75eb5199a 100644 --- a/src/libstore/build-result.hh +++ b/src/libstore/include/nix/store/build-result.hh @@ -1,7 +1,7 @@ #pragma once -#include "realisation.hh" -#include "derived-path.hh" +#include "nix/store/realisation.hh" +#include "nix/store/derived-path.hh" #include #include diff --git a/src/libstore/build/derivation-goal.hh b/src/libstore/include/nix/store/build/derivation-goal.hh similarity index 96% rename from src/libstore/build/derivation-goal.hh rename to src/libstore/include/nix/store/build/derivation-goal.hh index 707e38b4bc0..e21f295fc34 100644 --- a/src/libstore/build/derivation-goal.hh +++ b/src/libstore/include/nix/store/build/derivation-goal.hh @@ -1,11 +1,11 @@ #pragma once -#include "parsed-derivations.hh" -#include "lock.hh" -#include "outputs-spec.hh" -#include "store-api.hh" -#include "pathlocks.hh" -#include "goal.hh" +#include "nix/store/parsed-derivations.hh" +#include "nix/store/lock.hh" +#include "nix/store/outputs-spec.hh" +#include "nix/store/store-api.hh" +#include "nix/store/pathlocks.hh" +#include "nix/store/build/goal.hh" namespace nix { diff --git a/src/libstore/build/drv-output-substitution-goal.hh b/src/libstore/include/nix/store/build/drv-output-substitution-goal.hh similarity index 92% rename from src/libstore/build/drv-output-substitution-goal.hh rename to src/libstore/include/nix/store/build/drv-output-substitution-goal.hh index 948dbda8fc8..0fb47d15050 100644 --- a/src/libstore/build/drv-output-substitution-goal.hh +++ b/src/libstore/include/nix/store/build/drv-output-substitution-goal.hh @@ -1,8 +1,8 @@ #pragma once -#include "store-api.hh" -#include "goal.hh" -#include "realisation.hh" +#include "nix/store/store-api.hh" +#include "nix/store/build/goal.hh" +#include "nix/store/realisation.hh" #include #include diff --git a/src/libstore/build/goal.hh b/src/libstore/include/nix/store/build/goal.hh similarity index 97% rename from src/libstore/build/goal.hh rename to src/libstore/include/nix/store/build/goal.hh index 8395e8d9b0c..2fde29170c5 100644 --- a/src/libstore/build/goal.hh +++ b/src/libstore/include/nix/store/build/goal.hh @@ -1,8 +1,8 @@ #pragma once #include "nix/util/types.hh" -#include "store-api.hh" -#include "build-result.hh" +#include "nix/store/store-api.hh" +#include "nix/store/build-result.hh" namespace nix { diff --git a/src/libstore/build/hook-instance.hh b/src/libstore/include/nix/store/build/hook-instance.hh similarity index 100% rename from src/libstore/build/hook-instance.hh rename to src/libstore/include/nix/store/build/hook-instance.hh diff --git a/src/libstore/build/local-derivation-goal.hh b/src/libstore/include/nix/store/build/local-derivation-goal.hh similarity index 98% rename from src/libstore/build/local-derivation-goal.hh rename to src/libstore/include/nix/store/build/local-derivation-goal.hh index 34c4e9187ba..6d7033fc487 100644 --- a/src/libstore/build/local-derivation-goal.hh +++ b/src/libstore/include/nix/store/build/local-derivation-goal.hh @@ -1,7 +1,7 @@ #pragma once -#include "derivation-goal.hh" -#include "local-store.hh" +#include "nix/store/build/derivation-goal.hh" +#include "nix/store/local-store.hh" namespace nix { diff --git a/src/libstore/build/personality.hh b/src/libstore/include/nix/store/build/personality.hh similarity index 100% rename from src/libstore/build/personality.hh rename to src/libstore/include/nix/store/build/personality.hh diff --git a/src/libstore/build/substitution-goal.hh b/src/libstore/include/nix/store/build/substitution-goal.hh similarity index 96% rename from src/libstore/build/substitution-goal.hh rename to src/libstore/include/nix/store/build/substitution-goal.hh index a73f8e6669a..6d759a2e68b 100644 --- a/src/libstore/build/substitution-goal.hh +++ b/src/libstore/include/nix/store/build/substitution-goal.hh @@ -1,8 +1,8 @@ #pragma once -#include "lock.hh" -#include "store-api.hh" -#include "goal.hh" +#include "nix/store/lock.hh" +#include "nix/store/store-api.hh" +#include "nix/store/build/goal.hh" namespace nix { diff --git a/src/libstore/build/worker.hh b/src/libstore/include/nix/store/build/worker.hh similarity index 98% rename from src/libstore/build/worker.hh rename to src/libstore/include/nix/store/build/worker.hh index 16fb5c56b53..6f49cc994b5 100644 --- a/src/libstore/build/worker.hh +++ b/src/libstore/include/nix/store/build/worker.hh @@ -1,10 +1,10 @@ #pragma once #include "nix/util/types.hh" -#include "lock.hh" -#include "store-api.hh" -#include "goal.hh" -#include "realisation.hh" +#include "nix/store/lock.hh" +#include "nix/store/store-api.hh" +#include "nix/store/build/goal.hh" +#include "nix/store/realisation.hh" #include #include diff --git a/src/libstore/builtins.hh b/src/libstore/include/nix/store/builtins.hh similarity index 84% rename from src/libstore/builtins.hh rename to src/libstore/include/nix/store/builtins.hh index 66597e456c4..5c3c8868b13 100644 --- a/src/libstore/builtins.hh +++ b/src/libstore/include/nix/store/builtins.hh @@ -1,6 +1,6 @@ #pragma once -#include "derivations.hh" +#include "nix/store/derivations.hh" namespace nix { diff --git a/src/libstore/builtins/buildenv.hh b/src/libstore/include/nix/store/builtins/buildenv.hh similarity index 83% rename from src/libstore/builtins/buildenv.hh rename to src/libstore/include/nix/store/builtins/buildenv.hh index 73c0f5f7fd3..ff214026a78 100644 --- a/src/libstore/builtins/buildenv.hh +++ b/src/libstore/include/nix/store/builtins/buildenv.hh @@ -1,7 +1,7 @@ #pragma once -#include "derivations.hh" -#include "store-api.hh" +#include "nix/store/derivations.hh" +#include "nix/store/store-api.hh" namespace nix { diff --git a/src/libstore/content-address.hh b/src/libstore/include/nix/store/content-address.hh similarity index 100% rename from src/libstore/content-address.hh rename to src/libstore/include/nix/store/content-address.hh diff --git a/src/libstore/crypto.hh b/src/libstore/include/nix/store/crypto.hh similarity index 100% rename from src/libstore/crypto.hh rename to src/libstore/include/nix/store/crypto.hh diff --git a/src/libstore/daemon.hh b/src/libstore/include/nix/store/daemon.hh similarity index 91% rename from src/libstore/daemon.hh rename to src/libstore/include/nix/store/daemon.hh index c7f4e6d7028..67dd835fd17 100644 --- a/src/libstore/daemon.hh +++ b/src/libstore/include/nix/store/daemon.hh @@ -1,7 +1,7 @@ #pragma once #include "nix/util/serialise.hh" -#include "store-api.hh" +#include "nix/store/store-api.hh" namespace nix::daemon { diff --git a/src/libstore/derivations.hh b/src/libstore/include/nix/store/derivations.hh similarity index 99% rename from src/libstore/derivations.hh rename to src/libstore/include/nix/store/derivations.hh index c46ab211130..c02846da9c6 100644 --- a/src/libstore/derivations.hh +++ b/src/libstore/include/nix/store/derivations.hh @@ -1,9 +1,9 @@ #pragma once -#include "path.hh" +#include "nix/store/path.hh" #include "nix/util/types.hh" #include "nix/util/hash.hh" -#include "content-address.hh" +#include "nix/store/content-address.hh" #include "repair-flag.hh" #include "nix/util/sync.hh" diff --git a/src/libstore/derived-path.hh b/src/libstore/include/nix/store/derived-path.hh similarity index 97% rename from src/libstore/derived-path.hh rename to src/libstore/include/nix/store/derived-path.hh index 0914ace4ecb..0c9db2dc7f6 100644 --- a/src/libstore/derived-path.hh +++ b/src/libstore/include/nix/store/derived-path.hh @@ -1,9 +1,9 @@ #pragma once #include "nix/util/util.hh" -#include "path.hh" -#include "realisation.hh" -#include "outputs-spec.hh" +#include "nix/store/path.hh" +#include "nix/store/realisation.hh" +#include "nix/store/outputs-spec.hh" #include "nix/util/comparator.hh" #include diff --git a/src/libstore/filetransfer.hh b/src/libstore/include/nix/store/filetransfer.hh similarity index 100% rename from src/libstore/filetransfer.hh rename to src/libstore/include/nix/store/filetransfer.hh diff --git a/src/libstore/fs-accessor.hh b/src/libstore/include/nix/store/fs-accessor.hh similarity index 100% rename from src/libstore/fs-accessor.hh rename to src/libstore/include/nix/store/fs-accessor.hh diff --git a/src/libstore/gc-store.hh b/src/libstore/include/nix/store/gc-store.hh similarity index 98% rename from src/libstore/gc-store.hh rename to src/libstore/include/nix/store/gc-store.hh index b3cbbad7447..d6bc94f1d65 100644 --- a/src/libstore/gc-store.hh +++ b/src/libstore/include/nix/store/gc-store.hh @@ -1,6 +1,6 @@ #pragma once -#include "store-api.hh" +#include "nix/store/store-api.hh" namespace nix { diff --git a/src/libstore/globals.hh b/src/libstore/include/nix/store/globals.hh similarity index 100% rename from src/libstore/globals.hh rename to src/libstore/include/nix/store/globals.hh diff --git a/src/libstore/local-fs-store.hh b/src/libstore/include/nix/store/local-fs-store.hh similarity index 94% rename from src/libstore/local-fs-store.hh rename to src/libstore/include/nix/store/local-fs-store.hh index 947707341c6..47760cf8b74 100644 --- a/src/libstore/local-fs-store.hh +++ b/src/libstore/include/nix/store/local-fs-store.hh @@ -1,8 +1,8 @@ #pragma once -#include "store-api.hh" -#include "gc-store.hh" -#include "log-store.hh" +#include "nix/store/store-api.hh" +#include "nix/store/gc-store.hh" +#include "nix/store/log-store.hh" namespace nix { diff --git a/src/libstore/local-store.hh b/src/libstore/include/nix/store/local-store.hh similarity index 98% rename from src/libstore/local-store.hh rename to src/libstore/include/nix/store/local-store.hh index 7d20f10f602..d11987be577 100644 --- a/src/libstore/local-store.hh +++ b/src/libstore/include/nix/store/local-store.hh @@ -1,11 +1,11 @@ #pragma once -#include "sqlite.hh" +#include "nix/store/sqlite.hh" -#include "pathlocks.hh" -#include "store-api.hh" -#include "local-fs-store.hh" -#include "gc-store.hh" +#include "nix/store/pathlocks.hh" +#include "nix/store/store-api.hh" +#include "nix/store/local-fs-store.hh" +#include "nix/store/gc-store.hh" #include "nix/util/sync.hh" #include "nix/util/util.hh" diff --git a/src/libstore/lock.hh b/src/libstore/include/nix/store/lock.hh similarity index 100% rename from src/libstore/lock.hh rename to src/libstore/include/nix/store/lock.hh diff --git a/src/libstore/log-store.hh b/src/libstore/include/nix/store/log-store.hh similarity index 94% rename from src/libstore/log-store.hh rename to src/libstore/include/nix/store/log-store.hh index e4d95bab684..4b92cd2203b 100644 --- a/src/libstore/log-store.hh +++ b/src/libstore/include/nix/store/log-store.hh @@ -1,6 +1,6 @@ #pragma once -#include "store-api.hh" +#include "nix/store/store-api.hh" namespace nix { diff --git a/src/libstore/machines.hh b/src/libstore/include/nix/store/machines.hh similarity index 100% rename from src/libstore/machines.hh rename to src/libstore/include/nix/store/machines.hh diff --git a/src/libstore/make-content-addressed.hh b/src/libstore/include/nix/store/make-content-addressed.hh similarity index 83% rename from src/libstore/make-content-addressed.hh rename to src/libstore/include/nix/store/make-content-addressed.hh index c4a66ed414c..f546c09ebad 100644 --- a/src/libstore/make-content-addressed.hh +++ b/src/libstore/include/nix/store/make-content-addressed.hh @@ -1,6 +1,6 @@ #pragma once -#include "store-api.hh" +#include "nix/store/store-api.hh" namespace nix { diff --git a/src/libstore/names.hh b/src/libstore/include/nix/store/names.hh similarity index 100% rename from src/libstore/names.hh rename to src/libstore/include/nix/store/names.hh diff --git a/src/libstore/nar-accessor.hh b/src/libstore/include/nix/store/nar-accessor.hh similarity index 95% rename from src/libstore/nar-accessor.hh rename to src/libstore/include/nix/store/nar-accessor.hh index 7d998ae0bab..d374d72cf75 100644 --- a/src/libstore/nar-accessor.hh +++ b/src/libstore/include/nix/store/nar-accessor.hh @@ -3,7 +3,7 @@ #include #include -#include "fs-accessor.hh" +#include "nix/store/fs-accessor.hh" namespace nix { diff --git a/src/libstore/nar-info-disk-cache.hh b/src/libstore/include/nix/store/nar-info-disk-cache.hh similarity index 95% rename from src/libstore/nar-info-disk-cache.hh rename to src/libstore/include/nix/store/nar-info-disk-cache.hh index 8570eff4d71..33f7a5fcf09 100644 --- a/src/libstore/nar-info-disk-cache.hh +++ b/src/libstore/include/nix/store/nar-info-disk-cache.hh @@ -1,8 +1,8 @@ #pragma once #include "nix/util/ref.hh" -#include "nar-info.hh" -#include "realisation.hh" +#include "nix/store/nar-info.hh" +#include "nix/store/realisation.hh" namespace nix { diff --git a/src/libstore/nar-info.hh b/src/libstore/include/nix/store/nar-info.hh similarity index 94% rename from src/libstore/nar-info.hh rename to src/libstore/include/nix/store/nar-info.hh index 377f327e90b..5ff06c5a5f9 100644 --- a/src/libstore/nar-info.hh +++ b/src/libstore/include/nix/store/nar-info.hh @@ -2,7 +2,7 @@ #include "nix/util/types.hh" #include "nix/util/hash.hh" -#include "path-info.hh" +#include "nix/store/path-info.hh" namespace nix { diff --git a/src/libstore/outputs-spec.hh b/src/libstore/include/nix/store/outputs-spec.hh similarity index 100% rename from src/libstore/outputs-spec.hh rename to src/libstore/include/nix/store/outputs-spec.hh diff --git a/src/libstore/parsed-derivations.hh b/src/libstore/include/nix/store/parsed-derivations.hh similarity index 93% rename from src/libstore/parsed-derivations.hh rename to src/libstore/include/nix/store/parsed-derivations.hh index bfb3857c064..8930dd1f61d 100644 --- a/src/libstore/parsed-derivations.hh +++ b/src/libstore/include/nix/store/parsed-derivations.hh @@ -1,7 +1,7 @@ #pragma once -#include "derivations.hh" -#include "store-api.hh" +#include "nix/store/derivations.hh" +#include "nix/store/store-api.hh" #include diff --git a/src/libstore/path-info.hh b/src/libstore/include/nix/store/path-info.hh similarity index 97% rename from src/libstore/path-info.hh rename to src/libstore/include/nix/store/path-info.hh index 359a589dfd1..a3dc1d900ed 100644 --- a/src/libstore/path-info.hh +++ b/src/libstore/include/nix/store/path-info.hh @@ -1,9 +1,9 @@ #pragma once -#include "crypto.hh" -#include "path.hh" +#include "nix/store/crypto.hh" +#include "nix/store/path.hh" #include "nix/util/hash.hh" -#include "content-address.hh" +#include "nix/store/content-address.hh" #include #include diff --git a/src/libstore/path-regex.hh b/src/libstore/include/nix/store/path-regex.hh similarity index 100% rename from src/libstore/path-regex.hh rename to src/libstore/include/nix/store/path-regex.hh diff --git a/src/libstore/path-with-outputs.hh b/src/libstore/include/nix/store/path-with-outputs.hh similarity index 94% rename from src/libstore/path-with-outputs.hh rename to src/libstore/include/nix/store/path-with-outputs.hh index 5d25656a52e..d4fd57d05bd 100644 --- a/src/libstore/path-with-outputs.hh +++ b/src/libstore/include/nix/store/path-with-outputs.hh @@ -1,7 +1,7 @@ #pragma once -#include "path.hh" -#include "derived-path.hh" +#include "nix/store/path.hh" +#include "nix/store/derived-path.hh" namespace nix { diff --git a/src/libstore/path.hh b/src/libstore/include/nix/store/path.hh similarity index 100% rename from src/libstore/path.hh rename to src/libstore/include/nix/store/path.hh diff --git a/src/libstore/pathlocks.hh b/src/libstore/include/nix/store/pathlocks.hh similarity index 100% rename from src/libstore/pathlocks.hh rename to src/libstore/include/nix/store/pathlocks.hh diff --git a/src/libstore/profiles.hh b/src/libstore/include/nix/store/profiles.hh similarity index 98% rename from src/libstore/profiles.hh rename to src/libstore/include/nix/store/profiles.hh index 833f5e3c344..7cb50ef27dd 100644 --- a/src/libstore/profiles.hh +++ b/src/libstore/include/nix/store/profiles.hh @@ -1,7 +1,7 @@ #pragma once #include "nix/util/types.hh" -#include "pathlocks.hh" +#include "nix/store/pathlocks.hh" #include diff --git a/src/libstore/realisation.hh b/src/libstore/include/nix/store/realisation.hh similarity index 97% rename from src/libstore/realisation.hh rename to src/libstore/include/nix/store/realisation.hh index d265e878c02..aa27a8d898d 100644 --- a/src/libstore/realisation.hh +++ b/src/libstore/include/nix/store/realisation.hh @@ -3,10 +3,10 @@ #include #include "nix/util/hash.hh" -#include "path.hh" +#include "nix/store/path.hh" #include #include "nix/util/comparator.hh" -#include "crypto.hh" +#include "nix/store/crypto.hh" namespace nix { diff --git a/src/libstore/references.hh b/src/libstore/include/nix/store/references.hh similarity index 97% rename from src/libstore/references.hh rename to src/libstore/include/nix/store/references.hh index 86a865fe04d..1d4aa7bc5cf 100644 --- a/src/libstore/references.hh +++ b/src/libstore/include/nix/store/references.hh @@ -1,7 +1,7 @@ #pragma once #include "nix/util/hash.hh" -#include "path.hh" +#include "nix/store/path.hh" namespace nix { diff --git a/src/libstore/remote-fs-accessor.hh b/src/libstore/include/nix/store/remote-fs-accessor.hh similarity index 92% rename from src/libstore/remote-fs-accessor.hh rename to src/libstore/include/nix/store/remote-fs-accessor.hh index 4edbf2a2454..a0733a49043 100644 --- a/src/libstore/remote-fs-accessor.hh +++ b/src/libstore/include/nix/store/remote-fs-accessor.hh @@ -1,8 +1,8 @@ #pragma once -#include "fs-accessor.hh" +#include "nix/store/fs-accessor.hh" #include "nix/util/ref.hh" -#include "store-api.hh" +#include "nix/store/store-api.hh" namespace nix { diff --git a/src/libstore/remote-store.hh b/src/libstore/include/nix/store/remote-store.hh similarity index 98% rename from src/libstore/remote-store.hh rename to src/libstore/include/nix/store/remote-store.hh index 11d089cd245..7ec10e4a964 100644 --- a/src/libstore/remote-store.hh +++ b/src/libstore/include/nix/store/remote-store.hh @@ -3,9 +3,9 @@ #include #include -#include "store-api.hh" -#include "gc-store.hh" -#include "log-store.hh" +#include "nix/store/store-api.hh" +#include "nix/store/gc-store.hh" +#include "nix/store/log-store.hh" namespace nix { diff --git a/src/libstore/repair-flag.hh b/src/libstore/include/nix/store/repair-flag.hh similarity index 100% rename from src/libstore/repair-flag.hh rename to src/libstore/include/nix/store/repair-flag.hh diff --git a/src/libstore/s3-binary-cache-store.hh b/src/libstore/include/nix/store/s3-binary-cache-store.hh similarity index 92% rename from src/libstore/s3-binary-cache-store.hh rename to src/libstore/include/nix/store/s3-binary-cache-store.hh index bce828b111f..55e64006a29 100644 --- a/src/libstore/s3-binary-cache-store.hh +++ b/src/libstore/include/nix/store/s3-binary-cache-store.hh @@ -1,6 +1,6 @@ #pragma once -#include "binary-cache-store.hh" +#include "nix/store/binary-cache-store.hh" #include diff --git a/src/libstore/s3.hh b/src/libstore/include/nix/store/s3.hh similarity index 100% rename from src/libstore/s3.hh rename to src/libstore/include/nix/store/s3.hh diff --git a/src/libstore/serve-protocol.hh b/src/libstore/include/nix/store/serve-protocol.hh similarity index 100% rename from src/libstore/serve-protocol.hh rename to src/libstore/include/nix/store/serve-protocol.hh diff --git a/src/libstore/sqlite.hh b/src/libstore/include/nix/store/sqlite.hh similarity index 100% rename from src/libstore/sqlite.hh rename to src/libstore/include/nix/store/sqlite.hh diff --git a/src/libstore/ssh.hh b/src/libstore/include/nix/store/ssh.hh similarity index 100% rename from src/libstore/ssh.hh rename to src/libstore/include/nix/store/ssh.hh diff --git a/src/libstore/store-api.hh b/src/libstore/include/nix/store/store-api.hh similarity index 99% rename from src/libstore/store-api.hh rename to src/libstore/include/nix/store/store-api.hh index 353a7e2e131..c5e7cdc05ba 100644 --- a/src/libstore/store-api.hh +++ b/src/libstore/include/nix/store/store-api.hh @@ -1,17 +1,17 @@ #pragma once -#include "nar-info.hh" -#include "realisation.hh" -#include "path.hh" -#include "derived-path.hh" +#include "nix/store/nar-info.hh" +#include "nix/store/realisation.hh" +#include "nix/store/path.hh" +#include "nix/store/derived-path.hh" #include "nix/util/hash.hh" -#include "content-address.hh" +#include "nix/store/content-address.hh" #include "nix/util/serialise.hh" #include "nix/util/lru-cache.hh" #include "nix/util/sync.hh" -#include "globals.hh" +#include "nix/store/globals.hh" #include "nix/util/config.hh" -#include "path-info.hh" +#include "nix/store/path-info.hh" #include "repair-flag.hh" #include diff --git a/src/libstore/store-cast.hh b/src/libstore/include/nix/store/store-cast.hh similarity index 89% rename from src/libstore/store-cast.hh rename to src/libstore/include/nix/store/store-cast.hh index ff62fc3593e..3f1710d9e45 100644 --- a/src/libstore/store-cast.hh +++ b/src/libstore/include/nix/store/store-cast.hh @@ -1,6 +1,6 @@ #pragma once -#include "store-api.hh" +#include "nix/store/store-api.hh" namespace nix { diff --git a/src/libstore/uds-remote-store.hh b/src/libstore/include/nix/store/uds-remote-store.hh similarity index 94% rename from src/libstore/uds-remote-store.hh rename to src/libstore/include/nix/store/uds-remote-store.hh index f8dfcca704a..f0537e5937e 100644 --- a/src/libstore/uds-remote-store.hh +++ b/src/libstore/include/nix/store/uds-remote-store.hh @@ -1,7 +1,7 @@ #pragma once -#include "remote-store.hh" -#include "local-fs-store.hh" +#include "nix/store/remote-store.hh" +#include "nix/store/local-fs-store.hh" namespace nix { diff --git a/src/libstore/worker-protocol.hh b/src/libstore/include/nix/store/worker-protocol.hh similarity index 99% rename from src/libstore/worker-protocol.hh rename to src/libstore/include/nix/store/worker-protocol.hh index cb9272020c0..8876522f46e 100644 --- a/src/libstore/worker-protocol.hh +++ b/src/libstore/include/nix/store/worker-protocol.hh @@ -1,6 +1,6 @@ #pragma once -#include "store-api.hh" +#include "nix/store/store-api.hh" #include "nix/util/serialise.hh" namespace nix { diff --git a/src/libstore/legacy-ssh-store.cc b/src/libstore/legacy-ssh-store.cc index 08f0c1ee95f..a2f406dff30 100644 --- a/src/libstore/legacy-ssh-store.cc +++ b/src/libstore/legacy-ssh-store.cc @@ -1,13 +1,13 @@ #include "nix/util/archive.hh" #include "nix/util/pool.hh" -#include "remote-store.hh" -#include "serve-protocol.hh" -#include "build-result.hh" -#include "store-api.hh" -#include "path-with-outputs.hh" -#include "worker-protocol.hh" -#include "ssh.hh" -#include "derivations.hh" +#include "nix/store/remote-store.hh" +#include "nix/store/serve-protocol.hh" +#include "nix/store/build-result.hh" +#include "nix/store/store-api.hh" +#include "nix/store/path-with-outputs.hh" +#include "nix/store/worker-protocol.hh" +#include "nix/store/ssh.hh" +#include "nix/store/derivations.hh" #include "nix/util/callback.hh" namespace nix { diff --git a/src/libstore/local-binary-cache-store.cc b/src/libstore/local-binary-cache-store.cc index f20b1fa02f1..d5282c724e8 100644 --- a/src/libstore/local-binary-cache-store.cc +++ b/src/libstore/local-binary-cache-store.cc @@ -1,6 +1,6 @@ -#include "binary-cache-store.hh" -#include "globals.hh" -#include "nar-info-disk-cache.hh" +#include "nix/store/binary-cache-store.hh" +#include "nix/store/globals.hh" +#include "nix/store/nar-info-disk-cache.hh" #include diff --git a/src/libstore/local-fs-store.cc b/src/libstore/local-fs-store.cc index ae8faaeb640..2406c3049e9 100644 --- a/src/libstore/local-fs-store.cc +++ b/src/libstore/local-fs-store.cc @@ -1,10 +1,10 @@ #include "nix/util/archive.hh" -#include "fs-accessor.hh" -#include "store-api.hh" -#include "local-fs-store.hh" -#include "globals.hh" +#include "nix/store/fs-accessor.hh" +#include "nix/store/store-api.hh" +#include "nix/store/local-fs-store.hh" +#include "nix/store/globals.hh" #include "nix/util/compression.hh" -#include "derivations.hh" +#include "nix/store/derivations.hh" namespace nix { diff --git a/src/libstore/local-store.cc b/src/libstore/local-store.cc index f728bd16b36..b816bf1f075 100644 --- a/src/libstore/local-store.cc +++ b/src/libstore/local-store.cc @@ -1,11 +1,11 @@ -#include "local-store.hh" -#include "globals.hh" +#include "nix/store/local-store.hh" +#include "nix/store/globals.hh" #include "nix/util/archive.hh" -#include "pathlocks.hh" -#include "worker-protocol.hh" -#include "derivations.hh" -#include "nar-info.hh" -#include "references.hh" +#include "nix/store/pathlocks.hh" +#include "nix/store/worker-protocol.hh" +#include "nix/store/derivations.hh" +#include "nix/store/nar-info.hh" +#include "nix/store/references.hh" #include "nix/util/callback.hh" #include "nix/util/topo-sort.hh" #include "nix/util/finally.hh" diff --git a/src/libstore/local.mk b/src/libstore/local.mk index 8ce107d4de8..32b72018683 100644 --- a/src/libstore/local.mk +++ b/src/libstore/local.mk @@ -28,8 +28,7 @@ ifeq ($(HAVE_SECCOMP), 1) endif libstore_CXXFLAGS += \ - -Isrc/libstore \ - -Isrc/libstore/build \ + -Isrc/libstore/include \ -Isrc/libutil/include \ -DNIX_PREFIX=\"$(prefix)\" \ -DNIX_STORE_DIR=\"$(storedir)\" \ diff --git a/src/libstore/lock.cc b/src/libstore/lock.cc index 4fe1fcf56ba..bc897356c32 100644 --- a/src/libstore/lock.cc +++ b/src/libstore/lock.cc @@ -1,6 +1,6 @@ -#include "lock.hh" -#include "globals.hh" -#include "pathlocks.hh" +#include "nix/store/lock.hh" +#include "nix/store/globals.hh" +#include "nix/store/pathlocks.hh" #include #include diff --git a/src/libstore/log-store.cc b/src/libstore/log-store.cc index 8a26832ab28..2ef791e19a0 100644 --- a/src/libstore/log-store.cc +++ b/src/libstore/log-store.cc @@ -1,4 +1,4 @@ -#include "log-store.hh" +#include "nix/store/log-store.hh" namespace nix { diff --git a/src/libstore/machines.cc b/src/libstore/machines.cc index db49edf7cf8..282d6b6f094 100644 --- a/src/libstore/machines.cc +++ b/src/libstore/machines.cc @@ -1,7 +1,7 @@ -#include "machines.hh" +#include "nix/store/machines.hh" #include "nix/util/util.hh" -#include "globals.hh" -#include "store-api.hh" +#include "nix/store/globals.hh" +#include "nix/store/store-api.hh" #include diff --git a/src/libstore/make-content-addressed.cc b/src/libstore/make-content-addressed.cc index 64d172918a5..440dfc7bd6a 100644 --- a/src/libstore/make-content-addressed.cc +++ b/src/libstore/make-content-addressed.cc @@ -1,5 +1,5 @@ -#include "make-content-addressed.hh" -#include "references.hh" +#include "nix/store/make-content-addressed.hh" +#include "nix/store/references.hh" namespace nix { diff --git a/src/libstore/misc.cc b/src/libstore/misc.cc index 25160068d5d..09d77c7e681 100644 --- a/src/libstore/misc.cc +++ b/src/libstore/misc.cc @@ -1,13 +1,13 @@ -#include "derivations.hh" -#include "parsed-derivations.hh" -#include "globals.hh" -#include "local-store.hh" -#include "store-api.hh" +#include "nix/store/derivations.hh" +#include "nix/store/parsed-derivations.hh" +#include "nix/store/globals.hh" +#include "nix/store/local-store.hh" +#include "nix/store/store-api.hh" #include "nix/util/thread-pool.hh" #include "nix/util/topo-sort.hh" #include "nix/util/callback.hh" #include "nix/util/closure.hh" -#include "filetransfer.hh" +#include "nix/store/filetransfer.hh" namespace nix { diff --git a/src/libstore/names.cc b/src/libstore/names.cc index a4d525a5b85..ec1066ac303 100644 --- a/src/libstore/names.cc +++ b/src/libstore/names.cc @@ -1,4 +1,4 @@ -#include "names.hh" +#include "nix/store/names.hh" #include "nix/util/util.hh" #include diff --git a/src/libstore/nar-accessor.cc b/src/libstore/nar-accessor.cc index 259cb1ebbb8..71b7aa786ae 100644 --- a/src/libstore/nar-accessor.cc +++ b/src/libstore/nar-accessor.cc @@ -1,4 +1,4 @@ -#include "nar-accessor.hh" +#include "nix/store/nar-accessor.hh" #include "nix/util/archive.hh" #include diff --git a/src/libstore/nar-info-disk-cache.cc b/src/libstore/nar-info-disk-cache.cc index d2615a40f0a..4c92cff402b 100644 --- a/src/libstore/nar-info-disk-cache.cc +++ b/src/libstore/nar-info-disk-cache.cc @@ -1,7 +1,7 @@ -#include "nar-info-disk-cache.hh" +#include "nix/store/nar-info-disk-cache.hh" #include "nix/util/sync.hh" -#include "sqlite.hh" -#include "globals.hh" +#include "nix/store/sqlite.hh" +#include "nix/store/globals.hh" #include #include diff --git a/src/libstore/nar-info.cc b/src/libstore/nar-info.cc index 071d8355e5c..92d0cc91872 100644 --- a/src/libstore/nar-info.cc +++ b/src/libstore/nar-info.cc @@ -1,6 +1,6 @@ -#include "globals.hh" -#include "nar-info.hh" -#include "store-api.hh" +#include "nix/store/globals.hh" +#include "nix/store/nar-info.hh" +#include "nix/store/store-api.hh" namespace nix { diff --git a/src/libstore/optimise-store.cc b/src/libstore/optimise-store.cc index aaeb9d1dcf3..a1cfe130d83 100644 --- a/src/libstore/optimise-store.cc +++ b/src/libstore/optimise-store.cc @@ -1,6 +1,6 @@ #include "nix/util/util.hh" -#include "local-store.hh" -#include "globals.hh" +#include "nix/store/local-store.hh" +#include "nix/store/globals.hh" #include #include diff --git a/src/libstore/outputs-spec.cc b/src/libstore/outputs-spec.cc index ec8b2b19994..8f8dae8e304 100644 --- a/src/libstore/outputs-spec.cc +++ b/src/libstore/outputs-spec.cc @@ -3,8 +3,8 @@ #include "nix/util/util.hh" #include "nix/util/regex-combinators.hh" -#include "outputs-spec.hh" -#include "path-regex.hh" +#include "nix/store/outputs-spec.hh" +#include "nix/store/path-regex.hh" namespace nix { diff --git a/src/libstore/parsed-derivations.cc b/src/libstore/parsed-derivations.cc index cc4a94fab8d..720d161ab1e 100644 --- a/src/libstore/parsed-derivations.cc +++ b/src/libstore/parsed-derivations.cc @@ -1,4 +1,4 @@ -#include "parsed-derivations.hh" +#include "nix/store/parsed-derivations.hh" #include #include diff --git a/src/libstore/path-info.cc b/src/libstore/path-info.cc index bd55a9d0620..2d491b8ee4d 100644 --- a/src/libstore/path-info.cc +++ b/src/libstore/path-info.cc @@ -1,5 +1,5 @@ -#include "path-info.hh" -#include "worker-protocol.hh" +#include "nix/store/path-info.hh" +#include "nix/store/worker-protocol.hh" namespace nix { diff --git a/src/libstore/path-with-outputs.cc b/src/libstore/path-with-outputs.cc index 869b490ade7..51a10324263 100644 --- a/src/libstore/path-with-outputs.cc +++ b/src/libstore/path-with-outputs.cc @@ -1,5 +1,5 @@ -#include "path-with-outputs.hh" -#include "store-api.hh" +#include "nix/store/path-with-outputs.hh" +#include "nix/store/store-api.hh" #include diff --git a/src/libstore/path.cc b/src/libstore/path.cc index 46be54281f2..98512d98176 100644 --- a/src/libstore/path.cc +++ b/src/libstore/path.cc @@ -1,4 +1,4 @@ -#include "store-api.hh" +#include "nix/store/store-api.hh" #include diff --git a/src/libstore/pathlocks.cc b/src/libstore/pathlocks.cc index 56cc5e1f6d3..d8c9a66476e 100644 --- a/src/libstore/pathlocks.cc +++ b/src/libstore/pathlocks.cc @@ -1,4 +1,4 @@ -#include "pathlocks.hh" +#include "nix/store/pathlocks.hh" #include "nix/util/util.hh" #include "nix/util/sync.hh" diff --git a/src/libstore/profiles.cc b/src/libstore/profiles.cc index 5230419000f..3cea1bf9545 100644 --- a/src/libstore/profiles.cc +++ b/src/libstore/profiles.cc @@ -1,6 +1,6 @@ -#include "profiles.hh" -#include "store-api.hh" -#include "local-fs-store.hh" +#include "nix/store/profiles.hh" +#include "nix/store/store-api.hh" +#include "nix/store/local-fs-store.hh" #include "nix/util/util.hh" #include diff --git a/src/libstore/realisation.cc b/src/libstore/realisation.cc index a575a58157b..c0cb93cc5b1 100644 --- a/src/libstore/realisation.cc +++ b/src/libstore/realisation.cc @@ -1,5 +1,5 @@ -#include "realisation.hh" -#include "store-api.hh" +#include "nix/store/realisation.hh" +#include "nix/store/store-api.hh" #include "nix/util/closure.hh" #include diff --git a/src/libstore/references.cc b/src/libstore/references.cc index 68ce114ebfb..a9e122e6921 100644 --- a/src/libstore/references.cc +++ b/src/libstore/references.cc @@ -1,4 +1,4 @@ -#include "references.hh" +#include "nix/store/references.hh" #include "nix/util/hash.hh" #include "nix/util/util.hh" #include "nix/util/archive.hh" diff --git a/src/libstore/remote-fs-accessor.cc b/src/libstore/remote-fs-accessor.cc index fcfb527f50e..eb56ba1c1e3 100644 --- a/src/libstore/remote-fs-accessor.cc +++ b/src/libstore/remote-fs-accessor.cc @@ -1,6 +1,6 @@ #include -#include "remote-fs-accessor.hh" -#include "nar-accessor.hh" +#include "nix/store/remote-fs-accessor.hh" +#include "nix/store/nar-accessor.hh" #include #include diff --git a/src/libstore/remote-store.cc b/src/libstore/remote-store.cc index 8b5ed56729e..69178c8866a 100644 --- a/src/libstore/remote-store.cc +++ b/src/libstore/remote-store.cc @@ -1,19 +1,19 @@ #include "nix/util/serialise.hh" #include "nix/util/util.hh" -#include "path-with-outputs.hh" -#include "gc-store.hh" -#include "remote-fs-accessor.hh" -#include "build-result.hh" -#include "remote-store.hh" -#include "worker-protocol.hh" +#include "nix/store/path-with-outputs.hh" +#include "nix/store/gc-store.hh" +#include "nix/store/remote-fs-accessor.hh" +#include "nix/store/build-result.hh" +#include "nix/store/remote-store.hh" +#include "nix/store/worker-protocol.hh" #include "nix/util/archive.hh" -#include "globals.hh" -#include "derivations.hh" +#include "nix/store/globals.hh" +#include "nix/store/derivations.hh" #include "nix/util/pool.hh" #include "nix/util/finally.hh" #include "nix/util/logging.hh" #include "nix/util/callback.hh" -#include "filetransfer.hh" +#include "nix/store/filetransfer.hh" #include namespace nix { diff --git a/src/libstore/s3-binary-cache-store.cc b/src/libstore/s3-binary-cache-store.cc index 4c4fa180e80..a9aca4fa289 100644 --- a/src/libstore/s3-binary-cache-store.cc +++ b/src/libstore/s3-binary-cache-store.cc @@ -1,12 +1,12 @@ #if ENABLE_S3 -#include "s3.hh" -#include "s3-binary-cache-store.hh" -#include "nar-info.hh" -#include "nar-info-disk-cache.hh" -#include "globals.hh" +#include "nix/store/s3.hh" +#include "nix/store/s3-binary-cache-store.hh" +#include "nix/store/nar-info.hh" +#include "nix/store/nar-info-disk-cache.hh" +#include "nix/store/globals.hh" #include "nix/util/compression.hh" -#include "filetransfer.hh" +#include "nix/store/filetransfer.hh" #include #include diff --git a/src/libstore/sqlite.cc b/src/libstore/sqlite.cc index 15bca1cf1a9..ecceab74e37 100644 --- a/src/libstore/sqlite.cc +++ b/src/libstore/sqlite.cc @@ -1,5 +1,5 @@ -#include "sqlite.hh" -#include "globals.hh" +#include "nix/store/sqlite.hh" +#include "nix/store/globals.hh" #include "nix/util/util.hh" #include diff --git a/src/libstore/ssh-store.cc b/src/libstore/ssh-store.cc index 34ec1546104..4399e76e422 100644 --- a/src/libstore/ssh-store.cc +++ b/src/libstore/ssh-store.cc @@ -1,10 +1,10 @@ -#include "store-api.hh" -#include "remote-store.hh" -#include "remote-fs-accessor.hh" +#include "nix/store/store-api.hh" +#include "nix/store/remote-store.hh" +#include "nix/store/remote-fs-accessor.hh" #include "nix/util/archive.hh" -#include "worker-protocol.hh" +#include "nix/store/worker-protocol.hh" #include "nix/util/pool.hh" -#include "ssh.hh" +#include "nix/store/ssh.hh" namespace nix { diff --git a/src/libstore/ssh.cc b/src/libstore/ssh.cc index 69bfe34181e..6b49e45fe70 100644 --- a/src/libstore/ssh.cc +++ b/src/libstore/ssh.cc @@ -1,4 +1,4 @@ -#include "ssh.hh" +#include "nix/store/ssh.hh" namespace nix { diff --git a/src/libstore/store-api.cc b/src/libstore/store-api.cc index 15fd37bc0c8..d038c16ab04 100644 --- a/src/libstore/store-api.cc +++ b/src/libstore/store-api.cc @@ -1,15 +1,15 @@ -#include "crypto.hh" -#include "fs-accessor.hh" -#include "globals.hh" -#include "derivations.hh" -#include "store-api.hh" +#include "nix/store/crypto.hh" +#include "nix/store/fs-accessor.hh" +#include "nix/store/globals.hh" +#include "nix/store/derivations.hh" +#include "nix/store/store-api.hh" #include "nix/util/util.hh" -#include "nar-info-disk-cache.hh" +#include "nix/store/nar-info-disk-cache.hh" #include "nix/util/thread-pool.hh" #include "nix/util/url.hh" #include "nix/util/archive.hh" #include "nix/util/callback.hh" -#include "remote-store.hh" +#include "nix/store/remote-store.hh" #include #include @@ -1265,8 +1265,8 @@ Derivation Store::readInvalidDerivation(const StorePath & drvPath) } -#include "local-store.hh" -#include "uds-remote-store.hh" +#include "nix/store/local-store.hh" +#include "nix/store/uds-remote-store.hh" namespace nix { diff --git a/src/libstore/tests/derived-path.hh b/src/libstore/tests/derived-path.hh index 3bc81244083..40c0770903a 100644 --- a/src/libstore/tests/derived-path.hh +++ b/src/libstore/tests/derived-path.hh @@ -2,7 +2,7 @@ #include -#include +#include "nix/store/derived-path.hh" #include "tests/path.hh" #include "tests/outputs-spec.hh" diff --git a/src/libstore/tests/libstore.hh b/src/libstore/tests/libstore.hh index 05397659bdc..40655fb2cb3 100644 --- a/src/libstore/tests/libstore.hh +++ b/src/libstore/tests/libstore.hh @@ -1,7 +1,7 @@ #include #include -#include "store-api.hh" +#include "nix/store/store-api.hh" namespace nix { diff --git a/src/libstore/tests/local.mk b/src/libstore/tests/local.mk index 49a00124142..e5702342d6d 100644 --- a/src/libstore/tests/local.mk +++ b/src/libstore/tests/local.mk @@ -23,7 +23,8 @@ libstore-tests_INSTALL_DIR := libstore-tests_SOURCES := $(wildcard $(d)/*.cc) libstore-tests_CXXFLAGS += \ - -Isrc/libstore \ + -Isrc/libstore/ \ + -Isrc/libstore/include \ -Isrc/libutil/include \ -Isrc/libutil diff --git a/src/libstore/tests/machines.cc b/src/libstore/tests/machines.cc index f51052b1462..118c27b359b 100644 --- a/src/libstore/tests/machines.cc +++ b/src/libstore/tests/machines.cc @@ -1,5 +1,5 @@ -#include "machines.hh" -#include "globals.hh" +#include "nix/store/machines.hh" +#include "nix/store/globals.hh" #include diff --git a/src/libstore/tests/nar-info-disk-cache.cc b/src/libstore/tests/nar-info-disk-cache.cc index b4bdb832957..4c7354c0c1f 100644 --- a/src/libstore/tests/nar-info-disk-cache.cc +++ b/src/libstore/tests/nar-info-disk-cache.cc @@ -1,8 +1,8 @@ -#include "nar-info-disk-cache.hh" +#include "nix/store/nar-info-disk-cache.hh" #include #include -#include "sqlite.hh" +#include "nix/store/sqlite.hh" #include diff --git a/src/libstore/tests/outputs-spec.cc b/src/libstore/tests/outputs-spec.cc index 984d1d963c0..799e328328a 100644 --- a/src/libstore/tests/outputs-spec.cc +++ b/src/libstore/tests/outputs-spec.cc @@ -1,4 +1,4 @@ -#include "outputs-spec.hh" +#include "tests/outputs-spec.hh" #include #include diff --git a/src/libstore/tests/outputs-spec.hh b/src/libstore/tests/outputs-spec.hh index 2d455c817ea..dea7ece491a 100644 --- a/src/libstore/tests/outputs-spec.hh +++ b/src/libstore/tests/outputs-spec.hh @@ -2,9 +2,9 @@ #include -#include +#include "nix/store/outputs-spec.hh" -#include +#include "tests/path.hh" namespace rc { using namespace nix; diff --git a/src/libstore/tests/path.cc b/src/libstore/tests/path.cc index 430aa009937..56ed232a682 100644 --- a/src/libstore/tests/path.cc +++ b/src/libstore/tests/path.cc @@ -4,8 +4,8 @@ #include #include -#include "path-regex.hh" -#include "store-api.hh" +#include "nix/store/path-regex.hh" +#include "nix/store/store-api.hh" #include "tests/hash.hh" #include "tests/libstore.hh" diff --git a/src/libstore/tests/path.hh b/src/libstore/tests/path.hh index d7f1a8988f5..90852c26b7e 100644 --- a/src/libstore/tests/path.hh +++ b/src/libstore/tests/path.hh @@ -2,7 +2,7 @@ #include -#include +#include "nix/store/path.hh" namespace nix { diff --git a/src/libstore/tests/references.cc b/src/libstore/tests/references.cc index d91d1cedd65..19b3e29ee10 100644 --- a/src/libstore/tests/references.cc +++ b/src/libstore/tests/references.cc @@ -1,4 +1,4 @@ -#include "references.hh" +#include "nix/store/references.hh" #include diff --git a/src/libstore/uds-remote-store.cc b/src/libstore/uds-remote-store.cc index 5c38323cd33..ac0a6586761 100644 --- a/src/libstore/uds-remote-store.cc +++ b/src/libstore/uds-remote-store.cc @@ -1,4 +1,4 @@ -#include "uds-remote-store.hh" +#include "nix/store/uds-remote-store.hh" #include #include diff --git a/src/nix-build/nix-build.cc b/src/nix-build/nix-build.cc index ffa2254b9d9..f5268575777 100644 --- a/src/nix-build/nix-build.cc +++ b/src/nix-build/nix-build.cc @@ -9,14 +9,14 @@ #include -#include "parsed-derivations.hh" -#include "store-api.hh" -#include "local-fs-store.hh" -#include "globals.hh" -#include "derivations.hh" +#include "nix/store/parsed-derivations.hh" +#include "nix/store/store-api.hh" +#include "nix/store/local-fs-store.hh" +#include "nix/store/globals.hh" +#include "nix/store/derivations.hh" #include "nix/util/util.hh" #include "nix/main/shared.hh" -#include "path-with-outputs.hh" +#include "nix/store/path-with-outputs.hh" #include "nix/expr/eval.hh" #include "nix/expr/eval-inline.hh" #include "nix/expr/get-drvs.hh" diff --git a/src/nix-channel/nix-channel.cc b/src/nix-channel/nix-channel.cc index f7949e7cbf2..97d112ff9ca 100755 --- a/src/nix-channel/nix-channel.cc +++ b/src/nix-channel/nix-channel.cc @@ -1,8 +1,8 @@ -#include "profiles.hh" +#include "nix/store/profiles.hh" #include "nix/main/shared.hh" -#include "globals.hh" -#include "filetransfer.hh" -#include "store-api.hh" +#include "nix/store/globals.hh" +#include "nix/store/filetransfer.hh" +#include "nix/store/store-api.hh" #include "nix/cmd/legacy.hh" #include "nix/fetchers/fetchers.hh" #include "nix/util/util.hh" diff --git a/src/nix-collect-garbage/nix-collect-garbage.cc b/src/nix-collect-garbage/nix-collect-garbage.cc index cb3d72d88b0..208709be7a0 100644 --- a/src/nix-collect-garbage/nix-collect-garbage.cc +++ b/src/nix-collect-garbage/nix-collect-garbage.cc @@ -1,9 +1,9 @@ -#include "store-api.hh" -#include "store-cast.hh" -#include "gc-store.hh" -#include "profiles.hh" +#include "nix/store/store-api.hh" +#include "nix/store/store-cast.hh" +#include "nix/store/gc-store.hh" +#include "nix/store/profiles.hh" #include "nix/main/shared.hh" -#include "globals.hh" +#include "nix/store/globals.hh" #include "nix/cmd/legacy.hh" #include diff --git a/src/nix-copy-closure/nix-copy-closure.cc b/src/nix-copy-closure/nix-copy-closure.cc index b8269000fb5..f17af7dd268 100755 --- a/src/nix-copy-closure/nix-copy-closure.cc +++ b/src/nix-copy-closure/nix-copy-closure.cc @@ -1,5 +1,5 @@ #include "nix/main/shared.hh" -#include "store-api.hh" +#include "nix/store/store-api.hh" #include "nix/cmd/legacy.hh" using namespace nix; diff --git a/src/nix-env/nix-env.cc b/src/nix-env/nix-env.cc index f97a4623009..cf3bf31c38f 100644 --- a/src/nix-env/nix-env.cc +++ b/src/nix-env/nix-env.cc @@ -1,15 +1,15 @@ #include "nix/expr/attr-path.hh" #include "nix/cmd/common-eval-args.hh" -#include "derivations.hh" +#include "nix/store/derivations.hh" #include "nix/expr/eval.hh" #include "nix/expr/get-drvs.hh" -#include "globals.hh" -#include "names.hh" -#include "profiles.hh" -#include "path-with-outputs.hh" +#include "nix/store/globals.hh" +#include "nix/store/names.hh" +#include "nix/store/profiles.hh" +#include "nix/store/path-with-outputs.hh" #include "nix/main/shared.hh" -#include "store-api.hh" -#include "local-fs-store.hh" +#include "nix/store/store-api.hh" +#include "nix/store/local-fs-store.hh" #include "user-env.hh" #include "nix/util/util.hh" #include "nix/expr/value-to-json.hh" diff --git a/src/nix-env/user-env.cc b/src/nix-env/user-env.cc index 57161a8e9ea..c546a5d8cb8 100644 --- a/src/nix-env/user-env.cc +++ b/src/nix-env/user-env.cc @@ -1,14 +1,14 @@ #include "user-env.hh" #include "nix/util/util.hh" -#include "derivations.hh" -#include "store-api.hh" -#include "path-with-outputs.hh" -#include "local-fs-store.hh" -#include "globals.hh" +#include "nix/store/derivations.hh" +#include "nix/store/store-api.hh" +#include "nix/store/path-with-outputs.hh" +#include "nix/store/local-fs-store.hh" +#include "nix/store/globals.hh" #include "nix/main/shared.hh" #include "nix/expr/eval.hh" #include "nix/expr/eval-inline.hh" -#include "profiles.hh" +#include "nix/store/profiles.hh" namespace nix { diff --git a/src/nix-instantiate/nix-instantiate.cc b/src/nix-instantiate/nix-instantiate.cc index e4db9e9f353..45e6d7880c8 100644 --- a/src/nix-instantiate/nix-instantiate.cc +++ b/src/nix-instantiate/nix-instantiate.cc @@ -1,4 +1,4 @@ -#include "globals.hh" +#include "nix/store/globals.hh" #include "nix/main/shared.hh" #include "nix/expr/eval.hh" #include "nix/expr/eval-inline.hh" @@ -7,8 +7,8 @@ #include "nix/expr/value-to-xml.hh" #include "nix/expr/value-to-json.hh" #include "nix/util/util.hh" -#include "store-api.hh" -#include "local-fs-store.hh" +#include "nix/store/store-api.hh" +#include "nix/store/local-fs-store.hh" #include "nix/cmd/common-eval-args.hh" #include "nix/cmd/legacy.hh" diff --git a/src/nix-store/dotgraph.cc b/src/nix-store/dotgraph.cc index b60bf0b37be..747a03e29d4 100644 --- a/src/nix-store/dotgraph.cc +++ b/src/nix-store/dotgraph.cc @@ -1,6 +1,6 @@ #include "dotgraph.hh" #include "nix/util/util.hh" -#include "store-api.hh" +#include "nix/store/store-api.hh" #include diff --git a/src/nix-store/dotgraph.hh b/src/nix-store/dotgraph.hh index 73b8d06b945..8c351bdc502 100644 --- a/src/nix-store/dotgraph.hh +++ b/src/nix-store/dotgraph.hh @@ -1,6 +1,6 @@ #pragma once -#include "store-api.hh" +#include "nix/store/store-api.hh" namespace nix { diff --git a/src/nix-store/graphml.cc b/src/nix-store/graphml.cc index 1093513523c..f56d739b922 100644 --- a/src/nix-store/graphml.cc +++ b/src/nix-store/graphml.cc @@ -1,7 +1,7 @@ #include "graphml.hh" #include "nix/util/util.hh" -#include "store-api.hh" -#include "derivations.hh" +#include "nix/store/store-api.hh" +#include "nix/store/derivations.hh" #include diff --git a/src/nix-store/graphml.hh b/src/nix-store/graphml.hh index 78be8a3676e..b8cad6de7d5 100644 --- a/src/nix-store/graphml.hh +++ b/src/nix-store/graphml.hh @@ -1,6 +1,6 @@ #pragma once -#include "store-api.hh" +#include "nix/store/store-api.hh" namespace nix { diff --git a/src/nix-store/nix-store.cc b/src/nix-store/nix-store.cc index f9d9ea50472..0b9f65a5ed1 100644 --- a/src/nix-store/nix-store.cc +++ b/src/nix-store/nix-store.cc @@ -1,20 +1,20 @@ #include "nix/util/archive.hh" -#include "derivations.hh" +#include "nix/store/derivations.hh" #include "dotgraph.hh" -#include "globals.hh" -#include "build-result.hh" -#include "store-cast.hh" -#include "gc-store.hh" -#include "log-store.hh" -#include "local-store.hh" +#include "nix/store/globals.hh" +#include "nix/store/build-result.hh" +#include "nix/store/store-cast.hh" +#include "nix/store/gc-store.hh" +#include "nix/store/log-store.hh" +#include "nix/store/local-store.hh" #include "nix/util/monitor-fd.hh" -#include "serve-protocol.hh" +#include "nix/store/serve-protocol.hh" #include "nix/main/shared.hh" #include "nix/util/util.hh" -#include "worker-protocol.hh" +#include "nix/store/worker-protocol.hh" #include "graphml.hh" #include "nix/cmd/legacy.hh" -#include "path-with-outputs.hh" +#include "nix/store/path-with-outputs.hh" #include #include diff --git a/src/nix/add-to-store.cc b/src/nix/add-to-store.cc index 694590942c8..9850b27c452 100644 --- a/src/nix/add-to-store.cc +++ b/src/nix/add-to-store.cc @@ -1,6 +1,6 @@ #include "nix/cmd/command.hh" #include "nix/main/common-args.hh" -#include "store-api.hh" +#include "nix/store/store-api.hh" #include "nix/util/archive.hh" using namespace nix; diff --git a/src/nix/app.cc b/src/nix/app.cc index 8754ba813dd..321b91be5a0 100644 --- a/src/nix/app.cc +++ b/src/nix/app.cc @@ -1,11 +1,11 @@ #include "nix/cmd/installables.hh" #include "nix/cmd/installable-derived-path.hh" -#include "store-api.hh" +#include "nix/store/store-api.hh" #include "nix/expr/eval-inline.hh" #include "nix/expr/eval-cache.hh" -#include "names.hh" +#include "nix/store/names.hh" #include "nix/cmd/command.hh" -#include "derivations.hh" +#include "nix/store/derivations.hh" namespace nix { diff --git a/src/nix/build.cc b/src/nix/build.cc index b2c1c7be35f..221d219f01f 100644 --- a/src/nix/build.cc +++ b/src/nix/build.cc @@ -2,8 +2,8 @@ #include "nix/cmd/command.hh" #include "nix/main/common-args.hh" #include "nix/main/shared.hh" -#include "store-api.hh" -#include "local-fs-store.hh" +#include "nix/store/store-api.hh" +#include "nix/store/local-fs-store.hh" #include "nix/main/progress-bar.hh" #include diff --git a/src/nix/bundle.cc b/src/nix/bundle.cc index 73ce79cd3af..193e9d30900 100644 --- a/src/nix/bundle.cc +++ b/src/nix/bundle.cc @@ -1,9 +1,9 @@ #include "nix/cmd/command.hh" #include "nix/main/common-args.hh" #include "nix/main/shared.hh" -#include "store-api.hh" -#include "local-fs-store.hh" -#include "fs-accessor.hh" +#include "nix/store/store-api.hh" +#include "nix/store/local-fs-store.hh" +#include "nix/store/fs-accessor.hh" using namespace nix; diff --git a/src/nix/cat.cc b/src/nix/cat.cc index 3a508ad1bc9..32618b887da 100644 --- a/src/nix/cat.cc +++ b/src/nix/cat.cc @@ -1,7 +1,7 @@ #include "nix/cmd/command.hh" -#include "store-api.hh" -#include "fs-accessor.hh" -#include "nar-accessor.hh" +#include "nix/store/store-api.hh" +#include "nix/store/fs-accessor.hh" +#include "nix/store/nar-accessor.hh" using namespace nix; diff --git a/src/nix/copy.cc b/src/nix/copy.cc index 95746798298..ba61763af60 100644 --- a/src/nix/copy.cc +++ b/src/nix/copy.cc @@ -1,6 +1,6 @@ #include "nix/cmd/command.hh" #include "nix/main/shared.hh" -#include "store-api.hh" +#include "nix/store/store-api.hh" using namespace nix; diff --git a/src/nix/daemon.cc b/src/nix/daemon.cc index 1e8f5761d2c..0d80b1aa53b 100644 --- a/src/nix/daemon.cc +++ b/src/nix/daemon.cc @@ -1,15 +1,15 @@ #include "nix/cmd/command.hh" #include "nix/main/shared.hh" -#include "local-store.hh" -#include "remote-store.hh" +#include "nix/store/local-store.hh" +#include "nix/store/remote-store.hh" #include "nix/util/util.hh" #include "nix/util/serialise.hh" #include "nix/util/archive.hh" -#include "globals.hh" -#include "derivations.hh" +#include "nix/store/globals.hh" +#include "nix/store/derivations.hh" #include "nix/util/finally.hh" #include "nix/cmd/legacy.hh" -#include "daemon.hh" +#include "nix/store/daemon.hh" #include #include diff --git a/src/nix/describe-stores.cc b/src/nix/describe-stores.cc index 791bda05d0e..47be0c6dbf5 100644 --- a/src/nix/describe-stores.cc +++ b/src/nix/describe-stores.cc @@ -1,7 +1,7 @@ #include "nix/cmd/command.hh" #include "nix/main/common-args.hh" #include "nix/main/shared.hh" -#include "store-api.hh" +#include "nix/store/store-api.hh" #include diff --git a/src/nix/develop.cc b/src/nix/develop.cc index ad5e7d06f63..564121f21ac 100644 --- a/src/nix/develop.cc +++ b/src/nix/develop.cc @@ -2,9 +2,9 @@ #include "nix/cmd/command.hh" #include "nix/main/common-args.hh" #include "nix/main/shared.hh" -#include "store-api.hh" -#include "outputs-spec.hh" -#include "derivations.hh" +#include "nix/store/store-api.hh" +#include "nix/store/outputs-spec.hh" +#include "nix/store/derivations.hh" #include "nix/main/progress-bar.hh" #include "run.hh" diff --git a/src/nix/diff-closures.cc b/src/nix/diff-closures.cc index 79d3be31e19..501f4f2e3a0 100644 --- a/src/nix/diff-closures.cc +++ b/src/nix/diff-closures.cc @@ -1,8 +1,8 @@ #include "nix/cmd/command.hh" #include "nix/main/shared.hh" -#include "store-api.hh" +#include "nix/store/store-api.hh" #include "nix/main/common-args.hh" -#include "names.hh" +#include "nix/store/names.hh" #include diff --git a/src/nix/doctor.cc b/src/nix/doctor.cc index 4aee14baea1..83f00952a00 100644 --- a/src/nix/doctor.cc +++ b/src/nix/doctor.cc @@ -2,12 +2,12 @@ #include "nix/cmd/command.hh" #include "nix/util/logging.hh" -#include "serve-protocol.hh" +#include "nix/store/serve-protocol.hh" #include "nix/main/shared.hh" -#include "store-api.hh" -#include "local-fs-store.hh" +#include "nix/store/store-api.hh" +#include "nix/store/local-fs-store.hh" #include "nix/util/util.hh" -#include "worker-protocol.hh" +#include "nix/store/worker-protocol.hh" using namespace nix; diff --git a/src/nix/dump-path.cc b/src/nix/dump-path.cc index e9a2944d380..e731216c0d7 100644 --- a/src/nix/dump-path.cc +++ b/src/nix/dump-path.cc @@ -1,5 +1,5 @@ #include "nix/cmd/command.hh" -#include "store-api.hh" +#include "nix/store/store-api.hh" #include "nix/util/archive.hh" using namespace nix; diff --git a/src/nix/eval.cc b/src/nix/eval.cc index fd08a590612..647c5c75a97 100644 --- a/src/nix/eval.cc +++ b/src/nix/eval.cc @@ -1,7 +1,7 @@ #include "nix/cmd/command.hh" #include "nix/main/common-args.hh" #include "nix/main/shared.hh" -#include "store-api.hh" +#include "nix/store/store-api.hh" #include "nix/expr/eval.hh" #include "nix/expr/eval-inline.hh" #include "nix/expr/value-to-json.hh" diff --git a/src/nix/flake.cc b/src/nix/flake.cc index 36a2d7d6684..f05fb7b1f8e 100644 --- a/src/nix/flake.cc +++ b/src/nix/flake.cc @@ -5,9 +5,9 @@ #include "nix/expr/eval-inline.hh" #include "nix/expr/flake/flake.hh" #include "nix/expr/get-drvs.hh" -#include "store-api.hh" -#include "derivations.hh" -#include "outputs-spec.hh" +#include "nix/store/store-api.hh" +#include "nix/store/derivations.hh" +#include "nix/store/outputs-spec.hh" #include "nix/expr/attr-path.hh" #include "nix/fetchers/fetchers.hh" #include "nix/fetchers/registry.hh" diff --git a/src/nix/hash.cc b/src/nix/hash.cc index e18b5327fc1..c90f6000e4d 100644 --- a/src/nix/hash.cc +++ b/src/nix/hash.cc @@ -1,9 +1,9 @@ #include "nix/cmd/command.hh" #include "nix/util/hash.hh" -#include "content-address.hh" +#include "nix/store/content-address.hh" #include "nix/cmd/legacy.hh" #include "nix/main/shared.hh" -#include "references.hh" +#include "nix/store/references.hh" #include "nix/util/archive.hh" using namespace nix; diff --git a/src/nix/local.mk b/src/nix/local.mk index 355f56b4bdc..86f1aa4edb4 100644 --- a/src/nix/local.mk +++ b/src/nix/local.mk @@ -20,7 +20,7 @@ nix_CXXFLAGS += \ -Isrc/libexpr/include \ -Isrc/libfetchers/include \ -Isrc/libmain/include \ - -Isrc/libstore \ + -Isrc/libstore/include \ -Isrc/libutil/include nix_LIBS = libexpr libmain libfetchers libstore libutil libcmd diff --git a/src/nix/log.cc b/src/nix/log.cc index d802e491d21..5d6bd82b364 100644 --- a/src/nix/log.cc +++ b/src/nix/log.cc @@ -1,8 +1,8 @@ #include "nix/cmd/command.hh" #include "nix/main/common-args.hh" #include "nix/main/shared.hh" -#include "store-api.hh" -#include "log-store.hh" +#include "nix/store/store-api.hh" +#include "nix/store/log-store.hh" #include "nix/main/progress-bar.hh" using namespace nix; diff --git a/src/nix/ls.cc b/src/nix/ls.cc index 4226295b3ca..361131923a9 100644 --- a/src/nix/ls.cc +++ b/src/nix/ls.cc @@ -1,7 +1,7 @@ #include "nix/cmd/command.hh" -#include "store-api.hh" -#include "fs-accessor.hh" -#include "nar-accessor.hh" +#include "nix/store/store-api.hh" +#include "nix/store/fs-accessor.hh" +#include "nix/store/nar-accessor.hh" #include "nix/main/common-args.hh" #include diff --git a/src/nix/main.cc b/src/nix/main.cc index 766446c8a9b..7a09d3dd764 100644 --- a/src/nix/main.cc +++ b/src/nix/main.cc @@ -3,11 +3,11 @@ #include "nix/cmd/command.hh" #include "nix/main/common-args.hh" #include "nix/expr/eval.hh" -#include "globals.hh" +#include "nix/store/globals.hh" #include "nix/cmd/legacy.hh" #include "nix/main/shared.hh" -#include "store-api.hh" -#include "filetransfer.hh" +#include "nix/store/store-api.hh" +#include "nix/store/filetransfer.hh" #include "nix/util/finally.hh" #include "nix/main/loggers.hh" #include "nix/cmd/markdown.hh" diff --git a/src/nix/make-content-addressed.cc b/src/nix/make-content-addressed.cc index a690a010d2a..835af7e664c 100644 --- a/src/nix/make-content-addressed.cc +++ b/src/nix/make-content-addressed.cc @@ -1,6 +1,6 @@ #include "nix/cmd/command.hh" -#include "store-api.hh" -#include "make-content-addressed.hh" +#include "nix/store/store-api.hh" +#include "nix/store/make-content-addressed.hh" #include "nix/main/common-args.hh" #include diff --git a/src/nix/optimise-store.cc b/src/nix/optimise-store.cc index a23ec4d1c30..e319f5c9081 100644 --- a/src/nix/optimise-store.cc +++ b/src/nix/optimise-store.cc @@ -1,6 +1,6 @@ #include "nix/cmd/command.hh" #include "nix/main/shared.hh" -#include "store-api.hh" +#include "nix/store/store-api.hh" #include diff --git a/src/nix/path-from-hash-part.cc b/src/nix/path-from-hash-part.cc index 17dc1f97d2e..814b723f9b0 100644 --- a/src/nix/path-from-hash-part.cc +++ b/src/nix/path-from-hash-part.cc @@ -1,5 +1,5 @@ #include "nix/cmd/command.hh" -#include "store-api.hh" +#include "nix/store/store-api.hh" using namespace nix; diff --git a/src/nix/path-info.cc b/src/nix/path-info.cc index 36c06ff2b3a..78a2fd4d532 100644 --- a/src/nix/path-info.cc +++ b/src/nix/path-info.cc @@ -1,6 +1,6 @@ #include "nix/cmd/command.hh" #include "nix/main/shared.hh" -#include "store-api.hh" +#include "nix/store/store-api.hh" #include "nix/main/common-args.hh" #include diff --git a/src/nix/ping-store.cc b/src/nix/ping-store.cc index 46a0cb44c50..1e39aff595f 100644 --- a/src/nix/ping-store.cc +++ b/src/nix/ping-store.cc @@ -1,6 +1,6 @@ #include "nix/cmd/command.hh" #include "nix/main/shared.hh" -#include "store-api.hh" +#include "nix/store/store-api.hh" #include "nix/util/finally.hh" #include diff --git a/src/nix/prefetch.cc b/src/nix/prefetch.cc index e11ce047a13..aed9db876d3 100644 --- a/src/nix/prefetch.cc +++ b/src/nix/prefetch.cc @@ -1,8 +1,8 @@ #include "nix/cmd/command.hh" #include "nix/main/common-args.hh" #include "nix/main/shared.hh" -#include "store-api.hh" -#include "filetransfer.hh" +#include "nix/store/store-api.hh" +#include "nix/store/filetransfer.hh" #include "nix/util/finally.hh" #include "nix/main/progress-bar.hh" #include "nix/util/tarfile.hh" diff --git a/src/nix/profile.cc b/src/nix/profile.cc index 7f1e7d3613f..471ae24627c 100644 --- a/src/nix/profile.cc +++ b/src/nix/profile.cc @@ -1,14 +1,14 @@ #include "nix/cmd/command.hh" #include "nix/main/common-args.hh" #include "nix/main/shared.hh" -#include "store-api.hh" -#include "derivations.hh" +#include "nix/store/store-api.hh" +#include "nix/store/derivations.hh" #include "nix/util/archive.hh" -#include "builtins/buildenv.hh" +#include "nix/store/builtins/buildenv.hh" #include "nix/expr/flake/flakeref.hh" #include "../nix-env/user-env.hh" -#include "profiles.hh" -#include "names.hh" +#include "nix/store/profiles.hh" +#include "nix/store/names.hh" #include #include diff --git a/src/nix/registry.cc b/src/nix/registry.cc index 8edff0ff8aa..a94c497bced 100644 --- a/src/nix/registry.cc +++ b/src/nix/registry.cc @@ -3,7 +3,7 @@ #include "nix/main/shared.hh" #include "nix/expr/eval.hh" #include "nix/expr/flake/flake.hh" -#include "store-api.hh" +#include "nix/store/store-api.hh" #include "nix/fetchers/fetchers.hh" #include "nix/fetchers/registry.hh" diff --git a/src/nix/run.cc b/src/nix/run.cc index 4b11c98f695..f86cf58c13e 100644 --- a/src/nix/run.cc +++ b/src/nix/run.cc @@ -2,14 +2,14 @@ #include "nix/cmd/command.hh" #include "nix/main/common-args.hh" #include "nix/main/shared.hh" -#include "store-api.hh" -#include "derivations.hh" -#include "local-store.hh" +#include "nix/store/store-api.hh" +#include "nix/store/derivations.hh" +#include "nix/store/local-store.hh" #include "nix/util/finally.hh" -#include "fs-accessor.hh" +#include "nix/store/fs-accessor.hh" #include "nix/main/progress-bar.hh" #include "nix/expr/eval.hh" -#include "build/personality.hh" +#include "nix/store/build/personality.hh" #if __linux__ #include diff --git a/src/nix/run.hh b/src/nix/run.hh index fed3601580a..334edca5d68 100644 --- a/src/nix/run.hh +++ b/src/nix/run.hh @@ -1,6 +1,6 @@ #pragma once -#include "store-api.hh" +#include "nix/store/store-api.hh" namespace nix { diff --git a/src/nix/search.cc b/src/nix/search.cc index aa77d1071e7..09b26908954 100644 --- a/src/nix/search.cc +++ b/src/nix/search.cc @@ -1,8 +1,8 @@ #include "nix/cmd/command.hh" -#include "globals.hh" +#include "nix/store/globals.hh" #include "nix/expr/eval.hh" #include "nix/expr/eval-inline.hh" -#include "names.hh" +#include "nix/store/names.hh" #include "nix/expr/get-drvs.hh" #include "nix/main/common-args.hh" #include "nix/main/shared.hh" diff --git a/src/nix/show-config.cc b/src/nix/show-config.cc index 56e9b19aa7e..2e96bee0cac 100644 --- a/src/nix/show-config.cc +++ b/src/nix/show-config.cc @@ -1,7 +1,7 @@ #include "nix/cmd/command.hh" #include "nix/main/common-args.hh" #include "nix/main/shared.hh" -#include "store-api.hh" +#include "nix/store/store-api.hh" #include diff --git a/src/nix/show-derivation.cc b/src/nix/show-derivation.cc index ce0fbc3dca8..166a1b8d2cc 100644 --- a/src/nix/show-derivation.cc +++ b/src/nix/show-derivation.cc @@ -3,9 +3,9 @@ #include "nix/cmd/command.hh" #include "nix/main/common-args.hh" -#include "store-api.hh" +#include "nix/store/store-api.hh" #include "nix/util/archive.hh" -#include "derivations.hh" +#include "nix/store/derivations.hh" #include using namespace nix; diff --git a/src/nix/sigs.cc b/src/nix/sigs.cc index 22d3682a054..511943e5c30 100644 --- a/src/nix/sigs.cc +++ b/src/nix/sigs.cc @@ -1,6 +1,6 @@ #include "nix/cmd/command.hh" #include "nix/main/shared.hh" -#include "store-api.hh" +#include "nix/store/store-api.hh" #include "nix/util/thread-pool.hh" #include diff --git a/src/nix/store-copy-log.cc b/src/nix/store-copy-log.cc index 78e47b7b5b7..f4431437a40 100644 --- a/src/nix/store-copy-log.cc +++ b/src/nix/store-copy-log.cc @@ -1,8 +1,8 @@ #include "nix/cmd/command.hh" #include "nix/main/shared.hh" -#include "store-api.hh" -#include "store-cast.hh" -#include "log-store.hh" +#include "nix/store/store-api.hh" +#include "nix/store/store-cast.hh" +#include "nix/store/log-store.hh" #include "nix/util/sync.hh" #include "nix/util/thread-pool.hh" diff --git a/src/nix/store-delete.cc b/src/nix/store-delete.cc index ddb06f0199a..300380f0a1d 100644 --- a/src/nix/store-delete.cc +++ b/src/nix/store-delete.cc @@ -1,9 +1,9 @@ #include "nix/cmd/command.hh" #include "nix/main/common-args.hh" #include "nix/main/shared.hh" -#include "store-api.hh" -#include "store-cast.hh" -#include "gc-store.hh" +#include "nix/store/store-api.hh" +#include "nix/store/store-cast.hh" +#include "nix/store/gc-store.hh" using namespace nix; diff --git a/src/nix/store-gc.cc b/src/nix/store-gc.cc index 2e7122b4391..e6a303874f4 100644 --- a/src/nix/store-gc.cc +++ b/src/nix/store-gc.cc @@ -1,9 +1,9 @@ #include "nix/cmd/command.hh" #include "nix/main/common-args.hh" #include "nix/main/shared.hh" -#include "store-api.hh" -#include "store-cast.hh" -#include "gc-store.hh" +#include "nix/store/store-api.hh" +#include "nix/store/store-cast.hh" +#include "nix/store/gc-store.hh" using namespace nix; diff --git a/src/nix/store-repair.cc b/src/nix/store-repair.cc index b5437ad664b..0dd18a87621 100644 --- a/src/nix/store-repair.cc +++ b/src/nix/store-repair.cc @@ -1,5 +1,5 @@ #include "nix/cmd/command.hh" -#include "store-api.hh" +#include "nix/store/store-api.hh" using namespace nix; diff --git a/src/nix/upgrade-nix.cc b/src/nix/upgrade-nix.cc index 2b94945d16b..bcc214e4f2c 100644 --- a/src/nix/upgrade-nix.cc +++ b/src/nix/upgrade-nix.cc @@ -1,10 +1,10 @@ #include "nix/cmd/command.hh" #include "nix/main/common-args.hh" -#include "store-api.hh" -#include "filetransfer.hh" +#include "nix/store/store-api.hh" +#include "nix/store/filetransfer.hh" #include "nix/expr/eval.hh" #include "nix/expr/attr-path.hh" -#include "names.hh" +#include "nix/store/names.hh" #include "nix/main/progress-bar.hh" using namespace nix; diff --git a/src/nix/verify.cc b/src/nix/verify.cc index 5d4950247f0..65e36e7ee90 100644 --- a/src/nix/verify.cc +++ b/src/nix/verify.cc @@ -1,9 +1,9 @@ #include "nix/cmd/command.hh" #include "nix/main/shared.hh" -#include "store-api.hh" +#include "nix/store/store-api.hh" #include "nix/util/sync.hh" #include "nix/util/thread-pool.hh" -#include "references.hh" +#include "nix/store/references.hh" #include diff --git a/src/nix/why-depends.cc b/src/nix/why-depends.cc index f07376b2087..ef1df880071 100644 --- a/src/nix/why-depends.cc +++ b/src/nix/why-depends.cc @@ -1,7 +1,7 @@ #include "nix/cmd/command.hh" -#include "store-api.hh" +#include "nix/store/store-api.hh" #include "nix/main/progress-bar.hh" -#include "fs-accessor.hh" +#include "nix/store/fs-accessor.hh" #include "nix/main/shared.hh" #include diff --git a/src/resolve-system-dependencies/resolve-system-dependencies.cc b/src/resolve-system-dependencies/resolve-system-dependencies.cc index 5c209883dcd..1005bc72ded 100644 --- a/src/resolve-system-dependencies/resolve-system-dependencies.cc +++ b/src/resolve-system-dependencies/resolve-system-dependencies.cc @@ -1,7 +1,7 @@ -#include "derivations.hh" -#include "globals.hh" +#include "nix/store/derivations.hh" +#include "nix/store/globals.hh" #include "nix/main/shared.hh" -#include "store-api.hh" +#include "nix/store/store-api.hh" #include #include #include From 7c5cec275d3cdcd381a01f7955bac39dad555094 Mon Sep 17 00:00:00 2001 From: Andrea Bedini Date: Fri, 17 Feb 2023 18:01:23 +0800 Subject: [PATCH 10/21] Fix resolve-system-dependencies --- src/resolve-system-dependencies/local.mk | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/resolve-system-dependencies/local.mk b/src/resolve-system-dependencies/local.mk index fc48a841796..97503f506fa 100644 --- a/src/resolve-system-dependencies/local.mk +++ b/src/resolve-system-dependencies/local.mk @@ -6,7 +6,10 @@ resolve-system-dependencies_DIR := $(d) resolve-system-dependencies_INSTALL_DIR := $(libexecdir)/nix -resolve-system-dependencies_CXXFLAGS += -I src/libutil -I src/libstore -I src/libmain +resolve-system-dependencies_CXXFLAGS += \ + -Isrc/libmain/include \ + -Isrc/libstore/include \ + -Isrc/libutil/include resolve-system-dependencies_LIBS := libstore libmain libutil From 95db45278110a932949a488783dfb2075c4195eb Mon Sep 17 00:00:00 2001 From: Andrea Bedini Date: Fri, 17 Feb 2023 19:41:23 +0800 Subject: [PATCH 11/21] Fix perl bindings --- perl/lib/Nix/Store.xs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/perl/lib/Nix/Store.xs b/perl/lib/Nix/Store.xs index 9207c1d14aa..4bfcf61a536 100644 --- a/perl/lib/Nix/Store.xs +++ b/perl/lib/Nix/Store.xs @@ -8,11 +8,11 @@ #undef do_open #undef do_close -#include "nix/derivations.hh" -#include "nix/globals.hh" -#include "nix/store-api.hh" +#include "nix/store/crypto.hh" +#include "nix/store/derivations.hh" +#include "nix/store/globals.hh" +#include "nix/store/store-api.hh" #include "nix/util/util.hh" -#include "nix/crypto.hh" #include #include From 1dbc9d32565480612253abedcd10d8e8b9f06ad6 Mon Sep 17 00:00:00 2001 From: Andrea Bedini Date: Mon, 20 Feb 2023 14:00:49 +0800 Subject: [PATCH 12/21] Fix header files installation --- local.mk | 3 +-- src/libcmd/local.mk | 3 +++ src/libexpr/local.mk | 12 ++++++++---- src/libfetchers/local.mk | 3 +++ src/libmain/local.mk | 3 +++ src/libstore/local.mk | 11 +++++++---- src/libutil/local.mk | 3 +++ 7 files changed, 28 insertions(+), 10 deletions(-) diff --git a/local.mk b/local.mk index 5cbdc378b49..daab086b44f 100644 --- a/local.mk +++ b/local.mk @@ -2,8 +2,7 @@ clean-files += Makefile.config GLOBAL_CXXFLAGS += -Wno-deprecated-declarations -$(foreach i, config.h $(wildcard src/lib*/*.hh), \ - $(eval $(call install-file-in, $(i), $(includedir)/nix, 0644))) +$(eval $(call install-file-in, config.h, $(includedir)/nix, 0644)) $(GCH): src/libutil/include/nix/util/util.hh config.h diff --git a/src/libcmd/local.mk b/src/libcmd/local.mk index 8fbddcb4738..c825cfd78ed 100644 --- a/src/libcmd/local.mk +++ b/src/libcmd/local.mk @@ -20,3 +20,6 @@ libcmd_LDFLAGS = $(EDITLINE_LIBS) $(LOWDOWN_LIBS) -pthread libcmd_LIBS = libstore libutil libexpr libmain libfetchers $(eval $(call install-file-in, $(d)/nix-cmd.pc, $(libdir)/pkgconfig, 0644)) + +$(foreach i, $(wildcard src/libcmd/include/nix/cmd/*.hh), \ + $(eval $(call install-file-in, $(i), $(includedir)/nix/cmd, 0644))) diff --git a/src/libexpr/local.mk b/src/libexpr/local.mk index 28f2958be0f..88c1657d97f 100644 --- a/src/libexpr/local.mk +++ b/src/libexpr/local.mk @@ -42,10 +42,14 @@ clean-files += $(d)/parser-tab.cc $(d)/parser-tab.hh $(d)/lexer-tab.cc $(d)/lexe $(eval $(call install-file-in, $(d)/nix-expr.pc, $(libdir)/pkgconfig, 0644)) -$(foreach i, $(wildcard src/libexpr/value/*.hh), \ - $(eval $(call install-file-in, $(i), $(includedir)/nix/value, 0644))) -$(foreach i, $(wildcard src/libexpr/flake/*.hh), \ - $(eval $(call install-file-in, $(i), $(includedir)/nix/flake, 0644))) +$(foreach i, $(wildcard src/libexpr/include/nix/expr/*.hh), \ + $(eval $(call install-file-in, $(i), $(includedir)/nix/expr, 0644))) + +$(foreach i, $(wildcard src/libexpr/include/nix/expr/value/*.hh), \ + $(eval $(call install-file-in, $(i), $(includedir)/nix/expr/value, 0644))) + +$(foreach i, $(wildcard src/libexpr/include/nix/expr/flake/*.hh), \ + $(eval $(call install-file-in, $(i), $(includedir)/nix/expr/flake, 0644))) $(d)/primops.cc: $(d)/imported-drv-to-derivation.nix.gen.hh $(d)/primops/derivation.nix.gen.hh $(d)/fetchurl.nix.gen.hh diff --git a/src/libfetchers/local.mk b/src/libfetchers/local.mk index 16ddafb06e5..340f7ce3489 100644 --- a/src/libfetchers/local.mk +++ b/src/libfetchers/local.mk @@ -14,3 +14,6 @@ libfetchers_CXXFLAGS += \ libfetchers_LDFLAGS += -pthread libfetchers_LIBS = libutil libstore + +$(foreach i, $(wildcard src/libfetchers/include/nix/fetchers/*.hh), \ + $(eval $(call install-file-in, $(i), $(includedir)/nix/fetchers, 0644))) diff --git a/src/libmain/local.mk b/src/libmain/local.mk index 2931e14e6be..392c4563dea 100644 --- a/src/libmain/local.mk +++ b/src/libmain/local.mk @@ -18,3 +18,6 @@ libmain_LIBS = libstore libutil libmain_ALLOW_UNDEFINED = 1 $(eval $(call install-file-in, $(d)/nix-main.pc, $(libdir)/pkgconfig, 0644)) + +$(foreach i, $(wildcard src/libmain/include/nix/main/*.hh), \ + $(eval $(call install-file-in, $(i), $(includedir)/nix/main, 0644))) diff --git a/src/libstore/local.mk b/src/libstore/local.mk index 32b72018683..3defea82854 100644 --- a/src/libstore/local.mk +++ b/src/libstore/local.mk @@ -68,8 +68,11 @@ clean-files += $(d)/schema.sql.gen.hh $(d)/ca-specific-schema.sql.gen.hh $(eval $(call install-file-in, $(d)/nix-store.pc, $(libdir)/pkgconfig, 0644)) -$(foreach i, $(wildcard src/libstore/builtins/*.hh), \ - $(eval $(call install-file-in, $(i), $(includedir)/nix/builtins, 0644))) +$(foreach i, $(wildcard src/libstore/include/nix/store/*.hh), \ + $(eval $(call install-file-in, $(i), $(includedir)/nix/store, 0644))) -$(foreach i, $(wildcard src/libstore/build/*.hh), \ - $(eval $(call install-file-in, $(i), $(includedir)/nix/build, 0644))) +$(foreach i, $(wildcard src/libstore/include/nix/store/builtins/*.hh), \ + $(eval $(call install-file-in, $(i), $(includedir)/nix/store/builtins, 0644))) + +$(foreach i, $(wildcard src/libstore/include/nix/store/build/*.hh), \ + $(eval $(call install-file-in, $(i), $(includedir)/nix/store/build, 0644))) diff --git a/src/libutil/local.mk b/src/libutil/local.mk index 11538464f1b..7e43ff9f37d 100644 --- a/src/libutil/local.mk +++ b/src/libutil/local.mk @@ -13,3 +13,6 @@ libutil_LDFLAGS += -pthread $(OPENSSL_LIBS) $(LIBBROTLI_LIBS) $(LIBARCHIVE_LIBS) ifeq ($(HAVE_LIBCPUID), 1) libutil_LDFLAGS += -lcpuid endif + +$(foreach i, $(wildcard src/libutil/include/nix/util/*.hh), \ + $(eval $(call install-file-in, $(i), $(includedir)/nix/util, 0644))) From 7cf977b51a97270e0e5d60fe56bcc21ab3f5e552 Mon Sep 17 00:00:00 2001 From: Andrea Bedini Date: Mon, 20 Feb 2023 15:22:55 +0800 Subject: [PATCH 13/21] Fix plugins tests --- tests/plugins/local.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/plugins/local.mk b/tests/plugins/local.mk index b0ef05f9a3b..8714927cec1 100644 --- a/tests/plugins/local.mk +++ b/tests/plugins/local.mk @@ -10,5 +10,5 @@ libplugintest_EXCLUDE_FROM_LIBRARY_LIST := 1 libplugintest_CXXFLAGS := \ -Isrc/libexpr/include \ - -Isrc/libstore \ + -Isrc/libstore/include \ -Isrc/libutil/include From 70891acf1e7dca39f87ea969392dc51319b65157 Mon Sep 17 00:00:00 2001 From: Andrea Bedini Date: Mon, 20 Feb 2023 15:40:40 +0800 Subject: [PATCH 14/21] Remove extranous files --- perl/autom4te.cache/output.0 | 5623 ---------------------------------- perl/autom4te.cache/requests | 84 - perl/autom4te.cache/traces.0 | 291 -- 3 files changed, 5998 deletions(-) delete mode 100644 perl/autom4te.cache/output.0 delete mode 100644 perl/autom4te.cache/requests delete mode 100644 perl/autom4te.cache/traces.0 diff --git a/perl/autom4te.cache/output.0 b/perl/autom4te.cache/output.0 deleted file mode 100644 index 4b4b83915d3..00000000000 --- a/perl/autom4te.cache/output.0 +++ /dev/null @@ -1,5623 +0,0 @@ -@%:@! /bin/sh -@%:@ Guess values for system-dependent variables and create Makefiles. -@%:@ Generated by GNU Autoconf 2.71 for nix-perl 2.14.0. -@%:@ -@%:@ -@%:@ Copyright (C) 1992-1996, 1998-2017, 2020-2021 Free Software Foundation, -@%:@ Inc. -@%:@ -@%:@ -@%:@ This configure script is free software; the Free Software Foundation -@%:@ gives unlimited permission to copy, distribute and modify it. -## -------------------- ## -## M4sh Initialization. ## -## -------------------- ## - -# Be more Bourne compatible -DUALCASE=1; export DUALCASE # for MKS sh -as_nop=: -if test ${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1 -then : - emulate sh - NULLCMD=: - # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which - # is contrary to our usage. Disable this feature. - alias -g '${1+"$@"}'='"$@"' - setopt NO_GLOB_SUBST -else $as_nop - case `(set -o) 2>/dev/null` in @%:@( - *posix*) : - set -o posix ;; @%:@( - *) : - ;; -esac -fi - - - -# Reset variables that may have inherited troublesome values from -# the environment. - -# IFS needs to be set, to space, tab, and newline, in precisely that order. -# (If _AS_PATH_WALK were called with IFS unset, it would have the -# side effect of setting IFS to empty, thus disabling word splitting.) -# Quoting is to prevent editors from complaining about space-tab. -as_nl=' -' -export as_nl -IFS=" "" $as_nl" - -PS1='$ ' -PS2='> ' -PS4='+ ' - -# Ensure predictable behavior from utilities with locale-dependent output. -LC_ALL=C -export LC_ALL -LANGUAGE=C -export LANGUAGE - -# We cannot yet rely on "unset" to work, but we need these variables -# to be unset--not just set to an empty or harmless value--now, to -# avoid bugs in old shells (e.g. pre-3.0 UWIN ksh). This construct -# also avoids known problems related to "unset" and subshell syntax -# in other old shells (e.g. bash 2.01 and pdksh 5.2.14). -for as_var in BASH_ENV ENV MAIL MAILPATH CDPATH -do eval test \${$as_var+y} \ - && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : -done - -# Ensure that fds 0, 1, and 2 are open. -if (exec 3>&0) 2>/dev/null; then :; else exec 0&1) 2>/dev/null; then :; else exec 1>/dev/null; fi -if (exec 3>&2) ; then :; else exec 2>/dev/null; fi - -# The user is always right. -if ${PATH_SEPARATOR+false} :; then - PATH_SEPARATOR=: - (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { - (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || - PATH_SEPARATOR=';' - } -fi - - -# Find who we are. Look in the path if we contain no directory separator. -as_myself= -case $0 in @%:@(( - *[\\/]* ) as_myself=$0 ;; - *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac - test -r "$as_dir$0" && as_myself=$as_dir$0 && break - done -IFS=$as_save_IFS - - ;; -esac -# We did not find ourselves, most probably we were run as `sh COMMAND' -# in which case we are not to be found in the path. -if test "x$as_myself" = x; then - as_myself=$0 -fi -if test ! -f "$as_myself"; then - printf "%s\n" "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 - exit 1 -fi - - -# Use a proper internal environment variable to ensure we don't fall - # into an infinite loop, continuously re-executing ourselves. - if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then - _as_can_reexec=no; export _as_can_reexec; - # We cannot yet assume a decent shell, so we have to provide a -# neutralization value for shells without unset; and this also -# works around shells that cannot unset nonexistent variables. -# Preserve -v and -x to the replacement shell. -BASH_ENV=/dev/null -ENV=/dev/null -(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV -case $- in @%:@ (((( - *v*x* | *x*v* ) as_opts=-vx ;; - *v* ) as_opts=-v ;; - *x* ) as_opts=-x ;; - * ) as_opts= ;; -esac -exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} -# Admittedly, this is quite paranoid, since all the known shells bail -# out after a failed `exec'. -printf "%s\n" "$0: could not re-execute with $CONFIG_SHELL" >&2 -exit 255 - fi - # We don't want this to propagate to other subprocesses. - { _as_can_reexec=; unset _as_can_reexec;} -if test "x$CONFIG_SHELL" = x; then - as_bourne_compatible="as_nop=: -if test \${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1 -then : - emulate sh - NULLCMD=: - # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which - # is contrary to our usage. Disable this feature. - alias -g '\${1+\"\$@\"}'='\"\$@\"' - setopt NO_GLOB_SUBST -else \$as_nop - case \`(set -o) 2>/dev/null\` in @%:@( - *posix*) : - set -o posix ;; @%:@( - *) : - ;; -esac -fi -" - as_required="as_fn_return () { (exit \$1); } -as_fn_success () { as_fn_return 0; } -as_fn_failure () { as_fn_return 1; } -as_fn_ret_success () { return 0; } -as_fn_ret_failure () { return 1; } - -exitcode=0 -as_fn_success || { exitcode=1; echo as_fn_success failed.; } -as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; } -as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; } -as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; } -if ( set x; as_fn_ret_success y && test x = \"\$1\" ) -then : - -else \$as_nop - exitcode=1; echo positional parameters were not saved. -fi -test x\$exitcode = x0 || exit 1 -blah=\$(echo \$(echo blah)) -test x\"\$blah\" = xblah || exit 1 -test -x / || exit 1" - as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO - as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO - eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && - test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1" - if (eval "$as_required") 2>/dev/null -then : - as_have_required=yes -else $as_nop - as_have_required=no -fi - if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null -then : - -else $as_nop - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -as_found=false -for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH -do - IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac - as_found=: - case $as_dir in @%:@( - /*) - for as_base in sh bash ksh sh5; do - # Try only shells that exist, to save several forks. - as_shell=$as_dir$as_base - if { test -f "$as_shell" || test -f "$as_shell.exe"; } && - as_run=a "$as_shell" -c "$as_bourne_compatible""$as_required" 2>/dev/null -then : - CONFIG_SHELL=$as_shell as_have_required=yes - if as_run=a "$as_shell" -c "$as_bourne_compatible""$as_suggested" 2>/dev/null -then : - break 2 -fi -fi - done;; - esac - as_found=false -done -IFS=$as_save_IFS -if $as_found -then : - -else $as_nop - if { test -f "$SHELL" || test -f "$SHELL.exe"; } && - as_run=a "$SHELL" -c "$as_bourne_compatible""$as_required" 2>/dev/null -then : - CONFIG_SHELL=$SHELL as_have_required=yes -fi -fi - - - if test "x$CONFIG_SHELL" != x -then : - export CONFIG_SHELL - # We cannot yet assume a decent shell, so we have to provide a -# neutralization value for shells without unset; and this also -# works around shells that cannot unset nonexistent variables. -# Preserve -v and -x to the replacement shell. -BASH_ENV=/dev/null -ENV=/dev/null -(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV -case $- in @%:@ (((( - *v*x* | *x*v* ) as_opts=-vx ;; - *v* ) as_opts=-v ;; - *x* ) as_opts=-x ;; - * ) as_opts= ;; -esac -exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} -# Admittedly, this is quite paranoid, since all the known shells bail -# out after a failed `exec'. -printf "%s\n" "$0: could not re-execute with $CONFIG_SHELL" >&2 -exit 255 -fi - - if test x$as_have_required = xno -then : - printf "%s\n" "$0: This script requires a shell more modern than all" - printf "%s\n" "$0: the shells that I found on your system." - if test ${ZSH_VERSION+y} ; then - printf "%s\n" "$0: In particular, zsh $ZSH_VERSION has bugs and should" - printf "%s\n" "$0: be upgraded to zsh 4.3.4 or later." - else - printf "%s\n" "$0: Please tell bug-autoconf@gnu.org about your system, -$0: including any error possibly output before this -$0: message. Then install a modern shell, or manually run -$0: the script under such a shell if you do have one." - fi - exit 1 -fi -fi -fi -SHELL=${CONFIG_SHELL-/bin/sh} -export SHELL -# Unset more variables known to interfere with behavior of common tools. -CLICOLOR_FORCE= GREP_OPTIONS= -unset CLICOLOR_FORCE GREP_OPTIONS - -## --------------------- ## -## M4sh Shell Functions. ## -## --------------------- ## -@%:@ as_fn_unset VAR -@%:@ --------------- -@%:@ Portably unset VAR. -as_fn_unset () -{ - { eval $1=; unset $1;} -} -as_unset=as_fn_unset - - -@%:@ as_fn_set_status STATUS -@%:@ ----------------------- -@%:@ Set @S|@? to STATUS, without forking. -as_fn_set_status () -{ - return $1 -} @%:@ as_fn_set_status - -@%:@ as_fn_exit STATUS -@%:@ ----------------- -@%:@ Exit the shell with STATUS, even in a "trap 0" or "set -e" context. -as_fn_exit () -{ - set +e - as_fn_set_status $1 - exit $1 -} @%:@ as_fn_exit -@%:@ as_fn_nop -@%:@ --------- -@%:@ Do nothing but, unlike ":", preserve the value of @S|@?. -as_fn_nop () -{ - return $? -} -as_nop=as_fn_nop - -@%:@ as_fn_mkdir_p -@%:@ ------------- -@%:@ Create "@S|@as_dir" as a directory, including parents if necessary. -as_fn_mkdir_p () -{ - - case $as_dir in #( - -*) as_dir=./$as_dir;; - esac - test -d "$as_dir" || eval $as_mkdir_p || { - as_dirs= - while :; do - case $as_dir in #( - *\'*) as_qdir=`printf "%s\n" "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( - *) as_qdir=$as_dir;; - esac - as_dirs="'$as_qdir' $as_dirs" - as_dir=`$as_dirname -- "$as_dir" || -$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$as_dir" : 'X\(//\)[^/]' \| \ - X"$as_dir" : 'X\(//\)$' \| \ - X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || -printf "%s\n" X"$as_dir" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X\(\/\/\)[^/].*/{ - s//\1/ - q - } - /^X\(\/\/\)$/{ - s//\1/ - q - } - /^X\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q'` - test -d "$as_dir" && break - done - test -z "$as_dirs" || eval "mkdir $as_dirs" - } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" - - -} @%:@ as_fn_mkdir_p - -@%:@ as_fn_executable_p FILE -@%:@ ----------------------- -@%:@ Test if FILE is an executable regular file. -as_fn_executable_p () -{ - test -f "$1" && test -x "$1" -} @%:@ as_fn_executable_p -@%:@ as_fn_append VAR VALUE -@%:@ ---------------------- -@%:@ Append the text in VALUE to the end of the definition contained in VAR. Take -@%:@ advantage of any shell optimizations that allow amortized linear growth over -@%:@ repeated appends, instead of the typical quadratic growth present in naive -@%:@ implementations. -if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null -then : - eval 'as_fn_append () - { - eval $1+=\$2 - }' -else $as_nop - as_fn_append () - { - eval $1=\$$1\$2 - } -fi # as_fn_append - -@%:@ as_fn_arith ARG... -@%:@ ------------------ -@%:@ Perform arithmetic evaluation on the ARGs, and store the result in the -@%:@ global @S|@as_val. Take advantage of shells that can avoid forks. The arguments -@%:@ must be portable across @S|@(()) and expr. -if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null -then : - eval 'as_fn_arith () - { - as_val=$(( $* )) - }' -else $as_nop - as_fn_arith () - { - as_val=`expr "$@" || test $? -eq 1` - } -fi # as_fn_arith - -@%:@ as_fn_nop -@%:@ --------- -@%:@ Do nothing but, unlike ":", preserve the value of @S|@?. -as_fn_nop () -{ - return $? -} -as_nop=as_fn_nop - -@%:@ as_fn_error STATUS ERROR [LINENO LOG_FD] -@%:@ ---------------------------------------- -@%:@ Output "`basename @S|@0`: error: ERROR" to stderr. If LINENO and LOG_FD are -@%:@ provided, also output the error to LOG_FD, referencing LINENO. Then exit the -@%:@ script with STATUS, using 1 if that was 0. -as_fn_error () -{ - as_status=$1; test $as_status -eq 0 && as_status=1 - if test "$4"; then - as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 - fi - printf "%s\n" "$as_me: error: $2" >&2 - as_fn_exit $as_status -} @%:@ as_fn_error - -if expr a : '\(a\)' >/dev/null 2>&1 && - test "X`expr 00001 : '.*\(...\)'`" = X001; then - as_expr=expr -else - as_expr=false -fi - -if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then - as_basename=basename -else - as_basename=false -fi - -if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then - as_dirname=dirname -else - as_dirname=false -fi - -as_me=`$as_basename -- "$0" || -$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ - X"$0" : 'X\(//\)$' \| \ - X"$0" : 'X\(/\)' \| . 2>/dev/null || -printf "%s\n" X/"$0" | - sed '/^.*\/\([^/][^/]*\)\/*$/{ - s//\1/ - q - } - /^X\/\(\/\/\)$/{ - s//\1/ - q - } - /^X\/\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q'` - -# Avoid depending upon Character Ranges. -as_cr_letters='abcdefghijklmnopqrstuvwxyz' -as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' -as_cr_Letters=$as_cr_letters$as_cr_LETTERS -as_cr_digits='0123456789' -as_cr_alnum=$as_cr_Letters$as_cr_digits - - - as_lineno_1=$LINENO as_lineno_1a=$LINENO - as_lineno_2=$LINENO as_lineno_2a=$LINENO - eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" && - test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || { - # Blame Lee E. McMahon (1931-1989) for sed's syntax. :-) - sed -n ' - p - /[$]LINENO/= - ' <$as_myself | - sed ' - s/[$]LINENO.*/&-/ - t lineno - b - :lineno - N - :loop - s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/ - t loop - s/-\n.*// - ' >$as_me.lineno && - chmod +x "$as_me.lineno" || - { printf "%s\n" "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } - - # If we had to re-execute with $CONFIG_SHELL, we're ensured to have - # already done that, so ensure we don't try to do so again and fall - # in an infinite loop. This has already happened in practice. - _as_can_reexec=no; export _as_can_reexec - # Don't try to exec as it changes $[0], causing all sort of problems - # (the dirname of $[0] is not the place where we might find the - # original and so on. Autoconf is especially sensitive to this). - . "./$as_me.lineno" - # Exit status is that of the last command. - exit -} - - -# Determine whether it's possible to make 'echo' print without a newline. -# These variables are no longer used directly by Autoconf, but are AC_SUBSTed -# for compatibility with existing Makefiles. -ECHO_C= ECHO_N= ECHO_T= -case `echo -n x` in @%:@((((( --n*) - case `echo 'xy\c'` in - *c*) ECHO_T=' ';; # ECHO_T is single tab character. - xy) ECHO_C='\c';; - *) echo `echo ksh88 bug on AIX 6.1` > /dev/null - ECHO_T=' ';; - esac;; -*) - ECHO_N='-n';; -esac - -# For backward compatibility with old third-party macros, we provide -# the shell variables $as_echo and $as_echo_n. New code should use -# AS_ECHO(["message"]) and AS_ECHO_N(["message"]), respectively. -as_@&t@echo='printf %s\n' -as_@&t@echo_n='printf %s' - - -rm -f conf$$ conf$$.exe conf$$.file -if test -d conf$$.dir; then - rm -f conf$$.dir/conf$$.file -else - rm -f conf$$.dir - mkdir conf$$.dir 2>/dev/null -fi -if (echo >conf$$.file) 2>/dev/null; then - if ln -s conf$$.file conf$$ 2>/dev/null; then - as_ln_s='ln -s' - # ... but there are two gotchas: - # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. - # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -pR'. - ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -pR' - elif ln conf$$.file conf$$ 2>/dev/null; then - as_ln_s=ln - else - as_ln_s='cp -pR' - fi -else - as_ln_s='cp -pR' -fi -rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file -rmdir conf$$.dir 2>/dev/null - -if mkdir -p . 2>/dev/null; then - as_mkdir_p='mkdir -p "$as_dir"' -else - test -d ./-p && rmdir ./-p - as_mkdir_p=false -fi - -as_test_x='test -x' -as_executable_p=as_fn_executable_p - -# Sed expression to map a string onto a valid CPP name. -as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" - -# Sed expression to map a string onto a valid variable name. -as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" - - -test -n "$DJDIR" || exec 7<&0 &1 - -# Name of the host. -# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status, -# so uname gets run too. -ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` - -# -# Initializations. -# -ac_default_prefix=/usr/local -ac_clean_files= -ac_config_libobj_dir=. -LIB@&t@OBJS= -cross_compiling=no -subdirs= -MFLAGS= -MAKEFLAGS= - -# Identity of this package. -PACKAGE_NAME='nix-perl' -PACKAGE_TARNAME='nix-perl' -PACKAGE_VERSION='2.14.0' -PACKAGE_STRING='nix-perl 2.14.0' -PACKAGE_BUGREPORT='' -PACKAGE_URL='' - -ac_unique_file="MANIFEST" -ac_subst_vars='LTLIBOBJS -LIB@&t@OBJS -NIX -perlFlags -perllibdir -xz -bzip2 -curl -perl -host_os -host_vendor -host_cpu -host -build_os -build_vendor -build_cpu -build -ac_ct_CXX -CXXFLAGS -CXX -OBJEXT -EXEEXT -ac_ct_CC -CPPFLAGS -LDFLAGS -CFLAGS -CC -target_alias -host_alias -build_alias -LIBS -ECHO_T -ECHO_N -ECHO_C -DEFS -mandir -localedir -libdir -psdir -pdfdir -dvidir -htmldir -infodir -docdir -oldincludedir -includedir -runstatedir -localstatedir -sharedstatedir -sysconfdir -datadir -datarootdir -libexecdir -sbindir -bindir -program_transform_name -prefix -exec_prefix -PACKAGE_URL -PACKAGE_BUGREPORT -PACKAGE_STRING -PACKAGE_VERSION -PACKAGE_TARNAME -PACKAGE_NAME -PATH_SEPARATOR -SHELL' -ac_subst_files='' -ac_user_opts=' -enable_option_checking -enable_largefile -with_dbi -with_dbd_sqlite -' - ac_precious_vars='build_alias -host_alias -target_alias -CC -CFLAGS -LDFLAGS -LIBS -CPPFLAGS -CXX -CXXFLAGS -CCC' - - -# Initialize some variables set by options. -ac_init_help= -ac_init_version=false -ac_unrecognized_opts= -ac_unrecognized_sep= -# The variables have the same names as the options, with -# dashes changed to underlines. -cache_file=/dev/null -exec_prefix=NONE -no_create= -no_recursion= -prefix=NONE -program_prefix=NONE -program_suffix=NONE -program_transform_name=s,x,x, -silent= -site= -srcdir= -verbose= -x_includes=NONE -x_libraries=NONE - -# Installation directory options. -# These are left unexpanded so users can "make install exec_prefix=/foo" -# and all the variables that are supposed to be based on exec_prefix -# by default will actually change. -# Use braces instead of parens because sh, perl, etc. also accept them. -# (The list follows the same order as the GNU Coding Standards.) -bindir='${exec_prefix}/bin' -sbindir='${exec_prefix}/sbin' -libexecdir='${exec_prefix}/libexec' -datarootdir='${prefix}/share' -datadir='${datarootdir}' -sysconfdir='${prefix}/etc' -sharedstatedir='${prefix}/com' -localstatedir='${prefix}/var' -runstatedir='${localstatedir}/run' -includedir='${prefix}/include' -oldincludedir='/usr/include' -docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' -infodir='${datarootdir}/info' -htmldir='${docdir}' -dvidir='${docdir}' -pdfdir='${docdir}' -psdir='${docdir}' -libdir='${exec_prefix}/lib' -localedir='${datarootdir}/locale' -mandir='${datarootdir}/man' - -ac_prev= -ac_dashdash= -for ac_option -do - # If the previous option needs an argument, assign it. - if test -n "$ac_prev"; then - eval $ac_prev=\$ac_option - ac_prev= - continue - fi - - case $ac_option in - *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; - *=) ac_optarg= ;; - *) ac_optarg=yes ;; - esac - - case $ac_dashdash$ac_option in - --) - ac_dashdash=yes ;; - - -bindir | --bindir | --bindi | --bind | --bin | --bi) - ac_prev=bindir ;; - -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*) - bindir=$ac_optarg ;; - - -build | --build | --buil | --bui | --bu) - ac_prev=build_alias ;; - -build=* | --build=* | --buil=* | --bui=* | --bu=*) - build_alias=$ac_optarg ;; - - -cache-file | --cache-file | --cache-fil | --cache-fi \ - | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c) - ac_prev=cache_file ;; - -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \ - | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*) - cache_file=$ac_optarg ;; - - --config-cache | -C) - cache_file=config.cache ;; - - -datadir | --datadir | --datadi | --datad) - ac_prev=datadir ;; - -datadir=* | --datadir=* | --datadi=* | --datad=*) - datadir=$ac_optarg ;; - - -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \ - | --dataroo | --dataro | --datar) - ac_prev=datarootdir ;; - -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \ - | --dataroot=* | --dataroo=* | --dataro=* | --datar=*) - datarootdir=$ac_optarg ;; - - -disable-* | --disable-*) - ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'` - # Reject names that are not valid shell variable names. - expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error $? "invalid feature name: \`$ac_useropt'" - ac_useropt_orig=$ac_useropt - ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'` - case $ac_user_opts in - *" -"enable_$ac_useropt" -"*) ;; - *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig" - ac_unrecognized_sep=', ';; - esac - eval enable_$ac_useropt=no ;; - - -docdir | --docdir | --docdi | --doc | --do) - ac_prev=docdir ;; - -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*) - docdir=$ac_optarg ;; - - -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv) - ac_prev=dvidir ;; - -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*) - dvidir=$ac_optarg ;; - - -enable-* | --enable-*) - ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` - # Reject names that are not valid shell variable names. - expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error $? "invalid feature name: \`$ac_useropt'" - ac_useropt_orig=$ac_useropt - ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'` - case $ac_user_opts in - *" -"enable_$ac_useropt" -"*) ;; - *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig" - ac_unrecognized_sep=', ';; - esac - eval enable_$ac_useropt=\$ac_optarg ;; - - -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \ - | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \ - | --exec | --exe | --ex) - ac_prev=exec_prefix ;; - -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \ - | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \ - | --exec=* | --exe=* | --ex=*) - exec_prefix=$ac_optarg ;; - - -gas | --gas | --ga | --g) - # Obsolete; use --with-gas. - with_gas=yes ;; - - -help | --help | --hel | --he | -h) - ac_init_help=long ;; - -help=r* | --help=r* | --hel=r* | --he=r* | -hr*) - ac_init_help=recursive ;; - -help=s* | --help=s* | --hel=s* | --he=s* | -hs*) - ac_init_help=short ;; - - -host | --host | --hos | --ho) - ac_prev=host_alias ;; - -host=* | --host=* | --hos=* | --ho=*) - host_alias=$ac_optarg ;; - - -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht) - ac_prev=htmldir ;; - -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \ - | --ht=*) - htmldir=$ac_optarg ;; - - -includedir | --includedir | --includedi | --included | --include \ - | --includ | --inclu | --incl | --inc) - ac_prev=includedir ;; - -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \ - | --includ=* | --inclu=* | --incl=* | --inc=*) - includedir=$ac_optarg ;; - - -infodir | --infodir | --infodi | --infod | --info | --inf) - ac_prev=infodir ;; - -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*) - infodir=$ac_optarg ;; - - -libdir | --libdir | --libdi | --libd) - ac_prev=libdir ;; - -libdir=* | --libdir=* | --libdi=* | --libd=*) - libdir=$ac_optarg ;; - - -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \ - | --libexe | --libex | --libe) - ac_prev=libexecdir ;; - -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \ - | --libexe=* | --libex=* | --libe=*) - libexecdir=$ac_optarg ;; - - -localedir | --localedir | --localedi | --localed | --locale) - ac_prev=localedir ;; - -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*) - localedir=$ac_optarg ;; - - -localstatedir | --localstatedir | --localstatedi | --localstated \ - | --localstate | --localstat | --localsta | --localst | --locals) - ac_prev=localstatedir ;; - -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \ - | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*) - localstatedir=$ac_optarg ;; - - -mandir | --mandir | --mandi | --mand | --man | --ma | --m) - ac_prev=mandir ;; - -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*) - mandir=$ac_optarg ;; - - -nfp | --nfp | --nf) - # Obsolete; use --without-fp. - with_fp=no ;; - - -no-create | --no-create | --no-creat | --no-crea | --no-cre \ - | --no-cr | --no-c | -n) - no_create=yes ;; - - -no-recursion | --no-recursion | --no-recursio | --no-recursi \ - | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) - no_recursion=yes ;; - - -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \ - | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \ - | --oldin | --oldi | --old | --ol | --o) - ac_prev=oldincludedir ;; - -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \ - | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \ - | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*) - oldincludedir=$ac_optarg ;; - - -prefix | --prefix | --prefi | --pref | --pre | --pr | --p) - ac_prev=prefix ;; - -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*) - prefix=$ac_optarg ;; - - -program-prefix | --program-prefix | --program-prefi | --program-pref \ - | --program-pre | --program-pr | --program-p) - ac_prev=program_prefix ;; - -program-prefix=* | --program-prefix=* | --program-prefi=* \ - | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*) - program_prefix=$ac_optarg ;; - - -program-suffix | --program-suffix | --program-suffi | --program-suff \ - | --program-suf | --program-su | --program-s) - ac_prev=program_suffix ;; - -program-suffix=* | --program-suffix=* | --program-suffi=* \ - | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*) - program_suffix=$ac_optarg ;; - - -program-transform-name | --program-transform-name \ - | --program-transform-nam | --program-transform-na \ - | --program-transform-n | --program-transform- \ - | --program-transform | --program-transfor \ - | --program-transfo | --program-transf \ - | --program-trans | --program-tran \ - | --progr-tra | --program-tr | --program-t) - ac_prev=program_transform_name ;; - -program-transform-name=* | --program-transform-name=* \ - | --program-transform-nam=* | --program-transform-na=* \ - | --program-transform-n=* | --program-transform-=* \ - | --program-transform=* | --program-transfor=* \ - | --program-transfo=* | --program-transf=* \ - | --program-trans=* | --program-tran=* \ - | --progr-tra=* | --program-tr=* | --program-t=*) - program_transform_name=$ac_optarg ;; - - -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd) - ac_prev=pdfdir ;; - -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*) - pdfdir=$ac_optarg ;; - - -psdir | --psdir | --psdi | --psd | --ps) - ac_prev=psdir ;; - -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*) - psdir=$ac_optarg ;; - - -q | -quiet | --quiet | --quie | --qui | --qu | --q \ - | -silent | --silent | --silen | --sile | --sil) - silent=yes ;; - - -runstatedir | --runstatedir | --runstatedi | --runstated \ - | --runstate | --runstat | --runsta | --runst | --runs \ - | --run | --ru | --r) - ac_prev=runstatedir ;; - -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \ - | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \ - | --run=* | --ru=* | --r=*) - runstatedir=$ac_optarg ;; - - -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) - ac_prev=sbindir ;; - -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ - | --sbi=* | --sb=*) - sbindir=$ac_optarg ;; - - -sharedstatedir | --sharedstatedir | --sharedstatedi \ - | --sharedstated | --sharedstate | --sharedstat | --sharedsta \ - | --sharedst | --shareds | --shared | --share | --shar \ - | --sha | --sh) - ac_prev=sharedstatedir ;; - -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \ - | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \ - | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \ - | --sha=* | --sh=*) - sharedstatedir=$ac_optarg ;; - - -site | --site | --sit) - ac_prev=site ;; - -site=* | --site=* | --sit=*) - site=$ac_optarg ;; - - -srcdir | --srcdir | --srcdi | --srcd | --src | --sr) - ac_prev=srcdir ;; - -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*) - srcdir=$ac_optarg ;; - - -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \ - | --syscon | --sysco | --sysc | --sys | --sy) - ac_prev=sysconfdir ;; - -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \ - | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*) - sysconfdir=$ac_optarg ;; - - -target | --target | --targe | --targ | --tar | --ta | --t) - ac_prev=target_alias ;; - -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*) - target_alias=$ac_optarg ;; - - -v | -verbose | --verbose | --verbos | --verbo | --verb) - verbose=yes ;; - - -version | --version | --versio | --versi | --vers | -V) - ac_init_version=: ;; - - -with-* | --with-*) - ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` - # Reject names that are not valid shell variable names. - expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error $? "invalid package name: \`$ac_useropt'" - ac_useropt_orig=$ac_useropt - ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'` - case $ac_user_opts in - *" -"with_$ac_useropt" -"*) ;; - *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig" - ac_unrecognized_sep=', ';; - esac - eval with_$ac_useropt=\$ac_optarg ;; - - -without-* | --without-*) - ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'` - # Reject names that are not valid shell variable names. - expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error $? "invalid package name: \`$ac_useropt'" - ac_useropt_orig=$ac_useropt - ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'` - case $ac_user_opts in - *" -"with_$ac_useropt" -"*) ;; - *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig" - ac_unrecognized_sep=', ';; - esac - eval with_$ac_useropt=no ;; - - --x) - # Obsolete; use --with-x. - with_x=yes ;; - - -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \ - | --x-incl | --x-inc | --x-in | --x-i) - ac_prev=x_includes ;; - -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \ - | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*) - x_includes=$ac_optarg ;; - - -x-libraries | --x-libraries | --x-librarie | --x-librari \ - | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l) - ac_prev=x_libraries ;; - -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \ - | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) - x_libraries=$ac_optarg ;; - - -*) as_fn_error $? "unrecognized option: \`$ac_option' -Try \`$0 --help' for more information" - ;; - - *=*) - ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='` - # Reject names that are not valid shell variable names. - case $ac_envvar in #( - '' | [0-9]* | *[!_$as_cr_alnum]* ) - as_fn_error $? "invalid variable name: \`$ac_envvar'" ;; - esac - eval $ac_envvar=\$ac_optarg - export $ac_envvar ;; - - *) - # FIXME: should be removed in autoconf 3.0. - printf "%s\n" "$as_me: WARNING: you should use --build, --host, --target" >&2 - expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && - printf "%s\n" "$as_me: WARNING: invalid host type: $ac_option" >&2 - : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}" - ;; - - esac -done - -if test -n "$ac_prev"; then - ac_option=--`echo $ac_prev | sed 's/_/-/g'` - as_fn_error $? "missing argument to $ac_option" -fi - -if test -n "$ac_unrecognized_opts"; then - case $enable_option_checking in - no) ;; - fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;; - *) printf "%s\n" "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; - esac -fi - -# Check all directory arguments for consistency. -for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ - datadir sysconfdir sharedstatedir localstatedir includedir \ - oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ - libdir localedir mandir runstatedir -do - eval ac_val=\$$ac_var - # Remove trailing slashes. - case $ac_val in - */ ) - ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'` - eval $ac_var=\$ac_val;; - esac - # Be sure to have absolute directory names. - case $ac_val in - [\\/$]* | ?:[\\/]* ) continue;; - NONE | '' ) case $ac_var in *prefix ) continue;; esac;; - esac - as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val" -done - -# There might be people who depend on the old broken behavior: `$host' -# used to hold the argument of --host etc. -# FIXME: To remove some day. -build=$build_alias -host=$host_alias -target=$target_alias - -# FIXME: To remove some day. -if test "x$host_alias" != x; then - if test "x$build_alias" = x; then - cross_compiling=maybe - elif test "x$build_alias" != "x$host_alias"; then - cross_compiling=yes - fi -fi - -ac_tool_prefix= -test -n "$host_alias" && ac_tool_prefix=$host_alias- - -test "$silent" = yes && exec 6>/dev/null - - -ac_pwd=`pwd` && test -n "$ac_pwd" && -ac_ls_di=`ls -di .` && -ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || - as_fn_error $? "working directory cannot be determined" -test "X$ac_ls_di" = "X$ac_pwd_ls_di" || - as_fn_error $? "pwd does not report name of working directory" - - -# Find the source files, if location was not specified. -if test -z "$srcdir"; then - ac_srcdir_defaulted=yes - # Try the directory containing this script, then the parent directory. - ac_confdir=`$as_dirname -- "$as_myself" || -$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$as_myself" : 'X\(//\)[^/]' \| \ - X"$as_myself" : 'X\(//\)$' \| \ - X"$as_myself" : 'X\(/\)' \| . 2>/dev/null || -printf "%s\n" X"$as_myself" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X\(\/\/\)[^/].*/{ - s//\1/ - q - } - /^X\(\/\/\)$/{ - s//\1/ - q - } - /^X\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q'` - srcdir=$ac_confdir - if test ! -r "$srcdir/$ac_unique_file"; then - srcdir=.. - fi -else - ac_srcdir_defaulted=no -fi -if test ! -r "$srcdir/$ac_unique_file"; then - test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." - as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir" -fi -ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" -ac_abs_confdir=`( - cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg" - pwd)` -# When building in place, set srcdir=. -if test "$ac_abs_confdir" = "$ac_pwd"; then - srcdir=. -fi -# Remove unnecessary trailing slashes from srcdir. -# Double slashes in file names in object file debugging info -# mess up M-x gdb in Emacs. -case $srcdir in -*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;; -esac -for ac_var in $ac_precious_vars; do - eval ac_env_${ac_var}_set=\${${ac_var}+set} - eval ac_env_${ac_var}_value=\$${ac_var} - eval ac_cv_env_${ac_var}_set=\${${ac_var}+set} - eval ac_cv_env_${ac_var}_value=\$${ac_var} -done - -# -# Report the --help message. -# -if test "$ac_init_help" = "long"; then - # Omit some internal or obsolete options to make the list less imposing. - # This message is too long to be a string in the A/UX 3.1 sh. - cat <<_ACEOF -\`configure' configures nix-perl 2.14.0 to adapt to many kinds of systems. - -Usage: $0 [OPTION]... [VAR=VALUE]... - -To assign environment variables (e.g., CC, CFLAGS...), specify them as -VAR=VALUE. See below for descriptions of some of the useful variables. - -Defaults for the options are specified in brackets. - -Configuration: - -h, --help display this help and exit - --help=short display options specific to this package - --help=recursive display the short help of all the included packages - -V, --version display version information and exit - -q, --quiet, --silent do not print \`checking ...' messages - --cache-file=FILE cache test results in FILE [disabled] - -C, --config-cache alias for \`--cache-file=config.cache' - -n, --no-create do not create output files - --srcdir=DIR find the sources in DIR [configure dir or \`..'] - -Installation directories: - --prefix=PREFIX install architecture-independent files in PREFIX - @<:@@S|@ac_default_prefix@:>@ - --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX - @<:@PREFIX@:>@ - -By default, \`make install' will install all the files in -\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify -an installation prefix other than \`$ac_default_prefix' using \`--prefix', -for instance \`--prefix=\$HOME'. - -For better control, use the options below. - -Fine tuning of the installation directories: - --bindir=DIR user executables [EPREFIX/bin] - --sbindir=DIR system admin executables [EPREFIX/sbin] - --libexecdir=DIR program executables [EPREFIX/libexec] - --sysconfdir=DIR read-only single-machine data [PREFIX/etc] - --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] - --localstatedir=DIR modifiable single-machine data [PREFIX/var] - --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run] - --libdir=DIR object code libraries [EPREFIX/lib] - --includedir=DIR C header files [PREFIX/include] - --oldincludedir=DIR C header files for non-gcc [/usr/include] - --datarootdir=DIR read-only arch.-independent data root [PREFIX/share] - --datadir=DIR read-only architecture-independent data [DATAROOTDIR] - --infodir=DIR info documentation [DATAROOTDIR/info] - --localedir=DIR locale-dependent data [DATAROOTDIR/locale] - --mandir=DIR man documentation [DATAROOTDIR/man] - --docdir=DIR documentation root @<:@DATAROOTDIR/doc/nix-perl@:>@ - --htmldir=DIR html documentation [DOCDIR] - --dvidir=DIR dvi documentation [DOCDIR] - --pdfdir=DIR pdf documentation [DOCDIR] - --psdir=DIR ps documentation [DOCDIR] -_ACEOF - - cat <<\_ACEOF - -System types: - --build=BUILD configure for building on BUILD [guessed] - --host=HOST cross-compile to build programs to run on HOST [BUILD] -_ACEOF -fi - -if test -n "$ac_init_help"; then - case $ac_init_help in - short | recursive ) echo "Configuration of nix-perl 2.14.0:";; - esac - cat <<\_ACEOF - -Optional Features: - --disable-option-checking ignore unrecognized --enable/--with options - --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) - --enable-FEATURE[=ARG] include FEATURE [ARG=yes] - --disable-largefile omit support for large files - -Optional Packages: - --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] - --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) - --with-dbi=PATH prefix of the Perl DBI library - --with-dbd-sqlite=PATH prefix of the Perl DBD::SQLite library - -Some influential environment variables: - CC C compiler command - CFLAGS C compiler flags - LDFLAGS linker flags, e.g. -L if you have libraries in a - nonstandard directory - LIBS libraries to pass to the linker, e.g. -l - CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I if - you have headers in a nonstandard directory - CXX C++ compiler command - CXXFLAGS C++ compiler flags - -Use these variables to override the choices made by `configure' or to help -it to find libraries and programs with nonstandard names/locations. - -Report bugs to the package provider. -_ACEOF -ac_status=$? -fi - -if test "$ac_init_help" = "recursive"; then - # If there are subdirs, report their specific --help. - for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue - test -d "$ac_dir" || - { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } || - continue - ac_builddir=. - -case "$ac_dir" in -.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; -*) - ac_dir_suffix=/`printf "%s\n" "$ac_dir" | sed 's|^\.[\\/]||'` - # A ".." for each directory in $ac_dir_suffix. - ac_top_builddir_sub=`printf "%s\n" "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` - case $ac_top_builddir_sub in - "") ac_top_builddir_sub=. ac_top_build_prefix= ;; - *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; - esac ;; -esac -ac_abs_top_builddir=$ac_pwd -ac_abs_builddir=$ac_pwd$ac_dir_suffix -# for backward compatibility: -ac_top_builddir=$ac_top_build_prefix - -case $srcdir in - .) # We are building in place. - ac_srcdir=. - ac_top_srcdir=$ac_top_builddir_sub - ac_abs_top_srcdir=$ac_pwd ;; - [\\/]* | ?:[\\/]* ) # Absolute name. - ac_srcdir=$srcdir$ac_dir_suffix; - ac_top_srcdir=$srcdir - ac_abs_top_srcdir=$srcdir ;; - *) # Relative name. - ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix - ac_top_srcdir=$ac_top_build_prefix$srcdir - ac_abs_top_srcdir=$ac_pwd/$srcdir ;; -esac -ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix - - cd "$ac_dir" || { ac_status=$?; continue; } - # Check for configure.gnu first; this name is used for a wrapper for - # Metaconfig's "Configure" on case-insensitive file systems. - if test -f "$ac_srcdir/configure.gnu"; then - echo && - $SHELL "$ac_srcdir/configure.gnu" --help=recursive - elif test -f "$ac_srcdir/configure"; then - echo && - $SHELL "$ac_srcdir/configure" --help=recursive - else - printf "%s\n" "$as_me: WARNING: no configuration information is in $ac_dir" >&2 - fi || ac_status=$? - cd "$ac_pwd" || { ac_status=$?; break; } - done -fi - -test -n "$ac_init_help" && exit $ac_status -if $ac_init_version; then - cat <<\_ACEOF -nix-perl configure 2.14.0 -generated by GNU Autoconf 2.71 - -Copyright (C) 2021 Free Software Foundation, Inc. -This configure script is free software; the Free Software Foundation -gives unlimited permission to copy, distribute and modify it. -_ACEOF - exit -fi - -## ------------------------ ## -## Autoconf initialization. ## -## ------------------------ ## - -@%:@ ac_fn_c_try_compile LINENO -@%:@ -------------------------- -@%:@ Try to compile conftest.@S|@ac_ext, and return whether this succeeded. -ac_fn_c_try_compile () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - rm -f conftest.$ac_objext conftest.beam - if { { ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -printf "%s\n" "$ac_try_echo"; } >&5 - (eval "$ac_compile") 2>conftest.err - ac_status=$? - if test -s conftest.err; then - grep -v '^ *+' conftest.err >conftest.er1 - cat conftest.er1 >&5 - mv -f conftest.er1 conftest.err - fi - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext -then : - ac_retval=0 -else $as_nop - printf "%s\n" "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_retval=1 -fi - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno - as_fn_set_status $ac_retval - -} @%:@ ac_fn_c_try_compile - -@%:@ ac_fn_cxx_try_compile LINENO -@%:@ ---------------------------- -@%:@ Try to compile conftest.@S|@ac_ext, and return whether this succeeded. -ac_fn_cxx_try_compile () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - rm -f conftest.$ac_objext conftest.beam - if { { ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -printf "%s\n" "$ac_try_echo"; } >&5 - (eval "$ac_compile") 2>conftest.err - ac_status=$? - if test -s conftest.err; then - grep -v '^ *+' conftest.err >conftest.er1 - cat conftest.er1 >&5 - mv -f conftest.er1 conftest.err - fi - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext -then : - ac_retval=0 -else $as_nop - printf "%s\n" "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_retval=1 -fi - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno - as_fn_set_status $ac_retval - -} @%:@ ac_fn_cxx_try_compile -ac_configure_args_raw= -for ac_arg -do - case $ac_arg in - *\'*) - ac_arg=`printf "%s\n" "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; - esac - as_fn_append ac_configure_args_raw " '$ac_arg'" -done - -case $ac_configure_args_raw in - *$as_nl*) - ac_safe_unquote= ;; - *) - ac_unsafe_z='|&;<>()$`\\"*?@<:@ '' ' # This string ends in space, tab. - ac_unsafe_a="$ac_unsafe_z#~" - ac_safe_unquote="s/ '\\([^$ac_unsafe_a][^$ac_unsafe_z]*\\)'/ \\1/g" - ac_configure_args_raw=` printf "%s\n" "$ac_configure_args_raw" | sed "$ac_safe_unquote"`;; -esac - -cat >config.log <<_ACEOF -This file contains any messages produced by compilers while -running configure, to aid debugging if configure makes a mistake. - -It was created by nix-perl $as_me 2.14.0, which was -generated by GNU Autoconf 2.71. Invocation command line was - - $ $0$ac_configure_args_raw - -_ACEOF -exec 5>>config.log -{ -cat <<_ASUNAME -## --------- ## -## Platform. ## -## --------- ## - -hostname = `(hostname || uname -n) 2>/dev/null | sed 1q` -uname -m = `(uname -m) 2>/dev/null || echo unknown` -uname -r = `(uname -r) 2>/dev/null || echo unknown` -uname -s = `(uname -s) 2>/dev/null || echo unknown` -uname -v = `(uname -v) 2>/dev/null || echo unknown` - -/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown` -/bin/uname -X = `(/bin/uname -X) 2>/dev/null || echo unknown` - -/bin/arch = `(/bin/arch) 2>/dev/null || echo unknown` -/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown` -/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown` -/usr/bin/hostinfo = `(/usr/bin/hostinfo) 2>/dev/null || echo unknown` -/bin/machine = `(/bin/machine) 2>/dev/null || echo unknown` -/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown` -/bin/universe = `(/bin/universe) 2>/dev/null || echo unknown` - -_ASUNAME - -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac - printf "%s\n" "PATH: $as_dir" - done -IFS=$as_save_IFS - -} >&5 - -cat >&5 <<_ACEOF - - -## ----------- ## -## Core tests. ## -## ----------- ## - -_ACEOF - - -# Keep a trace of the command line. -# Strip out --no-create and --no-recursion so they do not pile up. -# Strip out --silent because we don't want to record it for future runs. -# Also quote any args containing shell meta-characters. -# Make two passes to allow for proper duplicate-argument suppression. -ac_configure_args= -ac_configure_args0= -ac_configure_args1= -ac_must_keep_next=false -for ac_pass in 1 2 -do - for ac_arg - do - case $ac_arg in - -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;; - -q | -quiet | --quiet | --quie | --qui | --qu | --q \ - | -silent | --silent | --silen | --sile | --sil) - continue ;; - *\'*) - ac_arg=`printf "%s\n" "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; - esac - case $ac_pass in - 1) as_fn_append ac_configure_args0 " '$ac_arg'" ;; - 2) - as_fn_append ac_configure_args1 " '$ac_arg'" - if test $ac_must_keep_next = true; then - ac_must_keep_next=false # Got value, back to normal. - else - case $ac_arg in - *=* | --config-cache | -C | -disable-* | --disable-* \ - | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \ - | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \ - | -with-* | --with-* | -without-* | --without-* | --x) - case "$ac_configure_args0 " in - "$ac_configure_args1"*" '$ac_arg' "* ) continue ;; - esac - ;; - -* ) ac_must_keep_next=true ;; - esac - fi - as_fn_append ac_configure_args " '$ac_arg'" - ;; - esac - done -done -{ ac_configure_args0=; unset ac_configure_args0;} -{ ac_configure_args1=; unset ac_configure_args1;} - -# When interrupted or exit'd, cleanup temporary files, and complete -# config.log. We remove comments because anyway the quotes in there -# would cause problems or look ugly. -# WARNING: Use '\'' to represent an apostrophe within the trap. -# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug. -trap 'exit_status=$? - # Sanitize IFS. - IFS=" "" $as_nl" - # Save into config.log some information that might help in debugging. - { - echo - - printf "%s\n" "## ---------------- ## -## Cache variables. ## -## ---------------- ##" - echo - # The following way of writing the cache mishandles newlines in values, -( - for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do - eval ac_val=\$$ac_var - case $ac_val in #( - *${as_nl}*) - case $ac_var in #( - *_cv_*) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 -printf "%s\n" "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; - esac - case $ac_var in #( - _ | IFS | as_nl) ;; #( - BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( - *) { eval $ac_var=; unset $ac_var;} ;; - esac ;; - esac - done - (set) 2>&1 | - case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #( - *${as_nl}ac_space=\ *) - sed -n \ - "s/'\''/'\''\\\\'\'''\''/g; - s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p" - ;; #( - *) - sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" - ;; - esac | - sort -) - echo - - printf "%s\n" "## ----------------- ## -## Output variables. ## -## ----------------- ##" - echo - for ac_var in $ac_subst_vars - do - eval ac_val=\$$ac_var - case $ac_val in - *\'\''*) ac_val=`printf "%s\n" "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; - esac - printf "%s\n" "$ac_var='\''$ac_val'\''" - done | sort - echo - - if test -n "$ac_subst_files"; then - printf "%s\n" "## ------------------- ## -## File substitutions. ## -## ------------------- ##" - echo - for ac_var in $ac_subst_files - do - eval ac_val=\$$ac_var - case $ac_val in - *\'\''*) ac_val=`printf "%s\n" "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; - esac - printf "%s\n" "$ac_var='\''$ac_val'\''" - done | sort - echo - fi - - if test -s confdefs.h; then - printf "%s\n" "## ----------- ## -## confdefs.h. ## -## ----------- ##" - echo - cat confdefs.h - echo - fi - test "$ac_signal" != 0 && - printf "%s\n" "$as_me: caught signal $ac_signal" - printf "%s\n" "$as_me: exit $exit_status" - } >&5 - rm -f core *.core core.conftest.* && - rm -f -r conftest* confdefs* conf$$* $ac_clean_files && - exit $exit_status -' 0 -for ac_signal in 1 2 13 15; do - trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal -done -ac_signal=0 - -# confdefs.h avoids OS command line length limits that DEFS can exceed. -rm -f -r conftest* confdefs.h - -printf "%s\n" "/* confdefs.h */" > confdefs.h - -# Predefined preprocessor variables. - -printf "%s\n" "@%:@define PACKAGE_NAME \"$PACKAGE_NAME\"" >>confdefs.h - -printf "%s\n" "@%:@define PACKAGE_TARNAME \"$PACKAGE_TARNAME\"" >>confdefs.h - -printf "%s\n" "@%:@define PACKAGE_VERSION \"$PACKAGE_VERSION\"" >>confdefs.h - -printf "%s\n" "@%:@define PACKAGE_STRING \"$PACKAGE_STRING\"" >>confdefs.h - -printf "%s\n" "@%:@define PACKAGE_BUGREPORT \"$PACKAGE_BUGREPORT\"" >>confdefs.h - -printf "%s\n" "@%:@define PACKAGE_URL \"$PACKAGE_URL\"" >>confdefs.h - - -# Let the site file select an alternate cache file if it wants to. -# Prefer an explicitly selected file to automatically selected ones. -if test -n "$CONFIG_SITE"; then - ac_site_files="$CONFIG_SITE" -elif test "x$prefix" != xNONE; then - ac_site_files="$prefix/share/config.site $prefix/etc/config.site" -else - ac_site_files="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site" -fi - -for ac_site_file in $ac_site_files -do - case $ac_site_file in @%:@( - */*) : - ;; @%:@( - *) : - ac_site_file=./$ac_site_file ;; -esac - if test -f "$ac_site_file" && test -r "$ac_site_file"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5 -printf "%s\n" "$as_me: loading site script $ac_site_file" >&6;} - sed 's/^/| /' "$ac_site_file" >&5 - . "$ac_site_file" \ - || { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "failed to load site script $ac_site_file -See \`config.log' for more details" "$LINENO" 5; } - fi -done - -if test -r "$cache_file"; then - # Some versions of bash will fail to source /dev/null (special files - # actually), so we avoid doing that. DJGPP emulates it as a regular file. - if test /dev/null != "$cache_file" && test -f "$cache_file"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5 -printf "%s\n" "$as_me: loading cache $cache_file" >&6;} - case $cache_file in - [\\/]* | ?:[\\/]* ) . "$cache_file";; - *) . "./$cache_file";; - esac - fi -else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5 -printf "%s\n" "$as_me: creating cache $cache_file" >&6;} - >$cache_file -fi - -# Test code for whether the C compiler supports C89 (global declarations) -ac_c_conftest_c89_globals=' -/* Does the compiler advertise C89 conformance? - Do not test the value of __STDC__, because some compilers set it to 0 - while being otherwise adequately conformant. */ -#if !defined __STDC__ -# error "Compiler does not advertise C89 conformance" -#endif - -#include -#include -struct stat; -/* Most of the following tests are stolen from RCS 5.7 src/conf.sh. */ -struct buf { int x; }; -struct buf * (*rcsopen) (struct buf *, struct stat *, int); -static char *e (p, i) - char **p; - int i; -{ - return p[i]; -} -static char *f (char * (*g) (char **, int), char **p, ...) -{ - char *s; - va_list v; - va_start (v,p); - s = g (p, va_arg (v,int)); - va_end (v); - return s; -} - -/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has - function prototypes and stuff, but not \xHH hex character constants. - These do not provoke an error unfortunately, instead are silently treated - as an "x". The following induces an error, until -std is added to get - proper ANSI mode. Curiously \x00 != x always comes out true, for an - array size at least. It is necessary to write \x00 == 0 to get something - that is true only with -std. */ -int osf4_cc_array ['\''\x00'\'' == 0 ? 1 : -1]; - -/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters - inside strings and character constants. */ -#define FOO(x) '\''x'\'' -int xlc6_cc_array[FOO(a) == '\''x'\'' ? 1 : -1]; - -int test (int i, double x); -struct s1 {int (*f) (int a);}; -struct s2 {int (*f) (double a);}; -int pairnames (int, char **, int *(*)(struct buf *, struct stat *, int), - int, int);' - -# Test code for whether the C compiler supports C89 (body of main). -ac_c_conftest_c89_main=' -ok |= (argc == 0 || f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]); -' - -# Test code for whether the C compiler supports C99 (global declarations) -ac_c_conftest_c99_globals=' -// Does the compiler advertise C99 conformance? -#if !defined __STDC_VERSION__ || __STDC_VERSION__ < 199901L -# error "Compiler does not advertise C99 conformance" -#endif - -#include -extern int puts (const char *); -extern int printf (const char *, ...); -extern int dprintf (int, const char *, ...); -extern void *malloc (size_t); - -// Check varargs macros. These examples are taken from C99 6.10.3.5. -// dprintf is used instead of fprintf to avoid needing to declare -// FILE and stderr. -#define debug(...) dprintf (2, __VA_ARGS__) -#define showlist(...) puts (#__VA_ARGS__) -#define report(test,...) ((test) ? puts (#test) : printf (__VA_ARGS__)) -static void -test_varargs_macros (void) -{ - int x = 1234; - int y = 5678; - debug ("Flag"); - debug ("X = %d\n", x); - showlist (The first, second, and third items.); - report (x>y, "x is %d but y is %d", x, y); -} - -// Check long long types. -#define BIG64 18446744073709551615ull -#define BIG32 4294967295ul -#define BIG_OK (BIG64 / BIG32 == 4294967297ull && BIG64 % BIG32 == 0) -#if !BIG_OK - #error "your preprocessor is broken" -#endif -#if BIG_OK -#else - #error "your preprocessor is broken" -#endif -static long long int bignum = -9223372036854775807LL; -static unsigned long long int ubignum = BIG64; - -struct incomplete_array -{ - int datasize; - double data[]; -}; - -struct named_init { - int number; - const wchar_t *name; - double average; -}; - -typedef const char *ccp; - -static inline int -test_restrict (ccp restrict text) -{ - // See if C++-style comments work. - // Iterate through items via the restricted pointer. - // Also check for declarations in for loops. - for (unsigned int i = 0; *(text+i) != '\''\0'\''; ++i) - continue; - return 0; -} - -// Check varargs and va_copy. -static bool -test_varargs (const char *format, ...) -{ - va_list args; - va_start (args, format); - va_list args_copy; - va_copy (args_copy, args); - - const char *str = ""; - int number = 0; - float fnumber = 0; - - while (*format) - { - switch (*format++) - { - case '\''s'\'': // string - str = va_arg (args_copy, const char *); - break; - case '\''d'\'': // int - number = va_arg (args_copy, int); - break; - case '\''f'\'': // float - fnumber = va_arg (args_copy, double); - break; - default: - break; - } - } - va_end (args_copy); - va_end (args); - - return *str && number && fnumber; -} -' - -# Test code for whether the C compiler supports C99 (body of main). -ac_c_conftest_c99_main=' - // Check bool. - _Bool success = false; - success |= (argc != 0); - - // Check restrict. - if (test_restrict ("String literal") == 0) - success = true; - char *restrict newvar = "Another string"; - - // Check varargs. - success &= test_varargs ("s, d'\'' f .", "string", 65, 34.234); - test_varargs_macros (); - - // Check flexible array members. - struct incomplete_array *ia = - malloc (sizeof (struct incomplete_array) + (sizeof (double) * 10)); - ia->datasize = 10; - for (int i = 0; i < ia->datasize; ++i) - ia->data[i] = i * 1.234; - - // Check named initializers. - struct named_init ni = { - .number = 34, - .name = L"Test wide string", - .average = 543.34343, - }; - - ni.number = 58; - - int dynamic_array[ni.number]; - dynamic_array[0] = argv[0][0]; - dynamic_array[ni.number - 1] = 543; - - // work around unused variable warnings - ok |= (!success || bignum == 0LL || ubignum == 0uLL || newvar[0] == '\''x'\'' - || dynamic_array[ni.number - 1] != 543); -' - -# Test code for whether the C compiler supports C11 (global declarations) -ac_c_conftest_c11_globals=' -// Does the compiler advertise C11 conformance? -#if !defined __STDC_VERSION__ || __STDC_VERSION__ < 201112L -# error "Compiler does not advertise C11 conformance" -#endif - -// Check _Alignas. -char _Alignas (double) aligned_as_double; -char _Alignas (0) no_special_alignment; -extern char aligned_as_int; -char _Alignas (0) _Alignas (int) aligned_as_int; - -// Check _Alignof. -enum -{ - int_alignment = _Alignof (int), - int_array_alignment = _Alignof (int[100]), - char_alignment = _Alignof (char) -}; -_Static_assert (0 < -_Alignof (int), "_Alignof is signed"); - -// Check _Noreturn. -int _Noreturn does_not_return (void) { for (;;) continue; } - -// Check _Static_assert. -struct test_static_assert -{ - int x; - _Static_assert (sizeof (int) <= sizeof (long int), - "_Static_assert does not work in struct"); - long int y; -}; - -// Check UTF-8 literals. -#define u8 syntax error! -char const utf8_literal[] = u8"happens to be ASCII" "another string"; - -// Check duplicate typedefs. -typedef long *long_ptr; -typedef long int *long_ptr; -typedef long_ptr long_ptr; - -// Anonymous structures and unions -- taken from C11 6.7.2.1 Example 1. -struct anonymous -{ - union { - struct { int i; int j; }; - struct { int k; long int l; } w; - }; - int m; -} v1; -' - -# Test code for whether the C compiler supports C11 (body of main). -ac_c_conftest_c11_main=' - _Static_assert ((offsetof (struct anonymous, i) - == offsetof (struct anonymous, w.k)), - "Anonymous union alignment botch"); - v1.i = 2; - v1.w.k = 5; - ok |= v1.i != 5; -' - -# Test code for whether the C compiler supports C11 (complete). -ac_c_conftest_c11_program="${ac_c_conftest_c89_globals} -${ac_c_conftest_c99_globals} -${ac_c_conftest_c11_globals} - -int -main (int argc, char **argv) -{ - int ok = 0; - ${ac_c_conftest_c89_main} - ${ac_c_conftest_c99_main} - ${ac_c_conftest_c11_main} - return ok; -} -" - -# Test code for whether the C compiler supports C99 (complete). -ac_c_conftest_c99_program="${ac_c_conftest_c89_globals} -${ac_c_conftest_c99_globals} - -int -main (int argc, char **argv) -{ - int ok = 0; - ${ac_c_conftest_c89_main} - ${ac_c_conftest_c99_main} - return ok; -} -" - -# Test code for whether the C compiler supports C89 (complete). -ac_c_conftest_c89_program="${ac_c_conftest_c89_globals} - -int -main (int argc, char **argv) -{ - int ok = 0; - ${ac_c_conftest_c89_main} - return ok; -} -" - -# Test code for whether the C++ compiler supports C++98 (global declarations) -ac_cxx_conftest_cxx98_globals=' -// Does the compiler advertise C++98 conformance? -#if !defined __cplusplus || __cplusplus < 199711L -# error "Compiler does not advertise C++98 conformance" -#endif - -// These inclusions are to reject old compilers that -// lack the unsuffixed header files. -#include -#include - -// and are *not* freestanding headers in C++98. -extern void assert (int); -namespace std { - extern int strcmp (const char *, const char *); -} - -// Namespaces, exceptions, and templates were all added after "C++ 2.0". -using std::exception; -using std::strcmp; - -namespace { - -void test_exception_syntax() -{ - try { - throw "test"; - } catch (const char *s) { - // Extra parentheses suppress a warning when building autoconf itself, - // due to lint rules shared with more typical C programs. - assert (!(strcmp) (s, "test")); - } -} - -template struct test_template -{ - T const val; - explicit test_template(T t) : val(t) {} - template T add(U u) { return static_cast(u) + val; } -}; - -} // anonymous namespace -' - -# Test code for whether the C++ compiler supports C++98 (body of main) -ac_cxx_conftest_cxx98_main=' - assert (argc); - assert (! argv[0]); -{ - test_exception_syntax (); - test_template tt (2.0); - assert (tt.add (4) == 6.0); - assert (true && !false); -} -' - -# Test code for whether the C++ compiler supports C++11 (global declarations) -ac_cxx_conftest_cxx11_globals=' -// Does the compiler advertise C++ 2011 conformance? -#if !defined __cplusplus || __cplusplus < 201103L -# error "Compiler does not advertise C++11 conformance" -#endif - -namespace cxx11test -{ - constexpr int get_val() { return 20; } - - struct testinit - { - int i; - double d; - }; - - class delegate - { - public: - delegate(int n) : n(n) {} - delegate(): delegate(2354) {} - - virtual int getval() { return this->n; }; - protected: - int n; - }; - - class overridden : public delegate - { - public: - overridden(int n): delegate(n) {} - virtual int getval() override final { return this->n * 2; } - }; - - class nocopy - { - public: - nocopy(int i): i(i) {} - nocopy() = default; - nocopy(const nocopy&) = delete; - nocopy & operator=(const nocopy&) = delete; - private: - int i; - }; - - // for testing lambda expressions - template Ret eval(Fn f, Ret v) - { - return f(v); - } - - // for testing variadic templates and trailing return types - template auto sum(V first) -> V - { - return first; - } - template auto sum(V first, Args... rest) -> V - { - return first + sum(rest...); - } -} -' - -# Test code for whether the C++ compiler supports C++11 (body of main) -ac_cxx_conftest_cxx11_main=' -{ - // Test auto and decltype - auto a1 = 6538; - auto a2 = 48573953.4; - auto a3 = "String literal"; - - int total = 0; - for (auto i = a3; *i; ++i) { total += *i; } - - decltype(a2) a4 = 34895.034; -} -{ - // Test constexpr - short sa[cxx11test::get_val()] = { 0 }; -} -{ - // Test initializer lists - cxx11test::testinit il = { 4323, 435234.23544 }; -} -{ - // Test range-based for - int array[] = {9, 7, 13, 15, 4, 18, 12, 10, 5, 3, - 14, 19, 17, 8, 6, 20, 16, 2, 11, 1}; - for (auto &x : array) { x += 23; } -} -{ - // Test lambda expressions - using cxx11test::eval; - assert (eval ([](int x) { return x*2; }, 21) == 42); - double d = 2.0; - assert (eval ([&](double x) { return d += x; }, 3.0) == 5.0); - assert (d == 5.0); - assert (eval ([=](double x) mutable { return d += x; }, 4.0) == 9.0); - assert (d == 5.0); -} -{ - // Test use of variadic templates - using cxx11test::sum; - auto a = sum(1); - auto b = sum(1, 2); - auto c = sum(1.0, 2.0, 3.0); -} -{ - // Test constructor delegation - cxx11test::delegate d1; - cxx11test::delegate d2(); - cxx11test::delegate d3(45); -} -{ - // Test override and final - cxx11test::overridden o1(55464); -} -{ - // Test nullptr - char *c = nullptr; -} -{ - // Test template brackets - test_template<::test_template> v(test_template(12)); -} -{ - // Unicode literals - char const *utf8 = u8"UTF-8 string \u2500"; - char16_t const *utf16 = u"UTF-8 string \u2500"; - char32_t const *utf32 = U"UTF-32 string \u2500"; -} -' - -# Test code for whether the C compiler supports C++11 (complete). -ac_cxx_conftest_cxx11_program="${ac_cxx_conftest_cxx98_globals} -${ac_cxx_conftest_cxx11_globals} - -int -main (int argc, char **argv) -{ - int ok = 0; - ${ac_cxx_conftest_cxx98_main} - ${ac_cxx_conftest_cxx11_main} - return ok; -} -" - -# Test code for whether the C compiler supports C++98 (complete). -ac_cxx_conftest_cxx98_program="${ac_cxx_conftest_cxx98_globals} -int -main (int argc, char **argv) -{ - int ok = 0; - ${ac_cxx_conftest_cxx98_main} - return ok; -} -" - - -# Auxiliary files required by this configure script. -ac_aux_files="config.guess config.sub" - -# Locations in which to look for auxiliary files. -ac_aux_dir_candidates="${srcdir}/../config" - -# Search for a directory containing all of the required auxiliary files, -# $ac_aux_files, from the $PATH-style list $ac_aux_dir_candidates. -# If we don't find one directory that contains all the files we need, -# we report the set of missing files from the *first* directory in -# $ac_aux_dir_candidates and give up. -ac_missing_aux_files="" -ac_first_candidate=: -printf "%s\n" "$as_me:${as_lineno-$LINENO}: looking for aux files: $ac_aux_files" >&5 -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -as_found=false -for as_dir in $ac_aux_dir_candidates -do - IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac - as_found=: - - printf "%s\n" "$as_me:${as_lineno-$LINENO}: trying $as_dir" >&5 - ac_aux_dir_found=yes - ac_install_sh= - for ac_aux in $ac_aux_files - do - # As a special case, if "install-sh" is required, that requirement - # can be satisfied by any of "install-sh", "install.sh", or "shtool", - # and $ac_install_sh is set appropriately for whichever one is found. - if test x"$ac_aux" = x"install-sh" - then - if test -f "${as_dir}install-sh"; then - printf "%s\n" "$as_me:${as_lineno-$LINENO}: ${as_dir}install-sh found" >&5 - ac_install_sh="${as_dir}install-sh -c" - elif test -f "${as_dir}install.sh"; then - printf "%s\n" "$as_me:${as_lineno-$LINENO}: ${as_dir}install.sh found" >&5 - ac_install_sh="${as_dir}install.sh -c" - elif test -f "${as_dir}shtool"; then - printf "%s\n" "$as_me:${as_lineno-$LINENO}: ${as_dir}shtool found" >&5 - ac_install_sh="${as_dir}shtool install -c" - else - ac_aux_dir_found=no - if $ac_first_candidate; then - ac_missing_aux_files="${ac_missing_aux_files} install-sh" - else - break - fi - fi - else - if test -f "${as_dir}${ac_aux}"; then - printf "%s\n" "$as_me:${as_lineno-$LINENO}: ${as_dir}${ac_aux} found" >&5 - else - ac_aux_dir_found=no - if $ac_first_candidate; then - ac_missing_aux_files="${ac_missing_aux_files} ${ac_aux}" - else - break - fi - fi - fi - done - if test "$ac_aux_dir_found" = yes; then - ac_aux_dir="$as_dir" - break - fi - ac_first_candidate=false - - as_found=false -done -IFS=$as_save_IFS -if $as_found -then : - -else $as_nop - as_fn_error $? "cannot find required auxiliary files:$ac_missing_aux_files" "$LINENO" 5 -fi - - -# These three variables are undocumented and unsupported, -# and are intended to be withdrawn in a future Autoconf release. -# They can cause serious problems if a builder's source tree is in a directory -# whose full name contains unusual characters. -if test -f "${ac_aux_dir}config.guess"; then - ac_@&t@config_guess="$SHELL ${ac_aux_dir}config.guess" -fi -if test -f "${ac_aux_dir}config.sub"; then - ac_@&t@config_sub="$SHELL ${ac_aux_dir}config.sub" -fi -if test -f "$ac_aux_dir/configure"; then - ac_@&t@configure="$SHELL ${ac_aux_dir}configure" -fi - -# Check that the precious variables saved in the cache have kept the same -# value. -ac_cache_corrupted=false -for ac_var in $ac_precious_vars; do - eval ac_old_set=\$ac_cv_env_${ac_var}_set - eval ac_new_set=\$ac_env_${ac_var}_set - eval ac_old_val=\$ac_cv_env_${ac_var}_value - eval ac_new_val=\$ac_env_${ac_var}_value - case $ac_old_set,$ac_new_set in - set,) - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 -printf "%s\n" "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} - ac_cache_corrupted=: ;; - ,set) - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5 -printf "%s\n" "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} - ac_cache_corrupted=: ;; - ,);; - *) - if test "x$ac_old_val" != "x$ac_new_val"; then - # differences in whitespace do not lead to failure. - ac_old_val_w=`echo x $ac_old_val` - ac_new_val_w=`echo x $ac_new_val` - if test "$ac_old_val_w" != "$ac_new_val_w"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5 -printf "%s\n" "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} - ac_cache_corrupted=: - else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5 -printf "%s\n" "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;} - eval $ac_var=\$ac_old_val - fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: former value: \`$ac_old_val'" >&5 -printf "%s\n" "$as_me: former value: \`$ac_old_val'" >&2;} - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: current value: \`$ac_new_val'" >&5 -printf "%s\n" "$as_me: current value: \`$ac_new_val'" >&2;} - fi;; - esac - # Pass precious variables to config.status. - if test "$ac_new_set" = set; then - case $ac_new_val in - *\'*) ac_arg=$ac_var=`printf "%s\n" "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; - *) ac_arg=$ac_var=$ac_new_val ;; - esac - case " $ac_configure_args " in - *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy. - *) as_fn_append ac_configure_args " '$ac_arg'" ;; - esac - fi -done -if $ac_cache_corrupted; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 -printf "%s\n" "$as_me: error: changes in the environment can compromise the build" >&2;} - as_fn_error $? "run \`${MAKE-make} distclean' and/or \`rm $cache_file' - and start over" "$LINENO" 5 -fi -## -------------------- ## -## Main body of script. ## -## -------------------- ## - -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - - - - - -CFLAGS= -CXXFLAGS= - - - - - - - - - -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu -if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. -set dummy ${ac_tool_prefix}gcc; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_CC+y} -then : - printf %s "(cached) " >&6 -else $as_nop - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then - ac_cv_prog_CC="${ac_tool_prefix}gcc" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -CC=$ac_cv_prog_CC -if test -n "$CC"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -printf "%s\n" "$CC" >&6; } -else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } -fi - - -fi -if test -z "$ac_cv_prog_CC"; then - ac_ct_CC=$CC - # Extract the first word of "gcc", so it can be a program name with args. -set dummy gcc; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_ac_ct_CC+y} -then : - printf %s "(cached) " >&6 -else $as_nop - if test -n "$ac_ct_CC"; then - ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_CC="gcc" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -ac_ct_CC=$ac_cv_prog_ac_ct_CC -if test -n "$ac_ct_CC"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 -printf "%s\n" "$ac_ct_CC" >&6; } -else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } -fi - - if test "x$ac_ct_CC" = x; then - CC="" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - CC=$ac_ct_CC - fi -else - CC="$ac_cv_prog_CC" -fi - -if test -z "$CC"; then - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. -set dummy ${ac_tool_prefix}cc; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_CC+y} -then : - printf %s "(cached) " >&6 -else $as_nop - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then - ac_cv_prog_CC="${ac_tool_prefix}cc" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -CC=$ac_cv_prog_CC -if test -n "$CC"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -printf "%s\n" "$CC" >&6; } -else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } -fi - - - fi -fi -if test -z "$CC"; then - # Extract the first word of "cc", so it can be a program name with args. -set dummy cc; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_CC+y} -then : - printf %s "(cached) " >&6 -else $as_nop - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -else - ac_prog_rejected=no -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then - if test "$as_dir$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then - ac_prog_rejected=yes - continue - fi - ac_cv_prog_CC="cc" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -if test $ac_prog_rejected = yes; then - # We found a bogon in the path, so make sure we never use it. - set dummy $ac_cv_prog_CC - shift - if test $@%:@ != 0; then - # We chose a different compiler from the bogus one. - # However, it has the same basename, so the bogon will be chosen - # first if we set CC to just the basename; use the full file name. - shift - ac_cv_prog_CC="$as_dir$ac_word${1+' '}$@" - fi -fi -fi -fi -CC=$ac_cv_prog_CC -if test -n "$CC"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -printf "%s\n" "$CC" >&6; } -else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } -fi - - -fi -if test -z "$CC"; then - if test -n "$ac_tool_prefix"; then - for ac_prog in cl.exe - do - # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. -set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_CC+y} -then : - printf %s "(cached) " >&6 -else $as_nop - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then - ac_cv_prog_CC="$ac_tool_prefix$ac_prog" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -CC=$ac_cv_prog_CC -if test -n "$CC"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -printf "%s\n" "$CC" >&6; } -else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } -fi - - - test -n "$CC" && break - done -fi -if test -z "$CC"; then - ac_ct_CC=$CC - for ac_prog in cl.exe -do - # Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_ac_ct_CC+y} -then : - printf %s "(cached) " >&6 -else $as_nop - if test -n "$ac_ct_CC"; then - ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_CC="$ac_prog" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -ac_ct_CC=$ac_cv_prog_ac_ct_CC -if test -n "$ac_ct_CC"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 -printf "%s\n" "$ac_ct_CC" >&6; } -else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } -fi - - - test -n "$ac_ct_CC" && break -done - - if test "x$ac_ct_CC" = x; then - CC="" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - CC=$ac_ct_CC - fi -fi - -fi -if test -z "$CC"; then - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}clang", so it can be a program name with args. -set dummy ${ac_tool_prefix}clang; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_CC+y} -then : - printf %s "(cached) " >&6 -else $as_nop - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then - ac_cv_prog_CC="${ac_tool_prefix}clang" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -CC=$ac_cv_prog_CC -if test -n "$CC"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -printf "%s\n" "$CC" >&6; } -else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } -fi - - -fi -if test -z "$ac_cv_prog_CC"; then - ac_ct_CC=$CC - # Extract the first word of "clang", so it can be a program name with args. -set dummy clang; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_ac_ct_CC+y} -then : - printf %s "(cached) " >&6 -else $as_nop - if test -n "$ac_ct_CC"; then - ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_CC="clang" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -ac_ct_CC=$ac_cv_prog_ac_ct_CC -if test -n "$ac_ct_CC"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 -printf "%s\n" "$ac_ct_CC" >&6; } -else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } -fi - - if test "x$ac_ct_CC" = x; then - CC="" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - CC=$ac_ct_CC - fi -else - CC="$ac_cv_prog_CC" -fi - -fi - - -test -z "$CC" && { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "no acceptable C compiler found in \$PATH -See \`config.log' for more details" "$LINENO" 5; } - -# Provide some information about the compiler. -printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 -set X $ac_compile -ac_compiler=$2 -for ac_option in --version -v -V -qversion -version; do - { { ac_try="$ac_compiler $ac_option >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -printf "%s\n" "$ac_try_echo"; } >&5 - (eval "$ac_compiler $ac_option >&5") 2>conftest.err - ac_status=$? - if test -s conftest.err; then - sed '10a\ -... rest of stderr output deleted ... - 10q' conftest.err >conftest.er1 - cat conftest.er1 >&5 - fi - rm -f conftest.er1 conftest.err - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } -done - -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main (void) -{ - - ; - return 0; -} -_ACEOF -ac_clean_files_save=$ac_clean_files -ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out" -# Try to create an executable without -o first, disregard a.out. -# It will help us diagnose broken compilers, and finding out an intuition -# of exeext. -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5 -printf %s "checking whether the C compiler works... " >&6; } -ac_link_default=`printf "%s\n" "$ac_link" | sed 's/ -o *conftest[^ ]*//'` - -# The possible output files: -ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*" - -ac_rmfiles= -for ac_file in $ac_files -do - case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;; - * ) ac_rmfiles="$ac_rmfiles $ac_file";; - esac -done -rm -f $ac_rmfiles - -if { { ac_try="$ac_link_default" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -printf "%s\n" "$ac_try_echo"; } >&5 - (eval "$ac_link_default") 2>&5 - ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } -then : - # Autoconf-2.13 could set the ac_cv_exeext variable to `no'. -# So ignore a value of `no', otherwise this would lead to `EXEEXT = no' -# in a Makefile. We should not override ac_cv_exeext if it was cached, -# so that the user can short-circuit this test for compilers unknown to -# Autoconf. -for ac_file in $ac_files '' -do - test -f "$ac_file" || continue - case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) - ;; - [ab].out ) - # We found the default executable, but exeext='' is most - # certainly right. - break;; - *.* ) - if test ${ac_cv_exeext+y} && test "$ac_cv_exeext" != no; - then :; else - ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` - fi - # We set ac_cv_exeext here because the later test for it is not - # safe: cross compilers may not add the suffix if given an `-o' - # argument, so we may need to know it at that point already. - # Even if this section looks crufty: it has the advantage of - # actually working. - break;; - * ) - break;; - esac -done -test "$ac_cv_exeext" = no && ac_cv_exeext= - -else $as_nop - ac_file='' -fi -if test -z "$ac_file" -then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } -printf "%s\n" "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error 77 "C compiler cannot create executables -See \`config.log' for more details" "$LINENO" 5; } -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } -fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5 -printf %s "checking for C compiler default output file name... " >&6; } -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5 -printf "%s\n" "$ac_file" >&6; } -ac_exeext=$ac_cv_exeext - -rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out -ac_clean_files=$ac_clean_files_save -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5 -printf %s "checking for suffix of executables... " >&6; } -if { { ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -printf "%s\n" "$ac_try_echo"; } >&5 - (eval "$ac_link") 2>&5 - ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } -then : - # If both `conftest.exe' and `conftest' are `present' (well, observable) -# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will -# work properly (i.e., refer to `conftest.exe'), while it won't with -# `rm'. -for ac_file in conftest.exe conftest conftest.*; do - test -f "$ac_file" || continue - case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;; - *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` - break;; - * ) break;; - esac -done -else $as_nop - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "cannot compute suffix of executables: cannot compile and link -See \`config.log' for more details" "$LINENO" 5; } -fi -rm -f conftest conftest$ac_cv_exeext -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 -printf "%s\n" "$ac_cv_exeext" >&6; } - -rm -f conftest.$ac_ext -EXEEXT=$ac_cv_exeext -ac_exeext=$EXEEXT -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -@%:@include -int -main (void) -{ -FILE *f = fopen ("conftest.out", "w"); - return ferror (f) || fclose (f) != 0; - - ; - return 0; -} -_ACEOF -ac_clean_files="$ac_clean_files conftest.out" -# Check that the compiler produces executables we can run. If not, either -# the compiler is broken, or we cross compile. -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5 -printf %s "checking whether we are cross compiling... " >&6; } -if test "$cross_compiling" != yes; then - { { ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -printf "%s\n" "$ac_try_echo"; } >&5 - (eval "$ac_link") 2>&5 - ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } - if { ac_try='./conftest$ac_cv_exeext' - { { case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -printf "%s\n" "$ac_try_echo"; } >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; }; then - cross_compiling=no - else - if test "$cross_compiling" = maybe; then - cross_compiling=yes - else - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error 77 "cannot run C compiled programs. -If you meant to cross compile, use \`--host'. -See \`config.log' for more details" "$LINENO" 5; } - fi - fi -fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 -printf "%s\n" "$cross_compiling" >&6; } - -rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out -ac_clean_files=$ac_clean_files_save -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 -printf %s "checking for suffix of object files... " >&6; } -if test ${ac_cv_objext+y} -then : - printf %s "(cached) " >&6 -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main (void) -{ - - ; - return 0; -} -_ACEOF -rm -f conftest.o conftest.obj -if { { ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -printf "%s\n" "$ac_try_echo"; } >&5 - (eval "$ac_compile") 2>&5 - ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } -then : - for ac_file in conftest.o conftest.obj conftest.*; do - test -f "$ac_file" || continue; - case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;; - *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'` - break;; - esac -done -else $as_nop - printf "%s\n" "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "cannot compute suffix of object files: cannot compile -See \`config.log' for more details" "$LINENO" 5; } -fi -rm -f conftest.$ac_cv_objext conftest.$ac_ext -fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5 -printf "%s\n" "$ac_cv_objext" >&6; } -OBJEXT=$ac_cv_objext -ac_objext=$OBJEXT -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports GNU C" >&5 -printf %s "checking whether the compiler supports GNU C... " >&6; } -if test ${ac_cv_c_compiler_gnu+y} -then : - printf %s "(cached) " >&6 -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main (void) -{ -#ifndef __GNUC__ - choke me -#endif - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO" -then : - ac_compiler_gnu=yes -else $as_nop - ac_compiler_gnu=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext -ac_cv_c_compiler_gnu=$ac_compiler_gnu - -fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5 -printf "%s\n" "$ac_cv_c_compiler_gnu" >&6; } -ac_compiler_gnu=$ac_cv_c_compiler_gnu - -if test $ac_compiler_gnu = yes; then - GCC=yes -else - GCC= -fi -ac_test_CFLAGS=${CFLAGS+y} -ac_save_CFLAGS=$CFLAGS -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 -printf %s "checking whether $CC accepts -g... " >&6; } -if test ${ac_cv_prog_cc_g+y} -then : - printf %s "(cached) " >&6 -else $as_nop - ac_save_c_werror_flag=$ac_c_werror_flag - ac_c_werror_flag=yes - ac_cv_prog_cc_g=no - CFLAGS="-g" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main (void) -{ - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO" -then : - ac_cv_prog_cc_g=yes -else $as_nop - CFLAGS="" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main (void) -{ - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO" -then : - -else $as_nop - ac_c_werror_flag=$ac_save_c_werror_flag - CFLAGS="-g" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main (void) -{ - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO" -then : - ac_cv_prog_cc_g=yes -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext - ac_c_werror_flag=$ac_save_c_werror_flag -fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5 -printf "%s\n" "$ac_cv_prog_cc_g" >&6; } -if test $ac_test_CFLAGS; then - CFLAGS=$ac_save_CFLAGS -elif test $ac_cv_prog_cc_g = yes; then - if test "$GCC" = yes; then - CFLAGS="-g -O2" - else - CFLAGS="-g" - fi -else - if test "$GCC" = yes; then - CFLAGS="-O2" - else - CFLAGS= - fi -fi -ac_prog_cc_stdc=no -if test x$ac_prog_cc_stdc = xno -then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C11 features" >&5 -printf %s "checking for $CC option to enable C11 features... " >&6; } -if test ${ac_cv_prog_cc_c11+y} -then : - printf %s "(cached) " >&6 -else $as_nop - ac_cv_prog_cc_c11=no -ac_save_CC=$CC -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -$ac_c_conftest_c11_program -_ACEOF -for ac_arg in '' -std=gnu11 -do - CC="$ac_save_CC $ac_arg" - if ac_fn_c_try_compile "$LINENO" -then : - ac_cv_prog_cc_c11=$ac_arg -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam - test "x$ac_cv_prog_cc_c11" != "xno" && break -done -rm -f conftest.$ac_ext -CC=$ac_save_CC -fi - -if test "x$ac_cv_prog_cc_c11" = xno -then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 -printf "%s\n" "unsupported" >&6; } -else $as_nop - if test "x$ac_cv_prog_cc_c11" = x -then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 -printf "%s\n" "none needed" >&6; } -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c11" >&5 -printf "%s\n" "$ac_cv_prog_cc_c11" >&6; } - CC="$CC $ac_cv_prog_cc_c11" -fi - ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c11 - ac_prog_cc_stdc=c11 -fi -fi -if test x$ac_prog_cc_stdc = xno -then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C99 features" >&5 -printf %s "checking for $CC option to enable C99 features... " >&6; } -if test ${ac_cv_prog_cc_c99+y} -then : - printf %s "(cached) " >&6 -else $as_nop - ac_cv_prog_cc_c99=no -ac_save_CC=$CC -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -$ac_c_conftest_c99_program -_ACEOF -for ac_arg in '' -std=gnu99 -std=c99 -c99 -qlanglvl=extc1x -qlanglvl=extc99 -AC99 -D_STDC_C99= -do - CC="$ac_save_CC $ac_arg" - if ac_fn_c_try_compile "$LINENO" -then : - ac_cv_prog_cc_c99=$ac_arg -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam - test "x$ac_cv_prog_cc_c99" != "xno" && break -done -rm -f conftest.$ac_ext -CC=$ac_save_CC -fi - -if test "x$ac_cv_prog_cc_c99" = xno -then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 -printf "%s\n" "unsupported" >&6; } -else $as_nop - if test "x$ac_cv_prog_cc_c99" = x -then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 -printf "%s\n" "none needed" >&6; } -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c99" >&5 -printf "%s\n" "$ac_cv_prog_cc_c99" >&6; } - CC="$CC $ac_cv_prog_cc_c99" -fi - ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c99 - ac_prog_cc_stdc=c99 -fi -fi -if test x$ac_prog_cc_stdc = xno -then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C89 features" >&5 -printf %s "checking for $CC option to enable C89 features... " >&6; } -if test ${ac_cv_prog_cc_c89+y} -then : - printf %s "(cached) " >&6 -else $as_nop - ac_cv_prog_cc_c89=no -ac_save_CC=$CC -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -$ac_c_conftest_c89_program -_ACEOF -for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" -do - CC="$ac_save_CC $ac_arg" - if ac_fn_c_try_compile "$LINENO" -then : - ac_cv_prog_cc_c89=$ac_arg -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam - test "x$ac_cv_prog_cc_c89" != "xno" && break -done -rm -f conftest.$ac_ext -CC=$ac_save_CC -fi - -if test "x$ac_cv_prog_cc_c89" = xno -then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 -printf "%s\n" "unsupported" >&6; } -else $as_nop - if test "x$ac_cv_prog_cc_c89" = x -then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 -printf "%s\n" "none needed" >&6; } -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 -printf "%s\n" "$ac_cv_prog_cc_c89" >&6; } - CC="$CC $ac_cv_prog_cc_c89" -fi - ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c89 - ac_prog_cc_stdc=c89 -fi -fi - -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - - - - - - - -ac_ext=cpp -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -if test -z "$CXX"; then - if test -n "$CCC"; then - CXX=$CCC - else - if test -n "$ac_tool_prefix"; then - for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC clang++ - do - # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. -set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_CXX+y} -then : - printf %s "(cached) " >&6 -else $as_nop - if test -n "$CXX"; then - ac_cv_prog_CXX="$CXX" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then - ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -CXX=$ac_cv_prog_CXX -if test -n "$CXX"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5 -printf "%s\n" "$CXX" >&6; } -else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } -fi - - - test -n "$CXX" && break - done -fi -if test -z "$CXX"; then - ac_ct_CXX=$CXX - for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC clang++ -do - # Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_ac_ct_CXX+y} -then : - printf %s "(cached) " >&6 -else $as_nop - if test -n "$ac_ct_CXX"; then - ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_CXX="$ac_prog" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -ac_ct_CXX=$ac_cv_prog_ac_ct_CXX -if test -n "$ac_ct_CXX"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5 -printf "%s\n" "$ac_ct_CXX" >&6; } -else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } -fi - - - test -n "$ac_ct_CXX" && break -done - - if test "x$ac_ct_CXX" = x; then - CXX="g++" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - CXX=$ac_ct_CXX - fi -fi - - fi -fi -# Provide some information about the compiler. -printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C++ compiler version" >&5 -set X $ac_compile -ac_compiler=$2 -for ac_option in --version -v -V -qversion; do - { { ac_try="$ac_compiler $ac_option >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -printf "%s\n" "$ac_try_echo"; } >&5 - (eval "$ac_compiler $ac_option >&5") 2>conftest.err - ac_status=$? - if test -s conftest.err; then - sed '10a\ -... rest of stderr output deleted ... - 10q' conftest.err >conftest.er1 - cat conftest.er1 >&5 - fi - rm -f conftest.er1 conftest.err - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } -done - -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports GNU C++" >&5 -printf %s "checking whether the compiler supports GNU C++... " >&6; } -if test ${ac_cv_cxx_compiler_gnu+y} -then : - printf %s "(cached) " >&6 -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main (void) -{ -#ifndef __GNUC__ - choke me -#endif - - ; - return 0; -} -_ACEOF -if ac_fn_cxx_try_compile "$LINENO" -then : - ac_compiler_gnu=yes -else $as_nop - ac_compiler_gnu=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext -ac_cv_cxx_compiler_gnu=$ac_compiler_gnu - -fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_compiler_gnu" >&5 -printf "%s\n" "$ac_cv_cxx_compiler_gnu" >&6; } -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - -if test $ac_compiler_gnu = yes; then - GXX=yes -else - GXX= -fi -ac_test_CXXFLAGS=${CXXFLAGS+y} -ac_save_CXXFLAGS=$CXXFLAGS -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5 -printf %s "checking whether $CXX accepts -g... " >&6; } -if test ${ac_cv_prog_cxx_g+y} -then : - printf %s "(cached) " >&6 -else $as_nop - ac_save_cxx_werror_flag=$ac_cxx_werror_flag - ac_cxx_werror_flag=yes - ac_cv_prog_cxx_g=no - CXXFLAGS="-g" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main (void) -{ - - ; - return 0; -} -_ACEOF -if ac_fn_cxx_try_compile "$LINENO" -then : - ac_cv_prog_cxx_g=yes -else $as_nop - CXXFLAGS="" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main (void) -{ - - ; - return 0; -} -_ACEOF -if ac_fn_cxx_try_compile "$LINENO" -then : - -else $as_nop - ac_cxx_werror_flag=$ac_save_cxx_werror_flag - CXXFLAGS="-g" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main (void) -{ - - ; - return 0; -} -_ACEOF -if ac_fn_cxx_try_compile "$LINENO" -then : - ac_cv_prog_cxx_g=yes -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext - ac_cxx_werror_flag=$ac_save_cxx_werror_flag -fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_g" >&5 -printf "%s\n" "$ac_cv_prog_cxx_g" >&6; } -if test $ac_test_CXXFLAGS; then - CXXFLAGS=$ac_save_CXXFLAGS -elif test $ac_cv_prog_cxx_g = yes; then - if test "$GXX" = yes; then - CXXFLAGS="-g -O2" - else - CXXFLAGS="-g" - fi -else - if test "$GXX" = yes; then - CXXFLAGS="-O2" - else - CXXFLAGS= - fi -fi -ac_prog_cxx_stdcxx=no -if test x$ac_prog_cxx_stdcxx = xno -then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++11 features" >&5 -printf %s "checking for $CXX option to enable C++11 features... " >&6; } -if test ${ac_cv_prog_cxx_11+y} -then : - printf %s "(cached) " >&6 -else $as_nop - ac_cv_prog_cxx_11=no -ac_save_CXX=$CXX -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -$ac_cxx_conftest_cxx11_program -_ACEOF -for ac_arg in '' -std=gnu++11 -std=gnu++0x -std=c++11 -std=c++0x -qlanglvl=extended0x -AA -do - CXX="$ac_save_CXX $ac_arg" - if ac_fn_cxx_try_compile "$LINENO" -then : - ac_cv_prog_cxx_cxx11=$ac_arg -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam - test "x$ac_cv_prog_cxx_cxx11" != "xno" && break -done -rm -f conftest.$ac_ext -CXX=$ac_save_CXX -fi - -if test "x$ac_cv_prog_cxx_cxx11" = xno -then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 -printf "%s\n" "unsupported" >&6; } -else $as_nop - if test "x$ac_cv_prog_cxx_cxx11" = x -then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 -printf "%s\n" "none needed" >&6; } -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_cxx11" >&5 -printf "%s\n" "$ac_cv_prog_cxx_cxx11" >&6; } - CXX="$CXX $ac_cv_prog_cxx_cxx11" -fi - ac_cv_prog_cxx_stdcxx=$ac_cv_prog_cxx_cxx11 - ac_prog_cxx_stdcxx=cxx11 -fi -fi -if test x$ac_prog_cxx_stdcxx = xno -then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++98 features" >&5 -printf %s "checking for $CXX option to enable C++98 features... " >&6; } -if test ${ac_cv_prog_cxx_98+y} -then : - printf %s "(cached) " >&6 -else $as_nop - ac_cv_prog_cxx_98=no -ac_save_CXX=$CXX -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -$ac_cxx_conftest_cxx98_program -_ACEOF -for ac_arg in '' -std=gnu++98 -std=c++98 -qlanglvl=extended -AA -do - CXX="$ac_save_CXX $ac_arg" - if ac_fn_cxx_try_compile "$LINENO" -then : - ac_cv_prog_cxx_cxx98=$ac_arg -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam - test "x$ac_cv_prog_cxx_cxx98" != "xno" && break -done -rm -f conftest.$ac_ext -CXX=$ac_save_CXX -fi - -if test "x$ac_cv_prog_cxx_cxx98" = xno -then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 -printf "%s\n" "unsupported" >&6; } -else $as_nop - if test "x$ac_cv_prog_cxx_cxx98" = x -then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 -printf "%s\n" "none needed" >&6; } -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_cxx98" >&5 -printf "%s\n" "$ac_cv_prog_cxx_cxx98" >&6; } - CXX="$CXX $ac_cv_prog_cxx_cxx98" -fi - ac_cv_prog_cxx_stdcxx=$ac_cv_prog_cxx_cxx98 - ac_prog_cxx_stdcxx=cxx98 -fi -fi - -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - - - - - - # Make sure we can run config.sub. -$SHELL "${ac_aux_dir}config.sub" sun4 >/dev/null 2>&1 || - as_fn_error $? "cannot run $SHELL ${ac_aux_dir}config.sub" "$LINENO" 5 - -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 -printf %s "checking build system type... " >&6; } -if test ${ac_cv_build+y} -then : - printf %s "(cached) " >&6 -else $as_nop - ac_build_alias=$build_alias -test "x$ac_build_alias" = x && - ac_build_alias=`$SHELL "${ac_aux_dir}config.guess"` -test "x$ac_build_alias" = x && - as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5 -ac_cv_build=`$SHELL "${ac_aux_dir}config.sub" $ac_build_alias` || - as_fn_error $? "$SHELL ${ac_aux_dir}config.sub $ac_build_alias failed" "$LINENO" 5 - -fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5 -printf "%s\n" "$ac_cv_build" >&6; } -case $ac_cv_build in -*-*-*) ;; -*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;; -esac -build=$ac_cv_build -ac_save_IFS=$IFS; IFS='-' -set x $ac_cv_build -shift -build_cpu=$1 -build_vendor=$2 -shift; shift -# Remember, the first character of IFS is used to create $*, -# except with old shells: -build_os=$* -IFS=$ac_save_IFS -case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac - - -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking host system type" >&5 -printf %s "checking host system type... " >&6; } -if test ${ac_cv_host+y} -then : - printf %s "(cached) " >&6 -else $as_nop - if test "x$host_alias" = x; then - ac_cv_host=$ac_cv_build -else - ac_cv_host=`$SHELL "${ac_aux_dir}config.sub" $host_alias` || - as_fn_error $? "$SHELL ${ac_aux_dir}config.sub $host_alias failed" "$LINENO" 5 -fi - -fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5 -printf "%s\n" "$ac_cv_host" >&6; } -case $ac_cv_host in -*-*-*) ;; -*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;; -esac -host=$ac_cv_host -ac_save_IFS=$IFS; IFS='-' -set x $ac_cv_host -shift -host_cpu=$1 -host_vendor=$2 -shift; shift -# Remember, the first character of IFS is used to create $*, -# except with old shells: -host_os=$* -IFS=$ac_save_IFS -case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac - - - -# Use 64-bit file system calls so that we can support files > 2 GiB. - -@%:@ Check whether --enable-largefile was given. -if test ${enable_largefile+y} -then : - enableval=$enable_largefile; -fi - -if test "$enable_largefile" != no; then - - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for special C compiler options needed for large files" >&5 -printf %s "checking for special C compiler options needed for large files... " >&6; } -if test ${ac_cv_sys_largefile_CC+y} -then : - printf %s "(cached) " >&6 -else $as_nop - ac_cv_sys_largefile_CC=no - if test "$GCC" != yes; then - ac_save_CC=$CC - while :; do - # IRIX 6.2 and later do not support large files by default, - # so use the C compiler's -n32 option if that helps. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -@%:@include - /* Check that off_t can represent 2**63 - 1 correctly. - We can't simply define LARGE_OFF_T to be 9223372036854775807, - since some C++ compilers masquerading as C compilers - incorrectly reject 9223372036854775807. */ -@%:@define LARGE_OFF_T (((off_t) 1 << 31 << 31) - 1 + ((off_t) 1 << 31 << 31)) - int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 - && LARGE_OFF_T % 2147483647 == 1) - ? 1 : -1]; -int -main (void) -{ - - ; - return 0; -} -_ACEOF - if ac_fn_c_try_compile "$LINENO" -then : - break -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam - CC="$CC -n32" - if ac_fn_c_try_compile "$LINENO" -then : - ac_cv_sys_largefile_CC=' -n32'; break -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam - break - done - CC=$ac_save_CC - rm -f conftest.$ac_ext - fi -fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_largefile_CC" >&5 -printf "%s\n" "$ac_cv_sys_largefile_CC" >&6; } - if test "$ac_cv_sys_largefile_CC" != no; then - CC=$CC$ac_cv_sys_largefile_CC - fi - - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for _FILE_OFFSET_BITS value needed for large files" >&5 -printf %s "checking for _FILE_OFFSET_BITS value needed for large files... " >&6; } -if test ${ac_cv_sys_file_offset_bits+y} -then : - printf %s "(cached) " >&6 -else $as_nop - while :; do - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -@%:@include - /* Check that off_t can represent 2**63 - 1 correctly. - We can't simply define LARGE_OFF_T to be 9223372036854775807, - since some C++ compilers masquerading as C compilers - incorrectly reject 9223372036854775807. */ -@%:@define LARGE_OFF_T (((off_t) 1 << 31 << 31) - 1 + ((off_t) 1 << 31 << 31)) - int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 - && LARGE_OFF_T % 2147483647 == 1) - ? 1 : -1]; -int -main (void) -{ - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO" -then : - ac_cv_sys_file_offset_bits=no; break -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -@%:@define _FILE_OFFSET_BITS 64 -@%:@include - /* Check that off_t can represent 2**63 - 1 correctly. - We can't simply define LARGE_OFF_T to be 9223372036854775807, - since some C++ compilers masquerading as C compilers - incorrectly reject 9223372036854775807. */ -@%:@define LARGE_OFF_T (((off_t) 1 << 31 << 31) - 1 + ((off_t) 1 << 31 << 31)) - int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 - && LARGE_OFF_T % 2147483647 == 1) - ? 1 : -1]; -int -main (void) -{ - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO" -then : - ac_cv_sys_file_offset_bits=64; break -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext - ac_cv_sys_file_offset_bits=unknown - break -done -fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_file_offset_bits" >&5 -printf "%s\n" "$ac_cv_sys_file_offset_bits" >&6; } -case $ac_cv_sys_file_offset_bits in #( - no | unknown) ;; - *) -printf "%s\n" "@%:@define _FILE_OFFSET_BITS $ac_cv_sys_file_offset_bits" >>confdefs.h -;; -esac -rm -rf conftest* - if test $ac_cv_sys_file_offset_bits = unknown; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for _LARGE_FILES value needed for large files" >&5 -printf %s "checking for _LARGE_FILES value needed for large files... " >&6; } -if test ${ac_cv_sys_large_files+y} -then : - printf %s "(cached) " >&6 -else $as_nop - while :; do - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -@%:@include - /* Check that off_t can represent 2**63 - 1 correctly. - We can't simply define LARGE_OFF_T to be 9223372036854775807, - since some C++ compilers masquerading as C compilers - incorrectly reject 9223372036854775807. */ -@%:@define LARGE_OFF_T (((off_t) 1 << 31 << 31) - 1 + ((off_t) 1 << 31 << 31)) - int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 - && LARGE_OFF_T % 2147483647 == 1) - ? 1 : -1]; -int -main (void) -{ - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO" -then : - ac_cv_sys_large_files=no; break -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -@%:@define _LARGE_FILES 1 -@%:@include - /* Check that off_t can represent 2**63 - 1 correctly. - We can't simply define LARGE_OFF_T to be 9223372036854775807, - since some C++ compilers masquerading as C compilers - incorrectly reject 9223372036854775807. */ -@%:@define LARGE_OFF_T (((off_t) 1 << 31 << 31) - 1 + ((off_t) 1 << 31 << 31)) - int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 - && LARGE_OFF_T % 2147483647 == 1) - ? 1 : -1]; -int -main (void) -{ - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO" -then : - ac_cv_sys_large_files=1; break -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext - ac_cv_sys_large_files=unknown - break -done -fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_large_files" >&5 -printf "%s\n" "$ac_cv_sys_large_files" >&6; } -case $ac_cv_sys_large_files in #( - no | unknown) ;; - *) -printf "%s\n" "@%:@define _LARGE_FILES $ac_cv_sys_large_files" >>confdefs.h -;; -esac -rm -rf conftest* - fi -fi - - - - - -# Extract the first word of "perl", so it can be a program name with args. -set dummy perl; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_path_perl+y} -then : - printf %s "(cached) " >&6 -else $as_nop - case $perl in - [\\/]* | ?:[\\/]*) - ac_cv_path_perl="$perl" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then - ac_cv_path_perl="$as_dir$ac_word$ac_exec_ext" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - - ;; -esac -fi -perl=$ac_cv_path_perl -if test -n "$perl"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $perl" >&5 -printf "%s\n" "$perl" >&6; } -else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } -fi - - -if test -z "$perl"; then - as_fn_error $? "perl is required" "$LINENO" 5 -fi - - -# Extract the first word of "curl", so it can be a program name with args. -set dummy curl; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_path_curl+y} -then : - printf %s "(cached) " >&6 -else $as_nop - case $curl in - [\\/]* | ?:[\\/]*) - ac_cv_path_curl="$curl" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then - ac_cv_path_curl="$as_dir$ac_word$ac_exec_ext" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - - ;; -esac -fi -curl=$ac_cv_path_curl -if test -n "$curl"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $curl" >&5 -printf "%s\n" "$curl" >&6; } -else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } -fi - - -if test -z "$curl"; then - as_fn_error $? "curl is required" "$LINENO" 5 -fi - - -# Extract the first word of "bzip2", so it can be a program name with args. -set dummy bzip2; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_path_bzip2+y} -then : - printf %s "(cached) " >&6 -else $as_nop - case $bzip2 in - [\\/]* | ?:[\\/]*) - ac_cv_path_bzip2="$bzip2" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then - ac_cv_path_bzip2="$as_dir$ac_word$ac_exec_ext" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - - ;; -esac -fi -bzip2=$ac_cv_path_bzip2 -if test -n "$bzip2"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $bzip2" >&5 -printf "%s\n" "$bzip2" >&6; } -else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } -fi - - -if test -z "$bzip2"; then - as_fn_error $? "bzip2 is required" "$LINENO" 5 -fi - - -# Extract the first word of "xz", so it can be a program name with args. -set dummy xz; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_path_xz+y} -then : - printf %s "(cached) " >&6 -else $as_nop - case $xz in - [\\/]* | ?:[\\/]*) - ac_cv_path_xz="$xz" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then - ac_cv_path_xz="$as_dir$ac_word$ac_exec_ext" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - - ;; -esac -fi -xz=$ac_cv_path_xz -if test -n "$xz"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xz" >&5 -printf "%s\n" "$xz" >&6; } -else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } -fi - - -if test -z "$xz"; then - as_fn_error $? "xz is required" "$LINENO" 5 -fi - - -# Test that Perl has the open/fork feature (Perl 5.8.0 and beyond). -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether Perl is recent enough" >&5 -printf %s "checking whether Perl is recent enough... " >&6; } -if ! $perl -e 'open(FOO, "-|", "true"); while () { print; }; close FOO or die;'; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } - as_fn_error $? "Your Perl version is too old. Nix requires Perl 5.8.0 or newer." "$LINENO" 5 -fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } - - -# Figure out where to install Perl modules. -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for the Perl installation prefix" >&5 -printf %s "checking for the Perl installation prefix... " >&6; } -perlversion=$($perl -e 'use Config; print $Config{version};') -perlarchname=$($perl -e 'use Config; print $Config{archname};') -perllibdir=${libdir}/perl5/site_perl/$perlversion/$perlarchname - -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $perllibdir" >&5 -printf "%s\n" "$perllibdir" >&6; } - -# Look for libsodium. -PKG_CHECK_MODULES(SODIUM, libsodium, CXXFLAGS="$SODIUM_CFLAGS $CXXFLAGS") - -# Check for the required Perl dependencies (DBI and DBD::SQLite). -perlFlags="-I$perllibdir" - - -@%:@ Check whether --with-dbi was given. -if test ${with_dbi+y} -then : - withval=$with_dbi; perlFlags="$perlFlags -I$withval" -fi - - - -@%:@ Check whether --with-dbd-sqlite was given. -if test ${with_dbd_sqlite+y} -then : - withval=$with_dbd_sqlite; perlFlags="$perlFlags -I$withval" -fi - - -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether DBD::SQLite works" >&5 -printf %s "checking whether DBD::SQLite works... " >&6; } -if ! $perl $perlFlags -e 'use DBI; use DBD::SQLite;' 2>&5; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "The Perl modules DBI and/or DBD::SQLite are missing. -See \`config.log' for more details" "$LINENO" 5; } -fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } - - - -PKG_CHECK_MODULES(NIX, nix-store) - - -# Extract the first word of "nix", so it can be a program name with args. -set dummy nix; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_path_NIX+y} -then : - printf %s "(cached) " >&6 -else $as_nop - case $NIX in - [\\/]* | ?:[\\/]*) - ac_cv_path_NIX="$NIX" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then - ac_cv_path_NIX="$as_dir$ac_word$ac_exec_ext" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - - ;; -esac -fi -NIX=$ac_cv_path_NIX -if test -n "$NIX"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $NIX" >&5 -printf "%s\n" "$NIX" >&6; } -else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } -fi - - -if test -z "$NIX"; then - as_fn_error $? "nix is required" "$LINENO" 5 -fi - - -# Expand all variables in config.status. -test "$prefix" = NONE && prefix=$ac_default_prefix -test "$exec_prefix" = NONE && exec_prefix='${prefix}' -for name in $ac_subst_vars; do - declare $name="$(eval echo "${!name}")" - declare $name="$(eval echo "${!name}")" - declare $name="$(eval echo "${!name}")" -done - -rm -f Makefile.config -ln -sfn ../mk mk - -ac_config_files="$ac_config_files " - -cat >confcache <<\_ACEOF -# This file is a shell script that caches the results of configure -# tests run on this system so they can be shared between configure -# scripts and configure runs, see configure's option --config-cache. -# It is not useful on other systems. If it contains results you don't -# want to keep, you may remove or edit it. -# -# config.status only pays attention to the cache file if you give it -# the --recheck option to rerun configure. -# -# `ac_cv_env_foo' variables (set or unset) will be overridden when -# loading this file, other *unset* `ac_cv_foo' will be assigned the -# following values. - -_ACEOF - -# The following way of writing the cache mishandles newlines in values, -# but we know of no workaround that is simple, portable, and efficient. -# So, we kill variables containing newlines. -# Ultrix sh set writes to stderr and can't be redirected directly, -# and sets the high bit in the cache file unless we assign to the vars. -( - for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do - eval ac_val=\$$ac_var - case $ac_val in #( - *${as_nl}*) - case $ac_var in #( - *_cv_*) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 -printf "%s\n" "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; - esac - case $ac_var in #( - _ | IFS | as_nl) ;; #( - BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( - *) { eval $ac_var=; unset $ac_var;} ;; - esac ;; - esac - done - - (set) 2>&1 | - case $as_nl`(ac_space=' '; set) 2>&1` in #( - *${as_nl}ac_space=\ *) - # `set' does not quote correctly, so add quotes: double-quote - # substitution turns \\\\ into \\, and sed turns \\ into \. - sed -n \ - "s/'/'\\\\''/g; - s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" - ;; #( - *) - # `set' quotes correctly as required by POSIX, so do not add quotes. - sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" - ;; - esac | - sort -) | - sed ' - /^ac_cv_env_/b end - t clear - :clear - s/^\([^=]*\)=\(.*[{}].*\)$/test ${\1+y} || &/ - t end - s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ - :end' >>confcache -if diff "$cache_file" confcache >/dev/null 2>&1; then :; else - if test -w "$cache_file"; then - if test "x$cache_file" != "x/dev/null"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 -printf "%s\n" "$as_me: updating cache $cache_file" >&6;} - if test ! -f "$cache_file" || test -h "$cache_file"; then - cat confcache >"$cache_file" - else - case $cache_file in #( - */* | ?:*) - mv -f confcache "$cache_file"$$ && - mv -f "$cache_file"$$ "$cache_file" ;; #( - *) - mv -f confcache "$cache_file" ;; - esac - fi - fi - else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 -printf "%s\n" "$as_me: not updating unwritable cache $cache_file" >&6;} - fi -fi -rm -f confcache - -test "x$prefix" = xNONE && prefix=$ac_default_prefix -# Let make expand exec_prefix. -test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' - -# Transform confdefs.h into DEFS. -# Protect against shell expansion while executing Makefile rules. -# Protect against Makefile macro expansion. -# -# If the first sed substitution is executed (which looks for macros that -# take arguments), then branch to the quote section. Otherwise, -# look for a macro that doesn't take arguments. -ac_script=' -:mline -/\\$/{ - N - s,\\\n,, - b mline -} -t clear -:clear -s/^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*([^)]*)\)[ ]*\(.*\)/-D\1=\2/g -t quote -s/^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\)/-D\1=\2/g -t quote -b any -:quote -s/[ `~#$^&*(){}\\|;'\''"<>?]/\\&/g -s/\[/\\&/g -s/\]/\\&/g -s/\$/$$/g -H -:any -${ - g - s/^\n// - s/\n/ /g - p -} -' -DEFS=`sed -n "$ac_script" confdefs.h` - - -ac_libobjs= -ac_ltlibobjs= -U= -for ac_i in : $LIB@&t@OBJS; do test "x$ac_i" = x: && continue - # 1. Remove the extension, and $U if already installed. - ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' - ac_i=`printf "%s\n" "$ac_i" | sed "$ac_script"` - # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR - # will be set to the directory where LIBOBJS objects are built. - as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext" - as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo' -done -LIB@&t@OBJS=$ac_libobjs - -LTLIBOBJS=$ac_ltlibobjs - - - -: "${CONFIG_STATUS=./config.status}" -ac_write_fail=0 -ac_clean_files_save=$ac_clean_files -ac_clean_files="$ac_clean_files $CONFIG_STATUS" -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5 -printf "%s\n" "$as_me: creating $CONFIG_STATUS" >&6;} -as_write_fail=0 -cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1 -#! $SHELL -# Generated by $as_me. -# Run this file to recreate the current configuration. -# Compiler output produced by configure, useful for debugging -# configure, is in config.log if it exists. - -debug=false -ac_cs_recheck=false -ac_cs_silent=false - -SHELL=\${CONFIG_SHELL-$SHELL} -export SHELL -_ASEOF -cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1 -## -------------------- ## -## M4sh Initialization. ## -## -------------------- ## - -# Be more Bourne compatible -DUALCASE=1; export DUALCASE # for MKS sh -as_nop=: -if test ${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1 -then : - emulate sh - NULLCMD=: - # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which - # is contrary to our usage. Disable this feature. - alias -g '${1+"$@"}'='"$@"' - setopt NO_GLOB_SUBST -else $as_nop - case `(set -o) 2>/dev/null` in @%:@( - *posix*) : - set -o posix ;; @%:@( - *) : - ;; -esac -fi - - - -# Reset variables that may have inherited troublesome values from -# the environment. - -# IFS needs to be set, to space, tab, and newline, in precisely that order. -# (If _AS_PATH_WALK were called with IFS unset, it would have the -# side effect of setting IFS to empty, thus disabling word splitting.) -# Quoting is to prevent editors from complaining about space-tab. -as_nl=' -' -export as_nl -IFS=" "" $as_nl" - -PS1='$ ' -PS2='> ' -PS4='+ ' - -# Ensure predictable behavior from utilities with locale-dependent output. -LC_ALL=C -export LC_ALL -LANGUAGE=C -export LANGUAGE - -# We cannot yet rely on "unset" to work, but we need these variables -# to be unset--not just set to an empty or harmless value--now, to -# avoid bugs in old shells (e.g. pre-3.0 UWIN ksh). This construct -# also avoids known problems related to "unset" and subshell syntax -# in other old shells (e.g. bash 2.01 and pdksh 5.2.14). -for as_var in BASH_ENV ENV MAIL MAILPATH CDPATH -do eval test \${$as_var+y} \ - && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : -done - -# Ensure that fds 0, 1, and 2 are open. -if (exec 3>&0) 2>/dev/null; then :; else exec 0&1) 2>/dev/null; then :; else exec 1>/dev/null; fi -if (exec 3>&2) ; then :; else exec 2>/dev/null; fi - -# The user is always right. -if ${PATH_SEPARATOR+false} :; then - PATH_SEPARATOR=: - (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { - (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || - PATH_SEPARATOR=';' - } -fi - - -# Find who we are. Look in the path if we contain no directory separator. -as_myself= -case $0 in @%:@(( - *[\\/]* ) as_myself=$0 ;; - *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac - test -r "$as_dir$0" && as_myself=$as_dir$0 && break - done -IFS=$as_save_IFS - - ;; -esac -# We did not find ourselves, most probably we were run as `sh COMMAND' -# in which case we are not to be found in the path. -if test "x$as_myself" = x; then - as_myself=$0 -fi -if test ! -f "$as_myself"; then - printf "%s\n" "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 - exit 1 -fi - - - -@%:@ as_fn_error STATUS ERROR [LINENO LOG_FD] -@%:@ ---------------------------------------- -@%:@ Output "`basename @S|@0`: error: ERROR" to stderr. If LINENO and LOG_FD are -@%:@ provided, also output the error to LOG_FD, referencing LINENO. Then exit the -@%:@ script with STATUS, using 1 if that was 0. -as_fn_error () -{ - as_status=$1; test $as_status -eq 0 && as_status=1 - if test "$4"; then - as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 - fi - printf "%s\n" "$as_me: error: $2" >&2 - as_fn_exit $as_status -} @%:@ as_fn_error - - - -@%:@ as_fn_set_status STATUS -@%:@ ----------------------- -@%:@ Set @S|@? to STATUS, without forking. -as_fn_set_status () -{ - return $1 -} @%:@ as_fn_set_status - -@%:@ as_fn_exit STATUS -@%:@ ----------------- -@%:@ Exit the shell with STATUS, even in a "trap 0" or "set -e" context. -as_fn_exit () -{ - set +e - as_fn_set_status $1 - exit $1 -} @%:@ as_fn_exit - -@%:@ as_fn_unset VAR -@%:@ --------------- -@%:@ Portably unset VAR. -as_fn_unset () -{ - { eval $1=; unset $1;} -} -as_unset=as_fn_unset - -@%:@ as_fn_append VAR VALUE -@%:@ ---------------------- -@%:@ Append the text in VALUE to the end of the definition contained in VAR. Take -@%:@ advantage of any shell optimizations that allow amortized linear growth over -@%:@ repeated appends, instead of the typical quadratic growth present in naive -@%:@ implementations. -if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null -then : - eval 'as_fn_append () - { - eval $1+=\$2 - }' -else $as_nop - as_fn_append () - { - eval $1=\$$1\$2 - } -fi # as_fn_append - -@%:@ as_fn_arith ARG... -@%:@ ------------------ -@%:@ Perform arithmetic evaluation on the ARGs, and store the result in the -@%:@ global @S|@as_val. Take advantage of shells that can avoid forks. The arguments -@%:@ must be portable across @S|@(()) and expr. -if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null -then : - eval 'as_fn_arith () - { - as_val=$(( $* )) - }' -else $as_nop - as_fn_arith () - { - as_val=`expr "$@" || test $? -eq 1` - } -fi # as_fn_arith - - -if expr a : '\(a\)' >/dev/null 2>&1 && - test "X`expr 00001 : '.*\(...\)'`" = X001; then - as_expr=expr -else - as_expr=false -fi - -if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then - as_basename=basename -else - as_basename=false -fi - -if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then - as_dirname=dirname -else - as_dirname=false -fi - -as_me=`$as_basename -- "$0" || -$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ - X"$0" : 'X\(//\)$' \| \ - X"$0" : 'X\(/\)' \| . 2>/dev/null || -printf "%s\n" X/"$0" | - sed '/^.*\/\([^/][^/]*\)\/*$/{ - s//\1/ - q - } - /^X\/\(\/\/\)$/{ - s//\1/ - q - } - /^X\/\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q'` - -# Avoid depending upon Character Ranges. -as_cr_letters='abcdefghijklmnopqrstuvwxyz' -as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' -as_cr_Letters=$as_cr_letters$as_cr_LETTERS -as_cr_digits='0123456789' -as_cr_alnum=$as_cr_Letters$as_cr_digits - - -# Determine whether it's possible to make 'echo' print without a newline. -# These variables are no longer used directly by Autoconf, but are AC_SUBSTed -# for compatibility with existing Makefiles. -ECHO_C= ECHO_N= ECHO_T= -case `echo -n x` in @%:@((((( --n*) - case `echo 'xy\c'` in - *c*) ECHO_T=' ';; # ECHO_T is single tab character. - xy) ECHO_C='\c';; - *) echo `echo ksh88 bug on AIX 6.1` > /dev/null - ECHO_T=' ';; - esac;; -*) - ECHO_N='-n';; -esac - -# For backward compatibility with old third-party macros, we provide -# the shell variables $as_echo and $as_echo_n. New code should use -# AS_ECHO(["message"]) and AS_ECHO_N(["message"]), respectively. -as_@&t@echo='printf %s\n' -as_@&t@echo_n='printf %s' - -rm -f conf$$ conf$$.exe conf$$.file -if test -d conf$$.dir; then - rm -f conf$$.dir/conf$$.file -else - rm -f conf$$.dir - mkdir conf$$.dir 2>/dev/null -fi -if (echo >conf$$.file) 2>/dev/null; then - if ln -s conf$$.file conf$$ 2>/dev/null; then - as_ln_s='ln -s' - # ... but there are two gotchas: - # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. - # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -pR'. - ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -pR' - elif ln conf$$.file conf$$ 2>/dev/null; then - as_ln_s=ln - else - as_ln_s='cp -pR' - fi -else - as_ln_s='cp -pR' -fi -rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file -rmdir conf$$.dir 2>/dev/null - - -@%:@ as_fn_mkdir_p -@%:@ ------------- -@%:@ Create "@S|@as_dir" as a directory, including parents if necessary. -as_fn_mkdir_p () -{ - - case $as_dir in #( - -*) as_dir=./$as_dir;; - esac - test -d "$as_dir" || eval $as_mkdir_p || { - as_dirs= - while :; do - case $as_dir in #( - *\'*) as_qdir=`printf "%s\n" "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( - *) as_qdir=$as_dir;; - esac - as_dirs="'$as_qdir' $as_dirs" - as_dir=`$as_dirname -- "$as_dir" || -$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$as_dir" : 'X\(//\)[^/]' \| \ - X"$as_dir" : 'X\(//\)$' \| \ - X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || -printf "%s\n" X"$as_dir" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X\(\/\/\)[^/].*/{ - s//\1/ - q - } - /^X\(\/\/\)$/{ - s//\1/ - q - } - /^X\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q'` - test -d "$as_dir" && break - done - test -z "$as_dirs" || eval "mkdir $as_dirs" - } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" - - -} @%:@ as_fn_mkdir_p -if mkdir -p . 2>/dev/null; then - as_mkdir_p='mkdir -p "$as_dir"' -else - test -d ./-p && rmdir ./-p - as_mkdir_p=false -fi - - -@%:@ as_fn_executable_p FILE -@%:@ ----------------------- -@%:@ Test if FILE is an executable regular file. -as_fn_executable_p () -{ - test -f "$1" && test -x "$1" -} @%:@ as_fn_executable_p -as_test_x='test -x' -as_executable_p=as_fn_executable_p - -# Sed expression to map a string onto a valid CPP name. -as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" - -# Sed expression to map a string onto a valid variable name. -as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" - - -exec 6>&1 -## ----------------------------------- ## -## Main body of $CONFIG_STATUS script. ## -## ----------------------------------- ## -_ASEOF -test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1 - -cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -# Save the log message, to keep $0 and so on meaningful, and to -# report actual input values of CONFIG_FILES etc. instead of their -# values after options handling. -ac_log=" -This file was extended by nix-perl $as_me 2.14.0, which was -generated by GNU Autoconf 2.71. Invocation command line was - - CONFIG_FILES = $CONFIG_FILES - CONFIG_HEADERS = $CONFIG_HEADERS - CONFIG_LINKS = $CONFIG_LINKS - CONFIG_COMMANDS = $CONFIG_COMMANDS - $ $0 $@ - -on `(hostname || uname -n) 2>/dev/null | sed 1q` -" - -_ACEOF - -case $ac_config_files in *" -"*) set x $ac_config_files; shift; ac_config_files=$*;; -esac - - - -cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -# Files that config.status was made for. -config_files="$ac_config_files" - -_ACEOF - -cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -ac_cs_usage="\ -\`$as_me' instantiates files and other configuration actions -from templates according to the current configuration. Unless the files -and actions are specified as TAGs, all are instantiated by default. - -Usage: $0 [OPTION]... [TAG]... - - -h, --help print this help, then exit - -V, --version print version number and configuration settings, then exit - --config print configuration, then exit - -q, --quiet, --silent - do not print progress messages - -d, --debug don't remove temporary files - --recheck update $as_me by reconfiguring in the same conditions - --file=FILE[:TEMPLATE] - instantiate the configuration file FILE - -Configuration files: -$config_files - -Report bugs to the package provider." - -_ACEOF -ac_cs_config=`printf "%s\n" "$ac_configure_args" | sed "$ac_safe_unquote"` -ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\''/g"` -cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -ac_cs_config='$ac_cs_config_escaped' -ac_cs_version="\\ -nix-perl config.status 2.14.0 -configured by $0, generated by GNU Autoconf 2.71, - with options \\"\$ac_cs_config\\" - -Copyright (C) 2021 Free Software Foundation, Inc. -This config.status script is free software; the Free Software Foundation -gives unlimited permission to copy, distribute and modify it." - -ac_pwd='$ac_pwd' -srcdir='$srcdir' -test -n "\$AWK" || AWK=awk -_ACEOF - -cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -# The default lists apply if the user does not specify any file. -ac_need_defaults=: -while test $# != 0 -do - case $1 in - --*=?*) - ac_option=`expr "X$1" : 'X\([^=]*\)='` - ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'` - ac_shift=: - ;; - --*=) - ac_option=`expr "X$1" : 'X\([^=]*\)='` - ac_optarg= - ac_shift=: - ;; - *) - ac_option=$1 - ac_optarg=$2 - ac_shift=shift - ;; - esac - - case $ac_option in - # Handling of the options. - -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) - ac_cs_recheck=: ;; - --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) - printf "%s\n" "$ac_cs_version"; exit ;; - --config | --confi | --conf | --con | --co | --c ) - printf "%s\n" "$ac_cs_config"; exit ;; - --debug | --debu | --deb | --de | --d | -d ) - debug=: ;; - --file | --fil | --fi | --f ) - $ac_shift - case $ac_optarg in - *\'*) ac_optarg=`printf "%s\n" "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; - '') as_fn_error $? "missing file argument" ;; - esac - as_fn_append CONFIG_FILES " '$ac_optarg'" - ac_need_defaults=false;; - --he | --h | --help | --hel | -h ) - printf "%s\n" "$ac_cs_usage"; exit ;; - -q | -quiet | --quiet | --quie | --qui | --qu | --q \ - | -silent | --silent | --silen | --sile | --sil | --si | --s) - ac_cs_silent=: ;; - - # This is an error. - -*) as_fn_error $? "unrecognized option: \`$1' -Try \`$0 --help' for more information." ;; - - *) as_fn_append ac_config_targets " $1" - ac_need_defaults=false ;; - - esac - shift -done - -ac_configure_extra_args= - -if $ac_cs_silent; then - exec 6>/dev/null - ac_configure_extra_args="$ac_configure_extra_args --silent" -fi - -_ACEOF -cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -if \$ac_cs_recheck; then - set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion - shift - \printf "%s\n" "running CONFIG_SHELL=$SHELL \$*" >&6 - CONFIG_SHELL='$SHELL' - export CONFIG_SHELL - exec "\$@" -fi - -_ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -exec 5>>config.log -{ - echo - sed 'h;s/./-/g;s/^.../@%:@@%:@ /;s/...$/ @%:@@%:@/;p;x;p;x' <<_ASBOX -@%:@@%:@ Running $as_me. @%:@@%:@ -_ASBOX - printf "%s\n" "$ac_log" -} >&5 - -_ACEOF -cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -_ACEOF - -cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 - -# Handling of arguments. -for ac_config_target in $ac_config_targets -do - case $ac_config_target in - - *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; - esac -done - - -# If the user did not use the arguments to specify the items to instantiate, -# then the envvar interface is used. Set only those that are not. -# We use the long form for the default assignment because of an extremely -# bizarre bug on SunOS 4.1.3. -if $ac_need_defaults; then - test ${CONFIG_FILES+y} || CONFIG_FILES=$config_files -fi - -# Have a temporary directory for convenience. Make it in the build tree -# simply because there is no reason against having it here, and in addition, -# creating and moving files from /tmp can sometimes cause problems. -# Hook for its removal unless debugging. -# Note that there is a small window in which the directory will not be cleaned: -# after its creation but before its name has been assigned to `$tmp'. -$debug || -{ - tmp= ac_tmp= - trap 'exit_status=$? - : "${ac_tmp:=$tmp}" - { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status -' 0 - trap 'as_fn_exit 1' 1 2 13 15 -} -# Create a (secure) tmp directory for tmp files. - -{ - tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` && - test -d "$tmp" -} || -{ - tmp=./conf$$-$RANDOM - (umask 077 && mkdir "$tmp") -} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5 -ac_tmp=$tmp - -# Set up the scripts for CONFIG_FILES section. -# No need to generate them if there are no CONFIG_FILES. -# This happens for instance with `./config.status config.h'. -if test -n "$CONFIG_FILES"; then - - -ac_cr=`echo X | tr X '\015'` -# On cygwin, bash can eat \r inside `` if the user requested igncr. -# But we know of no other shell where ac_cr would be empty at this -# point, so we can use a bashism as a fallback. -if test "x$ac_cr" = x; then - eval ac_cr=\$\'\\r\' -fi -ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' /dev/null` -if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then - ac_cs_awk_cr='\\r' -else - ac_cs_awk_cr=$ac_cr -fi - -echo 'BEGIN {' >"$ac_tmp/subs1.awk" && -_ACEOF - - -{ - echo "cat >conf$$subs.awk <<_ACEOF" && - echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' && - echo "_ACEOF" -} >conf$$subs.sh || - as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 -ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'` -ac_delim='%!_!# ' -for ac_last_try in false false false false false :; do - . ./conf$$subs.sh || - as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 - - ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` - if test $ac_delim_n = $ac_delim_num; then - break - elif $ac_last_try; then - as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 - else - ac_delim="$ac_delim!$ac_delim _$ac_delim!! " - fi -done -rm -f conf$$subs.sh - -cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK && -_ACEOF -sed -n ' -h -s/^/S["/; s/!.*/"]=/ -p -g -s/^[^!]*!// -:repl -t repl -s/'"$ac_delim"'$// -t delim -:nl -h -s/\(.\{148\}\)..*/\1/ -t more1 -s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/ -p -n -b repl -:more1 -s/["\\]/\\&/g; s/^/"/; s/$/"\\/ -p -g -s/.\{148\}// -t nl -:delim -h -s/\(.\{148\}\)..*/\1/ -t more2 -s/["\\]/\\&/g; s/^/"/; s/$/"/ -p -b -:more2 -s/["\\]/\\&/g; s/^/"/; s/$/"\\/ -p -g -s/.\{148\}// -t delim -' >$CONFIG_STATUS || ac_write_fail=1 -rm -f conf$$subs.awk -cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -_ACAWK -cat >>"\$ac_tmp/subs1.awk" <<_ACAWK && - for (key in S) S_is_set[key] = 1 - FS = "" - -} -{ - line = $ 0 - nfields = split(line, field, "@") - substed = 0 - len = length(field[1]) - for (i = 2; i < nfields; i++) { - key = field[i] - keylen = length(key) - if (S_is_set[key]) { - value = S[key] - line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3) - len += length(value) + length(field[++i]) - substed = 1 - } else - len += 1 + keylen - } - - print line -} - -_ACAWK -_ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then - sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g" -else - cat -fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \ - || as_fn_error $? "could not setup config files machinery" "$LINENO" 5 -_ACEOF - -# VPATH may cause trouble with some makes, so we remove sole $(srcdir), -# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and -# trailing colons and then remove the whole line if VPATH becomes empty -# (actually we leave an empty line to preserve line numbers). -if test "x$srcdir" = x.; then - ac_vpsub='/^[ ]*VPATH[ ]*=[ ]*/{ -h -s/// -s/^/:/ -s/[ ]*$/:/ -s/:\$(srcdir):/:/g -s/:\${srcdir}:/:/g -s/:@srcdir@:/:/g -s/^:*// -s/:*$// -x -s/\(=[ ]*\).*/\1/ -G -s/\n// -s/^[^=]*=[ ]*$// -}' -fi - -cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -fi # test -n "$CONFIG_FILES" - - -eval set X " :F $CONFIG_FILES " -shift -for ac_tag -do - case $ac_tag in - :[FHLC]) ac_mode=$ac_tag; continue;; - esac - case $ac_mode$ac_tag in - :[FHL]*:*);; - :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;; - :[FH]-) ac_tag=-:-;; - :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; - esac - ac_save_IFS=$IFS - IFS=: - set x $ac_tag - IFS=$ac_save_IFS - shift - ac_file=$1 - shift - - case $ac_mode in - :L) ac_source=$1;; - :[FH]) - ac_file_inputs= - for ac_f - do - case $ac_f in - -) ac_f="$ac_tmp/stdin";; - *) # Look for the file first in the build tree, then in the source tree - # (if the path is not absolute). The absolute path cannot be DOS-style, - # because $ac_f cannot contain `:'. - test -f "$ac_f" || - case $ac_f in - [\\/$]*) false;; - *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; - esac || - as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;; - esac - case $ac_f in *\'*) ac_f=`printf "%s\n" "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac - as_fn_append ac_file_inputs " '$ac_f'" - done - - # Let's still pretend it is `configure' which instantiates (i.e., don't - # use $as_me), people would be surprised to read: - # /* config.h. Generated by config.status. */ - configure_input='Generated from '` - printf "%s\n" "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g' - `' by configure.' - if test x"$ac_file" != x-; then - configure_input="$ac_file. $configure_input" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5 -printf "%s\n" "$as_me: creating $ac_file" >&6;} - fi - # Neutralize special characters interpreted by sed in replacement strings. - case $configure_input in #( - *\&* | *\|* | *\\* ) - ac_sed_conf_input=`printf "%s\n" "$configure_input" | - sed 's/[\\\\&|]/\\\\&/g'`;; #( - *) ac_sed_conf_input=$configure_input;; - esac - - case $ac_tag in - *:-:* | *:-) cat >"$ac_tmp/stdin" \ - || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; - esac - ;; - esac - - ac_dir=`$as_dirname -- "$ac_file" || -$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$ac_file" : 'X\(//\)[^/]' \| \ - X"$ac_file" : 'X\(//\)$' \| \ - X"$ac_file" : 'X\(/\)' \| . 2>/dev/null || -printf "%s\n" X"$ac_file" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X\(\/\/\)[^/].*/{ - s//\1/ - q - } - /^X\(\/\/\)$/{ - s//\1/ - q - } - /^X\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q'` - as_dir="$ac_dir"; as_fn_mkdir_p - ac_builddir=. - -case "$ac_dir" in -.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; -*) - ac_dir_suffix=/`printf "%s\n" "$ac_dir" | sed 's|^\.[\\/]||'` - # A ".." for each directory in $ac_dir_suffix. - ac_top_builddir_sub=`printf "%s\n" "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` - case $ac_top_builddir_sub in - "") ac_top_builddir_sub=. ac_top_build_prefix= ;; - *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; - esac ;; -esac -ac_abs_top_builddir=$ac_pwd -ac_abs_builddir=$ac_pwd$ac_dir_suffix -# for backward compatibility: -ac_top_builddir=$ac_top_build_prefix - -case $srcdir in - .) # We are building in place. - ac_srcdir=. - ac_top_srcdir=$ac_top_builddir_sub - ac_abs_top_srcdir=$ac_pwd ;; - [\\/]* | ?:[\\/]* ) # Absolute name. - ac_srcdir=$srcdir$ac_dir_suffix; - ac_top_srcdir=$srcdir - ac_abs_top_srcdir=$srcdir ;; - *) # Relative name. - ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix - ac_top_srcdir=$ac_top_build_prefix$srcdir - ac_abs_top_srcdir=$ac_pwd/$srcdir ;; -esac -ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix - - - case $ac_mode in - :F) - # - # CONFIG_FILE - # - -_ACEOF - -cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -# If the template does not know about datarootdir, expand it. -# FIXME: This hack should be removed a few years after 2.60. -ac_datarootdir_hack=; ac_datarootdir_seen= -ac_sed_dataroot=' -/datarootdir/ { - p - q -} -/@datadir@/p -/@docdir@/p -/@infodir@/p -/@localedir@/p -/@mandir@/p' -case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in -*datarootdir*) ac_datarootdir_seen=yes;; -*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*) - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 -printf "%s\n" "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} -_ACEOF -cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 - ac_datarootdir_hack=' - s&@datadir@&$datadir&g - s&@docdir@&$docdir&g - s&@infodir@&$infodir&g - s&@localedir@&$localedir&g - s&@mandir@&$mandir&g - s&\\\${datarootdir}&$datarootdir&g' ;; -esac -_ACEOF - -# Neutralize VPATH when `$srcdir' = `.'. -# Shell code in configure.ac might set extrasub. -# FIXME: do we really want to maintain this feature? -cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -ac_sed_extra="$ac_vpsub -$extrasub -_ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -:t -/@[a-zA-Z_][a-zA-Z_0-9]*@/!b -s|@configure_input@|$ac_sed_conf_input|;t t -s&@top_builddir@&$ac_top_builddir_sub&;t t -s&@top_build_prefix@&$ac_top_build_prefix&;t t -s&@srcdir@&$ac_srcdir&;t t -s&@abs_srcdir@&$ac_abs_srcdir&;t t -s&@top_srcdir@&$ac_top_srcdir&;t t -s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t -s&@builddir@&$ac_builddir&;t t -s&@abs_builddir@&$ac_abs_builddir&;t t -s&@abs_top_builddir@&$ac_abs_top_builddir&;t t -$ac_datarootdir_hack -" -eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \ - >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5 - -test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && - { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } && - { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' \ - "$ac_tmp/out"`; test -z "$ac_out"; } && - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' -which seems to be undefined. Please make sure it is defined" >&5 -printf "%s\n" "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' -which seems to be undefined. Please make sure it is defined" >&2;} - - rm -f "$ac_tmp/stdin" - case $ac_file in - -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";; - *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";; - esac \ - || as_fn_error $? "could not create $ac_file" "$LINENO" 5 - ;; - - - - esac - -done # for ac_tag - - -as_fn_exit 0 -_ACEOF -ac_clean_files=$ac_clean_files_save - -test $ac_write_fail = 0 || - as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5 - - -# configure is writing to config.log, and then calls config.status. -# config.status does its own redirection, appending to config.log. -# Unfortunately, on DOS this fails, as config.log is still kept open -# by configure, so config.status won't be able to write to it; its -# output is simply discarded. So we exec the FD to /dev/null, -# effectively closing config.log, so it can be properly (re)opened and -# appended to by config.status. When coming back to configure, we -# need to make the FD available again. -if test "$no_create" != yes; then - ac_cs_success=: - ac_config_status_args= - test "$silent" = yes && - ac_config_status_args="$ac_config_status_args --quiet" - exec 5>/dev/null - $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false - exec 5>>config.log - # Use ||, not &&, to avoid exiting from the if with $? = 1, which - # would make configure fail if this is the last instruction. - $ac_cs_success || as_fn_exit 1 -fi -if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 -printf "%s\n" "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} -fi - - \ No newline at end of file diff --git a/perl/autom4te.cache/requests b/perl/autom4te.cache/requests deleted file mode 100644 index e0d0a58e468..00000000000 --- a/perl/autom4te.cache/requests +++ /dev/null @@ -1,84 +0,0 @@ -# This file was generated by Autom4te 2.71. -# It contains the lists of macros which have been traced. -# It can be safely removed. - -@request = ( - bless( [ - '0', - 1, - [ - '/nix/store/760wf32r5vwm20fvyfg2dndrm8drjvrb-autoconf-2.71/share/autoconf' - ], - [ - '/nix/store/760wf32r5vwm20fvyfg2dndrm8drjvrb-autoconf-2.71/share/autoconf/autoconf/autoconf.m4f', - '/nix/store/760wf32r5vwm20fvyfg2dndrm8drjvrb-autoconf-2.71/share/autoconf/autoconf/trailer.m4', - 'configure.ac' - ], - { - '_m4_warn' => 1, - 'AM_POT_TOOLS' => 1, - 'AC_CONFIG_LIBOBJ_DIR' => 1, - 'AC_LIBSOURCE' => 1, - 'AC_SUBST' => 1, - 'AC_CONFIG_AUX_DIR' => 1, - 'AC_REQUIRE_AUX_FILE' => 1, - 'AC_CONFIG_FILES' => 1, - 'AH_OUTPUT' => 1, - 'AM_MAKEFILE_INCLUDE' => 1, - 'AM_ENABLE_MULTILIB' => 1, - 'LT_SUPPORTED_TAG' => 1, - 'AM_PROG_MOC' => 1, - 'AM_MAINTAINER_MODE' => 1, - 'AC_FC_SRCEXT' => 1, - 'm4_include' => 1, - 'AC_CANONICAL_SYSTEM' => 1, - 'AM_PROG_MKDIR_P' => 1, - 'AC_CANONICAL_TARGET' => 1, - 'm4_pattern_allow' => 1, - 'AM_INIT_AUTOMAKE' => 1, - 'LT_CONFIG_LTDL_DIR' => 1, - 'AM_EXTRA_RECURSIVE_TARGETS' => 1, - 'AC_CANONICAL_BUILD' => 1, - '_AM_SUBST_NOTMAKE' => 1, - 'AC_CANONICAL_HOST' => 1, - 'AC_SUBST_TRACE' => 1, - 'AC_CONFIG_SUBDIRS' => 1, - 'AC_PROG_LIBTOOL' => 1, - 'AC_FC_FREEFORM' => 1, - 'LT_INIT' => 1, - 'AC_CONFIG_MACRO_DIR_TRACE' => 1, - 'm4_sinclude' => 1, - 'AM_SILENT_RULES' => 1, - 'AM_AUTOMAKE_VERSION' => 1, - 'AC_FC_PP_DEFINE' => 1, - 'AC_INIT' => 1, - 'GTK_DOC_CHECK' => 1, - 'AM_PROG_LIBTOOL' => 1, - 'include' => 1, - 'AM_NLS' => 1, - 'AM_CONDITIONAL' => 1, - 'AC_DEFINE_TRACE_LITERAL' => 1, - 'AM_PROG_AR' => 1, - 'IT_PROG_INTLTOOL' => 1, - 'AM_PATH_GUILE' => 1, - 'AC_CONFIG_HEADERS' => 1, - 'm4_pattern_forbid' => 1, - 'AC_FC_PP_SRCEXT' => 1, - 'AM_XGETTEXT_OPTION' => 1, - '_AM_COND_ELSE' => 1, - 'sinclude' => 1, - 'AM_PROG_F77_C_O' => 1, - '_AM_COND_ENDIF' => 1, - 'AM_PROG_CXX_C_O' => 1, - 'AC_CONFIG_LINKS' => 1, - '_AM_COND_IF' => 1, - 'AM_GNU_GETTEXT_INTL_SUBDIR' => 1, - '_LT_AC_TAGCONFIG' => 1, - 'AM_PROG_FC_C_O' => 1, - 'AM_GNU_GETTEXT' => 1, - 'AM_PROG_CC_C_O' => 1, - '_AM_MAKEFILE_INCLUDE' => 1 - } - ], 'Autom4te::Request' ) - ); - diff --git a/perl/autom4te.cache/traces.0 b/perl/autom4te.cache/traces.0 deleted file mode 100644 index be2156d0c91..00000000000 --- a/perl/autom4te.cache/traces.0 +++ /dev/null @@ -1,291 +0,0 @@ -m4trace:configure.ac:1: -1- AC_INIT([nix-perl], [2.14.0]) -m4trace:configure.ac:1: -1- m4_pattern_forbid([^_?A[CHUM]_]) -m4trace:configure.ac:1: -1- m4_pattern_forbid([_AC_]) -m4trace:configure.ac:1: -1- m4_pattern_forbid([^LIBOBJS$], [do not use LIBOBJS directly, use AC_LIBOBJ (see section `AC_LIBOBJ vs LIBOBJS']) -m4trace:configure.ac:1: -1- m4_pattern_allow([^AS_FLAGS$]) -m4trace:configure.ac:1: -1- m4_pattern_forbid([^_?m4_]) -m4trace:configure.ac:1: -1- m4_pattern_forbid([^dnl$]) -m4trace:configure.ac:1: -1- m4_pattern_forbid([^_?AS_]) -m4trace:configure.ac:1: -1- AC_SUBST([SHELL]) -m4trace:configure.ac:1: -1- AC_SUBST_TRACE([SHELL]) -m4trace:configure.ac:1: -1- m4_pattern_allow([^SHELL$]) -m4trace:configure.ac:1: -1- AC_SUBST([PATH_SEPARATOR]) -m4trace:configure.ac:1: -1- AC_SUBST_TRACE([PATH_SEPARATOR]) -m4trace:configure.ac:1: -1- m4_pattern_allow([^PATH_SEPARATOR$]) -m4trace:configure.ac:1: -1- AC_SUBST([PACKAGE_NAME], [m4_ifdef([AC_PACKAGE_NAME], ['AC_PACKAGE_NAME'])]) -m4trace:configure.ac:1: -1- AC_SUBST_TRACE([PACKAGE_NAME]) -m4trace:configure.ac:1: -1- m4_pattern_allow([^PACKAGE_NAME$]) -m4trace:configure.ac:1: -1- AC_SUBST([PACKAGE_TARNAME], [m4_ifdef([AC_PACKAGE_TARNAME], ['AC_PACKAGE_TARNAME'])]) -m4trace:configure.ac:1: -1- AC_SUBST_TRACE([PACKAGE_TARNAME]) -m4trace:configure.ac:1: -1- m4_pattern_allow([^PACKAGE_TARNAME$]) -m4trace:configure.ac:1: -1- AC_SUBST([PACKAGE_VERSION], [m4_ifdef([AC_PACKAGE_VERSION], ['AC_PACKAGE_VERSION'])]) -m4trace:configure.ac:1: -1- AC_SUBST_TRACE([PACKAGE_VERSION]) -m4trace:configure.ac:1: -1- m4_pattern_allow([^PACKAGE_VERSION$]) -m4trace:configure.ac:1: -1- AC_SUBST([PACKAGE_STRING], [m4_ifdef([AC_PACKAGE_STRING], ['AC_PACKAGE_STRING'])]) -m4trace:configure.ac:1: -1- AC_SUBST_TRACE([PACKAGE_STRING]) -m4trace:configure.ac:1: -1- m4_pattern_allow([^PACKAGE_STRING$]) -m4trace:configure.ac:1: -1- AC_SUBST([PACKAGE_BUGREPORT], [m4_ifdef([AC_PACKAGE_BUGREPORT], ['AC_PACKAGE_BUGREPORT'])]) -m4trace:configure.ac:1: -1- AC_SUBST_TRACE([PACKAGE_BUGREPORT]) -m4trace:configure.ac:1: -1- m4_pattern_allow([^PACKAGE_BUGREPORT$]) -m4trace:configure.ac:1: -1- AC_SUBST([PACKAGE_URL], [m4_ifdef([AC_PACKAGE_URL], ['AC_PACKAGE_URL'])]) -m4trace:configure.ac:1: -1- AC_SUBST_TRACE([PACKAGE_URL]) -m4trace:configure.ac:1: -1- m4_pattern_allow([^PACKAGE_URL$]) -m4trace:configure.ac:1: -1- AC_SUBST([exec_prefix], [NONE]) -m4trace:configure.ac:1: -1- AC_SUBST_TRACE([exec_prefix]) -m4trace:configure.ac:1: -1- m4_pattern_allow([^exec_prefix$]) -m4trace:configure.ac:1: -1- AC_SUBST([prefix], [NONE]) -m4trace:configure.ac:1: -1- AC_SUBST_TRACE([prefix]) -m4trace:configure.ac:1: -1- m4_pattern_allow([^prefix$]) -m4trace:configure.ac:1: -1- AC_SUBST([program_transform_name], [s,x,x,]) -m4trace:configure.ac:1: -1- AC_SUBST_TRACE([program_transform_name]) -m4trace:configure.ac:1: -1- m4_pattern_allow([^program_transform_name$]) -m4trace:configure.ac:1: -1- AC_SUBST([bindir], ['${exec_prefix}/bin']) -m4trace:configure.ac:1: -1- AC_SUBST_TRACE([bindir]) -m4trace:configure.ac:1: -1- m4_pattern_allow([^bindir$]) -m4trace:configure.ac:1: -1- AC_SUBST([sbindir], ['${exec_prefix}/sbin']) -m4trace:configure.ac:1: -1- AC_SUBST_TRACE([sbindir]) -m4trace:configure.ac:1: -1- m4_pattern_allow([^sbindir$]) -m4trace:configure.ac:1: -1- AC_SUBST([libexecdir], ['${exec_prefix}/libexec']) -m4trace:configure.ac:1: -1- AC_SUBST_TRACE([libexecdir]) -m4trace:configure.ac:1: -1- m4_pattern_allow([^libexecdir$]) -m4trace:configure.ac:1: -1- AC_SUBST([datarootdir], ['${prefix}/share']) -m4trace:configure.ac:1: -1- AC_SUBST_TRACE([datarootdir]) -m4trace:configure.ac:1: -1- m4_pattern_allow([^datarootdir$]) -m4trace:configure.ac:1: -1- AC_SUBST([datadir], ['${datarootdir}']) -m4trace:configure.ac:1: -1- AC_SUBST_TRACE([datadir]) -m4trace:configure.ac:1: -1- m4_pattern_allow([^datadir$]) -m4trace:configure.ac:1: -1- AC_SUBST([sysconfdir], ['${prefix}/etc']) -m4trace:configure.ac:1: -1- AC_SUBST_TRACE([sysconfdir]) -m4trace:configure.ac:1: -1- m4_pattern_allow([^sysconfdir$]) -m4trace:configure.ac:1: -1- AC_SUBST([sharedstatedir], ['${prefix}/com']) -m4trace:configure.ac:1: -1- AC_SUBST_TRACE([sharedstatedir]) -m4trace:configure.ac:1: -1- m4_pattern_allow([^sharedstatedir$]) -m4trace:configure.ac:1: -1- AC_SUBST([localstatedir], ['${prefix}/var']) -m4trace:configure.ac:1: -1- AC_SUBST_TRACE([localstatedir]) -m4trace:configure.ac:1: -1- m4_pattern_allow([^localstatedir$]) -m4trace:configure.ac:1: -1- AC_SUBST([runstatedir], ['${localstatedir}/run']) -m4trace:configure.ac:1: -1- AC_SUBST_TRACE([runstatedir]) -m4trace:configure.ac:1: -1- m4_pattern_allow([^runstatedir$]) -m4trace:configure.ac:1: -1- AC_SUBST([includedir], ['${prefix}/include']) -m4trace:configure.ac:1: -1- AC_SUBST_TRACE([includedir]) -m4trace:configure.ac:1: -1- m4_pattern_allow([^includedir$]) -m4trace:configure.ac:1: -1- AC_SUBST([oldincludedir], ['/usr/include']) -m4trace:configure.ac:1: -1- AC_SUBST_TRACE([oldincludedir]) -m4trace:configure.ac:1: -1- m4_pattern_allow([^oldincludedir$]) -m4trace:configure.ac:1: -1- AC_SUBST([docdir], [m4_ifset([AC_PACKAGE_TARNAME], - ['${datarootdir}/doc/${PACKAGE_TARNAME}'], - ['${datarootdir}/doc/${PACKAGE}'])]) -m4trace:configure.ac:1: -1- AC_SUBST_TRACE([docdir]) -m4trace:configure.ac:1: -1- m4_pattern_allow([^docdir$]) -m4trace:configure.ac:1: -1- AC_SUBST([infodir], ['${datarootdir}/info']) -m4trace:configure.ac:1: -1- AC_SUBST_TRACE([infodir]) -m4trace:configure.ac:1: -1- m4_pattern_allow([^infodir$]) -m4trace:configure.ac:1: -1- AC_SUBST([htmldir], ['${docdir}']) -m4trace:configure.ac:1: -1- AC_SUBST_TRACE([htmldir]) -m4trace:configure.ac:1: -1- m4_pattern_allow([^htmldir$]) -m4trace:configure.ac:1: -1- AC_SUBST([dvidir], ['${docdir}']) -m4trace:configure.ac:1: -1- AC_SUBST_TRACE([dvidir]) -m4trace:configure.ac:1: -1- m4_pattern_allow([^dvidir$]) -m4trace:configure.ac:1: -1- AC_SUBST([pdfdir], ['${docdir}']) -m4trace:configure.ac:1: -1- AC_SUBST_TRACE([pdfdir]) -m4trace:configure.ac:1: -1- m4_pattern_allow([^pdfdir$]) -m4trace:configure.ac:1: -1- AC_SUBST([psdir], ['${docdir}']) -m4trace:configure.ac:1: -1- AC_SUBST_TRACE([psdir]) -m4trace:configure.ac:1: -1- m4_pattern_allow([^psdir$]) -m4trace:configure.ac:1: -1- AC_SUBST([libdir], ['${exec_prefix}/lib']) -m4trace:configure.ac:1: -1- AC_SUBST_TRACE([libdir]) -m4trace:configure.ac:1: -1- m4_pattern_allow([^libdir$]) -m4trace:configure.ac:1: -1- AC_SUBST([localedir], ['${datarootdir}/locale']) -m4trace:configure.ac:1: -1- AC_SUBST_TRACE([localedir]) -m4trace:configure.ac:1: -1- m4_pattern_allow([^localedir$]) -m4trace:configure.ac:1: -1- AC_SUBST([mandir], ['${datarootdir}/man']) -m4trace:configure.ac:1: -1- AC_SUBST_TRACE([mandir]) -m4trace:configure.ac:1: -1- m4_pattern_allow([^mandir$]) -m4trace:configure.ac:1: -1- AC_DEFINE_TRACE_LITERAL([PACKAGE_NAME]) -m4trace:configure.ac:1: -1- m4_pattern_allow([^PACKAGE_NAME$]) -m4trace:configure.ac:1: -1- AH_OUTPUT([PACKAGE_NAME], [/* Define to the full name of this package. */ -@%:@undef PACKAGE_NAME]) -m4trace:configure.ac:1: -1- AC_DEFINE_TRACE_LITERAL([PACKAGE_TARNAME]) -m4trace:configure.ac:1: -1- m4_pattern_allow([^PACKAGE_TARNAME$]) -m4trace:configure.ac:1: -1- AH_OUTPUT([PACKAGE_TARNAME], [/* Define to the one symbol short name of this package. */ -@%:@undef PACKAGE_TARNAME]) -m4trace:configure.ac:1: -1- AC_DEFINE_TRACE_LITERAL([PACKAGE_VERSION]) -m4trace:configure.ac:1: -1- m4_pattern_allow([^PACKAGE_VERSION$]) -m4trace:configure.ac:1: -1- AH_OUTPUT([PACKAGE_VERSION], [/* Define to the version of this package. */ -@%:@undef PACKAGE_VERSION]) -m4trace:configure.ac:1: -1- AC_DEFINE_TRACE_LITERAL([PACKAGE_STRING]) -m4trace:configure.ac:1: -1- m4_pattern_allow([^PACKAGE_STRING$]) -m4trace:configure.ac:1: -1- AH_OUTPUT([PACKAGE_STRING], [/* Define to the full name and version of this package. */ -@%:@undef PACKAGE_STRING]) -m4trace:configure.ac:1: -1- AC_DEFINE_TRACE_LITERAL([PACKAGE_BUGREPORT]) -m4trace:configure.ac:1: -1- m4_pattern_allow([^PACKAGE_BUGREPORT$]) -m4trace:configure.ac:1: -1- AH_OUTPUT([PACKAGE_BUGREPORT], [/* Define to the address where bug reports for this package should be sent. */ -@%:@undef PACKAGE_BUGREPORT]) -m4trace:configure.ac:1: -1- AC_DEFINE_TRACE_LITERAL([PACKAGE_URL]) -m4trace:configure.ac:1: -1- m4_pattern_allow([^PACKAGE_URL$]) -m4trace:configure.ac:1: -1- AH_OUTPUT([PACKAGE_URL], [/* Define to the home page for this package. */ -@%:@undef PACKAGE_URL]) -m4trace:configure.ac:1: -1- AC_SUBST([DEFS]) -m4trace:configure.ac:1: -1- AC_SUBST_TRACE([DEFS]) -m4trace:configure.ac:1: -1- m4_pattern_allow([^DEFS$]) -m4trace:configure.ac:1: -1- AC_SUBST([ECHO_C]) -m4trace:configure.ac:1: -1- AC_SUBST_TRACE([ECHO_C]) -m4trace:configure.ac:1: -1- m4_pattern_allow([^ECHO_C$]) -m4trace:configure.ac:1: -1- AC_SUBST([ECHO_N]) -m4trace:configure.ac:1: -1- AC_SUBST_TRACE([ECHO_N]) -m4trace:configure.ac:1: -1- m4_pattern_allow([^ECHO_N$]) -m4trace:configure.ac:1: -1- AC_SUBST([ECHO_T]) -m4trace:configure.ac:1: -1- AC_SUBST_TRACE([ECHO_T]) -m4trace:configure.ac:1: -1- m4_pattern_allow([^ECHO_T$]) -m4trace:configure.ac:1: -1- AC_SUBST([LIBS]) -m4trace:configure.ac:1: -1- AC_SUBST_TRACE([LIBS]) -m4trace:configure.ac:1: -1- m4_pattern_allow([^LIBS$]) -m4trace:configure.ac:1: -1- AC_SUBST([build_alias]) -m4trace:configure.ac:1: -1- AC_SUBST_TRACE([build_alias]) -m4trace:configure.ac:1: -1- m4_pattern_allow([^build_alias$]) -m4trace:configure.ac:1: -1- AC_SUBST([host_alias]) -m4trace:configure.ac:1: -1- AC_SUBST_TRACE([host_alias]) -m4trace:configure.ac:1: -1- m4_pattern_allow([^host_alias$]) -m4trace:configure.ac:1: -1- AC_SUBST([target_alias]) -m4trace:configure.ac:1: -1- AC_SUBST_TRACE([target_alias]) -m4trace:configure.ac:1: -1- m4_pattern_allow([^target_alias$]) -m4trace:configure.ac:3: -1- AC_CONFIG_AUX_DIR([../config]) -m4trace:configure.ac:7: -1- AC_SUBST([CC]) -m4trace:configure.ac:7: -1- AC_SUBST_TRACE([CC]) -m4trace:configure.ac:7: -1- m4_pattern_allow([^CC$]) -m4trace:configure.ac:7: -1- AC_SUBST([CFLAGS]) -m4trace:configure.ac:7: -1- AC_SUBST_TRACE([CFLAGS]) -m4trace:configure.ac:7: -1- m4_pattern_allow([^CFLAGS$]) -m4trace:configure.ac:7: -1- AC_SUBST([LDFLAGS]) -m4trace:configure.ac:7: -1- AC_SUBST_TRACE([LDFLAGS]) -m4trace:configure.ac:7: -1- m4_pattern_allow([^LDFLAGS$]) -m4trace:configure.ac:7: -1- AC_SUBST([LIBS]) -m4trace:configure.ac:7: -1- AC_SUBST_TRACE([LIBS]) -m4trace:configure.ac:7: -1- m4_pattern_allow([^LIBS$]) -m4trace:configure.ac:7: -1- AC_SUBST([CPPFLAGS]) -m4trace:configure.ac:7: -1- AC_SUBST_TRACE([CPPFLAGS]) -m4trace:configure.ac:7: -1- m4_pattern_allow([^CPPFLAGS$]) -m4trace:configure.ac:7: -1- AC_SUBST([CC]) -m4trace:configure.ac:7: -1- AC_SUBST_TRACE([CC]) -m4trace:configure.ac:7: -1- m4_pattern_allow([^CC$]) -m4trace:configure.ac:7: -1- AC_SUBST([CC]) -m4trace:configure.ac:7: -1- AC_SUBST_TRACE([CC]) -m4trace:configure.ac:7: -1- m4_pattern_allow([^CC$]) -m4trace:configure.ac:7: -1- AC_SUBST([CC]) -m4trace:configure.ac:7: -1- AC_SUBST_TRACE([CC]) -m4trace:configure.ac:7: -1- m4_pattern_allow([^CC$]) -m4trace:configure.ac:7: -1- AC_SUBST([CC]) -m4trace:configure.ac:7: -1- AC_SUBST_TRACE([CC]) -m4trace:configure.ac:7: -1- m4_pattern_allow([^CC$]) -m4trace:configure.ac:7: -1- AC_SUBST([ac_ct_CC]) -m4trace:configure.ac:7: -1- AC_SUBST_TRACE([ac_ct_CC]) -m4trace:configure.ac:7: -1- m4_pattern_allow([^ac_ct_CC$]) -m4trace:configure.ac:7: -1- AC_SUBST([CC]) -m4trace:configure.ac:7: -1- AC_SUBST_TRACE([CC]) -m4trace:configure.ac:7: -1- m4_pattern_allow([^CC$]) -m4trace:configure.ac:7: -1- AC_SUBST([EXEEXT], [$ac_cv_exeext]) -m4trace:configure.ac:7: -1- AC_SUBST_TRACE([EXEEXT]) -m4trace:configure.ac:7: -1- m4_pattern_allow([^EXEEXT$]) -m4trace:configure.ac:7: -1- AC_SUBST([OBJEXT], [$ac_cv_objext]) -m4trace:configure.ac:7: -1- AC_SUBST_TRACE([OBJEXT]) -m4trace:configure.ac:7: -1- m4_pattern_allow([^OBJEXT$]) -m4trace:configure.ac:8: -1- AC_SUBST([CXX]) -m4trace:configure.ac:8: -1- AC_SUBST_TRACE([CXX]) -m4trace:configure.ac:8: -1- m4_pattern_allow([^CXX$]) -m4trace:configure.ac:8: -1- AC_SUBST([CXXFLAGS]) -m4trace:configure.ac:8: -1- AC_SUBST_TRACE([CXXFLAGS]) -m4trace:configure.ac:8: -1- m4_pattern_allow([^CXXFLAGS$]) -m4trace:configure.ac:8: -1- AC_SUBST([LDFLAGS]) -m4trace:configure.ac:8: -1- AC_SUBST_TRACE([LDFLAGS]) -m4trace:configure.ac:8: -1- m4_pattern_allow([^LDFLAGS$]) -m4trace:configure.ac:8: -1- AC_SUBST([LIBS]) -m4trace:configure.ac:8: -1- AC_SUBST_TRACE([LIBS]) -m4trace:configure.ac:8: -1- m4_pattern_allow([^LIBS$]) -m4trace:configure.ac:8: -1- AC_SUBST([CPPFLAGS]) -m4trace:configure.ac:8: -1- AC_SUBST_TRACE([CPPFLAGS]) -m4trace:configure.ac:8: -1- m4_pattern_allow([^CPPFLAGS$]) -m4trace:configure.ac:8: -1- AC_SUBST([CXX]) -m4trace:configure.ac:8: -1- AC_SUBST_TRACE([CXX]) -m4trace:configure.ac:8: -1- m4_pattern_allow([^CXX$]) -m4trace:configure.ac:8: -1- AC_SUBST([ac_ct_CXX]) -m4trace:configure.ac:8: -1- AC_SUBST_TRACE([ac_ct_CXX]) -m4trace:configure.ac:8: -1- m4_pattern_allow([^ac_ct_CXX$]) -m4trace:configure.ac:10: -1- AC_CANONICAL_HOST -m4trace:configure.ac:10: -1- AC_CANONICAL_BUILD -m4trace:configure.ac:10: -1- AC_REQUIRE_AUX_FILE([config.sub]) -m4trace:configure.ac:10: -1- AC_REQUIRE_AUX_FILE([config.guess]) -m4trace:configure.ac:10: -1- AC_SUBST([build], [$ac_cv_build]) -m4trace:configure.ac:10: -1- AC_SUBST_TRACE([build]) -m4trace:configure.ac:10: -1- m4_pattern_allow([^build$]) -m4trace:configure.ac:10: -1- AC_SUBST([build_cpu], [$[1]]) -m4trace:configure.ac:10: -1- AC_SUBST_TRACE([build_cpu]) -m4trace:configure.ac:10: -1- m4_pattern_allow([^build_cpu$]) -m4trace:configure.ac:10: -1- AC_SUBST([build_vendor], [$[2]]) -m4trace:configure.ac:10: -1- AC_SUBST_TRACE([build_vendor]) -m4trace:configure.ac:10: -1- m4_pattern_allow([^build_vendor$]) -m4trace:configure.ac:10: -1- AC_SUBST([build_os]) -m4trace:configure.ac:10: -1- AC_SUBST_TRACE([build_os]) -m4trace:configure.ac:10: -1- m4_pattern_allow([^build_os$]) -m4trace:configure.ac:10: -1- AC_SUBST([host], [$ac_cv_host]) -m4trace:configure.ac:10: -1- AC_SUBST_TRACE([host]) -m4trace:configure.ac:10: -1- m4_pattern_allow([^host$]) -m4trace:configure.ac:10: -1- AC_SUBST([host_cpu], [$[1]]) -m4trace:configure.ac:10: -1- AC_SUBST_TRACE([host_cpu]) -m4trace:configure.ac:10: -1- m4_pattern_allow([^host_cpu$]) -m4trace:configure.ac:10: -1- AC_SUBST([host_vendor], [$[2]]) -m4trace:configure.ac:10: -1- AC_SUBST_TRACE([host_vendor]) -m4trace:configure.ac:10: -1- m4_pattern_allow([^host_vendor$]) -m4trace:configure.ac:10: -1- AC_SUBST([host_os]) -m4trace:configure.ac:10: -1- AC_SUBST_TRACE([host_os]) -m4trace:configure.ac:10: -1- m4_pattern_allow([^host_os$]) -m4trace:configure.ac:13: -1- AC_DEFINE_TRACE_LITERAL([_FILE_OFFSET_BITS]) -m4trace:configure.ac:13: -1- m4_pattern_allow([^_FILE_OFFSET_BITS$]) -m4trace:configure.ac:13: -1- AH_OUTPUT([_FILE_OFFSET_BITS], [/* Number of bits in a file offset, on hosts where this is settable. */ -@%:@undef _FILE_OFFSET_BITS]) -m4trace:configure.ac:13: -1- AC_DEFINE_TRACE_LITERAL([_LARGE_FILES]) -m4trace:configure.ac:13: -1- m4_pattern_allow([^_LARGE_FILES$]) -m4trace:configure.ac:13: -1- AH_OUTPUT([_LARGE_FILES], [/* Define for large files, on AIX-style hosts. */ -@%:@undef _LARGE_FILES]) -m4trace:configure.ac:23: -1- AC_SUBST([perl]) -m4trace:configure.ac:23: -1- AC_SUBST_TRACE([perl]) -m4trace:configure.ac:23: -1- m4_pattern_allow([^perl$]) -m4trace:configure.ac:24: -1- AC_SUBST([curl]) -m4trace:configure.ac:24: -1- AC_SUBST_TRACE([curl]) -m4trace:configure.ac:24: -1- m4_pattern_allow([^curl$]) -m4trace:configure.ac:25: -1- AC_SUBST([bzip2]) -m4trace:configure.ac:25: -1- AC_SUBST_TRACE([bzip2]) -m4trace:configure.ac:25: -1- m4_pattern_allow([^bzip2$]) -m4trace:configure.ac:26: -1- AC_SUBST([xz]) -m4trace:configure.ac:26: -1- AC_SUBST_TRACE([xz]) -m4trace:configure.ac:26: -1- m4_pattern_allow([^xz$]) -m4trace:configure.ac:41: -1- AC_SUBST([perllibdir], [${libdir}/perl5/site_perl/$perlversion/$perlarchname]) -m4trace:configure.ac:41: -1- AC_SUBST_TRACE([perllibdir]) -m4trace:configure.ac:41: -1- m4_pattern_allow([^perllibdir$]) -m4trace:configure.ac:50: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete. -You should run autoupdate.], [./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from... -configure.ac:50: the top level]) -m4trace:configure.ac:54: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete. -You should run autoupdate.], [./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from... -configure.ac:54: the top level]) -m4trace:configure.ac:65: -1- AC_SUBST([perlFlags]) -m4trace:configure.ac:65: -1- AC_SUBST_TRACE([perlFlags]) -m4trace:configure.ac:65: -1- m4_pattern_allow([^perlFlags$]) -m4trace:configure.ac:69: -1- AC_SUBST([NIX]) -m4trace:configure.ac:69: -1- AC_SUBST_TRACE([NIX]) -m4trace:configure.ac:69: -1- m4_pattern_allow([^NIX$]) -m4trace:configure.ac:83: -1- AC_CONFIG_FILES([]) -m4trace:configure.ac:84: -1- AC_SUBST([LIB@&t@OBJS], [$ac_libobjs]) -m4trace:configure.ac:84: -1- AC_SUBST_TRACE([LIB@&t@OBJS]) -m4trace:configure.ac:84: -1- m4_pattern_allow([^LIB@&t@OBJS$]) -m4trace:configure.ac:84: -1- AC_SUBST([LTLIBOBJS], [$ac_ltlibobjs]) -m4trace:configure.ac:84: -1- AC_SUBST_TRACE([LTLIBOBJS]) -m4trace:configure.ac:84: -1- m4_pattern_allow([^LTLIBOBJS$]) -m4trace:configure.ac:84: -1- AC_SUBST_TRACE([top_builddir]) -m4trace:configure.ac:84: -1- AC_SUBST_TRACE([top_build_prefix]) -m4trace:configure.ac:84: -1- AC_SUBST_TRACE([srcdir]) -m4trace:configure.ac:84: -1- AC_SUBST_TRACE([abs_srcdir]) -m4trace:configure.ac:84: -1- AC_SUBST_TRACE([top_srcdir]) -m4trace:configure.ac:84: -1- AC_SUBST_TRACE([abs_top_srcdir]) -m4trace:configure.ac:84: -1- AC_SUBST_TRACE([builddir]) -m4trace:configure.ac:84: -1- AC_SUBST_TRACE([abs_builddir]) -m4trace:configure.ac:84: -1- AC_SUBST_TRACE([abs_top_builddir]) From 6f85dde788847bfa8c863b6cd2542fa2f1f01dfc Mon Sep 17 00:00:00 2001 From: Andrea Bedini Date: Mon, 20 Feb 2023 16:05:26 +0800 Subject: [PATCH 15/21] Remove extranous files --- perl/config.log | 465 ---- perl/configure | 5623 ----------------------------------------------- 2 files changed, 6088 deletions(-) delete mode 100644 perl/config.log delete mode 100755 perl/configure diff --git a/perl/config.log b/perl/config.log deleted file mode 100644 index 8e3fe375c9b..00000000000 --- a/perl/config.log +++ /dev/null @@ -1,465 +0,0 @@ -This file contains any messages produced by compilers while -running configure, to aid debugging if configure makes a mistake. - -It was created by nix-perl configure 2.14.0, which was -generated by GNU Autoconf 2.71. Invocation command line was - - $ ./configure --prefix=/home/andrea/code/nix/outputs/out --with-dbi=/nix/store/vih7n0nx0j7lbq7bxfs4vzv6dmmfy86y-perl5.36.0-DBI-1.643/lib/perl5/site_perl --with-dbd-sqlite=/nix/store/5rzc64laaxsip1draw5ib8mm3hzhv2qw-perl5.36.0-DBD-SQLite-1.70/lib/perl5/site_perl - -## --------- ## -## Platform. ## -## --------- ## - -hostname = fino.bedini.io -uname -m = x86_64 -uname -r = 6.1.10-1-default -uname -s = Linux -uname -v = #1 SMP PREEMPT_DYNAMIC Mon Feb 6 07:27:26 UTC 2023 (2a0570b) - -/usr/bin/uname -p = x86_64 -/bin/uname -X = unknown - -/bin/arch = x86_64 -/usr/bin/arch -k = unknown -/usr/convex/getsysinfo = unknown -/usr/bin/hostinfo = unknown -/bin/machine = unknown -/usr/bin/oslevel = unknown -/bin/universe = unknown - -PATH: /nix/store/760wf32r5vwm20fvyfg2dndrm8drjvrb-autoconf-2.71/bin/ -PATH: /nix/store/5my3yfyik7gwmbnqv12v6vhiq4qzlw74-automake-1.16.5/bin/ -PATH: /nix/store/ahb1jl345mpn3v8my8aj77df294q59ij-gettext-0.21/bin/ -PATH: /nix/store/lxkkp26hdr7fjndy7zs5j7344z6hlrkn-libtool-2.4.7/bin/ -PATH: /nix/store/56bgsgyv06l2d6yc7m5lg1hxbm0h3cy4-gnum4-1.4.19/bin/ -PATH: /nix/store/p4vpay6wkmraar8p626zk2421790vr62-file-5.43/bin/ -PATH: /nix/store/nyjxcn992aqcm00l7i1hw3fjqk6281n7-pkg-config-wrapper-0.29.2/bin/ -PATH: /nix/store/pr5n59mb4jzmfx6kanwxly0l07p861fg-patchelf-0.15.0/bin/ -PATH: /nix/store/dq0xwmsk1g0i2ayg6pb7y87na2knzylh-gcc-wrapper-11.3.0/bin/ -PATH: /nix/store/1gf2flfqnpqbr1b4p4qz2f72y42bs56r-gcc-11.3.0/bin/ -PATH: /nix/store/57xv61c5zi8pphjbcwxxjlgc34p61ic9-glibc-2.35-163-bin/bin/ -PATH: /nix/store/a7gvj343m05j2s32xcnwr35v31ynlypr-coreutils-9.1/bin/ -PATH: /nix/store/1d6ian3r8kdzspw8hacjhl3xkp40g1lj-binutils-wrapper-2.39/bin/ -PATH: /nix/store/039g378vc3pc3dvi9dzdlrd0i4q93qwf-binutils-2.39/bin/ -PATH: /nix/store/sy86g4sva5jjznbl7ir4lcbgc4b1n4s1-nix-2.14.0pre20230216_dirty/bin/ -PATH: /nix/store/hl5lsmyf6alwj91nv8kmg2iz1lbnxym9-curl-7.86.0-dev/bin/ -PATH: /nix/store/39m0xn31z7n44wflfxqq7fbjh1ik6xq7-brotli-1.0.9/bin/ -PATH: /nix/store/0lm4ygslgn65xi9pkw2kw29qiqqd80hz-libkrb5-1.20-dev/bin/ -PATH: /nix/store/r7gl900my2fw6k33nxh2r7rzv8nv0s25-libkrb5-1.20/bin/ -PATH: /nix/store/n8jl8q7kk4a03n4gjiymy4y4hpcp2apm-nghttp2-1.49.0-bin/bin/ -PATH: /nix/store/hfkdbq95wsm9a0zf2hz51ads25h657hx-libidn2-2.3.2-bin/bin/ -PATH: /nix/store/fq47cv26nb87hwz2678r6i8ym5b57lwf-openssl-3.0.7-bin/bin/ -PATH: /nix/store/mb0pcxkmrg0f6k0zaywlnvpk9q3j5ans-zstd-1.5.2-bin/bin/ -PATH: /nix/store/w10in9diaqrcqqxi5lg20n3q2jfpk6pq-zstd-1.5.2/bin/ -PATH: /nix/store/52fbv6j49khca4cfvwm35fqd984w2520-curl-7.86.0-bin/bin/ -PATH: /nix/store/a8mhcagrsly7c7mpjrpsnaahk4aax056-bzip2-1.0.8-bin/bin/ -PATH: /nix/store/zlcnmqq14jz5x9439jf937mvayyl63da-xz-5.2.7-bin/bin/ -PATH: /nix/store/1zlrx8g7xs6ar0ggca4h3p6hmapq2p2h-perl-5.36.0/bin/ -PATH: /nix/store/a7gvj343m05j2s32xcnwr35v31ynlypr-coreutils-9.1/bin/ -PATH: /nix/store/mydc6f4k2z73xlcz7ilif3v2lcaiqvza-findutils-4.9.0/bin/ -PATH: /nix/store/j9p3g8472iijd50vhdprx0nmk2fqn5gv-diffutils-3.8/bin/ -PATH: /nix/store/89zs7rms6x00xfq4dq6m7mjnhkr8a6r4-gnused-4.8/bin/ -PATH: /nix/store/86bp03jkmsl6f92w0yzg4s59g5mhxwmy-gnugrep-3.7/bin/ -PATH: /nix/store/hwcdqw4jrjnd37wxqgsd47hd0j8bnj09-gawk-5.1.1/bin/ -PATH: /nix/store/cfbhw8r8ags41vwqaz47r583d0p4h4a1-gnutar-1.34/bin/ -PATH: /nix/store/p3m1ndl1lapwrlh698bnb5lvvxh67378-gzip-1.12/bin/ -PATH: /nix/store/a8mhcagrsly7c7mpjrpsnaahk4aax056-bzip2-1.0.8-bin/bin/ -PATH: /nix/store/mblgz65m3zv9x548a3d5m96fj2pbwr09-gnumake-4.3/bin/ -PATH: /nix/store/dsd5gz46hdbdk2rfdimqddhq6m8m8fqs-bash-5.1-p16/bin/ -PATH: /nix/store/v7ljksji50mg3w61dykaa3n3y79n6nil-patch-2.7.6/bin/ -PATH: /nix/store/zlcnmqq14jz5x9439jf937mvayyl63da-xz-5.2.7-bin/bin/ -PATH: /nix/store/y6aj732zm9m87c82fpvf103a1xb22blp-file-5.43/bin/ -PATH: /home/andrea/.nix-profile/bin/ -PATH: /home/andrea/bin/ -PATH: /home/andrea/.npm/bin/ -PATH: /home/andrea/.local/bin/ -PATH: /home/andrea/.nix-profile/bin/ -PATH: /nix/var/nix/profiles/default/bin/ -PATH: /home/andrea/.nix-profile/bin/ -PATH: /home/andrea/bin/ -PATH: /home/andrea/.npm/bin/ -PATH: /home/andrea/.local/bin/ -PATH: /home/andrea/.nix-profile/bin/ -PATH: /home/andrea/bin/ -PATH: /home/andrea/.npm/bin/ -PATH: /home/andrea/.local/bin/ -PATH: /home/andrea/.nix-profile/bin/ -PATH: /home/andrea/.cabal/bin/ -PATH: /home/andrea/.ghcup/bin/ -PATH: /home/andrea/bin/ -PATH: /home/andrea/.npm/bin/ -PATH: /home/andrea/.local/bin/ -PATH: /home/andrea/.nix-profile/bin/ -PATH: /nix/var/nix/profiles/default/bin/ -PATH: /home/andrea/.local/bin/ -PATH: /home/andrea/bin/ -PATH: /usr/local/bin/ -PATH: /usr/bin/ -PATH: /bin/ -PATH: /usr/sbin/ -PATH: /sbin/ -PATH: /usr/sbin/ -PATH: /sbin/ - - -## ----------- ## -## Core tests. ## -## ----------- ## - -configure:1766: loading site script /usr/share/site/x86_64-pc-linux-gnu -| #!/bin/sh -| # Site script for configure. It is resourced via $CONFIG_SITE environment varaible. -| -| # If user did not specify libdir, guess the correct target: -| # Use lib64 for 64 bit bi-arch targets, keep the default for the rest. -| if test "$libdir" = '${exec_prefix}/lib' ; then -| -| ac_config_site_64bit_host=NONE -| -| case "$host" in -| "" ) -| # User did not specify host target. -| # The native platform x86_64 is a bi-arch platform. -| # Try to detect cross-compilation to inferior architecture. -| -| # We are trying to guess 32-bit target compilation. It's not as easy as -| # it sounds, as there is possible several intermediate combinations. -| ac_config_site_cross_to_32bit_host=NONE -| -| # User defined -m32 in CFLAGS or CXXFLAGS or CC or CXX: -| # (It's sufficient for 32-bit, but alone may cause mis-behavior of some checks.) -| case "$CFLAGS $CXXFLAGS $CC $CXX" in -| *-m32*) -| ac_config_site_cross_to_32bit_host=YES -| ;; -| esac -| -| # Running with linux32: -| # (Changes detected platform, but not the toolchain target.) -| case "`/bin/uname -i`" in -| x86_64 | ppc64 | s390x | aarch64 ) -| ;; -| * ) -| ac_config_site_cross_to_32bit_host=YES -| ;; -| esac -| -| if test "x$ac_config_site_cross_to_32bit_host" = xNONE; then -| ac_config_site_64bit_host=YES -| fi -| -| ;; -| *x86_64* | *ppc64* | *s390x* | *aarch64* ) -| ac_config_site_64bit_host=YES -| ;; -| esac -| -| if test "x$ac_config_site_64bit_host" = xYES; then -| libdir='${exec_prefix}/lib64' -| fi -| fi -| -| # Continue with the standard behavior of configure defined in AC_SITE_LOAD: -| if test "x$prefix" != xNONE; then -| ac_site_files="$prefix/share/config.site $prefix/etc/config.site" -| else -| ac_site_files="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site" -| fi -| -| for ac_site_file in $ac_site_files -| do -| case $ac_site_file in #( -| */*) : -| ;; #( -| *) : -| ac_site_file=./$ac_site_file ;; -| esac -| if test -f "$ac_site_file" && test -r "$ac_site_file"; then -| { printf "%s\n" "/usr/share/site/x86_64-pc-linux-gnu:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5 -| printf "%s\n" "/usr/share/site/x86_64-pc-linux-gnu: loading site script $ac_site_file" >&6;} -| sed 's/^/| /' "$ac_site_file" >&5 -| . "$ac_site_file" \ -| || { { printf "%s\n" "/usr/share/site/x86_64-pc-linux-gnu:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -| printf "%s\n" "/usr/share/site/x86_64-pc-linux-gnu: error: in \`$ac_pwd':" >&2;} -| as_fn_error $? "failed to load site script $ac_site_file -| See \`config.log' for more details" "$LINENO" 5; } -| fi -| done -configure:2332: looking for aux files: config.guess config.sub -configure:2345: trying ./../config/ -configure:2374: ./../config/config.guess found -configure:2374: ./../config/config.sub found -configure:2552: checking for gcc -configure:2584: result: gcc -configure:2937: checking for C compiler version -configure:2946: gcc --version >&5 -gcc (GCC) 11.3.0 -Copyright (C) 2021 Free Software Foundation, Inc. -This is free software; see the source for copying conditions. There is NO -warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - -configure:2957: $? = 0 -configure:2946: gcc -v >&5 -Using built-in specs. -COLLECT_GCC=/nix/store/1gf2flfqnpqbr1b4p4qz2f72y42bs56r-gcc-11.3.0/bin/gcc -COLLECT_LTO_WRAPPER=/nix/store/1gf2flfqnpqbr1b4p4qz2f72y42bs56r-gcc-11.3.0/libexec/gcc/x86_64-unknown-linux-gnu/11.3.0/lto-wrapper -Target: x86_64-unknown-linux-gnu -Configured with: -Thread model: posix -Supported LTO compression algorithms: zlib -gcc version 11.3.0 (GCC) -configure:2957: $? = 0 -configure:2946: gcc -V >&5 -gcc: error: unrecognized command-line option '-V' -gcc: fatal error: no input files -compilation terminated. -configure:2957: $? = 1 -configure:2946: gcc -qversion >&5 -gcc: error: unrecognized command-line option '-qversion'; did you mean '--version'? -gcc: fatal error: no input files -compilation terminated. -configure:2957: $? = 1 -configure:2946: gcc -version >&5 -gcc: error: unrecognized command-line option '-version' -gcc: fatal error: no input files -compilation terminated. -configure:2957: $? = 1 -configure:2977: checking whether the C compiler works -configure:2999: gcc conftest.c >&5 -configure:3003: $? = 0 -configure:3053: result: yes -configure:3056: checking for C compiler default output file name -configure:3058: result: a.out -configure:3064: checking for suffix of executables -configure:3071: gcc -o conftest conftest.c >&5 -configure:3075: $? = 0 -configure:3098: result: -configure:3120: checking whether we are cross compiling -configure:3128: gcc -o conftest conftest.c >&5 -configure:3132: $? = 0 -configure:3139: ./conftest -configure:3143: $? = 0 -configure:3158: result: no -configure:3163: checking for suffix of object files -configure:3186: gcc -c conftest.c >&5 -configure:3190: $? = 0 -configure:3212: result: o -configure:3216: checking whether the compiler supports GNU C -configure:3236: gcc -c conftest.c >&5 -configure:3236: $? = 0 -configure:3246: result: yes -configure:3257: checking whether gcc accepts -g -configure:3278: gcc -c -g conftest.c >&5 -configure:3278: $? = 0 -configure:3322: result: yes -configure:3342: checking for gcc option to enable C11 features -configure:3357: gcc -c conftest.c >&5 -configure:3357: $? = 0 -configure:3375: result: none needed -configure:3613: checking for C++ compiler version -configure:3622: g++ --version >&5 -g++ (GCC) 11.3.0 -Copyright (C) 2021 Free Software Foundation, Inc. -This is free software; see the source for copying conditions. There is NO -warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - -configure:3633: $? = 0 -configure:3622: g++ -v >&5 -Using built-in specs. -COLLECT_GCC=/nix/store/1gf2flfqnpqbr1b4p4qz2f72y42bs56r-gcc-11.3.0/bin/g++ -COLLECT_LTO_WRAPPER=/nix/store/1gf2flfqnpqbr1b4p4qz2f72y42bs56r-gcc-11.3.0/libexec/gcc/x86_64-unknown-linux-gnu/11.3.0/lto-wrapper -Target: x86_64-unknown-linux-gnu -Configured with: -Thread model: posix -Supported LTO compression algorithms: zlib -gcc version 11.3.0 (GCC) -configure:3633: $? = 0 -configure:3622: g++ -V >&5 -g++: error: unrecognized command-line option '-V' -g++: fatal error: no input files -compilation terminated. -configure:3633: $? = 1 -configure:3622: g++ -qversion >&5 -g++: error: unrecognized command-line option '-qversion'; did you mean '--version'? -g++: fatal error: no input files -compilation terminated. -configure:3633: $? = 1 -configure:3637: checking whether the compiler supports GNU C++ -configure:3657: g++ -c conftest.cpp >&5 -configure:3657: $? = 0 -configure:3667: result: yes -configure:3678: checking whether g++ accepts -g -configure:3699: g++ -c -g conftest.cpp >&5 -configure:3699: $? = 0 -configure:3743: result: yes -configure:3763: checking for g++ option to enable C++11 features -configure:3778: g++ -c conftest.cpp >&5 -conftest.cpp: In function 'int main(int, char**)': -conftest.cpp:175:25: warning: empty parentheses were disambiguated as a function declaration [-Wvexing-parse] - 175 | cxx11test::delegate d2(); - | ^~ -conftest.cpp:175:25: note: remove parentheses to default-initialize a variable - 175 | cxx11test::delegate d2(); - | ^~ - | -- -conftest.cpp:175:25: note: or replace parentheses with braces to value-initialize a variable -configure:3778: $? = 0 -configure:3796: result: none needed -configure:3868: checking build system type -configure:3883: result: x86_64-pc-linux-gnu -configure:3903: checking host system type -configure:3917: result: x86_64-pc-linux-gnu -configure:3948: checking for special C compiler options needed for large files -configure:3996: result: no -configure:4002: checking for _FILE_OFFSET_BITS value needed for large files -configure:4028: gcc -c conftest.c >&5 -configure:4028: $? = 0 -configure:4062: result: no -configure:4150: checking for perl -configure:4173: found /nix/store/1zlrx8g7xs6ar0ggca4h3p6hmapq2p2h-perl-5.36.0/bin/perl -configure:4185: result: /nix/store/1zlrx8g7xs6ar0ggca4h3p6hmapq2p2h-perl-5.36.0/bin/perl -configure:4200: checking for curl -configure:4223: found /nix/store/52fbv6j49khca4cfvwm35fqd984w2520-curl-7.86.0-bin/bin/curl -configure:4235: result: /nix/store/52fbv6j49khca4cfvwm35fqd984w2520-curl-7.86.0-bin/bin/curl -configure:4250: checking for bzip2 -configure:4273: found /nix/store/a8mhcagrsly7c7mpjrpsnaahk4aax056-bzip2-1.0.8-bin/bin/bzip2 -configure:4285: result: /nix/store/a8mhcagrsly7c7mpjrpsnaahk4aax056-bzip2-1.0.8-bin/bin/bzip2 -configure:4300: checking for xz -configure:4323: found /nix/store/zlcnmqq14jz5x9439jf937mvayyl63da-xz-5.2.7-bin/bin/xz -configure:4335: result: /nix/store/zlcnmqq14jz5x9439jf937mvayyl63da-xz-5.2.7-bin/bin/xz -configure:4349: checking whether Perl is recent enough -configure:4356: result: yes -configure:4361: checking for the Perl installation prefix -configure:4367: result: ${exec_prefix}/lib64/perl5/site_perl/5.36.0/x86_64-linux-thread-multi - -## ---------------- ## -## Cache variables. ## -## ---------------- ## - -ac_cv_build=x86_64-pc-linux-gnu -ac_cv_c_compiler_gnu=yes -ac_cv_cxx_compiler_gnu=yes -ac_cv_env_CCC_set= -ac_cv_env_CCC_value= -ac_cv_env_CC_set=set -ac_cv_env_CC_value=gcc -ac_cv_env_CFLAGS_set= -ac_cv_env_CFLAGS_value= -ac_cv_env_CPPFLAGS_set= -ac_cv_env_CPPFLAGS_value= -ac_cv_env_CXXFLAGS_set= -ac_cv_env_CXXFLAGS_value= -ac_cv_env_CXX_set=set -ac_cv_env_CXX_value=g++ -ac_cv_env_LDFLAGS_set= -ac_cv_env_LDFLAGS_value= -ac_cv_env_LIBS_set= -ac_cv_env_LIBS_value= -ac_cv_env_build_alias_set= -ac_cv_env_build_alias_value= -ac_cv_env_host_alias_set= -ac_cv_env_host_alias_value= -ac_cv_env_target_alias_set= -ac_cv_env_target_alias_value= -ac_cv_host=x86_64-pc-linux-gnu -ac_cv_objext=o -ac_cv_path_bzip2=/nix/store/a8mhcagrsly7c7mpjrpsnaahk4aax056-bzip2-1.0.8-bin/bin/bzip2 -ac_cv_path_curl=/nix/store/52fbv6j49khca4cfvwm35fqd984w2520-curl-7.86.0-bin/bin/curl -ac_cv_path_perl=/nix/store/1zlrx8g7xs6ar0ggca4h3p6hmapq2p2h-perl-5.36.0/bin/perl -ac_cv_path_xz=/nix/store/zlcnmqq14jz5x9439jf937mvayyl63da-xz-5.2.7-bin/bin/xz -ac_cv_prog_ac_ct_CC=gcc -ac_cv_prog_cc_c11= -ac_cv_prog_cc_g=yes -ac_cv_prog_cc_stdc= -ac_cv_prog_cxx_11=no -ac_cv_prog_cxx_cxx11= -ac_cv_prog_cxx_g=yes -ac_cv_prog_cxx_stdcxx= -ac_cv_sys_file_offset_bits=no -ac_cv_sys_largefile_CC=no -lt_cv_deplibs_check_method=pass_all - -## ----------------- ## -## Output variables. ## -## ----------------- ## - -CC='gcc' -CFLAGS='' -CPPFLAGS='' -CXX='g++' -CXXFLAGS='' -DEFS='' -ECHO_C='' -ECHO_N='-n' -ECHO_T='' -EXEEXT='' -LDFLAGS='' -LIBOBJS='' -LIBS='' -LTLIBOBJS='' -NIX='' -OBJEXT='o' -PACKAGE_BUGREPORT='' -PACKAGE_NAME='nix-perl' -PACKAGE_STRING='nix-perl 2.14.0' -PACKAGE_TARNAME='nix-perl' -PACKAGE_URL='' -PACKAGE_VERSION='2.14.0' -PATH_SEPARATOR=':' -SHELL='/nix/store/dsd5gz46hdbdk2rfdimqddhq6m8m8fqs-bash-5.1-p16/bin/bash' -ac_ct_CC='gcc' -ac_ct_CXX='' -bindir='${exec_prefix}/bin' -build='x86_64-pc-linux-gnu' -build_alias='' -build_cpu='x86_64' -build_os='linux-gnu' -build_vendor='pc' -bzip2='/nix/store/a8mhcagrsly7c7mpjrpsnaahk4aax056-bzip2-1.0.8-bin/bin/bzip2' -curl='/nix/store/52fbv6j49khca4cfvwm35fqd984w2520-curl-7.86.0-bin/bin/curl' -datadir='${datarootdir}' -datarootdir='${prefix}/share' -docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' -dvidir='${docdir}' -exec_prefix='NONE' -host='x86_64-pc-linux-gnu' -host_alias='' -host_cpu='x86_64' -host_os='linux-gnu' -host_vendor='pc' -htmldir='${docdir}' -includedir='${prefix}/include' -infodir='${datarootdir}/info' -libdir='${exec_prefix}/lib64' -libexecdir='${exec_prefix}/libexec' -localedir='${datarootdir}/locale' -localstatedir='${prefix}/var' -mandir='${datarootdir}/man' -oldincludedir='/usr/include' -pdfdir='${docdir}' -perl='/nix/store/1zlrx8g7xs6ar0ggca4h3p6hmapq2p2h-perl-5.36.0/bin/perl' -perlFlags='' -perllibdir='${exec_prefix}/lib64/perl5/site_perl/5.36.0/x86_64-linux-thread-multi' -prefix='/home/andrea/code/nix/outputs/out' -program_transform_name='s,x,x,' -psdir='${docdir}' -runstatedir='${localstatedir}/run' -sbindir='${exec_prefix}/sbin' -sharedstatedir='${prefix}/com' -sysconfdir='${prefix}/etc' -target_alias='' -xz='/nix/store/zlcnmqq14jz5x9439jf937mvayyl63da-xz-5.2.7-bin/bin/xz' - -## ----------- ## -## confdefs.h. ## -## ----------- ## - -/* confdefs.h */ -#define PACKAGE_NAME "nix-perl" -#define PACKAGE_TARNAME "nix-perl" -#define PACKAGE_VERSION "2.14.0" -#define PACKAGE_STRING "nix-perl 2.14.0" -#define PACKAGE_BUGREPORT "" -#define PACKAGE_URL "" - -configure: exit 2 diff --git a/perl/configure b/perl/configure deleted file mode 100755 index 1c1bcc7eceb..00000000000 --- a/perl/configure +++ /dev/null @@ -1,5623 +0,0 @@ -#! /bin/sh -# Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.71 for nix-perl 2.14.0. -# -# -# Copyright (C) 1992-1996, 1998-2017, 2020-2021 Free Software Foundation, -# Inc. -# -# -# This configure script is free software; the Free Software Foundation -# gives unlimited permission to copy, distribute and modify it. -## -------------------- ## -## M4sh Initialization. ## -## -------------------- ## - -# Be more Bourne compatible -DUALCASE=1; export DUALCASE # for MKS sh -as_nop=: -if test ${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1 -then : - emulate sh - NULLCMD=: - # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which - # is contrary to our usage. Disable this feature. - alias -g '${1+"$@"}'='"$@"' - setopt NO_GLOB_SUBST -else $as_nop - case `(set -o) 2>/dev/null` in #( - *posix*) : - set -o posix ;; #( - *) : - ;; -esac -fi - - - -# Reset variables that may have inherited troublesome values from -# the environment. - -# IFS needs to be set, to space, tab, and newline, in precisely that order. -# (If _AS_PATH_WALK were called with IFS unset, it would have the -# side effect of setting IFS to empty, thus disabling word splitting.) -# Quoting is to prevent editors from complaining about space-tab. -as_nl=' -' -export as_nl -IFS=" "" $as_nl" - -PS1='$ ' -PS2='> ' -PS4='+ ' - -# Ensure predictable behavior from utilities with locale-dependent output. -LC_ALL=C -export LC_ALL -LANGUAGE=C -export LANGUAGE - -# We cannot yet rely on "unset" to work, but we need these variables -# to be unset--not just set to an empty or harmless value--now, to -# avoid bugs in old shells (e.g. pre-3.0 UWIN ksh). This construct -# also avoids known problems related to "unset" and subshell syntax -# in other old shells (e.g. bash 2.01 and pdksh 5.2.14). -for as_var in BASH_ENV ENV MAIL MAILPATH CDPATH -do eval test \${$as_var+y} \ - && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : -done - -# Ensure that fds 0, 1, and 2 are open. -if (exec 3>&0) 2>/dev/null; then :; else exec 0&1) 2>/dev/null; then :; else exec 1>/dev/null; fi -if (exec 3>&2) ; then :; else exec 2>/dev/null; fi - -# The user is always right. -if ${PATH_SEPARATOR+false} :; then - PATH_SEPARATOR=: - (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { - (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || - PATH_SEPARATOR=';' - } -fi - - -# Find who we are. Look in the path if we contain no directory separator. -as_myself= -case $0 in #(( - *[\\/]* ) as_myself=$0 ;; - *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac - test -r "$as_dir$0" && as_myself=$as_dir$0 && break - done -IFS=$as_save_IFS - - ;; -esac -# We did not find ourselves, most probably we were run as `sh COMMAND' -# in which case we are not to be found in the path. -if test "x$as_myself" = x; then - as_myself=$0 -fi -if test ! -f "$as_myself"; then - printf "%s\n" "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 - exit 1 -fi - - -# Use a proper internal environment variable to ensure we don't fall - # into an infinite loop, continuously re-executing ourselves. - if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then - _as_can_reexec=no; export _as_can_reexec; - # We cannot yet assume a decent shell, so we have to provide a -# neutralization value for shells without unset; and this also -# works around shells that cannot unset nonexistent variables. -# Preserve -v and -x to the replacement shell. -BASH_ENV=/dev/null -ENV=/dev/null -(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV -case $- in # (((( - *v*x* | *x*v* ) as_opts=-vx ;; - *v* ) as_opts=-v ;; - *x* ) as_opts=-x ;; - * ) as_opts= ;; -esac -exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} -# Admittedly, this is quite paranoid, since all the known shells bail -# out after a failed `exec'. -printf "%s\n" "$0: could not re-execute with $CONFIG_SHELL" >&2 -exit 255 - fi - # We don't want this to propagate to other subprocesses. - { _as_can_reexec=; unset _as_can_reexec;} -if test "x$CONFIG_SHELL" = x; then - as_bourne_compatible="as_nop=: -if test \${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1 -then : - emulate sh - NULLCMD=: - # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which - # is contrary to our usage. Disable this feature. - alias -g '\${1+\"\$@\"}'='\"\$@\"' - setopt NO_GLOB_SUBST -else \$as_nop - case \`(set -o) 2>/dev/null\` in #( - *posix*) : - set -o posix ;; #( - *) : - ;; -esac -fi -" - as_required="as_fn_return () { (exit \$1); } -as_fn_success () { as_fn_return 0; } -as_fn_failure () { as_fn_return 1; } -as_fn_ret_success () { return 0; } -as_fn_ret_failure () { return 1; } - -exitcode=0 -as_fn_success || { exitcode=1; echo as_fn_success failed.; } -as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; } -as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; } -as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; } -if ( set x; as_fn_ret_success y && test x = \"\$1\" ) -then : - -else \$as_nop - exitcode=1; echo positional parameters were not saved. -fi -test x\$exitcode = x0 || exit 1 -blah=\$(echo \$(echo blah)) -test x\"\$blah\" = xblah || exit 1 -test -x / || exit 1" - as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO - as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO - eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && - test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1" - if (eval "$as_required") 2>/dev/null -then : - as_have_required=yes -else $as_nop - as_have_required=no -fi - if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null -then : - -else $as_nop - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -as_found=false -for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH -do - IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac - as_found=: - case $as_dir in #( - /*) - for as_base in sh bash ksh sh5; do - # Try only shells that exist, to save several forks. - as_shell=$as_dir$as_base - if { test -f "$as_shell" || test -f "$as_shell.exe"; } && - as_run=a "$as_shell" -c "$as_bourne_compatible""$as_required" 2>/dev/null -then : - CONFIG_SHELL=$as_shell as_have_required=yes - if as_run=a "$as_shell" -c "$as_bourne_compatible""$as_suggested" 2>/dev/null -then : - break 2 -fi -fi - done;; - esac - as_found=false -done -IFS=$as_save_IFS -if $as_found -then : - -else $as_nop - if { test -f "$SHELL" || test -f "$SHELL.exe"; } && - as_run=a "$SHELL" -c "$as_bourne_compatible""$as_required" 2>/dev/null -then : - CONFIG_SHELL=$SHELL as_have_required=yes -fi -fi - - - if test "x$CONFIG_SHELL" != x -then : - export CONFIG_SHELL - # We cannot yet assume a decent shell, so we have to provide a -# neutralization value for shells without unset; and this also -# works around shells that cannot unset nonexistent variables. -# Preserve -v and -x to the replacement shell. -BASH_ENV=/dev/null -ENV=/dev/null -(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV -case $- in # (((( - *v*x* | *x*v* ) as_opts=-vx ;; - *v* ) as_opts=-v ;; - *x* ) as_opts=-x ;; - * ) as_opts= ;; -esac -exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} -# Admittedly, this is quite paranoid, since all the known shells bail -# out after a failed `exec'. -printf "%s\n" "$0: could not re-execute with $CONFIG_SHELL" >&2 -exit 255 -fi - - if test x$as_have_required = xno -then : - printf "%s\n" "$0: This script requires a shell more modern than all" - printf "%s\n" "$0: the shells that I found on your system." - if test ${ZSH_VERSION+y} ; then - printf "%s\n" "$0: In particular, zsh $ZSH_VERSION has bugs and should" - printf "%s\n" "$0: be upgraded to zsh 4.3.4 or later." - else - printf "%s\n" "$0: Please tell bug-autoconf@gnu.org about your system, -$0: including any error possibly output before this -$0: message. Then install a modern shell, or manually run -$0: the script under such a shell if you do have one." - fi - exit 1 -fi -fi -fi -SHELL=${CONFIG_SHELL-/bin/sh} -export SHELL -# Unset more variables known to interfere with behavior of common tools. -CLICOLOR_FORCE= GREP_OPTIONS= -unset CLICOLOR_FORCE GREP_OPTIONS - -## --------------------- ## -## M4sh Shell Functions. ## -## --------------------- ## -# as_fn_unset VAR -# --------------- -# Portably unset VAR. -as_fn_unset () -{ - { eval $1=; unset $1;} -} -as_unset=as_fn_unset - - -# as_fn_set_status STATUS -# ----------------------- -# Set $? to STATUS, without forking. -as_fn_set_status () -{ - return $1 -} # as_fn_set_status - -# as_fn_exit STATUS -# ----------------- -# Exit the shell with STATUS, even in a "trap 0" or "set -e" context. -as_fn_exit () -{ - set +e - as_fn_set_status $1 - exit $1 -} # as_fn_exit -# as_fn_nop -# --------- -# Do nothing but, unlike ":", preserve the value of $?. -as_fn_nop () -{ - return $? -} -as_nop=as_fn_nop - -# as_fn_mkdir_p -# ------------- -# Create "$as_dir" as a directory, including parents if necessary. -as_fn_mkdir_p () -{ - - case $as_dir in #( - -*) as_dir=./$as_dir;; - esac - test -d "$as_dir" || eval $as_mkdir_p || { - as_dirs= - while :; do - case $as_dir in #( - *\'*) as_qdir=`printf "%s\n" "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( - *) as_qdir=$as_dir;; - esac - as_dirs="'$as_qdir' $as_dirs" - as_dir=`$as_dirname -- "$as_dir" || -$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$as_dir" : 'X\(//\)[^/]' \| \ - X"$as_dir" : 'X\(//\)$' \| \ - X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || -printf "%s\n" X"$as_dir" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X\(\/\/\)[^/].*/{ - s//\1/ - q - } - /^X\(\/\/\)$/{ - s//\1/ - q - } - /^X\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q'` - test -d "$as_dir" && break - done - test -z "$as_dirs" || eval "mkdir $as_dirs" - } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" - - -} # as_fn_mkdir_p - -# as_fn_executable_p FILE -# ----------------------- -# Test if FILE is an executable regular file. -as_fn_executable_p () -{ - test -f "$1" && test -x "$1" -} # as_fn_executable_p -# as_fn_append VAR VALUE -# ---------------------- -# Append the text in VALUE to the end of the definition contained in VAR. Take -# advantage of any shell optimizations that allow amortized linear growth over -# repeated appends, instead of the typical quadratic growth present in naive -# implementations. -if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null -then : - eval 'as_fn_append () - { - eval $1+=\$2 - }' -else $as_nop - as_fn_append () - { - eval $1=\$$1\$2 - } -fi # as_fn_append - -# as_fn_arith ARG... -# ------------------ -# Perform arithmetic evaluation on the ARGs, and store the result in the -# global $as_val. Take advantage of shells that can avoid forks. The arguments -# must be portable across $(()) and expr. -if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null -then : - eval 'as_fn_arith () - { - as_val=$(( $* )) - }' -else $as_nop - as_fn_arith () - { - as_val=`expr "$@" || test $? -eq 1` - } -fi # as_fn_arith - -# as_fn_nop -# --------- -# Do nothing but, unlike ":", preserve the value of $?. -as_fn_nop () -{ - return $? -} -as_nop=as_fn_nop - -# as_fn_error STATUS ERROR [LINENO LOG_FD] -# ---------------------------------------- -# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are -# provided, also output the error to LOG_FD, referencing LINENO. Then exit the -# script with STATUS, using 1 if that was 0. -as_fn_error () -{ - as_status=$1; test $as_status -eq 0 && as_status=1 - if test "$4"; then - as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 - fi - printf "%s\n" "$as_me: error: $2" >&2 - as_fn_exit $as_status -} # as_fn_error - -if expr a : '\(a\)' >/dev/null 2>&1 && - test "X`expr 00001 : '.*\(...\)'`" = X001; then - as_expr=expr -else - as_expr=false -fi - -if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then - as_basename=basename -else - as_basename=false -fi - -if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then - as_dirname=dirname -else - as_dirname=false -fi - -as_me=`$as_basename -- "$0" || -$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ - X"$0" : 'X\(//\)$' \| \ - X"$0" : 'X\(/\)' \| . 2>/dev/null || -printf "%s\n" X/"$0" | - sed '/^.*\/\([^/][^/]*\)\/*$/{ - s//\1/ - q - } - /^X\/\(\/\/\)$/{ - s//\1/ - q - } - /^X\/\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q'` - -# Avoid depending upon Character Ranges. -as_cr_letters='abcdefghijklmnopqrstuvwxyz' -as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' -as_cr_Letters=$as_cr_letters$as_cr_LETTERS -as_cr_digits='0123456789' -as_cr_alnum=$as_cr_Letters$as_cr_digits - - - as_lineno_1=$LINENO as_lineno_1a=$LINENO - as_lineno_2=$LINENO as_lineno_2a=$LINENO - eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" && - test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || { - # Blame Lee E. McMahon (1931-1989) for sed's syntax. :-) - sed -n ' - p - /[$]LINENO/= - ' <$as_myself | - sed ' - s/[$]LINENO.*/&-/ - t lineno - b - :lineno - N - :loop - s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/ - t loop - s/-\n.*// - ' >$as_me.lineno && - chmod +x "$as_me.lineno" || - { printf "%s\n" "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } - - # If we had to re-execute with $CONFIG_SHELL, we're ensured to have - # already done that, so ensure we don't try to do so again and fall - # in an infinite loop. This has already happened in practice. - _as_can_reexec=no; export _as_can_reexec - # Don't try to exec as it changes $[0], causing all sort of problems - # (the dirname of $[0] is not the place where we might find the - # original and so on. Autoconf is especially sensitive to this). - . "./$as_me.lineno" - # Exit status is that of the last command. - exit -} - - -# Determine whether it's possible to make 'echo' print without a newline. -# These variables are no longer used directly by Autoconf, but are AC_SUBSTed -# for compatibility with existing Makefiles. -ECHO_C= ECHO_N= ECHO_T= -case `echo -n x` in #((((( --n*) - case `echo 'xy\c'` in - *c*) ECHO_T=' ';; # ECHO_T is single tab character. - xy) ECHO_C='\c';; - *) echo `echo ksh88 bug on AIX 6.1` > /dev/null - ECHO_T=' ';; - esac;; -*) - ECHO_N='-n';; -esac - -# For backward compatibility with old third-party macros, we provide -# the shell variables $as_echo and $as_echo_n. New code should use -# AS_ECHO(["message"]) and AS_ECHO_N(["message"]), respectively. -as_echo='printf %s\n' -as_echo_n='printf %s' - - -rm -f conf$$ conf$$.exe conf$$.file -if test -d conf$$.dir; then - rm -f conf$$.dir/conf$$.file -else - rm -f conf$$.dir - mkdir conf$$.dir 2>/dev/null -fi -if (echo >conf$$.file) 2>/dev/null; then - if ln -s conf$$.file conf$$ 2>/dev/null; then - as_ln_s='ln -s' - # ... but there are two gotchas: - # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. - # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -pR'. - ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -pR' - elif ln conf$$.file conf$$ 2>/dev/null; then - as_ln_s=ln - else - as_ln_s='cp -pR' - fi -else - as_ln_s='cp -pR' -fi -rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file -rmdir conf$$.dir 2>/dev/null - -if mkdir -p . 2>/dev/null; then - as_mkdir_p='mkdir -p "$as_dir"' -else - test -d ./-p && rmdir ./-p - as_mkdir_p=false -fi - -as_test_x='test -x' -as_executable_p=as_fn_executable_p - -# Sed expression to map a string onto a valid CPP name. -as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" - -# Sed expression to map a string onto a valid variable name. -as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" - - -test -n "$DJDIR" || exec 7<&0 &1 - -# Name of the host. -# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status, -# so uname gets run too. -ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` - -# -# Initializations. -# -ac_default_prefix=/usr/local -ac_clean_files= -ac_config_libobj_dir=. -LIBOBJS= -cross_compiling=no -subdirs= -MFLAGS= -MAKEFLAGS= - -# Identity of this package. -PACKAGE_NAME='nix-perl' -PACKAGE_TARNAME='nix-perl' -PACKAGE_VERSION='2.14.0' -PACKAGE_STRING='nix-perl 2.14.0' -PACKAGE_BUGREPORT='' -PACKAGE_URL='' - -ac_unique_file="MANIFEST" -ac_subst_vars='LTLIBOBJS -LIBOBJS -NIX -perlFlags -perllibdir -xz -bzip2 -curl -perl -host_os -host_vendor -host_cpu -host -build_os -build_vendor -build_cpu -build -ac_ct_CXX -CXXFLAGS -CXX -OBJEXT -EXEEXT -ac_ct_CC -CPPFLAGS -LDFLAGS -CFLAGS -CC -target_alias -host_alias -build_alias -LIBS -ECHO_T -ECHO_N -ECHO_C -DEFS -mandir -localedir -libdir -psdir -pdfdir -dvidir -htmldir -infodir -docdir -oldincludedir -includedir -runstatedir -localstatedir -sharedstatedir -sysconfdir -datadir -datarootdir -libexecdir -sbindir -bindir -program_transform_name -prefix -exec_prefix -PACKAGE_URL -PACKAGE_BUGREPORT -PACKAGE_STRING -PACKAGE_VERSION -PACKAGE_TARNAME -PACKAGE_NAME -PATH_SEPARATOR -SHELL' -ac_subst_files='' -ac_user_opts=' -enable_option_checking -enable_largefile -with_dbi -with_dbd_sqlite -' - ac_precious_vars='build_alias -host_alias -target_alias -CC -CFLAGS -LDFLAGS -LIBS -CPPFLAGS -CXX -CXXFLAGS -CCC' - - -# Initialize some variables set by options. -ac_init_help= -ac_init_version=false -ac_unrecognized_opts= -ac_unrecognized_sep= -# The variables have the same names as the options, with -# dashes changed to underlines. -cache_file=/dev/null -exec_prefix=NONE -no_create= -no_recursion= -prefix=NONE -program_prefix=NONE -program_suffix=NONE -program_transform_name=s,x,x, -silent= -site= -srcdir= -verbose= -x_includes=NONE -x_libraries=NONE - -# Installation directory options. -# These are left unexpanded so users can "make install exec_prefix=/foo" -# and all the variables that are supposed to be based on exec_prefix -# by default will actually change. -# Use braces instead of parens because sh, perl, etc. also accept them. -# (The list follows the same order as the GNU Coding Standards.) -bindir='${exec_prefix}/bin' -sbindir='${exec_prefix}/sbin' -libexecdir='${exec_prefix}/libexec' -datarootdir='${prefix}/share' -datadir='${datarootdir}' -sysconfdir='${prefix}/etc' -sharedstatedir='${prefix}/com' -localstatedir='${prefix}/var' -runstatedir='${localstatedir}/run' -includedir='${prefix}/include' -oldincludedir='/usr/include' -docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' -infodir='${datarootdir}/info' -htmldir='${docdir}' -dvidir='${docdir}' -pdfdir='${docdir}' -psdir='${docdir}' -libdir='${exec_prefix}/lib' -localedir='${datarootdir}/locale' -mandir='${datarootdir}/man' - -ac_prev= -ac_dashdash= -for ac_option -do - # If the previous option needs an argument, assign it. - if test -n "$ac_prev"; then - eval $ac_prev=\$ac_option - ac_prev= - continue - fi - - case $ac_option in - *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; - *=) ac_optarg= ;; - *) ac_optarg=yes ;; - esac - - case $ac_dashdash$ac_option in - --) - ac_dashdash=yes ;; - - -bindir | --bindir | --bindi | --bind | --bin | --bi) - ac_prev=bindir ;; - -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*) - bindir=$ac_optarg ;; - - -build | --build | --buil | --bui | --bu) - ac_prev=build_alias ;; - -build=* | --build=* | --buil=* | --bui=* | --bu=*) - build_alias=$ac_optarg ;; - - -cache-file | --cache-file | --cache-fil | --cache-fi \ - | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c) - ac_prev=cache_file ;; - -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \ - | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*) - cache_file=$ac_optarg ;; - - --config-cache | -C) - cache_file=config.cache ;; - - -datadir | --datadir | --datadi | --datad) - ac_prev=datadir ;; - -datadir=* | --datadir=* | --datadi=* | --datad=*) - datadir=$ac_optarg ;; - - -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \ - | --dataroo | --dataro | --datar) - ac_prev=datarootdir ;; - -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \ - | --dataroot=* | --dataroo=* | --dataro=* | --datar=*) - datarootdir=$ac_optarg ;; - - -disable-* | --disable-*) - ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'` - # Reject names that are not valid shell variable names. - expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error $? "invalid feature name: \`$ac_useropt'" - ac_useropt_orig=$ac_useropt - ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'` - case $ac_user_opts in - *" -"enable_$ac_useropt" -"*) ;; - *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig" - ac_unrecognized_sep=', ';; - esac - eval enable_$ac_useropt=no ;; - - -docdir | --docdir | --docdi | --doc | --do) - ac_prev=docdir ;; - -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*) - docdir=$ac_optarg ;; - - -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv) - ac_prev=dvidir ;; - -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*) - dvidir=$ac_optarg ;; - - -enable-* | --enable-*) - ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` - # Reject names that are not valid shell variable names. - expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error $? "invalid feature name: \`$ac_useropt'" - ac_useropt_orig=$ac_useropt - ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'` - case $ac_user_opts in - *" -"enable_$ac_useropt" -"*) ;; - *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig" - ac_unrecognized_sep=', ';; - esac - eval enable_$ac_useropt=\$ac_optarg ;; - - -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \ - | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \ - | --exec | --exe | --ex) - ac_prev=exec_prefix ;; - -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \ - | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \ - | --exec=* | --exe=* | --ex=*) - exec_prefix=$ac_optarg ;; - - -gas | --gas | --ga | --g) - # Obsolete; use --with-gas. - with_gas=yes ;; - - -help | --help | --hel | --he | -h) - ac_init_help=long ;; - -help=r* | --help=r* | --hel=r* | --he=r* | -hr*) - ac_init_help=recursive ;; - -help=s* | --help=s* | --hel=s* | --he=s* | -hs*) - ac_init_help=short ;; - - -host | --host | --hos | --ho) - ac_prev=host_alias ;; - -host=* | --host=* | --hos=* | --ho=*) - host_alias=$ac_optarg ;; - - -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht) - ac_prev=htmldir ;; - -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \ - | --ht=*) - htmldir=$ac_optarg ;; - - -includedir | --includedir | --includedi | --included | --include \ - | --includ | --inclu | --incl | --inc) - ac_prev=includedir ;; - -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \ - | --includ=* | --inclu=* | --incl=* | --inc=*) - includedir=$ac_optarg ;; - - -infodir | --infodir | --infodi | --infod | --info | --inf) - ac_prev=infodir ;; - -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*) - infodir=$ac_optarg ;; - - -libdir | --libdir | --libdi | --libd) - ac_prev=libdir ;; - -libdir=* | --libdir=* | --libdi=* | --libd=*) - libdir=$ac_optarg ;; - - -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \ - | --libexe | --libex | --libe) - ac_prev=libexecdir ;; - -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \ - | --libexe=* | --libex=* | --libe=*) - libexecdir=$ac_optarg ;; - - -localedir | --localedir | --localedi | --localed | --locale) - ac_prev=localedir ;; - -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*) - localedir=$ac_optarg ;; - - -localstatedir | --localstatedir | --localstatedi | --localstated \ - | --localstate | --localstat | --localsta | --localst | --locals) - ac_prev=localstatedir ;; - -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \ - | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*) - localstatedir=$ac_optarg ;; - - -mandir | --mandir | --mandi | --mand | --man | --ma | --m) - ac_prev=mandir ;; - -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*) - mandir=$ac_optarg ;; - - -nfp | --nfp | --nf) - # Obsolete; use --without-fp. - with_fp=no ;; - - -no-create | --no-create | --no-creat | --no-crea | --no-cre \ - | --no-cr | --no-c | -n) - no_create=yes ;; - - -no-recursion | --no-recursion | --no-recursio | --no-recursi \ - | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) - no_recursion=yes ;; - - -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \ - | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \ - | --oldin | --oldi | --old | --ol | --o) - ac_prev=oldincludedir ;; - -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \ - | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \ - | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*) - oldincludedir=$ac_optarg ;; - - -prefix | --prefix | --prefi | --pref | --pre | --pr | --p) - ac_prev=prefix ;; - -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*) - prefix=$ac_optarg ;; - - -program-prefix | --program-prefix | --program-prefi | --program-pref \ - | --program-pre | --program-pr | --program-p) - ac_prev=program_prefix ;; - -program-prefix=* | --program-prefix=* | --program-prefi=* \ - | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*) - program_prefix=$ac_optarg ;; - - -program-suffix | --program-suffix | --program-suffi | --program-suff \ - | --program-suf | --program-su | --program-s) - ac_prev=program_suffix ;; - -program-suffix=* | --program-suffix=* | --program-suffi=* \ - | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*) - program_suffix=$ac_optarg ;; - - -program-transform-name | --program-transform-name \ - | --program-transform-nam | --program-transform-na \ - | --program-transform-n | --program-transform- \ - | --program-transform | --program-transfor \ - | --program-transfo | --program-transf \ - | --program-trans | --program-tran \ - | --progr-tra | --program-tr | --program-t) - ac_prev=program_transform_name ;; - -program-transform-name=* | --program-transform-name=* \ - | --program-transform-nam=* | --program-transform-na=* \ - | --program-transform-n=* | --program-transform-=* \ - | --program-transform=* | --program-transfor=* \ - | --program-transfo=* | --program-transf=* \ - | --program-trans=* | --program-tran=* \ - | --progr-tra=* | --program-tr=* | --program-t=*) - program_transform_name=$ac_optarg ;; - - -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd) - ac_prev=pdfdir ;; - -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*) - pdfdir=$ac_optarg ;; - - -psdir | --psdir | --psdi | --psd | --ps) - ac_prev=psdir ;; - -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*) - psdir=$ac_optarg ;; - - -q | -quiet | --quiet | --quie | --qui | --qu | --q \ - | -silent | --silent | --silen | --sile | --sil) - silent=yes ;; - - -runstatedir | --runstatedir | --runstatedi | --runstated \ - | --runstate | --runstat | --runsta | --runst | --runs \ - | --run | --ru | --r) - ac_prev=runstatedir ;; - -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \ - | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \ - | --run=* | --ru=* | --r=*) - runstatedir=$ac_optarg ;; - - -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) - ac_prev=sbindir ;; - -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ - | --sbi=* | --sb=*) - sbindir=$ac_optarg ;; - - -sharedstatedir | --sharedstatedir | --sharedstatedi \ - | --sharedstated | --sharedstate | --sharedstat | --sharedsta \ - | --sharedst | --shareds | --shared | --share | --shar \ - | --sha | --sh) - ac_prev=sharedstatedir ;; - -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \ - | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \ - | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \ - | --sha=* | --sh=*) - sharedstatedir=$ac_optarg ;; - - -site | --site | --sit) - ac_prev=site ;; - -site=* | --site=* | --sit=*) - site=$ac_optarg ;; - - -srcdir | --srcdir | --srcdi | --srcd | --src | --sr) - ac_prev=srcdir ;; - -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*) - srcdir=$ac_optarg ;; - - -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \ - | --syscon | --sysco | --sysc | --sys | --sy) - ac_prev=sysconfdir ;; - -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \ - | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*) - sysconfdir=$ac_optarg ;; - - -target | --target | --targe | --targ | --tar | --ta | --t) - ac_prev=target_alias ;; - -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*) - target_alias=$ac_optarg ;; - - -v | -verbose | --verbose | --verbos | --verbo | --verb) - verbose=yes ;; - - -version | --version | --versio | --versi | --vers | -V) - ac_init_version=: ;; - - -with-* | --with-*) - ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` - # Reject names that are not valid shell variable names. - expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error $? "invalid package name: \`$ac_useropt'" - ac_useropt_orig=$ac_useropt - ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'` - case $ac_user_opts in - *" -"with_$ac_useropt" -"*) ;; - *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig" - ac_unrecognized_sep=', ';; - esac - eval with_$ac_useropt=\$ac_optarg ;; - - -without-* | --without-*) - ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'` - # Reject names that are not valid shell variable names. - expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error $? "invalid package name: \`$ac_useropt'" - ac_useropt_orig=$ac_useropt - ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'` - case $ac_user_opts in - *" -"with_$ac_useropt" -"*) ;; - *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig" - ac_unrecognized_sep=', ';; - esac - eval with_$ac_useropt=no ;; - - --x) - # Obsolete; use --with-x. - with_x=yes ;; - - -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \ - | --x-incl | --x-inc | --x-in | --x-i) - ac_prev=x_includes ;; - -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \ - | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*) - x_includes=$ac_optarg ;; - - -x-libraries | --x-libraries | --x-librarie | --x-librari \ - | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l) - ac_prev=x_libraries ;; - -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \ - | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) - x_libraries=$ac_optarg ;; - - -*) as_fn_error $? "unrecognized option: \`$ac_option' -Try \`$0 --help' for more information" - ;; - - *=*) - ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='` - # Reject names that are not valid shell variable names. - case $ac_envvar in #( - '' | [0-9]* | *[!_$as_cr_alnum]* ) - as_fn_error $? "invalid variable name: \`$ac_envvar'" ;; - esac - eval $ac_envvar=\$ac_optarg - export $ac_envvar ;; - - *) - # FIXME: should be removed in autoconf 3.0. - printf "%s\n" "$as_me: WARNING: you should use --build, --host, --target" >&2 - expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && - printf "%s\n" "$as_me: WARNING: invalid host type: $ac_option" >&2 - : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}" - ;; - - esac -done - -if test -n "$ac_prev"; then - ac_option=--`echo $ac_prev | sed 's/_/-/g'` - as_fn_error $? "missing argument to $ac_option" -fi - -if test -n "$ac_unrecognized_opts"; then - case $enable_option_checking in - no) ;; - fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;; - *) printf "%s\n" "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; - esac -fi - -# Check all directory arguments for consistency. -for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ - datadir sysconfdir sharedstatedir localstatedir includedir \ - oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ - libdir localedir mandir runstatedir -do - eval ac_val=\$$ac_var - # Remove trailing slashes. - case $ac_val in - */ ) - ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'` - eval $ac_var=\$ac_val;; - esac - # Be sure to have absolute directory names. - case $ac_val in - [\\/$]* | ?:[\\/]* ) continue;; - NONE | '' ) case $ac_var in *prefix ) continue;; esac;; - esac - as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val" -done - -# There might be people who depend on the old broken behavior: `$host' -# used to hold the argument of --host etc. -# FIXME: To remove some day. -build=$build_alias -host=$host_alias -target=$target_alias - -# FIXME: To remove some day. -if test "x$host_alias" != x; then - if test "x$build_alias" = x; then - cross_compiling=maybe - elif test "x$build_alias" != "x$host_alias"; then - cross_compiling=yes - fi -fi - -ac_tool_prefix= -test -n "$host_alias" && ac_tool_prefix=$host_alias- - -test "$silent" = yes && exec 6>/dev/null - - -ac_pwd=`pwd` && test -n "$ac_pwd" && -ac_ls_di=`ls -di .` && -ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || - as_fn_error $? "working directory cannot be determined" -test "X$ac_ls_di" = "X$ac_pwd_ls_di" || - as_fn_error $? "pwd does not report name of working directory" - - -# Find the source files, if location was not specified. -if test -z "$srcdir"; then - ac_srcdir_defaulted=yes - # Try the directory containing this script, then the parent directory. - ac_confdir=`$as_dirname -- "$as_myself" || -$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$as_myself" : 'X\(//\)[^/]' \| \ - X"$as_myself" : 'X\(//\)$' \| \ - X"$as_myself" : 'X\(/\)' \| . 2>/dev/null || -printf "%s\n" X"$as_myself" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X\(\/\/\)[^/].*/{ - s//\1/ - q - } - /^X\(\/\/\)$/{ - s//\1/ - q - } - /^X\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q'` - srcdir=$ac_confdir - if test ! -r "$srcdir/$ac_unique_file"; then - srcdir=.. - fi -else - ac_srcdir_defaulted=no -fi -if test ! -r "$srcdir/$ac_unique_file"; then - test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." - as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir" -fi -ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" -ac_abs_confdir=`( - cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg" - pwd)` -# When building in place, set srcdir=. -if test "$ac_abs_confdir" = "$ac_pwd"; then - srcdir=. -fi -# Remove unnecessary trailing slashes from srcdir. -# Double slashes in file names in object file debugging info -# mess up M-x gdb in Emacs. -case $srcdir in -*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;; -esac -for ac_var in $ac_precious_vars; do - eval ac_env_${ac_var}_set=\${${ac_var}+set} - eval ac_env_${ac_var}_value=\$${ac_var} - eval ac_cv_env_${ac_var}_set=\${${ac_var}+set} - eval ac_cv_env_${ac_var}_value=\$${ac_var} -done - -# -# Report the --help message. -# -if test "$ac_init_help" = "long"; then - # Omit some internal or obsolete options to make the list less imposing. - # This message is too long to be a string in the A/UX 3.1 sh. - cat <<_ACEOF -\`configure' configures nix-perl 2.14.0 to adapt to many kinds of systems. - -Usage: $0 [OPTION]... [VAR=VALUE]... - -To assign environment variables (e.g., CC, CFLAGS...), specify them as -VAR=VALUE. See below for descriptions of some of the useful variables. - -Defaults for the options are specified in brackets. - -Configuration: - -h, --help display this help and exit - --help=short display options specific to this package - --help=recursive display the short help of all the included packages - -V, --version display version information and exit - -q, --quiet, --silent do not print \`checking ...' messages - --cache-file=FILE cache test results in FILE [disabled] - -C, --config-cache alias for \`--cache-file=config.cache' - -n, --no-create do not create output files - --srcdir=DIR find the sources in DIR [configure dir or \`..'] - -Installation directories: - --prefix=PREFIX install architecture-independent files in PREFIX - [$ac_default_prefix] - --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX - [PREFIX] - -By default, \`make install' will install all the files in -\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify -an installation prefix other than \`$ac_default_prefix' using \`--prefix', -for instance \`--prefix=\$HOME'. - -For better control, use the options below. - -Fine tuning of the installation directories: - --bindir=DIR user executables [EPREFIX/bin] - --sbindir=DIR system admin executables [EPREFIX/sbin] - --libexecdir=DIR program executables [EPREFIX/libexec] - --sysconfdir=DIR read-only single-machine data [PREFIX/etc] - --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] - --localstatedir=DIR modifiable single-machine data [PREFIX/var] - --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run] - --libdir=DIR object code libraries [EPREFIX/lib] - --includedir=DIR C header files [PREFIX/include] - --oldincludedir=DIR C header files for non-gcc [/usr/include] - --datarootdir=DIR read-only arch.-independent data root [PREFIX/share] - --datadir=DIR read-only architecture-independent data [DATAROOTDIR] - --infodir=DIR info documentation [DATAROOTDIR/info] - --localedir=DIR locale-dependent data [DATAROOTDIR/locale] - --mandir=DIR man documentation [DATAROOTDIR/man] - --docdir=DIR documentation root [DATAROOTDIR/doc/nix-perl] - --htmldir=DIR html documentation [DOCDIR] - --dvidir=DIR dvi documentation [DOCDIR] - --pdfdir=DIR pdf documentation [DOCDIR] - --psdir=DIR ps documentation [DOCDIR] -_ACEOF - - cat <<\_ACEOF - -System types: - --build=BUILD configure for building on BUILD [guessed] - --host=HOST cross-compile to build programs to run on HOST [BUILD] -_ACEOF -fi - -if test -n "$ac_init_help"; then - case $ac_init_help in - short | recursive ) echo "Configuration of nix-perl 2.14.0:";; - esac - cat <<\_ACEOF - -Optional Features: - --disable-option-checking ignore unrecognized --enable/--with options - --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) - --enable-FEATURE[=ARG] include FEATURE [ARG=yes] - --disable-largefile omit support for large files - -Optional Packages: - --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] - --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) - --with-dbi=PATH prefix of the Perl DBI library - --with-dbd-sqlite=PATH prefix of the Perl DBD::SQLite library - -Some influential environment variables: - CC C compiler command - CFLAGS C compiler flags - LDFLAGS linker flags, e.g. -L if you have libraries in a - nonstandard directory - LIBS libraries to pass to the linker, e.g. -l - CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I if - you have headers in a nonstandard directory - CXX C++ compiler command - CXXFLAGS C++ compiler flags - -Use these variables to override the choices made by `configure' or to help -it to find libraries and programs with nonstandard names/locations. - -Report bugs to the package provider. -_ACEOF -ac_status=$? -fi - -if test "$ac_init_help" = "recursive"; then - # If there are subdirs, report their specific --help. - for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue - test -d "$ac_dir" || - { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } || - continue - ac_builddir=. - -case "$ac_dir" in -.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; -*) - ac_dir_suffix=/`printf "%s\n" "$ac_dir" | sed 's|^\.[\\/]||'` - # A ".." for each directory in $ac_dir_suffix. - ac_top_builddir_sub=`printf "%s\n" "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` - case $ac_top_builddir_sub in - "") ac_top_builddir_sub=. ac_top_build_prefix= ;; - *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; - esac ;; -esac -ac_abs_top_builddir=$ac_pwd -ac_abs_builddir=$ac_pwd$ac_dir_suffix -# for backward compatibility: -ac_top_builddir=$ac_top_build_prefix - -case $srcdir in - .) # We are building in place. - ac_srcdir=. - ac_top_srcdir=$ac_top_builddir_sub - ac_abs_top_srcdir=$ac_pwd ;; - [\\/]* | ?:[\\/]* ) # Absolute name. - ac_srcdir=$srcdir$ac_dir_suffix; - ac_top_srcdir=$srcdir - ac_abs_top_srcdir=$srcdir ;; - *) # Relative name. - ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix - ac_top_srcdir=$ac_top_build_prefix$srcdir - ac_abs_top_srcdir=$ac_pwd/$srcdir ;; -esac -ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix - - cd "$ac_dir" || { ac_status=$?; continue; } - # Check for configure.gnu first; this name is used for a wrapper for - # Metaconfig's "Configure" on case-insensitive file systems. - if test -f "$ac_srcdir/configure.gnu"; then - echo && - $SHELL "$ac_srcdir/configure.gnu" --help=recursive - elif test -f "$ac_srcdir/configure"; then - echo && - $SHELL "$ac_srcdir/configure" --help=recursive - else - printf "%s\n" "$as_me: WARNING: no configuration information is in $ac_dir" >&2 - fi || ac_status=$? - cd "$ac_pwd" || { ac_status=$?; break; } - done -fi - -test -n "$ac_init_help" && exit $ac_status -if $ac_init_version; then - cat <<\_ACEOF -nix-perl configure 2.14.0 -generated by GNU Autoconf 2.71 - -Copyright (C) 2021 Free Software Foundation, Inc. -This configure script is free software; the Free Software Foundation -gives unlimited permission to copy, distribute and modify it. -_ACEOF - exit -fi - -## ------------------------ ## -## Autoconf initialization. ## -## ------------------------ ## - -# ac_fn_c_try_compile LINENO -# -------------------------- -# Try to compile conftest.$ac_ext, and return whether this succeeded. -ac_fn_c_try_compile () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - rm -f conftest.$ac_objext conftest.beam - if { { ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -printf "%s\n" "$ac_try_echo"; } >&5 - (eval "$ac_compile") 2>conftest.err - ac_status=$? - if test -s conftest.err; then - grep -v '^ *+' conftest.err >conftest.er1 - cat conftest.er1 >&5 - mv -f conftest.er1 conftest.err - fi - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext -then : - ac_retval=0 -else $as_nop - printf "%s\n" "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_retval=1 -fi - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno - as_fn_set_status $ac_retval - -} # ac_fn_c_try_compile - -# ac_fn_cxx_try_compile LINENO -# ---------------------------- -# Try to compile conftest.$ac_ext, and return whether this succeeded. -ac_fn_cxx_try_compile () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - rm -f conftest.$ac_objext conftest.beam - if { { ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -printf "%s\n" "$ac_try_echo"; } >&5 - (eval "$ac_compile") 2>conftest.err - ac_status=$? - if test -s conftest.err; then - grep -v '^ *+' conftest.err >conftest.er1 - cat conftest.er1 >&5 - mv -f conftest.er1 conftest.err - fi - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext -then : - ac_retval=0 -else $as_nop - printf "%s\n" "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_retval=1 -fi - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno - as_fn_set_status $ac_retval - -} # ac_fn_cxx_try_compile -ac_configure_args_raw= -for ac_arg -do - case $ac_arg in - *\'*) - ac_arg=`printf "%s\n" "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; - esac - as_fn_append ac_configure_args_raw " '$ac_arg'" -done - -case $ac_configure_args_raw in - *$as_nl*) - ac_safe_unquote= ;; - *) - ac_unsafe_z='|&;<>()$`\\"*?[ '' ' # This string ends in space, tab. - ac_unsafe_a="$ac_unsafe_z#~" - ac_safe_unquote="s/ '\\([^$ac_unsafe_a][^$ac_unsafe_z]*\\)'/ \\1/g" - ac_configure_args_raw=` printf "%s\n" "$ac_configure_args_raw" | sed "$ac_safe_unquote"`;; -esac - -cat >config.log <<_ACEOF -This file contains any messages produced by compilers while -running configure, to aid debugging if configure makes a mistake. - -It was created by nix-perl $as_me 2.14.0, which was -generated by GNU Autoconf 2.71. Invocation command line was - - $ $0$ac_configure_args_raw - -_ACEOF -exec 5>>config.log -{ -cat <<_ASUNAME -## --------- ## -## Platform. ## -## --------- ## - -hostname = `(hostname || uname -n) 2>/dev/null | sed 1q` -uname -m = `(uname -m) 2>/dev/null || echo unknown` -uname -r = `(uname -r) 2>/dev/null || echo unknown` -uname -s = `(uname -s) 2>/dev/null || echo unknown` -uname -v = `(uname -v) 2>/dev/null || echo unknown` - -/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown` -/bin/uname -X = `(/bin/uname -X) 2>/dev/null || echo unknown` - -/bin/arch = `(/bin/arch) 2>/dev/null || echo unknown` -/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown` -/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown` -/usr/bin/hostinfo = `(/usr/bin/hostinfo) 2>/dev/null || echo unknown` -/bin/machine = `(/bin/machine) 2>/dev/null || echo unknown` -/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown` -/bin/universe = `(/bin/universe) 2>/dev/null || echo unknown` - -_ASUNAME - -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac - printf "%s\n" "PATH: $as_dir" - done -IFS=$as_save_IFS - -} >&5 - -cat >&5 <<_ACEOF - - -## ----------- ## -## Core tests. ## -## ----------- ## - -_ACEOF - - -# Keep a trace of the command line. -# Strip out --no-create and --no-recursion so they do not pile up. -# Strip out --silent because we don't want to record it for future runs. -# Also quote any args containing shell meta-characters. -# Make two passes to allow for proper duplicate-argument suppression. -ac_configure_args= -ac_configure_args0= -ac_configure_args1= -ac_must_keep_next=false -for ac_pass in 1 2 -do - for ac_arg - do - case $ac_arg in - -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;; - -q | -quiet | --quiet | --quie | --qui | --qu | --q \ - | -silent | --silent | --silen | --sile | --sil) - continue ;; - *\'*) - ac_arg=`printf "%s\n" "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; - esac - case $ac_pass in - 1) as_fn_append ac_configure_args0 " '$ac_arg'" ;; - 2) - as_fn_append ac_configure_args1 " '$ac_arg'" - if test $ac_must_keep_next = true; then - ac_must_keep_next=false # Got value, back to normal. - else - case $ac_arg in - *=* | --config-cache | -C | -disable-* | --disable-* \ - | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \ - | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \ - | -with-* | --with-* | -without-* | --without-* | --x) - case "$ac_configure_args0 " in - "$ac_configure_args1"*" '$ac_arg' "* ) continue ;; - esac - ;; - -* ) ac_must_keep_next=true ;; - esac - fi - as_fn_append ac_configure_args " '$ac_arg'" - ;; - esac - done -done -{ ac_configure_args0=; unset ac_configure_args0;} -{ ac_configure_args1=; unset ac_configure_args1;} - -# When interrupted or exit'd, cleanup temporary files, and complete -# config.log. We remove comments because anyway the quotes in there -# would cause problems or look ugly. -# WARNING: Use '\'' to represent an apostrophe within the trap. -# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug. -trap 'exit_status=$? - # Sanitize IFS. - IFS=" "" $as_nl" - # Save into config.log some information that might help in debugging. - { - echo - - printf "%s\n" "## ---------------- ## -## Cache variables. ## -## ---------------- ##" - echo - # The following way of writing the cache mishandles newlines in values, -( - for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do - eval ac_val=\$$ac_var - case $ac_val in #( - *${as_nl}*) - case $ac_var in #( - *_cv_*) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 -printf "%s\n" "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; - esac - case $ac_var in #( - _ | IFS | as_nl) ;; #( - BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( - *) { eval $ac_var=; unset $ac_var;} ;; - esac ;; - esac - done - (set) 2>&1 | - case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #( - *${as_nl}ac_space=\ *) - sed -n \ - "s/'\''/'\''\\\\'\'''\''/g; - s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p" - ;; #( - *) - sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" - ;; - esac | - sort -) - echo - - printf "%s\n" "## ----------------- ## -## Output variables. ## -## ----------------- ##" - echo - for ac_var in $ac_subst_vars - do - eval ac_val=\$$ac_var - case $ac_val in - *\'\''*) ac_val=`printf "%s\n" "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; - esac - printf "%s\n" "$ac_var='\''$ac_val'\''" - done | sort - echo - - if test -n "$ac_subst_files"; then - printf "%s\n" "## ------------------- ## -## File substitutions. ## -## ------------------- ##" - echo - for ac_var in $ac_subst_files - do - eval ac_val=\$$ac_var - case $ac_val in - *\'\''*) ac_val=`printf "%s\n" "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; - esac - printf "%s\n" "$ac_var='\''$ac_val'\''" - done | sort - echo - fi - - if test -s confdefs.h; then - printf "%s\n" "## ----------- ## -## confdefs.h. ## -## ----------- ##" - echo - cat confdefs.h - echo - fi - test "$ac_signal" != 0 && - printf "%s\n" "$as_me: caught signal $ac_signal" - printf "%s\n" "$as_me: exit $exit_status" - } >&5 - rm -f core *.core core.conftest.* && - rm -f -r conftest* confdefs* conf$$* $ac_clean_files && - exit $exit_status -' 0 -for ac_signal in 1 2 13 15; do - trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal -done -ac_signal=0 - -# confdefs.h avoids OS command line length limits that DEFS can exceed. -rm -f -r conftest* confdefs.h - -printf "%s\n" "/* confdefs.h */" > confdefs.h - -# Predefined preprocessor variables. - -printf "%s\n" "#define PACKAGE_NAME \"$PACKAGE_NAME\"" >>confdefs.h - -printf "%s\n" "#define PACKAGE_TARNAME \"$PACKAGE_TARNAME\"" >>confdefs.h - -printf "%s\n" "#define PACKAGE_VERSION \"$PACKAGE_VERSION\"" >>confdefs.h - -printf "%s\n" "#define PACKAGE_STRING \"$PACKAGE_STRING\"" >>confdefs.h - -printf "%s\n" "#define PACKAGE_BUGREPORT \"$PACKAGE_BUGREPORT\"" >>confdefs.h - -printf "%s\n" "#define PACKAGE_URL \"$PACKAGE_URL\"" >>confdefs.h - - -# Let the site file select an alternate cache file if it wants to. -# Prefer an explicitly selected file to automatically selected ones. -if test -n "$CONFIG_SITE"; then - ac_site_files="$CONFIG_SITE" -elif test "x$prefix" != xNONE; then - ac_site_files="$prefix/share/config.site $prefix/etc/config.site" -else - ac_site_files="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site" -fi - -for ac_site_file in $ac_site_files -do - case $ac_site_file in #( - */*) : - ;; #( - *) : - ac_site_file=./$ac_site_file ;; -esac - if test -f "$ac_site_file" && test -r "$ac_site_file"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5 -printf "%s\n" "$as_me: loading site script $ac_site_file" >&6;} - sed 's/^/| /' "$ac_site_file" >&5 - . "$ac_site_file" \ - || { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "failed to load site script $ac_site_file -See \`config.log' for more details" "$LINENO" 5; } - fi -done - -if test -r "$cache_file"; then - # Some versions of bash will fail to source /dev/null (special files - # actually), so we avoid doing that. DJGPP emulates it as a regular file. - if test /dev/null != "$cache_file" && test -f "$cache_file"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5 -printf "%s\n" "$as_me: loading cache $cache_file" >&6;} - case $cache_file in - [\\/]* | ?:[\\/]* ) . "$cache_file";; - *) . "./$cache_file";; - esac - fi -else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5 -printf "%s\n" "$as_me: creating cache $cache_file" >&6;} - >$cache_file -fi - -# Test code for whether the C compiler supports C89 (global declarations) -ac_c_conftest_c89_globals=' -/* Does the compiler advertise C89 conformance? - Do not test the value of __STDC__, because some compilers set it to 0 - while being otherwise adequately conformant. */ -#if !defined __STDC__ -# error "Compiler does not advertise C89 conformance" -#endif - -#include -#include -struct stat; -/* Most of the following tests are stolen from RCS 5.7 src/conf.sh. */ -struct buf { int x; }; -struct buf * (*rcsopen) (struct buf *, struct stat *, int); -static char *e (p, i) - char **p; - int i; -{ - return p[i]; -} -static char *f (char * (*g) (char **, int), char **p, ...) -{ - char *s; - va_list v; - va_start (v,p); - s = g (p, va_arg (v,int)); - va_end (v); - return s; -} - -/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has - function prototypes and stuff, but not \xHH hex character constants. - These do not provoke an error unfortunately, instead are silently treated - as an "x". The following induces an error, until -std is added to get - proper ANSI mode. Curiously \x00 != x always comes out true, for an - array size at least. It is necessary to write \x00 == 0 to get something - that is true only with -std. */ -int osf4_cc_array ['\''\x00'\'' == 0 ? 1 : -1]; - -/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters - inside strings and character constants. */ -#define FOO(x) '\''x'\'' -int xlc6_cc_array[FOO(a) == '\''x'\'' ? 1 : -1]; - -int test (int i, double x); -struct s1 {int (*f) (int a);}; -struct s2 {int (*f) (double a);}; -int pairnames (int, char **, int *(*)(struct buf *, struct stat *, int), - int, int);' - -# Test code for whether the C compiler supports C89 (body of main). -ac_c_conftest_c89_main=' -ok |= (argc == 0 || f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]); -' - -# Test code for whether the C compiler supports C99 (global declarations) -ac_c_conftest_c99_globals=' -// Does the compiler advertise C99 conformance? -#if !defined __STDC_VERSION__ || __STDC_VERSION__ < 199901L -# error "Compiler does not advertise C99 conformance" -#endif - -#include -extern int puts (const char *); -extern int printf (const char *, ...); -extern int dprintf (int, const char *, ...); -extern void *malloc (size_t); - -// Check varargs macros. These examples are taken from C99 6.10.3.5. -// dprintf is used instead of fprintf to avoid needing to declare -// FILE and stderr. -#define debug(...) dprintf (2, __VA_ARGS__) -#define showlist(...) puts (#__VA_ARGS__) -#define report(test,...) ((test) ? puts (#test) : printf (__VA_ARGS__)) -static void -test_varargs_macros (void) -{ - int x = 1234; - int y = 5678; - debug ("Flag"); - debug ("X = %d\n", x); - showlist (The first, second, and third items.); - report (x>y, "x is %d but y is %d", x, y); -} - -// Check long long types. -#define BIG64 18446744073709551615ull -#define BIG32 4294967295ul -#define BIG_OK (BIG64 / BIG32 == 4294967297ull && BIG64 % BIG32 == 0) -#if !BIG_OK - #error "your preprocessor is broken" -#endif -#if BIG_OK -#else - #error "your preprocessor is broken" -#endif -static long long int bignum = -9223372036854775807LL; -static unsigned long long int ubignum = BIG64; - -struct incomplete_array -{ - int datasize; - double data[]; -}; - -struct named_init { - int number; - const wchar_t *name; - double average; -}; - -typedef const char *ccp; - -static inline int -test_restrict (ccp restrict text) -{ - // See if C++-style comments work. - // Iterate through items via the restricted pointer. - // Also check for declarations in for loops. - for (unsigned int i = 0; *(text+i) != '\''\0'\''; ++i) - continue; - return 0; -} - -// Check varargs and va_copy. -static bool -test_varargs (const char *format, ...) -{ - va_list args; - va_start (args, format); - va_list args_copy; - va_copy (args_copy, args); - - const char *str = ""; - int number = 0; - float fnumber = 0; - - while (*format) - { - switch (*format++) - { - case '\''s'\'': // string - str = va_arg (args_copy, const char *); - break; - case '\''d'\'': // int - number = va_arg (args_copy, int); - break; - case '\''f'\'': // float - fnumber = va_arg (args_copy, double); - break; - default: - break; - } - } - va_end (args_copy); - va_end (args); - - return *str && number && fnumber; -} -' - -# Test code for whether the C compiler supports C99 (body of main). -ac_c_conftest_c99_main=' - // Check bool. - _Bool success = false; - success |= (argc != 0); - - // Check restrict. - if (test_restrict ("String literal") == 0) - success = true; - char *restrict newvar = "Another string"; - - // Check varargs. - success &= test_varargs ("s, d'\'' f .", "string", 65, 34.234); - test_varargs_macros (); - - // Check flexible array members. - struct incomplete_array *ia = - malloc (sizeof (struct incomplete_array) + (sizeof (double) * 10)); - ia->datasize = 10; - for (int i = 0; i < ia->datasize; ++i) - ia->data[i] = i * 1.234; - - // Check named initializers. - struct named_init ni = { - .number = 34, - .name = L"Test wide string", - .average = 543.34343, - }; - - ni.number = 58; - - int dynamic_array[ni.number]; - dynamic_array[0] = argv[0][0]; - dynamic_array[ni.number - 1] = 543; - - // work around unused variable warnings - ok |= (!success || bignum == 0LL || ubignum == 0uLL || newvar[0] == '\''x'\'' - || dynamic_array[ni.number - 1] != 543); -' - -# Test code for whether the C compiler supports C11 (global declarations) -ac_c_conftest_c11_globals=' -// Does the compiler advertise C11 conformance? -#if !defined __STDC_VERSION__ || __STDC_VERSION__ < 201112L -# error "Compiler does not advertise C11 conformance" -#endif - -// Check _Alignas. -char _Alignas (double) aligned_as_double; -char _Alignas (0) no_special_alignment; -extern char aligned_as_int; -char _Alignas (0) _Alignas (int) aligned_as_int; - -// Check _Alignof. -enum -{ - int_alignment = _Alignof (int), - int_array_alignment = _Alignof (int[100]), - char_alignment = _Alignof (char) -}; -_Static_assert (0 < -_Alignof (int), "_Alignof is signed"); - -// Check _Noreturn. -int _Noreturn does_not_return (void) { for (;;) continue; } - -// Check _Static_assert. -struct test_static_assert -{ - int x; - _Static_assert (sizeof (int) <= sizeof (long int), - "_Static_assert does not work in struct"); - long int y; -}; - -// Check UTF-8 literals. -#define u8 syntax error! -char const utf8_literal[] = u8"happens to be ASCII" "another string"; - -// Check duplicate typedefs. -typedef long *long_ptr; -typedef long int *long_ptr; -typedef long_ptr long_ptr; - -// Anonymous structures and unions -- taken from C11 6.7.2.1 Example 1. -struct anonymous -{ - union { - struct { int i; int j; }; - struct { int k; long int l; } w; - }; - int m; -} v1; -' - -# Test code for whether the C compiler supports C11 (body of main). -ac_c_conftest_c11_main=' - _Static_assert ((offsetof (struct anonymous, i) - == offsetof (struct anonymous, w.k)), - "Anonymous union alignment botch"); - v1.i = 2; - v1.w.k = 5; - ok |= v1.i != 5; -' - -# Test code for whether the C compiler supports C11 (complete). -ac_c_conftest_c11_program="${ac_c_conftest_c89_globals} -${ac_c_conftest_c99_globals} -${ac_c_conftest_c11_globals} - -int -main (int argc, char **argv) -{ - int ok = 0; - ${ac_c_conftest_c89_main} - ${ac_c_conftest_c99_main} - ${ac_c_conftest_c11_main} - return ok; -} -" - -# Test code for whether the C compiler supports C99 (complete). -ac_c_conftest_c99_program="${ac_c_conftest_c89_globals} -${ac_c_conftest_c99_globals} - -int -main (int argc, char **argv) -{ - int ok = 0; - ${ac_c_conftest_c89_main} - ${ac_c_conftest_c99_main} - return ok; -} -" - -# Test code for whether the C compiler supports C89 (complete). -ac_c_conftest_c89_program="${ac_c_conftest_c89_globals} - -int -main (int argc, char **argv) -{ - int ok = 0; - ${ac_c_conftest_c89_main} - return ok; -} -" - -# Test code for whether the C++ compiler supports C++98 (global declarations) -ac_cxx_conftest_cxx98_globals=' -// Does the compiler advertise C++98 conformance? -#if !defined __cplusplus || __cplusplus < 199711L -# error "Compiler does not advertise C++98 conformance" -#endif - -// These inclusions are to reject old compilers that -// lack the unsuffixed header files. -#include -#include - -// and are *not* freestanding headers in C++98. -extern void assert (int); -namespace std { - extern int strcmp (const char *, const char *); -} - -// Namespaces, exceptions, and templates were all added after "C++ 2.0". -using std::exception; -using std::strcmp; - -namespace { - -void test_exception_syntax() -{ - try { - throw "test"; - } catch (const char *s) { - // Extra parentheses suppress a warning when building autoconf itself, - // due to lint rules shared with more typical C programs. - assert (!(strcmp) (s, "test")); - } -} - -template struct test_template -{ - T const val; - explicit test_template(T t) : val(t) {} - template T add(U u) { return static_cast(u) + val; } -}; - -} // anonymous namespace -' - -# Test code for whether the C++ compiler supports C++98 (body of main) -ac_cxx_conftest_cxx98_main=' - assert (argc); - assert (! argv[0]); -{ - test_exception_syntax (); - test_template tt (2.0); - assert (tt.add (4) == 6.0); - assert (true && !false); -} -' - -# Test code for whether the C++ compiler supports C++11 (global declarations) -ac_cxx_conftest_cxx11_globals=' -// Does the compiler advertise C++ 2011 conformance? -#if !defined __cplusplus || __cplusplus < 201103L -# error "Compiler does not advertise C++11 conformance" -#endif - -namespace cxx11test -{ - constexpr int get_val() { return 20; } - - struct testinit - { - int i; - double d; - }; - - class delegate - { - public: - delegate(int n) : n(n) {} - delegate(): delegate(2354) {} - - virtual int getval() { return this->n; }; - protected: - int n; - }; - - class overridden : public delegate - { - public: - overridden(int n): delegate(n) {} - virtual int getval() override final { return this->n * 2; } - }; - - class nocopy - { - public: - nocopy(int i): i(i) {} - nocopy() = default; - nocopy(const nocopy&) = delete; - nocopy & operator=(const nocopy&) = delete; - private: - int i; - }; - - // for testing lambda expressions - template Ret eval(Fn f, Ret v) - { - return f(v); - } - - // for testing variadic templates and trailing return types - template auto sum(V first) -> V - { - return first; - } - template auto sum(V first, Args... rest) -> V - { - return first + sum(rest...); - } -} -' - -# Test code for whether the C++ compiler supports C++11 (body of main) -ac_cxx_conftest_cxx11_main=' -{ - // Test auto and decltype - auto a1 = 6538; - auto a2 = 48573953.4; - auto a3 = "String literal"; - - int total = 0; - for (auto i = a3; *i; ++i) { total += *i; } - - decltype(a2) a4 = 34895.034; -} -{ - // Test constexpr - short sa[cxx11test::get_val()] = { 0 }; -} -{ - // Test initializer lists - cxx11test::testinit il = { 4323, 435234.23544 }; -} -{ - // Test range-based for - int array[] = {9, 7, 13, 15, 4, 18, 12, 10, 5, 3, - 14, 19, 17, 8, 6, 20, 16, 2, 11, 1}; - for (auto &x : array) { x += 23; } -} -{ - // Test lambda expressions - using cxx11test::eval; - assert (eval ([](int x) { return x*2; }, 21) == 42); - double d = 2.0; - assert (eval ([&](double x) { return d += x; }, 3.0) == 5.0); - assert (d == 5.0); - assert (eval ([=](double x) mutable { return d += x; }, 4.0) == 9.0); - assert (d == 5.0); -} -{ - // Test use of variadic templates - using cxx11test::sum; - auto a = sum(1); - auto b = sum(1, 2); - auto c = sum(1.0, 2.0, 3.0); -} -{ - // Test constructor delegation - cxx11test::delegate d1; - cxx11test::delegate d2(); - cxx11test::delegate d3(45); -} -{ - // Test override and final - cxx11test::overridden o1(55464); -} -{ - // Test nullptr - char *c = nullptr; -} -{ - // Test template brackets - test_template<::test_template> v(test_template(12)); -} -{ - // Unicode literals - char const *utf8 = u8"UTF-8 string \u2500"; - char16_t const *utf16 = u"UTF-8 string \u2500"; - char32_t const *utf32 = U"UTF-32 string \u2500"; -} -' - -# Test code for whether the C compiler supports C++11 (complete). -ac_cxx_conftest_cxx11_program="${ac_cxx_conftest_cxx98_globals} -${ac_cxx_conftest_cxx11_globals} - -int -main (int argc, char **argv) -{ - int ok = 0; - ${ac_cxx_conftest_cxx98_main} - ${ac_cxx_conftest_cxx11_main} - return ok; -} -" - -# Test code for whether the C compiler supports C++98 (complete). -ac_cxx_conftest_cxx98_program="${ac_cxx_conftest_cxx98_globals} -int -main (int argc, char **argv) -{ - int ok = 0; - ${ac_cxx_conftest_cxx98_main} - return ok; -} -" - - -# Auxiliary files required by this configure script. -ac_aux_files="config.guess config.sub" - -# Locations in which to look for auxiliary files. -ac_aux_dir_candidates="${srcdir}/../config" - -# Search for a directory containing all of the required auxiliary files, -# $ac_aux_files, from the $PATH-style list $ac_aux_dir_candidates. -# If we don't find one directory that contains all the files we need, -# we report the set of missing files from the *first* directory in -# $ac_aux_dir_candidates and give up. -ac_missing_aux_files="" -ac_first_candidate=: -printf "%s\n" "$as_me:${as_lineno-$LINENO}: looking for aux files: $ac_aux_files" >&5 -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -as_found=false -for as_dir in $ac_aux_dir_candidates -do - IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac - as_found=: - - printf "%s\n" "$as_me:${as_lineno-$LINENO}: trying $as_dir" >&5 - ac_aux_dir_found=yes - ac_install_sh= - for ac_aux in $ac_aux_files - do - # As a special case, if "install-sh" is required, that requirement - # can be satisfied by any of "install-sh", "install.sh", or "shtool", - # and $ac_install_sh is set appropriately for whichever one is found. - if test x"$ac_aux" = x"install-sh" - then - if test -f "${as_dir}install-sh"; then - printf "%s\n" "$as_me:${as_lineno-$LINENO}: ${as_dir}install-sh found" >&5 - ac_install_sh="${as_dir}install-sh -c" - elif test -f "${as_dir}install.sh"; then - printf "%s\n" "$as_me:${as_lineno-$LINENO}: ${as_dir}install.sh found" >&5 - ac_install_sh="${as_dir}install.sh -c" - elif test -f "${as_dir}shtool"; then - printf "%s\n" "$as_me:${as_lineno-$LINENO}: ${as_dir}shtool found" >&5 - ac_install_sh="${as_dir}shtool install -c" - else - ac_aux_dir_found=no - if $ac_first_candidate; then - ac_missing_aux_files="${ac_missing_aux_files} install-sh" - else - break - fi - fi - else - if test -f "${as_dir}${ac_aux}"; then - printf "%s\n" "$as_me:${as_lineno-$LINENO}: ${as_dir}${ac_aux} found" >&5 - else - ac_aux_dir_found=no - if $ac_first_candidate; then - ac_missing_aux_files="${ac_missing_aux_files} ${ac_aux}" - else - break - fi - fi - fi - done - if test "$ac_aux_dir_found" = yes; then - ac_aux_dir="$as_dir" - break - fi - ac_first_candidate=false - - as_found=false -done -IFS=$as_save_IFS -if $as_found -then : - -else $as_nop - as_fn_error $? "cannot find required auxiliary files:$ac_missing_aux_files" "$LINENO" 5 -fi - - -# These three variables are undocumented and unsupported, -# and are intended to be withdrawn in a future Autoconf release. -# They can cause serious problems if a builder's source tree is in a directory -# whose full name contains unusual characters. -if test -f "${ac_aux_dir}config.guess"; then - ac_config_guess="$SHELL ${ac_aux_dir}config.guess" -fi -if test -f "${ac_aux_dir}config.sub"; then - ac_config_sub="$SHELL ${ac_aux_dir}config.sub" -fi -if test -f "$ac_aux_dir/configure"; then - ac_configure="$SHELL ${ac_aux_dir}configure" -fi - -# Check that the precious variables saved in the cache have kept the same -# value. -ac_cache_corrupted=false -for ac_var in $ac_precious_vars; do - eval ac_old_set=\$ac_cv_env_${ac_var}_set - eval ac_new_set=\$ac_env_${ac_var}_set - eval ac_old_val=\$ac_cv_env_${ac_var}_value - eval ac_new_val=\$ac_env_${ac_var}_value - case $ac_old_set,$ac_new_set in - set,) - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 -printf "%s\n" "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} - ac_cache_corrupted=: ;; - ,set) - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5 -printf "%s\n" "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} - ac_cache_corrupted=: ;; - ,);; - *) - if test "x$ac_old_val" != "x$ac_new_val"; then - # differences in whitespace do not lead to failure. - ac_old_val_w=`echo x $ac_old_val` - ac_new_val_w=`echo x $ac_new_val` - if test "$ac_old_val_w" != "$ac_new_val_w"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5 -printf "%s\n" "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} - ac_cache_corrupted=: - else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5 -printf "%s\n" "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;} - eval $ac_var=\$ac_old_val - fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: former value: \`$ac_old_val'" >&5 -printf "%s\n" "$as_me: former value: \`$ac_old_val'" >&2;} - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: current value: \`$ac_new_val'" >&5 -printf "%s\n" "$as_me: current value: \`$ac_new_val'" >&2;} - fi;; - esac - # Pass precious variables to config.status. - if test "$ac_new_set" = set; then - case $ac_new_val in - *\'*) ac_arg=$ac_var=`printf "%s\n" "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; - *) ac_arg=$ac_var=$ac_new_val ;; - esac - case " $ac_configure_args " in - *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy. - *) as_fn_append ac_configure_args " '$ac_arg'" ;; - esac - fi -done -if $ac_cache_corrupted; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 -printf "%s\n" "$as_me: error: changes in the environment can compromise the build" >&2;} - as_fn_error $? "run \`${MAKE-make} distclean' and/or \`rm $cache_file' - and start over" "$LINENO" 5 -fi -## -------------------- ## -## Main body of script. ## -## -------------------- ## - -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - - - - - -CFLAGS= -CXXFLAGS= - - - - - - - - - -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu -if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. -set dummy ${ac_tool_prefix}gcc; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_CC+y} -then : - printf %s "(cached) " >&6 -else $as_nop - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then - ac_cv_prog_CC="${ac_tool_prefix}gcc" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -CC=$ac_cv_prog_CC -if test -n "$CC"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -printf "%s\n" "$CC" >&6; } -else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } -fi - - -fi -if test -z "$ac_cv_prog_CC"; then - ac_ct_CC=$CC - # Extract the first word of "gcc", so it can be a program name with args. -set dummy gcc; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_ac_ct_CC+y} -then : - printf %s "(cached) " >&6 -else $as_nop - if test -n "$ac_ct_CC"; then - ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_CC="gcc" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -ac_ct_CC=$ac_cv_prog_ac_ct_CC -if test -n "$ac_ct_CC"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 -printf "%s\n" "$ac_ct_CC" >&6; } -else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } -fi - - if test "x$ac_ct_CC" = x; then - CC="" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - CC=$ac_ct_CC - fi -else - CC="$ac_cv_prog_CC" -fi - -if test -z "$CC"; then - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. -set dummy ${ac_tool_prefix}cc; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_CC+y} -then : - printf %s "(cached) " >&6 -else $as_nop - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then - ac_cv_prog_CC="${ac_tool_prefix}cc" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -CC=$ac_cv_prog_CC -if test -n "$CC"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -printf "%s\n" "$CC" >&6; } -else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } -fi - - - fi -fi -if test -z "$CC"; then - # Extract the first word of "cc", so it can be a program name with args. -set dummy cc; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_CC+y} -then : - printf %s "(cached) " >&6 -else $as_nop - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -else - ac_prog_rejected=no -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then - if test "$as_dir$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then - ac_prog_rejected=yes - continue - fi - ac_cv_prog_CC="cc" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -if test $ac_prog_rejected = yes; then - # We found a bogon in the path, so make sure we never use it. - set dummy $ac_cv_prog_CC - shift - if test $# != 0; then - # We chose a different compiler from the bogus one. - # However, it has the same basename, so the bogon will be chosen - # first if we set CC to just the basename; use the full file name. - shift - ac_cv_prog_CC="$as_dir$ac_word${1+' '}$@" - fi -fi -fi -fi -CC=$ac_cv_prog_CC -if test -n "$CC"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -printf "%s\n" "$CC" >&6; } -else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } -fi - - -fi -if test -z "$CC"; then - if test -n "$ac_tool_prefix"; then - for ac_prog in cl.exe - do - # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. -set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_CC+y} -then : - printf %s "(cached) " >&6 -else $as_nop - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then - ac_cv_prog_CC="$ac_tool_prefix$ac_prog" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -CC=$ac_cv_prog_CC -if test -n "$CC"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -printf "%s\n" "$CC" >&6; } -else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } -fi - - - test -n "$CC" && break - done -fi -if test -z "$CC"; then - ac_ct_CC=$CC - for ac_prog in cl.exe -do - # Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_ac_ct_CC+y} -then : - printf %s "(cached) " >&6 -else $as_nop - if test -n "$ac_ct_CC"; then - ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_CC="$ac_prog" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -ac_ct_CC=$ac_cv_prog_ac_ct_CC -if test -n "$ac_ct_CC"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 -printf "%s\n" "$ac_ct_CC" >&6; } -else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } -fi - - - test -n "$ac_ct_CC" && break -done - - if test "x$ac_ct_CC" = x; then - CC="" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - CC=$ac_ct_CC - fi -fi - -fi -if test -z "$CC"; then - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}clang", so it can be a program name with args. -set dummy ${ac_tool_prefix}clang; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_CC+y} -then : - printf %s "(cached) " >&6 -else $as_nop - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then - ac_cv_prog_CC="${ac_tool_prefix}clang" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -CC=$ac_cv_prog_CC -if test -n "$CC"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -printf "%s\n" "$CC" >&6; } -else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } -fi - - -fi -if test -z "$ac_cv_prog_CC"; then - ac_ct_CC=$CC - # Extract the first word of "clang", so it can be a program name with args. -set dummy clang; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_ac_ct_CC+y} -then : - printf %s "(cached) " >&6 -else $as_nop - if test -n "$ac_ct_CC"; then - ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_CC="clang" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -ac_ct_CC=$ac_cv_prog_ac_ct_CC -if test -n "$ac_ct_CC"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 -printf "%s\n" "$ac_ct_CC" >&6; } -else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } -fi - - if test "x$ac_ct_CC" = x; then - CC="" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - CC=$ac_ct_CC - fi -else - CC="$ac_cv_prog_CC" -fi - -fi - - -test -z "$CC" && { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "no acceptable C compiler found in \$PATH -See \`config.log' for more details" "$LINENO" 5; } - -# Provide some information about the compiler. -printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 -set X $ac_compile -ac_compiler=$2 -for ac_option in --version -v -V -qversion -version; do - { { ac_try="$ac_compiler $ac_option >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -printf "%s\n" "$ac_try_echo"; } >&5 - (eval "$ac_compiler $ac_option >&5") 2>conftest.err - ac_status=$? - if test -s conftest.err; then - sed '10a\ -... rest of stderr output deleted ... - 10q' conftest.err >conftest.er1 - cat conftest.er1 >&5 - fi - rm -f conftest.er1 conftest.err - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } -done - -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main (void) -{ - - ; - return 0; -} -_ACEOF -ac_clean_files_save=$ac_clean_files -ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out" -# Try to create an executable without -o first, disregard a.out. -# It will help us diagnose broken compilers, and finding out an intuition -# of exeext. -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5 -printf %s "checking whether the C compiler works... " >&6; } -ac_link_default=`printf "%s\n" "$ac_link" | sed 's/ -o *conftest[^ ]*//'` - -# The possible output files: -ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*" - -ac_rmfiles= -for ac_file in $ac_files -do - case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;; - * ) ac_rmfiles="$ac_rmfiles $ac_file";; - esac -done -rm -f $ac_rmfiles - -if { { ac_try="$ac_link_default" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -printf "%s\n" "$ac_try_echo"; } >&5 - (eval "$ac_link_default") 2>&5 - ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } -then : - # Autoconf-2.13 could set the ac_cv_exeext variable to `no'. -# So ignore a value of `no', otherwise this would lead to `EXEEXT = no' -# in a Makefile. We should not override ac_cv_exeext if it was cached, -# so that the user can short-circuit this test for compilers unknown to -# Autoconf. -for ac_file in $ac_files '' -do - test -f "$ac_file" || continue - case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) - ;; - [ab].out ) - # We found the default executable, but exeext='' is most - # certainly right. - break;; - *.* ) - if test ${ac_cv_exeext+y} && test "$ac_cv_exeext" != no; - then :; else - ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` - fi - # We set ac_cv_exeext here because the later test for it is not - # safe: cross compilers may not add the suffix if given an `-o' - # argument, so we may need to know it at that point already. - # Even if this section looks crufty: it has the advantage of - # actually working. - break;; - * ) - break;; - esac -done -test "$ac_cv_exeext" = no && ac_cv_exeext= - -else $as_nop - ac_file='' -fi -if test -z "$ac_file" -then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } -printf "%s\n" "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error 77 "C compiler cannot create executables -See \`config.log' for more details" "$LINENO" 5; } -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } -fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5 -printf %s "checking for C compiler default output file name... " >&6; } -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5 -printf "%s\n" "$ac_file" >&6; } -ac_exeext=$ac_cv_exeext - -rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out -ac_clean_files=$ac_clean_files_save -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5 -printf %s "checking for suffix of executables... " >&6; } -if { { ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -printf "%s\n" "$ac_try_echo"; } >&5 - (eval "$ac_link") 2>&5 - ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } -then : - # If both `conftest.exe' and `conftest' are `present' (well, observable) -# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will -# work properly (i.e., refer to `conftest.exe'), while it won't with -# `rm'. -for ac_file in conftest.exe conftest conftest.*; do - test -f "$ac_file" || continue - case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;; - *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` - break;; - * ) break;; - esac -done -else $as_nop - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "cannot compute suffix of executables: cannot compile and link -See \`config.log' for more details" "$LINENO" 5; } -fi -rm -f conftest conftest$ac_cv_exeext -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 -printf "%s\n" "$ac_cv_exeext" >&6; } - -rm -f conftest.$ac_ext -EXEEXT=$ac_cv_exeext -ac_exeext=$EXEEXT -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -int -main (void) -{ -FILE *f = fopen ("conftest.out", "w"); - return ferror (f) || fclose (f) != 0; - - ; - return 0; -} -_ACEOF -ac_clean_files="$ac_clean_files conftest.out" -# Check that the compiler produces executables we can run. If not, either -# the compiler is broken, or we cross compile. -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5 -printf %s "checking whether we are cross compiling... " >&6; } -if test "$cross_compiling" != yes; then - { { ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -printf "%s\n" "$ac_try_echo"; } >&5 - (eval "$ac_link") 2>&5 - ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } - if { ac_try='./conftest$ac_cv_exeext' - { { case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -printf "%s\n" "$ac_try_echo"; } >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; }; then - cross_compiling=no - else - if test "$cross_compiling" = maybe; then - cross_compiling=yes - else - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error 77 "cannot run C compiled programs. -If you meant to cross compile, use \`--host'. -See \`config.log' for more details" "$LINENO" 5; } - fi - fi -fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 -printf "%s\n" "$cross_compiling" >&6; } - -rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out -ac_clean_files=$ac_clean_files_save -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 -printf %s "checking for suffix of object files... " >&6; } -if test ${ac_cv_objext+y} -then : - printf %s "(cached) " >&6 -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main (void) -{ - - ; - return 0; -} -_ACEOF -rm -f conftest.o conftest.obj -if { { ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -printf "%s\n" "$ac_try_echo"; } >&5 - (eval "$ac_compile") 2>&5 - ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } -then : - for ac_file in conftest.o conftest.obj conftest.*; do - test -f "$ac_file" || continue; - case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;; - *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'` - break;; - esac -done -else $as_nop - printf "%s\n" "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "cannot compute suffix of object files: cannot compile -See \`config.log' for more details" "$LINENO" 5; } -fi -rm -f conftest.$ac_cv_objext conftest.$ac_ext -fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5 -printf "%s\n" "$ac_cv_objext" >&6; } -OBJEXT=$ac_cv_objext -ac_objext=$OBJEXT -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports GNU C" >&5 -printf %s "checking whether the compiler supports GNU C... " >&6; } -if test ${ac_cv_c_compiler_gnu+y} -then : - printf %s "(cached) " >&6 -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main (void) -{ -#ifndef __GNUC__ - choke me -#endif - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO" -then : - ac_compiler_gnu=yes -else $as_nop - ac_compiler_gnu=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext -ac_cv_c_compiler_gnu=$ac_compiler_gnu - -fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5 -printf "%s\n" "$ac_cv_c_compiler_gnu" >&6; } -ac_compiler_gnu=$ac_cv_c_compiler_gnu - -if test $ac_compiler_gnu = yes; then - GCC=yes -else - GCC= -fi -ac_test_CFLAGS=${CFLAGS+y} -ac_save_CFLAGS=$CFLAGS -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 -printf %s "checking whether $CC accepts -g... " >&6; } -if test ${ac_cv_prog_cc_g+y} -then : - printf %s "(cached) " >&6 -else $as_nop - ac_save_c_werror_flag=$ac_c_werror_flag - ac_c_werror_flag=yes - ac_cv_prog_cc_g=no - CFLAGS="-g" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main (void) -{ - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO" -then : - ac_cv_prog_cc_g=yes -else $as_nop - CFLAGS="" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main (void) -{ - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO" -then : - -else $as_nop - ac_c_werror_flag=$ac_save_c_werror_flag - CFLAGS="-g" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main (void) -{ - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO" -then : - ac_cv_prog_cc_g=yes -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext - ac_c_werror_flag=$ac_save_c_werror_flag -fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5 -printf "%s\n" "$ac_cv_prog_cc_g" >&6; } -if test $ac_test_CFLAGS; then - CFLAGS=$ac_save_CFLAGS -elif test $ac_cv_prog_cc_g = yes; then - if test "$GCC" = yes; then - CFLAGS="-g -O2" - else - CFLAGS="-g" - fi -else - if test "$GCC" = yes; then - CFLAGS="-O2" - else - CFLAGS= - fi -fi -ac_prog_cc_stdc=no -if test x$ac_prog_cc_stdc = xno -then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C11 features" >&5 -printf %s "checking for $CC option to enable C11 features... " >&6; } -if test ${ac_cv_prog_cc_c11+y} -then : - printf %s "(cached) " >&6 -else $as_nop - ac_cv_prog_cc_c11=no -ac_save_CC=$CC -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -$ac_c_conftest_c11_program -_ACEOF -for ac_arg in '' -std=gnu11 -do - CC="$ac_save_CC $ac_arg" - if ac_fn_c_try_compile "$LINENO" -then : - ac_cv_prog_cc_c11=$ac_arg -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam - test "x$ac_cv_prog_cc_c11" != "xno" && break -done -rm -f conftest.$ac_ext -CC=$ac_save_CC -fi - -if test "x$ac_cv_prog_cc_c11" = xno -then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 -printf "%s\n" "unsupported" >&6; } -else $as_nop - if test "x$ac_cv_prog_cc_c11" = x -then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 -printf "%s\n" "none needed" >&6; } -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c11" >&5 -printf "%s\n" "$ac_cv_prog_cc_c11" >&6; } - CC="$CC $ac_cv_prog_cc_c11" -fi - ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c11 - ac_prog_cc_stdc=c11 -fi -fi -if test x$ac_prog_cc_stdc = xno -then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C99 features" >&5 -printf %s "checking for $CC option to enable C99 features... " >&6; } -if test ${ac_cv_prog_cc_c99+y} -then : - printf %s "(cached) " >&6 -else $as_nop - ac_cv_prog_cc_c99=no -ac_save_CC=$CC -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -$ac_c_conftest_c99_program -_ACEOF -for ac_arg in '' -std=gnu99 -std=c99 -c99 -qlanglvl=extc1x -qlanglvl=extc99 -AC99 -D_STDC_C99= -do - CC="$ac_save_CC $ac_arg" - if ac_fn_c_try_compile "$LINENO" -then : - ac_cv_prog_cc_c99=$ac_arg -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam - test "x$ac_cv_prog_cc_c99" != "xno" && break -done -rm -f conftest.$ac_ext -CC=$ac_save_CC -fi - -if test "x$ac_cv_prog_cc_c99" = xno -then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 -printf "%s\n" "unsupported" >&6; } -else $as_nop - if test "x$ac_cv_prog_cc_c99" = x -then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 -printf "%s\n" "none needed" >&6; } -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c99" >&5 -printf "%s\n" "$ac_cv_prog_cc_c99" >&6; } - CC="$CC $ac_cv_prog_cc_c99" -fi - ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c99 - ac_prog_cc_stdc=c99 -fi -fi -if test x$ac_prog_cc_stdc = xno -then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C89 features" >&5 -printf %s "checking for $CC option to enable C89 features... " >&6; } -if test ${ac_cv_prog_cc_c89+y} -then : - printf %s "(cached) " >&6 -else $as_nop - ac_cv_prog_cc_c89=no -ac_save_CC=$CC -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -$ac_c_conftest_c89_program -_ACEOF -for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" -do - CC="$ac_save_CC $ac_arg" - if ac_fn_c_try_compile "$LINENO" -then : - ac_cv_prog_cc_c89=$ac_arg -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam - test "x$ac_cv_prog_cc_c89" != "xno" && break -done -rm -f conftest.$ac_ext -CC=$ac_save_CC -fi - -if test "x$ac_cv_prog_cc_c89" = xno -then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 -printf "%s\n" "unsupported" >&6; } -else $as_nop - if test "x$ac_cv_prog_cc_c89" = x -then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 -printf "%s\n" "none needed" >&6; } -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 -printf "%s\n" "$ac_cv_prog_cc_c89" >&6; } - CC="$CC $ac_cv_prog_cc_c89" -fi - ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c89 - ac_prog_cc_stdc=c89 -fi -fi - -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - - - - - - - -ac_ext=cpp -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -if test -z "$CXX"; then - if test -n "$CCC"; then - CXX=$CCC - else - if test -n "$ac_tool_prefix"; then - for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC clang++ - do - # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. -set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_CXX+y} -then : - printf %s "(cached) " >&6 -else $as_nop - if test -n "$CXX"; then - ac_cv_prog_CXX="$CXX" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then - ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -CXX=$ac_cv_prog_CXX -if test -n "$CXX"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5 -printf "%s\n" "$CXX" >&6; } -else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } -fi - - - test -n "$CXX" && break - done -fi -if test -z "$CXX"; then - ac_ct_CXX=$CXX - for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC clang++ -do - # Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_ac_ct_CXX+y} -then : - printf %s "(cached) " >&6 -else $as_nop - if test -n "$ac_ct_CXX"; then - ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_CXX="$ac_prog" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -ac_ct_CXX=$ac_cv_prog_ac_ct_CXX -if test -n "$ac_ct_CXX"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5 -printf "%s\n" "$ac_ct_CXX" >&6; } -else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } -fi - - - test -n "$ac_ct_CXX" && break -done - - if test "x$ac_ct_CXX" = x; then - CXX="g++" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - CXX=$ac_ct_CXX - fi -fi - - fi -fi -# Provide some information about the compiler. -printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C++ compiler version" >&5 -set X $ac_compile -ac_compiler=$2 -for ac_option in --version -v -V -qversion; do - { { ac_try="$ac_compiler $ac_option >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -printf "%s\n" "$ac_try_echo"; } >&5 - (eval "$ac_compiler $ac_option >&5") 2>conftest.err - ac_status=$? - if test -s conftest.err; then - sed '10a\ -... rest of stderr output deleted ... - 10q' conftest.err >conftest.er1 - cat conftest.er1 >&5 - fi - rm -f conftest.er1 conftest.err - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } -done - -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports GNU C++" >&5 -printf %s "checking whether the compiler supports GNU C++... " >&6; } -if test ${ac_cv_cxx_compiler_gnu+y} -then : - printf %s "(cached) " >&6 -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main (void) -{ -#ifndef __GNUC__ - choke me -#endif - - ; - return 0; -} -_ACEOF -if ac_fn_cxx_try_compile "$LINENO" -then : - ac_compiler_gnu=yes -else $as_nop - ac_compiler_gnu=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext -ac_cv_cxx_compiler_gnu=$ac_compiler_gnu - -fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_compiler_gnu" >&5 -printf "%s\n" "$ac_cv_cxx_compiler_gnu" >&6; } -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - -if test $ac_compiler_gnu = yes; then - GXX=yes -else - GXX= -fi -ac_test_CXXFLAGS=${CXXFLAGS+y} -ac_save_CXXFLAGS=$CXXFLAGS -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5 -printf %s "checking whether $CXX accepts -g... " >&6; } -if test ${ac_cv_prog_cxx_g+y} -then : - printf %s "(cached) " >&6 -else $as_nop - ac_save_cxx_werror_flag=$ac_cxx_werror_flag - ac_cxx_werror_flag=yes - ac_cv_prog_cxx_g=no - CXXFLAGS="-g" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main (void) -{ - - ; - return 0; -} -_ACEOF -if ac_fn_cxx_try_compile "$LINENO" -then : - ac_cv_prog_cxx_g=yes -else $as_nop - CXXFLAGS="" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main (void) -{ - - ; - return 0; -} -_ACEOF -if ac_fn_cxx_try_compile "$LINENO" -then : - -else $as_nop - ac_cxx_werror_flag=$ac_save_cxx_werror_flag - CXXFLAGS="-g" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main (void) -{ - - ; - return 0; -} -_ACEOF -if ac_fn_cxx_try_compile "$LINENO" -then : - ac_cv_prog_cxx_g=yes -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext - ac_cxx_werror_flag=$ac_save_cxx_werror_flag -fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_g" >&5 -printf "%s\n" "$ac_cv_prog_cxx_g" >&6; } -if test $ac_test_CXXFLAGS; then - CXXFLAGS=$ac_save_CXXFLAGS -elif test $ac_cv_prog_cxx_g = yes; then - if test "$GXX" = yes; then - CXXFLAGS="-g -O2" - else - CXXFLAGS="-g" - fi -else - if test "$GXX" = yes; then - CXXFLAGS="-O2" - else - CXXFLAGS= - fi -fi -ac_prog_cxx_stdcxx=no -if test x$ac_prog_cxx_stdcxx = xno -then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++11 features" >&5 -printf %s "checking for $CXX option to enable C++11 features... " >&6; } -if test ${ac_cv_prog_cxx_11+y} -then : - printf %s "(cached) " >&6 -else $as_nop - ac_cv_prog_cxx_11=no -ac_save_CXX=$CXX -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -$ac_cxx_conftest_cxx11_program -_ACEOF -for ac_arg in '' -std=gnu++11 -std=gnu++0x -std=c++11 -std=c++0x -qlanglvl=extended0x -AA -do - CXX="$ac_save_CXX $ac_arg" - if ac_fn_cxx_try_compile "$LINENO" -then : - ac_cv_prog_cxx_cxx11=$ac_arg -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam - test "x$ac_cv_prog_cxx_cxx11" != "xno" && break -done -rm -f conftest.$ac_ext -CXX=$ac_save_CXX -fi - -if test "x$ac_cv_prog_cxx_cxx11" = xno -then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 -printf "%s\n" "unsupported" >&6; } -else $as_nop - if test "x$ac_cv_prog_cxx_cxx11" = x -then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 -printf "%s\n" "none needed" >&6; } -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_cxx11" >&5 -printf "%s\n" "$ac_cv_prog_cxx_cxx11" >&6; } - CXX="$CXX $ac_cv_prog_cxx_cxx11" -fi - ac_cv_prog_cxx_stdcxx=$ac_cv_prog_cxx_cxx11 - ac_prog_cxx_stdcxx=cxx11 -fi -fi -if test x$ac_prog_cxx_stdcxx = xno -then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++98 features" >&5 -printf %s "checking for $CXX option to enable C++98 features... " >&6; } -if test ${ac_cv_prog_cxx_98+y} -then : - printf %s "(cached) " >&6 -else $as_nop - ac_cv_prog_cxx_98=no -ac_save_CXX=$CXX -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -$ac_cxx_conftest_cxx98_program -_ACEOF -for ac_arg in '' -std=gnu++98 -std=c++98 -qlanglvl=extended -AA -do - CXX="$ac_save_CXX $ac_arg" - if ac_fn_cxx_try_compile "$LINENO" -then : - ac_cv_prog_cxx_cxx98=$ac_arg -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam - test "x$ac_cv_prog_cxx_cxx98" != "xno" && break -done -rm -f conftest.$ac_ext -CXX=$ac_save_CXX -fi - -if test "x$ac_cv_prog_cxx_cxx98" = xno -then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 -printf "%s\n" "unsupported" >&6; } -else $as_nop - if test "x$ac_cv_prog_cxx_cxx98" = x -then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 -printf "%s\n" "none needed" >&6; } -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_cxx98" >&5 -printf "%s\n" "$ac_cv_prog_cxx_cxx98" >&6; } - CXX="$CXX $ac_cv_prog_cxx_cxx98" -fi - ac_cv_prog_cxx_stdcxx=$ac_cv_prog_cxx_cxx98 - ac_prog_cxx_stdcxx=cxx98 -fi -fi - -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - - - - - - # Make sure we can run config.sub. -$SHELL "${ac_aux_dir}config.sub" sun4 >/dev/null 2>&1 || - as_fn_error $? "cannot run $SHELL ${ac_aux_dir}config.sub" "$LINENO" 5 - -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 -printf %s "checking build system type... " >&6; } -if test ${ac_cv_build+y} -then : - printf %s "(cached) " >&6 -else $as_nop - ac_build_alias=$build_alias -test "x$ac_build_alias" = x && - ac_build_alias=`$SHELL "${ac_aux_dir}config.guess"` -test "x$ac_build_alias" = x && - as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5 -ac_cv_build=`$SHELL "${ac_aux_dir}config.sub" $ac_build_alias` || - as_fn_error $? "$SHELL ${ac_aux_dir}config.sub $ac_build_alias failed" "$LINENO" 5 - -fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5 -printf "%s\n" "$ac_cv_build" >&6; } -case $ac_cv_build in -*-*-*) ;; -*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;; -esac -build=$ac_cv_build -ac_save_IFS=$IFS; IFS='-' -set x $ac_cv_build -shift -build_cpu=$1 -build_vendor=$2 -shift; shift -# Remember, the first character of IFS is used to create $*, -# except with old shells: -build_os=$* -IFS=$ac_save_IFS -case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac - - -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking host system type" >&5 -printf %s "checking host system type... " >&6; } -if test ${ac_cv_host+y} -then : - printf %s "(cached) " >&6 -else $as_nop - if test "x$host_alias" = x; then - ac_cv_host=$ac_cv_build -else - ac_cv_host=`$SHELL "${ac_aux_dir}config.sub" $host_alias` || - as_fn_error $? "$SHELL ${ac_aux_dir}config.sub $host_alias failed" "$LINENO" 5 -fi - -fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5 -printf "%s\n" "$ac_cv_host" >&6; } -case $ac_cv_host in -*-*-*) ;; -*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;; -esac -host=$ac_cv_host -ac_save_IFS=$IFS; IFS='-' -set x $ac_cv_host -shift -host_cpu=$1 -host_vendor=$2 -shift; shift -# Remember, the first character of IFS is used to create $*, -# except with old shells: -host_os=$* -IFS=$ac_save_IFS -case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac - - - -# Use 64-bit file system calls so that we can support files > 2 GiB. - -# Check whether --enable-largefile was given. -if test ${enable_largefile+y} -then : - enableval=$enable_largefile; -fi - -if test "$enable_largefile" != no; then - - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for special C compiler options needed for large files" >&5 -printf %s "checking for special C compiler options needed for large files... " >&6; } -if test ${ac_cv_sys_largefile_CC+y} -then : - printf %s "(cached) " >&6 -else $as_nop - ac_cv_sys_largefile_CC=no - if test "$GCC" != yes; then - ac_save_CC=$CC - while :; do - # IRIX 6.2 and later do not support large files by default, - # so use the C compiler's -n32 option if that helps. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include - /* Check that off_t can represent 2**63 - 1 correctly. - We can't simply define LARGE_OFF_T to be 9223372036854775807, - since some C++ compilers masquerading as C compilers - incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T (((off_t) 1 << 31 << 31) - 1 + ((off_t) 1 << 31 << 31)) - int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 - && LARGE_OFF_T % 2147483647 == 1) - ? 1 : -1]; -int -main (void) -{ - - ; - return 0; -} -_ACEOF - if ac_fn_c_try_compile "$LINENO" -then : - break -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam - CC="$CC -n32" - if ac_fn_c_try_compile "$LINENO" -then : - ac_cv_sys_largefile_CC=' -n32'; break -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam - break - done - CC=$ac_save_CC - rm -f conftest.$ac_ext - fi -fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_largefile_CC" >&5 -printf "%s\n" "$ac_cv_sys_largefile_CC" >&6; } - if test "$ac_cv_sys_largefile_CC" != no; then - CC=$CC$ac_cv_sys_largefile_CC - fi - - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for _FILE_OFFSET_BITS value needed for large files" >&5 -printf %s "checking for _FILE_OFFSET_BITS value needed for large files... " >&6; } -if test ${ac_cv_sys_file_offset_bits+y} -then : - printf %s "(cached) " >&6 -else $as_nop - while :; do - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include - /* Check that off_t can represent 2**63 - 1 correctly. - We can't simply define LARGE_OFF_T to be 9223372036854775807, - since some C++ compilers masquerading as C compilers - incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T (((off_t) 1 << 31 << 31) - 1 + ((off_t) 1 << 31 << 31)) - int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 - && LARGE_OFF_T % 2147483647 == 1) - ? 1 : -1]; -int -main (void) -{ - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO" -then : - ac_cv_sys_file_offset_bits=no; break -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#define _FILE_OFFSET_BITS 64 -#include - /* Check that off_t can represent 2**63 - 1 correctly. - We can't simply define LARGE_OFF_T to be 9223372036854775807, - since some C++ compilers masquerading as C compilers - incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T (((off_t) 1 << 31 << 31) - 1 + ((off_t) 1 << 31 << 31)) - int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 - && LARGE_OFF_T % 2147483647 == 1) - ? 1 : -1]; -int -main (void) -{ - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO" -then : - ac_cv_sys_file_offset_bits=64; break -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext - ac_cv_sys_file_offset_bits=unknown - break -done -fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_file_offset_bits" >&5 -printf "%s\n" "$ac_cv_sys_file_offset_bits" >&6; } -case $ac_cv_sys_file_offset_bits in #( - no | unknown) ;; - *) -printf "%s\n" "#define _FILE_OFFSET_BITS $ac_cv_sys_file_offset_bits" >>confdefs.h -;; -esac -rm -rf conftest* - if test $ac_cv_sys_file_offset_bits = unknown; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for _LARGE_FILES value needed for large files" >&5 -printf %s "checking for _LARGE_FILES value needed for large files... " >&6; } -if test ${ac_cv_sys_large_files+y} -then : - printf %s "(cached) " >&6 -else $as_nop - while :; do - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include - /* Check that off_t can represent 2**63 - 1 correctly. - We can't simply define LARGE_OFF_T to be 9223372036854775807, - since some C++ compilers masquerading as C compilers - incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T (((off_t) 1 << 31 << 31) - 1 + ((off_t) 1 << 31 << 31)) - int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 - && LARGE_OFF_T % 2147483647 == 1) - ? 1 : -1]; -int -main (void) -{ - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO" -then : - ac_cv_sys_large_files=no; break -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#define _LARGE_FILES 1 -#include - /* Check that off_t can represent 2**63 - 1 correctly. - We can't simply define LARGE_OFF_T to be 9223372036854775807, - since some C++ compilers masquerading as C compilers - incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T (((off_t) 1 << 31 << 31) - 1 + ((off_t) 1 << 31 << 31)) - int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 - && LARGE_OFF_T % 2147483647 == 1) - ? 1 : -1]; -int -main (void) -{ - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO" -then : - ac_cv_sys_large_files=1; break -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext - ac_cv_sys_large_files=unknown - break -done -fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_large_files" >&5 -printf "%s\n" "$ac_cv_sys_large_files" >&6; } -case $ac_cv_sys_large_files in #( - no | unknown) ;; - *) -printf "%s\n" "#define _LARGE_FILES $ac_cv_sys_large_files" >>confdefs.h -;; -esac -rm -rf conftest* - fi -fi - - - - - -# Extract the first word of "perl", so it can be a program name with args. -set dummy perl; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_path_perl+y} -then : - printf %s "(cached) " >&6 -else $as_nop - case $perl in - [\\/]* | ?:[\\/]*) - ac_cv_path_perl="$perl" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then - ac_cv_path_perl="$as_dir$ac_word$ac_exec_ext" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - - ;; -esac -fi -perl=$ac_cv_path_perl -if test -n "$perl"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $perl" >&5 -printf "%s\n" "$perl" >&6; } -else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } -fi - - -if test -z "$perl"; then - as_fn_error $? "perl is required" "$LINENO" 5 -fi - - -# Extract the first word of "curl", so it can be a program name with args. -set dummy curl; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_path_curl+y} -then : - printf %s "(cached) " >&6 -else $as_nop - case $curl in - [\\/]* | ?:[\\/]*) - ac_cv_path_curl="$curl" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then - ac_cv_path_curl="$as_dir$ac_word$ac_exec_ext" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - - ;; -esac -fi -curl=$ac_cv_path_curl -if test -n "$curl"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $curl" >&5 -printf "%s\n" "$curl" >&6; } -else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } -fi - - -if test -z "$curl"; then - as_fn_error $? "curl is required" "$LINENO" 5 -fi - - -# Extract the first word of "bzip2", so it can be a program name with args. -set dummy bzip2; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_path_bzip2+y} -then : - printf %s "(cached) " >&6 -else $as_nop - case $bzip2 in - [\\/]* | ?:[\\/]*) - ac_cv_path_bzip2="$bzip2" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then - ac_cv_path_bzip2="$as_dir$ac_word$ac_exec_ext" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - - ;; -esac -fi -bzip2=$ac_cv_path_bzip2 -if test -n "$bzip2"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $bzip2" >&5 -printf "%s\n" "$bzip2" >&6; } -else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } -fi - - -if test -z "$bzip2"; then - as_fn_error $? "bzip2 is required" "$LINENO" 5 -fi - - -# Extract the first word of "xz", so it can be a program name with args. -set dummy xz; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_path_xz+y} -then : - printf %s "(cached) " >&6 -else $as_nop - case $xz in - [\\/]* | ?:[\\/]*) - ac_cv_path_xz="$xz" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then - ac_cv_path_xz="$as_dir$ac_word$ac_exec_ext" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - - ;; -esac -fi -xz=$ac_cv_path_xz -if test -n "$xz"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xz" >&5 -printf "%s\n" "$xz" >&6; } -else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } -fi - - -if test -z "$xz"; then - as_fn_error $? "xz is required" "$LINENO" 5 -fi - - -# Test that Perl has the open/fork feature (Perl 5.8.0 and beyond). -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether Perl is recent enough" >&5 -printf %s "checking whether Perl is recent enough... " >&6; } -if ! $perl -e 'open(FOO, "-|", "true"); while () { print; }; close FOO or die;'; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } - as_fn_error $? "Your Perl version is too old. Nix requires Perl 5.8.0 or newer." "$LINENO" 5 -fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } - - -# Figure out where to install Perl modules. -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for the Perl installation prefix" >&5 -printf %s "checking for the Perl installation prefix... " >&6; } -perlversion=$($perl -e 'use Config; print $Config{version};') -perlarchname=$($perl -e 'use Config; print $Config{archname};') -perllibdir=${libdir}/perl5/site_perl/$perlversion/$perlarchname - -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $perllibdir" >&5 -printf "%s\n" "$perllibdir" >&6; } - -# Look for libsodium. -PKG_CHECK_MODULES(SODIUM, libsodium, CXXFLAGS="$SODIUM_CFLAGS $CXXFLAGS") - -# Check for the required Perl dependencies (DBI and DBD::SQLite). -perlFlags="-I$perllibdir" - - -# Check whether --with-dbi was given. -if test ${with_dbi+y} -then : - withval=$with_dbi; perlFlags="$perlFlags -I$withval" -fi - - - -# Check whether --with-dbd-sqlite was given. -if test ${with_dbd_sqlite+y} -then : - withval=$with_dbd_sqlite; perlFlags="$perlFlags -I$withval" -fi - - -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether DBD::SQLite works" >&5 -printf %s "checking whether DBD::SQLite works... " >&6; } -if ! $perl $perlFlags -e 'use DBI; use DBD::SQLite;' 2>&5; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "The Perl modules DBI and/or DBD::SQLite are missing. -See \`config.log' for more details" "$LINENO" 5; } -fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } - - - -PKG_CHECK_MODULES(NIX, nix-store) - - -# Extract the first word of "nix", so it can be a program name with args. -set dummy nix; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_path_NIX+y} -then : - printf %s "(cached) " >&6 -else $as_nop - case $NIX in - [\\/]* | ?:[\\/]*) - ac_cv_path_NIX="$NIX" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then - ac_cv_path_NIX="$as_dir$ac_word$ac_exec_ext" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - - ;; -esac -fi -NIX=$ac_cv_path_NIX -if test -n "$NIX"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $NIX" >&5 -printf "%s\n" "$NIX" >&6; } -else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } -fi - - -if test -z "$NIX"; then - as_fn_error $? "nix is required" "$LINENO" 5 -fi - - -# Expand all variables in config.status. -test "$prefix" = NONE && prefix=$ac_default_prefix -test "$exec_prefix" = NONE && exec_prefix='${prefix}' -for name in $ac_subst_vars; do - declare $name="$(eval echo "${!name}")" - declare $name="$(eval echo "${!name}")" - declare $name="$(eval echo "${!name}")" -done - -rm -f Makefile.config -ln -sfn ../mk mk - -ac_config_files="$ac_config_files " - -cat >confcache <<\_ACEOF -# This file is a shell script that caches the results of configure -# tests run on this system so they can be shared between configure -# scripts and configure runs, see configure's option --config-cache. -# It is not useful on other systems. If it contains results you don't -# want to keep, you may remove or edit it. -# -# config.status only pays attention to the cache file if you give it -# the --recheck option to rerun configure. -# -# `ac_cv_env_foo' variables (set or unset) will be overridden when -# loading this file, other *unset* `ac_cv_foo' will be assigned the -# following values. - -_ACEOF - -# The following way of writing the cache mishandles newlines in values, -# but we know of no workaround that is simple, portable, and efficient. -# So, we kill variables containing newlines. -# Ultrix sh set writes to stderr and can't be redirected directly, -# and sets the high bit in the cache file unless we assign to the vars. -( - for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do - eval ac_val=\$$ac_var - case $ac_val in #( - *${as_nl}*) - case $ac_var in #( - *_cv_*) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 -printf "%s\n" "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; - esac - case $ac_var in #( - _ | IFS | as_nl) ;; #( - BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( - *) { eval $ac_var=; unset $ac_var;} ;; - esac ;; - esac - done - - (set) 2>&1 | - case $as_nl`(ac_space=' '; set) 2>&1` in #( - *${as_nl}ac_space=\ *) - # `set' does not quote correctly, so add quotes: double-quote - # substitution turns \\\\ into \\, and sed turns \\ into \. - sed -n \ - "s/'/'\\\\''/g; - s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" - ;; #( - *) - # `set' quotes correctly as required by POSIX, so do not add quotes. - sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" - ;; - esac | - sort -) | - sed ' - /^ac_cv_env_/b end - t clear - :clear - s/^\([^=]*\)=\(.*[{}].*\)$/test ${\1+y} || &/ - t end - s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ - :end' >>confcache -if diff "$cache_file" confcache >/dev/null 2>&1; then :; else - if test -w "$cache_file"; then - if test "x$cache_file" != "x/dev/null"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 -printf "%s\n" "$as_me: updating cache $cache_file" >&6;} - if test ! -f "$cache_file" || test -h "$cache_file"; then - cat confcache >"$cache_file" - else - case $cache_file in #( - */* | ?:*) - mv -f confcache "$cache_file"$$ && - mv -f "$cache_file"$$ "$cache_file" ;; #( - *) - mv -f confcache "$cache_file" ;; - esac - fi - fi - else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 -printf "%s\n" "$as_me: not updating unwritable cache $cache_file" >&6;} - fi -fi -rm -f confcache - -test "x$prefix" = xNONE && prefix=$ac_default_prefix -# Let make expand exec_prefix. -test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' - -# Transform confdefs.h into DEFS. -# Protect against shell expansion while executing Makefile rules. -# Protect against Makefile macro expansion. -# -# If the first sed substitution is executed (which looks for macros that -# take arguments), then branch to the quote section. Otherwise, -# look for a macro that doesn't take arguments. -ac_script=' -:mline -/\\$/{ - N - s,\\\n,, - b mline -} -t clear -:clear -s/^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*([^)]*)\)[ ]*\(.*\)/-D\1=\2/g -t quote -s/^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\)/-D\1=\2/g -t quote -b any -:quote -s/[ `~#$^&*(){}\\|;'\''"<>?]/\\&/g -s/\[/\\&/g -s/\]/\\&/g -s/\$/$$/g -H -:any -${ - g - s/^\n// - s/\n/ /g - p -} -' -DEFS=`sed -n "$ac_script" confdefs.h` - - -ac_libobjs= -ac_ltlibobjs= -U= -for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue - # 1. Remove the extension, and $U if already installed. - ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' - ac_i=`printf "%s\n" "$ac_i" | sed "$ac_script"` - # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR - # will be set to the directory where LIBOBJS objects are built. - as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext" - as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo' -done -LIBOBJS=$ac_libobjs - -LTLIBOBJS=$ac_ltlibobjs - - - -: "${CONFIG_STATUS=./config.status}" -ac_write_fail=0 -ac_clean_files_save=$ac_clean_files -ac_clean_files="$ac_clean_files $CONFIG_STATUS" -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5 -printf "%s\n" "$as_me: creating $CONFIG_STATUS" >&6;} -as_write_fail=0 -cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1 -#! $SHELL -# Generated by $as_me. -# Run this file to recreate the current configuration. -# Compiler output produced by configure, useful for debugging -# configure, is in config.log if it exists. - -debug=false -ac_cs_recheck=false -ac_cs_silent=false - -SHELL=\${CONFIG_SHELL-$SHELL} -export SHELL -_ASEOF -cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1 -## -------------------- ## -## M4sh Initialization. ## -## -------------------- ## - -# Be more Bourne compatible -DUALCASE=1; export DUALCASE # for MKS sh -as_nop=: -if test ${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1 -then : - emulate sh - NULLCMD=: - # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which - # is contrary to our usage. Disable this feature. - alias -g '${1+"$@"}'='"$@"' - setopt NO_GLOB_SUBST -else $as_nop - case `(set -o) 2>/dev/null` in #( - *posix*) : - set -o posix ;; #( - *) : - ;; -esac -fi - - - -# Reset variables that may have inherited troublesome values from -# the environment. - -# IFS needs to be set, to space, tab, and newline, in precisely that order. -# (If _AS_PATH_WALK were called with IFS unset, it would have the -# side effect of setting IFS to empty, thus disabling word splitting.) -# Quoting is to prevent editors from complaining about space-tab. -as_nl=' -' -export as_nl -IFS=" "" $as_nl" - -PS1='$ ' -PS2='> ' -PS4='+ ' - -# Ensure predictable behavior from utilities with locale-dependent output. -LC_ALL=C -export LC_ALL -LANGUAGE=C -export LANGUAGE - -# We cannot yet rely on "unset" to work, but we need these variables -# to be unset--not just set to an empty or harmless value--now, to -# avoid bugs in old shells (e.g. pre-3.0 UWIN ksh). This construct -# also avoids known problems related to "unset" and subshell syntax -# in other old shells (e.g. bash 2.01 and pdksh 5.2.14). -for as_var in BASH_ENV ENV MAIL MAILPATH CDPATH -do eval test \${$as_var+y} \ - && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : -done - -# Ensure that fds 0, 1, and 2 are open. -if (exec 3>&0) 2>/dev/null; then :; else exec 0&1) 2>/dev/null; then :; else exec 1>/dev/null; fi -if (exec 3>&2) ; then :; else exec 2>/dev/null; fi - -# The user is always right. -if ${PATH_SEPARATOR+false} :; then - PATH_SEPARATOR=: - (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { - (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || - PATH_SEPARATOR=';' - } -fi - - -# Find who we are. Look in the path if we contain no directory separator. -as_myself= -case $0 in #(( - *[\\/]* ) as_myself=$0 ;; - *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac - test -r "$as_dir$0" && as_myself=$as_dir$0 && break - done -IFS=$as_save_IFS - - ;; -esac -# We did not find ourselves, most probably we were run as `sh COMMAND' -# in which case we are not to be found in the path. -if test "x$as_myself" = x; then - as_myself=$0 -fi -if test ! -f "$as_myself"; then - printf "%s\n" "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 - exit 1 -fi - - - -# as_fn_error STATUS ERROR [LINENO LOG_FD] -# ---------------------------------------- -# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are -# provided, also output the error to LOG_FD, referencing LINENO. Then exit the -# script with STATUS, using 1 if that was 0. -as_fn_error () -{ - as_status=$1; test $as_status -eq 0 && as_status=1 - if test "$4"; then - as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 - fi - printf "%s\n" "$as_me: error: $2" >&2 - as_fn_exit $as_status -} # as_fn_error - - - -# as_fn_set_status STATUS -# ----------------------- -# Set $? to STATUS, without forking. -as_fn_set_status () -{ - return $1 -} # as_fn_set_status - -# as_fn_exit STATUS -# ----------------- -# Exit the shell with STATUS, even in a "trap 0" or "set -e" context. -as_fn_exit () -{ - set +e - as_fn_set_status $1 - exit $1 -} # as_fn_exit - -# as_fn_unset VAR -# --------------- -# Portably unset VAR. -as_fn_unset () -{ - { eval $1=; unset $1;} -} -as_unset=as_fn_unset - -# as_fn_append VAR VALUE -# ---------------------- -# Append the text in VALUE to the end of the definition contained in VAR. Take -# advantage of any shell optimizations that allow amortized linear growth over -# repeated appends, instead of the typical quadratic growth present in naive -# implementations. -if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null -then : - eval 'as_fn_append () - { - eval $1+=\$2 - }' -else $as_nop - as_fn_append () - { - eval $1=\$$1\$2 - } -fi # as_fn_append - -# as_fn_arith ARG... -# ------------------ -# Perform arithmetic evaluation on the ARGs, and store the result in the -# global $as_val. Take advantage of shells that can avoid forks. The arguments -# must be portable across $(()) and expr. -if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null -then : - eval 'as_fn_arith () - { - as_val=$(( $* )) - }' -else $as_nop - as_fn_arith () - { - as_val=`expr "$@" || test $? -eq 1` - } -fi # as_fn_arith - - -if expr a : '\(a\)' >/dev/null 2>&1 && - test "X`expr 00001 : '.*\(...\)'`" = X001; then - as_expr=expr -else - as_expr=false -fi - -if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then - as_basename=basename -else - as_basename=false -fi - -if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then - as_dirname=dirname -else - as_dirname=false -fi - -as_me=`$as_basename -- "$0" || -$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ - X"$0" : 'X\(//\)$' \| \ - X"$0" : 'X\(/\)' \| . 2>/dev/null || -printf "%s\n" X/"$0" | - sed '/^.*\/\([^/][^/]*\)\/*$/{ - s//\1/ - q - } - /^X\/\(\/\/\)$/{ - s//\1/ - q - } - /^X\/\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q'` - -# Avoid depending upon Character Ranges. -as_cr_letters='abcdefghijklmnopqrstuvwxyz' -as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' -as_cr_Letters=$as_cr_letters$as_cr_LETTERS -as_cr_digits='0123456789' -as_cr_alnum=$as_cr_Letters$as_cr_digits - - -# Determine whether it's possible to make 'echo' print without a newline. -# These variables are no longer used directly by Autoconf, but are AC_SUBSTed -# for compatibility with existing Makefiles. -ECHO_C= ECHO_N= ECHO_T= -case `echo -n x` in #((((( --n*) - case `echo 'xy\c'` in - *c*) ECHO_T=' ';; # ECHO_T is single tab character. - xy) ECHO_C='\c';; - *) echo `echo ksh88 bug on AIX 6.1` > /dev/null - ECHO_T=' ';; - esac;; -*) - ECHO_N='-n';; -esac - -# For backward compatibility with old third-party macros, we provide -# the shell variables $as_echo and $as_echo_n. New code should use -# AS_ECHO(["message"]) and AS_ECHO_N(["message"]), respectively. -as_echo='printf %s\n' -as_echo_n='printf %s' - -rm -f conf$$ conf$$.exe conf$$.file -if test -d conf$$.dir; then - rm -f conf$$.dir/conf$$.file -else - rm -f conf$$.dir - mkdir conf$$.dir 2>/dev/null -fi -if (echo >conf$$.file) 2>/dev/null; then - if ln -s conf$$.file conf$$ 2>/dev/null; then - as_ln_s='ln -s' - # ... but there are two gotchas: - # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. - # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -pR'. - ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -pR' - elif ln conf$$.file conf$$ 2>/dev/null; then - as_ln_s=ln - else - as_ln_s='cp -pR' - fi -else - as_ln_s='cp -pR' -fi -rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file -rmdir conf$$.dir 2>/dev/null - - -# as_fn_mkdir_p -# ------------- -# Create "$as_dir" as a directory, including parents if necessary. -as_fn_mkdir_p () -{ - - case $as_dir in #( - -*) as_dir=./$as_dir;; - esac - test -d "$as_dir" || eval $as_mkdir_p || { - as_dirs= - while :; do - case $as_dir in #( - *\'*) as_qdir=`printf "%s\n" "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( - *) as_qdir=$as_dir;; - esac - as_dirs="'$as_qdir' $as_dirs" - as_dir=`$as_dirname -- "$as_dir" || -$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$as_dir" : 'X\(//\)[^/]' \| \ - X"$as_dir" : 'X\(//\)$' \| \ - X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || -printf "%s\n" X"$as_dir" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X\(\/\/\)[^/].*/{ - s//\1/ - q - } - /^X\(\/\/\)$/{ - s//\1/ - q - } - /^X\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q'` - test -d "$as_dir" && break - done - test -z "$as_dirs" || eval "mkdir $as_dirs" - } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" - - -} # as_fn_mkdir_p -if mkdir -p . 2>/dev/null; then - as_mkdir_p='mkdir -p "$as_dir"' -else - test -d ./-p && rmdir ./-p - as_mkdir_p=false -fi - - -# as_fn_executable_p FILE -# ----------------------- -# Test if FILE is an executable regular file. -as_fn_executable_p () -{ - test -f "$1" && test -x "$1" -} # as_fn_executable_p -as_test_x='test -x' -as_executable_p=as_fn_executable_p - -# Sed expression to map a string onto a valid CPP name. -as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" - -# Sed expression to map a string onto a valid variable name. -as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" - - -exec 6>&1 -## ----------------------------------- ## -## Main body of $CONFIG_STATUS script. ## -## ----------------------------------- ## -_ASEOF -test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1 - -cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -# Save the log message, to keep $0 and so on meaningful, and to -# report actual input values of CONFIG_FILES etc. instead of their -# values after options handling. -ac_log=" -This file was extended by nix-perl $as_me 2.14.0, which was -generated by GNU Autoconf 2.71. Invocation command line was - - CONFIG_FILES = $CONFIG_FILES - CONFIG_HEADERS = $CONFIG_HEADERS - CONFIG_LINKS = $CONFIG_LINKS - CONFIG_COMMANDS = $CONFIG_COMMANDS - $ $0 $@ - -on `(hostname || uname -n) 2>/dev/null | sed 1q` -" - -_ACEOF - -case $ac_config_files in *" -"*) set x $ac_config_files; shift; ac_config_files=$*;; -esac - - - -cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -# Files that config.status was made for. -config_files="$ac_config_files" - -_ACEOF - -cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -ac_cs_usage="\ -\`$as_me' instantiates files and other configuration actions -from templates according to the current configuration. Unless the files -and actions are specified as TAGs, all are instantiated by default. - -Usage: $0 [OPTION]... [TAG]... - - -h, --help print this help, then exit - -V, --version print version number and configuration settings, then exit - --config print configuration, then exit - -q, --quiet, --silent - do not print progress messages - -d, --debug don't remove temporary files - --recheck update $as_me by reconfiguring in the same conditions - --file=FILE[:TEMPLATE] - instantiate the configuration file FILE - -Configuration files: -$config_files - -Report bugs to the package provider." - -_ACEOF -ac_cs_config=`printf "%s\n" "$ac_configure_args" | sed "$ac_safe_unquote"` -ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\''/g"` -cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -ac_cs_config='$ac_cs_config_escaped' -ac_cs_version="\\ -nix-perl config.status 2.14.0 -configured by $0, generated by GNU Autoconf 2.71, - with options \\"\$ac_cs_config\\" - -Copyright (C) 2021 Free Software Foundation, Inc. -This config.status script is free software; the Free Software Foundation -gives unlimited permission to copy, distribute and modify it." - -ac_pwd='$ac_pwd' -srcdir='$srcdir' -test -n "\$AWK" || AWK=awk -_ACEOF - -cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -# The default lists apply if the user does not specify any file. -ac_need_defaults=: -while test $# != 0 -do - case $1 in - --*=?*) - ac_option=`expr "X$1" : 'X\([^=]*\)='` - ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'` - ac_shift=: - ;; - --*=) - ac_option=`expr "X$1" : 'X\([^=]*\)='` - ac_optarg= - ac_shift=: - ;; - *) - ac_option=$1 - ac_optarg=$2 - ac_shift=shift - ;; - esac - - case $ac_option in - # Handling of the options. - -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) - ac_cs_recheck=: ;; - --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) - printf "%s\n" "$ac_cs_version"; exit ;; - --config | --confi | --conf | --con | --co | --c ) - printf "%s\n" "$ac_cs_config"; exit ;; - --debug | --debu | --deb | --de | --d | -d ) - debug=: ;; - --file | --fil | --fi | --f ) - $ac_shift - case $ac_optarg in - *\'*) ac_optarg=`printf "%s\n" "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; - '') as_fn_error $? "missing file argument" ;; - esac - as_fn_append CONFIG_FILES " '$ac_optarg'" - ac_need_defaults=false;; - --he | --h | --help | --hel | -h ) - printf "%s\n" "$ac_cs_usage"; exit ;; - -q | -quiet | --quiet | --quie | --qui | --qu | --q \ - | -silent | --silent | --silen | --sile | --sil | --si | --s) - ac_cs_silent=: ;; - - # This is an error. - -*) as_fn_error $? "unrecognized option: \`$1' -Try \`$0 --help' for more information." ;; - - *) as_fn_append ac_config_targets " $1" - ac_need_defaults=false ;; - - esac - shift -done - -ac_configure_extra_args= - -if $ac_cs_silent; then - exec 6>/dev/null - ac_configure_extra_args="$ac_configure_extra_args --silent" -fi - -_ACEOF -cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -if \$ac_cs_recheck; then - set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion - shift - \printf "%s\n" "running CONFIG_SHELL=$SHELL \$*" >&6 - CONFIG_SHELL='$SHELL' - export CONFIG_SHELL - exec "\$@" -fi - -_ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -exec 5>>config.log -{ - echo - sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX -## Running $as_me. ## -_ASBOX - printf "%s\n" "$ac_log" -} >&5 - -_ACEOF -cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -_ACEOF - -cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 - -# Handling of arguments. -for ac_config_target in $ac_config_targets -do - case $ac_config_target in - - *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; - esac -done - - -# If the user did not use the arguments to specify the items to instantiate, -# then the envvar interface is used. Set only those that are not. -# We use the long form for the default assignment because of an extremely -# bizarre bug on SunOS 4.1.3. -if $ac_need_defaults; then - test ${CONFIG_FILES+y} || CONFIG_FILES=$config_files -fi - -# Have a temporary directory for convenience. Make it in the build tree -# simply because there is no reason against having it here, and in addition, -# creating and moving files from /tmp can sometimes cause problems. -# Hook for its removal unless debugging. -# Note that there is a small window in which the directory will not be cleaned: -# after its creation but before its name has been assigned to `$tmp'. -$debug || -{ - tmp= ac_tmp= - trap 'exit_status=$? - : "${ac_tmp:=$tmp}" - { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status -' 0 - trap 'as_fn_exit 1' 1 2 13 15 -} -# Create a (secure) tmp directory for tmp files. - -{ - tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` && - test -d "$tmp" -} || -{ - tmp=./conf$$-$RANDOM - (umask 077 && mkdir "$tmp") -} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5 -ac_tmp=$tmp - -# Set up the scripts for CONFIG_FILES section. -# No need to generate them if there are no CONFIG_FILES. -# This happens for instance with `./config.status config.h'. -if test -n "$CONFIG_FILES"; then - - -ac_cr=`echo X | tr X '\015'` -# On cygwin, bash can eat \r inside `` if the user requested igncr. -# But we know of no other shell where ac_cr would be empty at this -# point, so we can use a bashism as a fallback. -if test "x$ac_cr" = x; then - eval ac_cr=\$\'\\r\' -fi -ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' /dev/null` -if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then - ac_cs_awk_cr='\\r' -else - ac_cs_awk_cr=$ac_cr -fi - -echo 'BEGIN {' >"$ac_tmp/subs1.awk" && -_ACEOF - - -{ - echo "cat >conf$$subs.awk <<_ACEOF" && - echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' && - echo "_ACEOF" -} >conf$$subs.sh || - as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 -ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'` -ac_delim='%!_!# ' -for ac_last_try in false false false false false :; do - . ./conf$$subs.sh || - as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 - - ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` - if test $ac_delim_n = $ac_delim_num; then - break - elif $ac_last_try; then - as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 - else - ac_delim="$ac_delim!$ac_delim _$ac_delim!! " - fi -done -rm -f conf$$subs.sh - -cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK && -_ACEOF -sed -n ' -h -s/^/S["/; s/!.*/"]=/ -p -g -s/^[^!]*!// -:repl -t repl -s/'"$ac_delim"'$// -t delim -:nl -h -s/\(.\{148\}\)..*/\1/ -t more1 -s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/ -p -n -b repl -:more1 -s/["\\]/\\&/g; s/^/"/; s/$/"\\/ -p -g -s/.\{148\}// -t nl -:delim -h -s/\(.\{148\}\)..*/\1/ -t more2 -s/["\\]/\\&/g; s/^/"/; s/$/"/ -p -b -:more2 -s/["\\]/\\&/g; s/^/"/; s/$/"\\/ -p -g -s/.\{148\}// -t delim -' >$CONFIG_STATUS || ac_write_fail=1 -rm -f conf$$subs.awk -cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -_ACAWK -cat >>"\$ac_tmp/subs1.awk" <<_ACAWK && - for (key in S) S_is_set[key] = 1 - FS = "" - -} -{ - line = $ 0 - nfields = split(line, field, "@") - substed = 0 - len = length(field[1]) - for (i = 2; i < nfields; i++) { - key = field[i] - keylen = length(key) - if (S_is_set[key]) { - value = S[key] - line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3) - len += length(value) + length(field[++i]) - substed = 1 - } else - len += 1 + keylen - } - - print line -} - -_ACAWK -_ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then - sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g" -else - cat -fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \ - || as_fn_error $? "could not setup config files machinery" "$LINENO" 5 -_ACEOF - -# VPATH may cause trouble with some makes, so we remove sole $(srcdir), -# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and -# trailing colons and then remove the whole line if VPATH becomes empty -# (actually we leave an empty line to preserve line numbers). -if test "x$srcdir" = x.; then - ac_vpsub='/^[ ]*VPATH[ ]*=[ ]*/{ -h -s/// -s/^/:/ -s/[ ]*$/:/ -s/:\$(srcdir):/:/g -s/:\${srcdir}:/:/g -s/:@srcdir@:/:/g -s/^:*// -s/:*$// -x -s/\(=[ ]*\).*/\1/ -G -s/\n// -s/^[^=]*=[ ]*$// -}' -fi - -cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -fi # test -n "$CONFIG_FILES" - - -eval set X " :F $CONFIG_FILES " -shift -for ac_tag -do - case $ac_tag in - :[FHLC]) ac_mode=$ac_tag; continue;; - esac - case $ac_mode$ac_tag in - :[FHL]*:*);; - :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;; - :[FH]-) ac_tag=-:-;; - :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; - esac - ac_save_IFS=$IFS - IFS=: - set x $ac_tag - IFS=$ac_save_IFS - shift - ac_file=$1 - shift - - case $ac_mode in - :L) ac_source=$1;; - :[FH]) - ac_file_inputs= - for ac_f - do - case $ac_f in - -) ac_f="$ac_tmp/stdin";; - *) # Look for the file first in the build tree, then in the source tree - # (if the path is not absolute). The absolute path cannot be DOS-style, - # because $ac_f cannot contain `:'. - test -f "$ac_f" || - case $ac_f in - [\\/$]*) false;; - *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; - esac || - as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;; - esac - case $ac_f in *\'*) ac_f=`printf "%s\n" "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac - as_fn_append ac_file_inputs " '$ac_f'" - done - - # Let's still pretend it is `configure' which instantiates (i.e., don't - # use $as_me), people would be surprised to read: - # /* config.h. Generated by config.status. */ - configure_input='Generated from '` - printf "%s\n" "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g' - `' by configure.' - if test x"$ac_file" != x-; then - configure_input="$ac_file. $configure_input" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5 -printf "%s\n" "$as_me: creating $ac_file" >&6;} - fi - # Neutralize special characters interpreted by sed in replacement strings. - case $configure_input in #( - *\&* | *\|* | *\\* ) - ac_sed_conf_input=`printf "%s\n" "$configure_input" | - sed 's/[\\\\&|]/\\\\&/g'`;; #( - *) ac_sed_conf_input=$configure_input;; - esac - - case $ac_tag in - *:-:* | *:-) cat >"$ac_tmp/stdin" \ - || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; - esac - ;; - esac - - ac_dir=`$as_dirname -- "$ac_file" || -$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$ac_file" : 'X\(//\)[^/]' \| \ - X"$ac_file" : 'X\(//\)$' \| \ - X"$ac_file" : 'X\(/\)' \| . 2>/dev/null || -printf "%s\n" X"$ac_file" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X\(\/\/\)[^/].*/{ - s//\1/ - q - } - /^X\(\/\/\)$/{ - s//\1/ - q - } - /^X\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q'` - as_dir="$ac_dir"; as_fn_mkdir_p - ac_builddir=. - -case "$ac_dir" in -.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; -*) - ac_dir_suffix=/`printf "%s\n" "$ac_dir" | sed 's|^\.[\\/]||'` - # A ".." for each directory in $ac_dir_suffix. - ac_top_builddir_sub=`printf "%s\n" "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` - case $ac_top_builddir_sub in - "") ac_top_builddir_sub=. ac_top_build_prefix= ;; - *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; - esac ;; -esac -ac_abs_top_builddir=$ac_pwd -ac_abs_builddir=$ac_pwd$ac_dir_suffix -# for backward compatibility: -ac_top_builddir=$ac_top_build_prefix - -case $srcdir in - .) # We are building in place. - ac_srcdir=. - ac_top_srcdir=$ac_top_builddir_sub - ac_abs_top_srcdir=$ac_pwd ;; - [\\/]* | ?:[\\/]* ) # Absolute name. - ac_srcdir=$srcdir$ac_dir_suffix; - ac_top_srcdir=$srcdir - ac_abs_top_srcdir=$srcdir ;; - *) # Relative name. - ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix - ac_top_srcdir=$ac_top_build_prefix$srcdir - ac_abs_top_srcdir=$ac_pwd/$srcdir ;; -esac -ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix - - - case $ac_mode in - :F) - # - # CONFIG_FILE - # - -_ACEOF - -cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -# If the template does not know about datarootdir, expand it. -# FIXME: This hack should be removed a few years after 2.60. -ac_datarootdir_hack=; ac_datarootdir_seen= -ac_sed_dataroot=' -/datarootdir/ { - p - q -} -/@datadir@/p -/@docdir@/p -/@infodir@/p -/@localedir@/p -/@mandir@/p' -case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in -*datarootdir*) ac_datarootdir_seen=yes;; -*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*) - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 -printf "%s\n" "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} -_ACEOF -cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 - ac_datarootdir_hack=' - s&@datadir@&$datadir&g - s&@docdir@&$docdir&g - s&@infodir@&$infodir&g - s&@localedir@&$localedir&g - s&@mandir@&$mandir&g - s&\\\${datarootdir}&$datarootdir&g' ;; -esac -_ACEOF - -# Neutralize VPATH when `$srcdir' = `.'. -# Shell code in configure.ac might set extrasub. -# FIXME: do we really want to maintain this feature? -cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -ac_sed_extra="$ac_vpsub -$extrasub -_ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -:t -/@[a-zA-Z_][a-zA-Z_0-9]*@/!b -s|@configure_input@|$ac_sed_conf_input|;t t -s&@top_builddir@&$ac_top_builddir_sub&;t t -s&@top_build_prefix@&$ac_top_build_prefix&;t t -s&@srcdir@&$ac_srcdir&;t t -s&@abs_srcdir@&$ac_abs_srcdir&;t t -s&@top_srcdir@&$ac_top_srcdir&;t t -s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t -s&@builddir@&$ac_builddir&;t t -s&@abs_builddir@&$ac_abs_builddir&;t t -s&@abs_top_builddir@&$ac_abs_top_builddir&;t t -$ac_datarootdir_hack -" -eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \ - >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5 - -test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && - { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } && - { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' \ - "$ac_tmp/out"`; test -z "$ac_out"; } && - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' -which seems to be undefined. Please make sure it is defined" >&5 -printf "%s\n" "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' -which seems to be undefined. Please make sure it is defined" >&2;} - - rm -f "$ac_tmp/stdin" - case $ac_file in - -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";; - *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";; - esac \ - || as_fn_error $? "could not create $ac_file" "$LINENO" 5 - ;; - - - - esac - -done # for ac_tag - - -as_fn_exit 0 -_ACEOF -ac_clean_files=$ac_clean_files_save - -test $ac_write_fail = 0 || - as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5 - - -# configure is writing to config.log, and then calls config.status. -# config.status does its own redirection, appending to config.log. -# Unfortunately, on DOS this fails, as config.log is still kept open -# by configure, so config.status won't be able to write to it; its -# output is simply discarded. So we exec the FD to /dev/null, -# effectively closing config.log, so it can be properly (re)opened and -# appended to by config.status. When coming back to configure, we -# need to make the FD available again. -if test "$no_create" != yes; then - ac_cs_success=: - ac_config_status_args= - test "$silent" = yes && - ac_config_status_args="$ac_config_status_args --quiet" - exec 5>/dev/null - $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false - exec 5>>config.log - # Use ||, not &&, to avoid exiting from the if with $? = 1, which - # would make configure fail if this is the last instruction. - $ac_cs_success || as_fn_exit 1 -fi -if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 -printf "%s\n" "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} -fi - - From 5df4c108a2c80acbe25ae6d57a8d24a5afa11406 Mon Sep 17 00:00:00 2001 From: Andrea Bedini Date: Mon, 20 Feb 2023 16:05:45 +0800 Subject: [PATCH 16/21] Perl bindings use pkg-config --- perl/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/perl/Makefile b/perl/Makefile index 053d8643ff2..5d3d81ab877 100644 --- a/perl/Makefile +++ b/perl/Makefile @@ -1,6 +1,6 @@ makefiles = local.mk -GLOBAL_CXXFLAGS += -g -Wall -std=c++2a -I../src -I../src/libutil/include +GLOBAL_CXXFLAGS += -g -Wall -std=c++2a -include Makefile.config From a73a11007c9f91577d85a96a40c050b49f24c4b9 Mon Sep 17 00:00:00 2001 From: Andrea Bedini Date: Mon, 20 Feb 2023 16:12:30 +0800 Subject: [PATCH 17/21] Add result-* to gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 47815fde675..2e5d87b98ce 100644 --- a/.gitignore +++ b/.gitignore @@ -127,5 +127,6 @@ compile_commands.json nix-rust/target result +result-* .vscode/ From a205add350aed8e6c3cca785920438cdceabfb5b Mon Sep 17 00:00:00 2001 From: Andrea Bedini Date: Mon, 20 Feb 2023 16:41:27 +0800 Subject: [PATCH 18/21] Add include shims with deprecation warning --- src/libcmd/include/nix/command.hh | 2 ++ src/libcmd/include/nix/common-eval-args.hh | 2 ++ src/libcmd/include/nix/installable-derived-path.hh | 2 ++ src/libcmd/include/nix/installables.hh | 2 ++ src/libcmd/include/nix/legacy.hh | 2 ++ src/libcmd/include/nix/markdown.hh | 2 ++ src/libcmd/local.mk | 7 +++++++ src/libexpr/include/nix/attr-path.hh | 2 ++ src/libexpr/include/nix/attr-set.hh | 2 ++ src/libexpr/include/nix/eval-cache.hh | 2 ++ src/libexpr/include/nix/eval-inline.hh | 2 ++ src/libexpr/include/nix/eval.hh | 2 ++ src/libexpr/include/nix/flake/flake.hh | 2 ++ src/libexpr/include/nix/flake/flakeref.hh | 2 ++ src/libexpr/include/nix/flake/lockfile.hh | 2 ++ src/libexpr/include/nix/function-trace.hh | 2 ++ src/libexpr/include/nix/get-drvs.hh | 2 ++ src/libexpr/include/nix/json-to-value.hh | 2 ++ src/libexpr/include/nix/nixexpr.hh | 2 ++ src/libexpr/include/nix/primops.hh | 2 ++ src/libexpr/include/nix/symbol-table.hh | 2 ++ src/libexpr/include/nix/value-to-json.hh | 2 ++ src/libexpr/include/nix/value-to-xml.hh | 2 ++ src/libexpr/include/nix/value.hh | 2 ++ src/libexpr/include/nix/value/context.hh | 2 ++ src/libexpr/local.mk | 13 +++++++++++++ src/libfetchers/include/nix/attrs.hh | 2 ++ src/libfetchers/include/nix/cache.hh | 2 ++ src/libfetchers/include/nix/fetch-settings.hh | 2 ++ src/libfetchers/include/nix/fetchers.hh | 2 ++ src/libfetchers/include/nix/registry.hh | 2 ++ src/libfetchers/local.mk | 7 +++++++ src/libmain/include/nix/common-args.hh | 2 ++ src/libmain/include/nix/loggers.hh | 2 ++ src/libmain/include/nix/progress-bar.hh | 2 ++ src/libmain/include/nix/shared.hh | 2 ++ src/libmain/local.mk | 7 +++++++ src/libstore/include/nix/binary-cache-store.hh | 2 ++ src/libstore/include/nix/build-result.hh | 2 ++ src/libstore/include/nix/build/derivation-goal.hh | 2 ++ .../nix/build/drv-output-substitution-goal.hh | 2 ++ src/libstore/include/nix/build/goal.hh | 2 ++ src/libstore/include/nix/build/hook-instance.hh | 2 ++ .../include/nix/build/local-derivation-goal.hh | 2 ++ src/libstore/include/nix/build/personality.hh | 2 ++ src/libstore/include/nix/build/substitution-goal.hh | 2 ++ src/libstore/include/nix/build/worker.hh | 2 ++ src/libstore/include/nix/builtins.hh | 2 ++ src/libstore/include/nix/builtins/buildenv.hh | 2 ++ src/libstore/include/nix/content-address.hh | 2 ++ src/libstore/include/nix/crypto.hh | 2 ++ src/libstore/include/nix/daemon.hh | 2 ++ src/libstore/include/nix/derivations.hh | 2 ++ src/libstore/include/nix/derived-path.hh | 2 ++ src/libstore/include/nix/filetransfer.hh | 2 ++ src/libstore/include/nix/fs-accessor.hh | 2 ++ src/libstore/include/nix/gc-store.hh | 2 ++ src/libstore/include/nix/globals.hh | 2 ++ src/libstore/include/nix/local-fs-store.hh | 2 ++ src/libstore/include/nix/local-store.hh | 2 ++ src/libstore/include/nix/lock.hh | 2 ++ src/libstore/include/nix/log-store.hh | 2 ++ src/libstore/include/nix/machines.hh | 2 ++ src/libstore/include/nix/make-content-addressed.hh | 2 ++ src/libstore/include/nix/names.hh | 2 ++ src/libstore/include/nix/nar-accessor.hh | 2 ++ src/libstore/include/nix/nar-info-disk-cache.hh | 2 ++ src/libstore/include/nix/nar-info.hh | 2 ++ src/libstore/include/nix/outputs-spec.hh | 2 ++ src/libstore/include/nix/parsed-derivations.hh | 2 ++ src/libstore/include/nix/path-info.hh | 2 ++ src/libstore/include/nix/path-regex.hh | 2 ++ src/libstore/include/nix/path-with-outputs.hh | 2 ++ src/libstore/include/nix/path.hh | 2 ++ src/libstore/include/nix/pathlocks.hh | 2 ++ src/libstore/include/nix/profiles.hh | 2 ++ src/libstore/include/nix/realisation.hh | 2 ++ src/libstore/include/nix/references.hh | 2 ++ src/libstore/include/nix/remote-fs-accessor.hh | 2 ++ src/libstore/include/nix/remote-store.hh | 2 ++ src/libstore/include/nix/repair-flag.hh | 2 ++ src/libstore/include/nix/s3-binary-cache-store.hh | 2 ++ src/libstore/include/nix/s3.hh | 2 ++ src/libstore/include/nix/serve-protocol.hh | 2 ++ src/libstore/include/nix/sqlite.hh | 2 ++ src/libstore/include/nix/ssh.hh | 2 ++ src/libstore/include/nix/store-api.hh | 2 ++ src/libstore/include/nix/store-cast.hh | 2 ++ src/libstore/include/nix/uds-remote-store.hh | 2 ++ src/libstore/include/nix/worker-protocol.hh | 2 ++ src/libstore/local.mk | 13 +++++++++++++ src/libutil/include/nix/abstract-setting-to-json.hh | 2 ++ src/libutil/include/nix/ansicolor.hh | 2 ++ src/libutil/include/nix/archive.hh | 2 ++ src/libutil/include/nix/args.hh | 2 ++ src/libutil/include/nix/callback.hh | 2 ++ src/libutil/include/nix/canon-path.hh | 2 ++ src/libutil/include/nix/cgroup.hh | 2 ++ src/libutil/include/nix/chunked-vector.hh | 2 ++ src/libutil/include/nix/closure.hh | 2 ++ src/libutil/include/nix/comparator.hh | 2 ++ src/libutil/include/nix/compression.hh | 2 ++ src/libutil/include/nix/compute-levels.hh | 2 ++ src/libutil/include/nix/config.hh | 2 ++ src/libutil/include/nix/error.hh | 2 ++ src/libutil/include/nix/experimental-features.hh | 2 ++ src/libutil/include/nix/finally.hh | 2 ++ src/libutil/include/nix/fmt.hh | 2 ++ src/libutil/include/nix/git.hh | 2 ++ src/libutil/include/nix/hash.hh | 2 ++ src/libutil/include/nix/hilite.hh | 2 ++ src/libutil/include/nix/json-impls.hh | 2 ++ src/libutil/include/nix/json-utils.hh | 2 ++ src/libutil/include/nix/logging.hh | 2 ++ src/libutil/include/nix/lru-cache.hh | 2 ++ src/libutil/include/nix/monitor-fd.hh | 2 ++ src/libutil/include/nix/namespaces.hh | 2 ++ src/libutil/include/nix/pool.hh | 2 ++ src/libutil/include/nix/ref.hh | 2 ++ src/libutil/include/nix/regex-combinators.hh | 2 ++ src/libutil/include/nix/serialise.hh | 2 ++ src/libutil/include/nix/split.hh | 2 ++ src/libutil/include/nix/suggestions.hh | 2 ++ src/libutil/include/nix/sync.hh | 2 ++ src/libutil/include/nix/tarfile.hh | 2 ++ src/libutil/include/nix/thread-pool.hh | 2 ++ src/libutil/include/nix/topo-sort.hh | 2 ++ src/libutil/include/nix/types.hh | 2 ++ src/libutil/include/nix/url-parts.hh | 2 ++ src/libutil/include/nix/url.hh | 2 ++ src/libutil/include/nix/util.hh | 2 ++ src/libutil/include/nix/xml-writer.hh | 2 ++ src/libutil/local.mk | 7 +++++++ 133 files changed, 308 insertions(+) create mode 100644 src/libcmd/include/nix/command.hh create mode 100644 src/libcmd/include/nix/common-eval-args.hh create mode 100644 src/libcmd/include/nix/installable-derived-path.hh create mode 100644 src/libcmd/include/nix/installables.hh create mode 100644 src/libcmd/include/nix/legacy.hh create mode 100644 src/libcmd/include/nix/markdown.hh create mode 100644 src/libexpr/include/nix/attr-path.hh create mode 100644 src/libexpr/include/nix/attr-set.hh create mode 100644 src/libexpr/include/nix/eval-cache.hh create mode 100644 src/libexpr/include/nix/eval-inline.hh create mode 100644 src/libexpr/include/nix/eval.hh create mode 100644 src/libexpr/include/nix/flake/flake.hh create mode 100644 src/libexpr/include/nix/flake/flakeref.hh create mode 100644 src/libexpr/include/nix/flake/lockfile.hh create mode 100644 src/libexpr/include/nix/function-trace.hh create mode 100644 src/libexpr/include/nix/get-drvs.hh create mode 100644 src/libexpr/include/nix/json-to-value.hh create mode 100644 src/libexpr/include/nix/nixexpr.hh create mode 100644 src/libexpr/include/nix/primops.hh create mode 100644 src/libexpr/include/nix/symbol-table.hh create mode 100644 src/libexpr/include/nix/value-to-json.hh create mode 100644 src/libexpr/include/nix/value-to-xml.hh create mode 100644 src/libexpr/include/nix/value.hh create mode 100644 src/libexpr/include/nix/value/context.hh create mode 100644 src/libfetchers/include/nix/attrs.hh create mode 100644 src/libfetchers/include/nix/cache.hh create mode 100644 src/libfetchers/include/nix/fetch-settings.hh create mode 100644 src/libfetchers/include/nix/fetchers.hh create mode 100644 src/libfetchers/include/nix/registry.hh create mode 100644 src/libmain/include/nix/common-args.hh create mode 100644 src/libmain/include/nix/loggers.hh create mode 100644 src/libmain/include/nix/progress-bar.hh create mode 100644 src/libmain/include/nix/shared.hh create mode 100644 src/libstore/include/nix/binary-cache-store.hh create mode 100644 src/libstore/include/nix/build-result.hh create mode 100644 src/libstore/include/nix/build/derivation-goal.hh create mode 100644 src/libstore/include/nix/build/drv-output-substitution-goal.hh create mode 100644 src/libstore/include/nix/build/goal.hh create mode 100644 src/libstore/include/nix/build/hook-instance.hh create mode 100644 src/libstore/include/nix/build/local-derivation-goal.hh create mode 100644 src/libstore/include/nix/build/personality.hh create mode 100644 src/libstore/include/nix/build/substitution-goal.hh create mode 100644 src/libstore/include/nix/build/worker.hh create mode 100644 src/libstore/include/nix/builtins.hh create mode 100644 src/libstore/include/nix/builtins/buildenv.hh create mode 100644 src/libstore/include/nix/content-address.hh create mode 100644 src/libstore/include/nix/crypto.hh create mode 100644 src/libstore/include/nix/daemon.hh create mode 100644 src/libstore/include/nix/derivations.hh create mode 100644 src/libstore/include/nix/derived-path.hh create mode 100644 src/libstore/include/nix/filetransfer.hh create mode 100644 src/libstore/include/nix/fs-accessor.hh create mode 100644 src/libstore/include/nix/gc-store.hh create mode 100644 src/libstore/include/nix/globals.hh create mode 100644 src/libstore/include/nix/local-fs-store.hh create mode 100644 src/libstore/include/nix/local-store.hh create mode 100644 src/libstore/include/nix/lock.hh create mode 100644 src/libstore/include/nix/log-store.hh create mode 100644 src/libstore/include/nix/machines.hh create mode 100644 src/libstore/include/nix/make-content-addressed.hh create mode 100644 src/libstore/include/nix/names.hh create mode 100644 src/libstore/include/nix/nar-accessor.hh create mode 100644 src/libstore/include/nix/nar-info-disk-cache.hh create mode 100644 src/libstore/include/nix/nar-info.hh create mode 100644 src/libstore/include/nix/outputs-spec.hh create mode 100644 src/libstore/include/nix/parsed-derivations.hh create mode 100644 src/libstore/include/nix/path-info.hh create mode 100644 src/libstore/include/nix/path-regex.hh create mode 100644 src/libstore/include/nix/path-with-outputs.hh create mode 100644 src/libstore/include/nix/path.hh create mode 100644 src/libstore/include/nix/pathlocks.hh create mode 100644 src/libstore/include/nix/profiles.hh create mode 100644 src/libstore/include/nix/realisation.hh create mode 100644 src/libstore/include/nix/references.hh create mode 100644 src/libstore/include/nix/remote-fs-accessor.hh create mode 100644 src/libstore/include/nix/remote-store.hh create mode 100644 src/libstore/include/nix/repair-flag.hh create mode 100644 src/libstore/include/nix/s3-binary-cache-store.hh create mode 100644 src/libstore/include/nix/s3.hh create mode 100644 src/libstore/include/nix/serve-protocol.hh create mode 100644 src/libstore/include/nix/sqlite.hh create mode 100644 src/libstore/include/nix/ssh.hh create mode 100644 src/libstore/include/nix/store-api.hh create mode 100644 src/libstore/include/nix/store-cast.hh create mode 100644 src/libstore/include/nix/uds-remote-store.hh create mode 100644 src/libstore/include/nix/worker-protocol.hh create mode 100644 src/libutil/include/nix/abstract-setting-to-json.hh create mode 100644 src/libutil/include/nix/ansicolor.hh create mode 100644 src/libutil/include/nix/archive.hh create mode 100644 src/libutil/include/nix/args.hh create mode 100644 src/libutil/include/nix/callback.hh create mode 100644 src/libutil/include/nix/canon-path.hh create mode 100644 src/libutil/include/nix/cgroup.hh create mode 100644 src/libutil/include/nix/chunked-vector.hh create mode 100644 src/libutil/include/nix/closure.hh create mode 100644 src/libutil/include/nix/comparator.hh create mode 100644 src/libutil/include/nix/compression.hh create mode 100644 src/libutil/include/nix/compute-levels.hh create mode 100644 src/libutil/include/nix/config.hh create mode 100644 src/libutil/include/nix/error.hh create mode 100644 src/libutil/include/nix/experimental-features.hh create mode 100644 src/libutil/include/nix/finally.hh create mode 100644 src/libutil/include/nix/fmt.hh create mode 100644 src/libutil/include/nix/git.hh create mode 100644 src/libutil/include/nix/hash.hh create mode 100644 src/libutil/include/nix/hilite.hh create mode 100644 src/libutil/include/nix/json-impls.hh create mode 100644 src/libutil/include/nix/json-utils.hh create mode 100644 src/libutil/include/nix/logging.hh create mode 100644 src/libutil/include/nix/lru-cache.hh create mode 100644 src/libutil/include/nix/monitor-fd.hh create mode 100644 src/libutil/include/nix/namespaces.hh create mode 100644 src/libutil/include/nix/pool.hh create mode 100644 src/libutil/include/nix/ref.hh create mode 100644 src/libutil/include/nix/regex-combinators.hh create mode 100644 src/libutil/include/nix/serialise.hh create mode 100644 src/libutil/include/nix/split.hh create mode 100644 src/libutil/include/nix/suggestions.hh create mode 100644 src/libutil/include/nix/sync.hh create mode 100644 src/libutil/include/nix/tarfile.hh create mode 100644 src/libutil/include/nix/thread-pool.hh create mode 100644 src/libutil/include/nix/topo-sort.hh create mode 100644 src/libutil/include/nix/types.hh create mode 100644 src/libutil/include/nix/url-parts.hh create mode 100644 src/libutil/include/nix/url.hh create mode 100644 src/libutil/include/nix/util.hh create mode 100644 src/libutil/include/nix/xml-writer.hh diff --git a/src/libcmd/include/nix/command.hh b/src/libcmd/include/nix/command.hh new file mode 100644 index 00000000000..490a54e594d --- /dev/null +++ b/src/libcmd/include/nix/command.hh @@ -0,0 +1,2 @@ +#warning "Including nix/command.hh is deprecated. Include nix/cmd/command.hh instead." +#include "nix/cmd/command.hh" diff --git a/src/libcmd/include/nix/common-eval-args.hh b/src/libcmd/include/nix/common-eval-args.hh new file mode 100644 index 00000000000..0e92a0fca1d --- /dev/null +++ b/src/libcmd/include/nix/common-eval-args.hh @@ -0,0 +1,2 @@ +#warning "Including nix/common-eval-args.hh is deprecated. Include nix/cmd/common-eval-args.hh instead." +#include "nix/cmd/common-eval-args.hh" diff --git a/src/libcmd/include/nix/installable-derived-path.hh b/src/libcmd/include/nix/installable-derived-path.hh new file mode 100644 index 00000000000..504f9c4961a --- /dev/null +++ b/src/libcmd/include/nix/installable-derived-path.hh @@ -0,0 +1,2 @@ +#warning "Including nix/installable-derived-path.hh is deprecated. Include nix/cmd/installable-derived-path.hh instead." +#include "nix/cmd/installable-derived-path.hh" diff --git a/src/libcmd/include/nix/installables.hh b/src/libcmd/include/nix/installables.hh new file mode 100644 index 00000000000..1d1f75ddd88 --- /dev/null +++ b/src/libcmd/include/nix/installables.hh @@ -0,0 +1,2 @@ +#warning "Including nix/installables.hh is deprecated. Include nix/cmd/installables.hh instead." +#include "nix/cmd/installables.hh" diff --git a/src/libcmd/include/nix/legacy.hh b/src/libcmd/include/nix/legacy.hh new file mode 100644 index 00000000000..246f394fb47 --- /dev/null +++ b/src/libcmd/include/nix/legacy.hh @@ -0,0 +1,2 @@ +#warning "Including nix/legacy.hh is deprecated. Include nix/cmd/legacy.hh instead." +#include "nix/cmd/legacy.hh" diff --git a/src/libcmd/include/nix/markdown.hh b/src/libcmd/include/nix/markdown.hh new file mode 100644 index 00000000000..70346f7bb6a --- /dev/null +++ b/src/libcmd/include/nix/markdown.hh @@ -0,0 +1,2 @@ +#warning "Including nix/markdown.hh is deprecated. Include nix/cmd/markdown.hh instead." +#include "nix/cmd/markdown.hh" diff --git a/src/libcmd/local.mk b/src/libcmd/local.mk index c825cfd78ed..bf42c537d43 100644 --- a/src/libcmd/local.mk +++ b/src/libcmd/local.mk @@ -21,5 +21,12 @@ libcmd_LIBS = libstore libutil libexpr libmain libfetchers $(eval $(call install-file-in, $(d)/nix-cmd.pc, $(libdir)/pkgconfig, 0644)) +# old include paths + +$(foreach i, $(wildcard src/libcmd/include/nix/*.hh), \ + $(eval $(call install-file-in, $(i), $(includedir)/nix, 0644))) + +# new include paths + $(foreach i, $(wildcard src/libcmd/include/nix/cmd/*.hh), \ $(eval $(call install-file-in, $(i), $(includedir)/nix/cmd, 0644))) diff --git a/src/libexpr/include/nix/attr-path.hh b/src/libexpr/include/nix/attr-path.hh new file mode 100644 index 00000000000..5ecf64e0345 --- /dev/null +++ b/src/libexpr/include/nix/attr-path.hh @@ -0,0 +1,2 @@ +#warning "Including nix/attr-path.hh is deprecated. Please include nix/expr/attr-path.hh instead." +#include "nix/expr/attr-path.hh" diff --git a/src/libexpr/include/nix/attr-set.hh b/src/libexpr/include/nix/attr-set.hh new file mode 100644 index 00000000000..77d80bd5d1f --- /dev/null +++ b/src/libexpr/include/nix/attr-set.hh @@ -0,0 +1,2 @@ +#warning "Including nix/attr-set.hh is deprecated. Please include nix/expr/attr-set.hh instead." +#include "nix/expr/attr-set.hh" diff --git a/src/libexpr/include/nix/eval-cache.hh b/src/libexpr/include/nix/eval-cache.hh new file mode 100644 index 00000000000..89336990e1c --- /dev/null +++ b/src/libexpr/include/nix/eval-cache.hh @@ -0,0 +1,2 @@ +#warning "Including nix/eval-cache.hh is deprecated. Please include nix/expr/eval-cache.hh instead." +#include "nix/expr/eval-cache.hh" diff --git a/src/libexpr/include/nix/eval-inline.hh b/src/libexpr/include/nix/eval-inline.hh new file mode 100644 index 00000000000..d54b6ea7883 --- /dev/null +++ b/src/libexpr/include/nix/eval-inline.hh @@ -0,0 +1,2 @@ +#warning "Including nix/eval-inline.hh is deprecated. Please include nix/expr/eval-inline.hh instead." +#include "nix/expr/eval-inline.hh" diff --git a/src/libexpr/include/nix/eval.hh b/src/libexpr/include/nix/eval.hh new file mode 100644 index 00000000000..92e92e43016 --- /dev/null +++ b/src/libexpr/include/nix/eval.hh @@ -0,0 +1,2 @@ +#warning "Including nix/eval.hh is deprecated. Please include nix/expr/eval.hh instead." +#include "nix/expr/eval.hh" diff --git a/src/libexpr/include/nix/flake/flake.hh b/src/libexpr/include/nix/flake/flake.hh new file mode 100644 index 00000000000..cd67ed74000 --- /dev/null +++ b/src/libexpr/include/nix/flake/flake.hh @@ -0,0 +1,2 @@ +#warning "Including nix/flake/flake.hh is deprecated. Please include nix/expr/flake/flake.hh instead." +#include "nix/expr/flake/flake.hh" diff --git a/src/libexpr/include/nix/flake/flakeref.hh b/src/libexpr/include/nix/flake/flakeref.hh new file mode 100644 index 00000000000..3c82476e547 --- /dev/null +++ b/src/libexpr/include/nix/flake/flakeref.hh @@ -0,0 +1,2 @@ +#warning "Including nix/flake/flakeref.hh is deprecated. Please include nix/expr/flake/flakeref.hh instead." +#include "nix/expr/flake/flakeref.hh" diff --git a/src/libexpr/include/nix/flake/lockfile.hh b/src/libexpr/include/nix/flake/lockfile.hh new file mode 100644 index 00000000000..602422af62e --- /dev/null +++ b/src/libexpr/include/nix/flake/lockfile.hh @@ -0,0 +1,2 @@ +#warning "Including nix/flake/lockfile.hh is deprecated. Please include nix/expr/flake/lockfile.hh instead." +#include "nix/expr/flake/lockfile.hh" diff --git a/src/libexpr/include/nix/function-trace.hh b/src/libexpr/include/nix/function-trace.hh new file mode 100644 index 00000000000..f1729dbc47f --- /dev/null +++ b/src/libexpr/include/nix/function-trace.hh @@ -0,0 +1,2 @@ +#warning "Including nix/function-trace.hh is deprecated. Please include nix/expr/function-trace.hh instead." +#include "nix/expr/function-trace.hh" diff --git a/src/libexpr/include/nix/get-drvs.hh b/src/libexpr/include/nix/get-drvs.hh new file mode 100644 index 00000000000..29a5379cda7 --- /dev/null +++ b/src/libexpr/include/nix/get-drvs.hh @@ -0,0 +1,2 @@ +#warning "Including nix/get-drvs.hh is deprecated. Please include nix/expr/get-drvs.hh instead." +#include "nix/expr/get-drvs.hh" diff --git a/src/libexpr/include/nix/json-to-value.hh b/src/libexpr/include/nix/json-to-value.hh new file mode 100644 index 00000000000..15ab368e493 --- /dev/null +++ b/src/libexpr/include/nix/json-to-value.hh @@ -0,0 +1,2 @@ +#warning "Including nix/json-to-value.hh is deprecated. Please include nix/expr/json-to-value.hh instead." +#include "nix/expr/json-to-value.hh" diff --git a/src/libexpr/include/nix/nixexpr.hh b/src/libexpr/include/nix/nixexpr.hh new file mode 100644 index 00000000000..1714763a561 --- /dev/null +++ b/src/libexpr/include/nix/nixexpr.hh @@ -0,0 +1,2 @@ +#warning "Including nix/nixexpr.hh is deprecated. Please include nix/expr/nixexpr.hh instead." +#include "nix/expr/nixexpr.hh" diff --git a/src/libexpr/include/nix/primops.hh b/src/libexpr/include/nix/primops.hh new file mode 100644 index 00000000000..392dd83a7a6 --- /dev/null +++ b/src/libexpr/include/nix/primops.hh @@ -0,0 +1,2 @@ +#warning "Including nix/primops.hh is deprecated. Please include nix/expr/primops.hh instead." +#include "nix/expr/primops.hh" diff --git a/src/libexpr/include/nix/symbol-table.hh b/src/libexpr/include/nix/symbol-table.hh new file mode 100644 index 00000000000..42bd1bb439d --- /dev/null +++ b/src/libexpr/include/nix/symbol-table.hh @@ -0,0 +1,2 @@ +#warning "Including nix/symbol-table.hh is deprecated. Please include nix/expr/symbol-table.hh instead." +#include "nix/expr/symbol-table.hh" diff --git a/src/libexpr/include/nix/value-to-json.hh b/src/libexpr/include/nix/value-to-json.hh new file mode 100644 index 00000000000..4f9bbae0c3b --- /dev/null +++ b/src/libexpr/include/nix/value-to-json.hh @@ -0,0 +1,2 @@ +#warning "Including nix/value-to-json.hh is deprecated. Please include nix/expr/value-to-json.hh instead." +#include "nix/expr/value-to-json.hh" diff --git a/src/libexpr/include/nix/value-to-xml.hh b/src/libexpr/include/nix/value-to-xml.hh new file mode 100644 index 00000000000..94ba22ff5f7 --- /dev/null +++ b/src/libexpr/include/nix/value-to-xml.hh @@ -0,0 +1,2 @@ +#warning "Including nix/value-to-xml.hh is deprecated. Please include nix/expr/value-to-xml.hh instead." +#include "nix/expr/value-to-xml.hh" diff --git a/src/libexpr/include/nix/value.hh b/src/libexpr/include/nix/value.hh new file mode 100644 index 00000000000..9f6b496e148 --- /dev/null +++ b/src/libexpr/include/nix/value.hh @@ -0,0 +1,2 @@ +#warning "Including nix/value.hh is deprecated. Please include nix/expr/value.hh instead." +#include "nix/expr/value.hh" diff --git a/src/libexpr/include/nix/value/context.hh b/src/libexpr/include/nix/value/context.hh new file mode 100644 index 00000000000..d024ad56b27 --- /dev/null +++ b/src/libexpr/include/nix/value/context.hh @@ -0,0 +1,2 @@ +#warning "Including nix/value/context.hh is deprecated. Please include nix/expr/value/context.hh instead." +#include "nix/expr/value/context.hh" diff --git a/src/libexpr/local.mk b/src/libexpr/local.mk index 88c1657d97f..7b985e7f984 100644 --- a/src/libexpr/local.mk +++ b/src/libexpr/local.mk @@ -42,6 +42,19 @@ clean-files += $(d)/parser-tab.cc $(d)/parser-tab.hh $(d)/lexer-tab.cc $(d)/lexe $(eval $(call install-file-in, $(d)/nix-expr.pc, $(libdir)/pkgconfig, 0644)) +# old include paths + +$(foreach i, $(wildcard src/libexpr/include/nix/*.hh), \ + $(eval $(call install-file-in, $(i), $(includedir)/nix, 0644))) + +$(foreach i, $(wildcard src/libexpr/include/nix/value/*.hh), \ + $(eval $(call install-file-in, $(i), $(includedir)/nix/value, 0644))) + +$(foreach i, $(wildcard src/libexpr/include/nix/flake/*.hh), \ + $(eval $(call install-file-in, $(i), $(includedir)/nix/flake, 0644))) + +# new include paths + $(foreach i, $(wildcard src/libexpr/include/nix/expr/*.hh), \ $(eval $(call install-file-in, $(i), $(includedir)/nix/expr, 0644))) diff --git a/src/libfetchers/include/nix/attrs.hh b/src/libfetchers/include/nix/attrs.hh new file mode 100644 index 00000000000..d6a69c504c4 --- /dev/null +++ b/src/libfetchers/include/nix/attrs.hh @@ -0,0 +1,2 @@ +#warning "Including nix/attrs.hh is deprecated. Please include nix/fetchers/attrs.hh instead." +#include "nix/fetchers/attrs.hh" diff --git a/src/libfetchers/include/nix/cache.hh b/src/libfetchers/include/nix/cache.hh new file mode 100644 index 00000000000..7657b5f8fd2 --- /dev/null +++ b/src/libfetchers/include/nix/cache.hh @@ -0,0 +1,2 @@ +#warning "Including nix/cache.hh is deprecated. Please include nix/fetchers/cache.hh instead." +#include "nix/fetchers/cache.hh" diff --git a/src/libfetchers/include/nix/fetch-settings.hh b/src/libfetchers/include/nix/fetch-settings.hh new file mode 100644 index 00000000000..b0394b16626 --- /dev/null +++ b/src/libfetchers/include/nix/fetch-settings.hh @@ -0,0 +1,2 @@ +#warning "Including nix/fetch-settings.hh is deprecated. Please include nix/fetchers/fetch-settings.hh instead." +#include "nix/fetchers/fetch-settings.hh" diff --git a/src/libfetchers/include/nix/fetchers.hh b/src/libfetchers/include/nix/fetchers.hh new file mode 100644 index 00000000000..c5a5678e3bf --- /dev/null +++ b/src/libfetchers/include/nix/fetchers.hh @@ -0,0 +1,2 @@ +#warning "Including nix/fetchers.hh is deprecated. Please include nix/fetchers/fetchers.hh instead." +#include "nix/fetchers/fetchers.hh" diff --git a/src/libfetchers/include/nix/registry.hh b/src/libfetchers/include/nix/registry.hh new file mode 100644 index 00000000000..4d7a364114b --- /dev/null +++ b/src/libfetchers/include/nix/registry.hh @@ -0,0 +1,2 @@ +#warning "Including nix/registry.hh is deprecated. Please include nix/fetchers/registry.hh instead." +#include "nix/fetchers/registry.hh" diff --git a/src/libfetchers/local.mk b/src/libfetchers/local.mk index 340f7ce3489..1c81651f9cb 100644 --- a/src/libfetchers/local.mk +++ b/src/libfetchers/local.mk @@ -15,5 +15,12 @@ libfetchers_LDFLAGS += -pthread libfetchers_LIBS = libutil libstore +# old include paths + +$(foreach i, $(wildcard src/libfetchers/include/nix/*.hh), \ + $(eval $(call install-file-in, $(i), $(includedir)/nix, 0644))) + +# new include paths + $(foreach i, $(wildcard src/libfetchers/include/nix/fetchers/*.hh), \ $(eval $(call install-file-in, $(i), $(includedir)/nix/fetchers, 0644))) diff --git a/src/libmain/include/nix/common-args.hh b/src/libmain/include/nix/common-args.hh new file mode 100644 index 00000000000..7510648146e --- /dev/null +++ b/src/libmain/include/nix/common-args.hh @@ -0,0 +1,2 @@ +#warning "Including nix/common-args.hh is deprecated. Please include nix/main/common-args.hh instead." +#include "nix/main/common-args.hh" diff --git a/src/libmain/include/nix/loggers.hh b/src/libmain/include/nix/loggers.hh new file mode 100644 index 00000000000..e346a6c23f5 --- /dev/null +++ b/src/libmain/include/nix/loggers.hh @@ -0,0 +1,2 @@ +#warning "Including nix/loggers.hh is deprecated. Please include nix/main/loggers.hh instead." +#include "nix/main/loggers.hh" diff --git a/src/libmain/include/nix/progress-bar.hh b/src/libmain/include/nix/progress-bar.hh new file mode 100644 index 00000000000..b15e0f5c2b9 --- /dev/null +++ b/src/libmain/include/nix/progress-bar.hh @@ -0,0 +1,2 @@ +#warning "Including nix/progress-bar.hh is deprecated. Please include nix/main/progress-bar.hh instead." +#include "nix/main/progress-bar.hh" diff --git a/src/libmain/include/nix/shared.hh b/src/libmain/include/nix/shared.hh new file mode 100644 index 00000000000..a2530026725 --- /dev/null +++ b/src/libmain/include/nix/shared.hh @@ -0,0 +1,2 @@ +#warning "Including nix/shared.hh is deprecated. Please include nix/main/shared.hh instead." +#include "nix/main/shared.hh" diff --git a/src/libmain/local.mk b/src/libmain/local.mk index 392c4563dea..96064b71afc 100644 --- a/src/libmain/local.mk +++ b/src/libmain/local.mk @@ -19,5 +19,12 @@ libmain_ALLOW_UNDEFINED = 1 $(eval $(call install-file-in, $(d)/nix-main.pc, $(libdir)/pkgconfig, 0644)) +# old include paths + +$(foreach i, $(wildcard src/libmain/include/nix/*.hh), \ + $(eval $(call install-file-in, $(i), $(includedir)/nix, 0644))) + +# new include paths + $(foreach i, $(wildcard src/libmain/include/nix/main/*.hh), \ $(eval $(call install-file-in, $(i), $(includedir)/nix/main, 0644))) diff --git a/src/libstore/include/nix/binary-cache-store.hh b/src/libstore/include/nix/binary-cache-store.hh new file mode 100644 index 00000000000..aedebcb3643 --- /dev/null +++ b/src/libstore/include/nix/binary-cache-store.hh @@ -0,0 +1,2 @@ +#warning "Including nix/binary-cache-store.hh is deprecated. Please include nix/store/binary-cache-store.hh instead." +#include "nix/store/binary-cache-store.hh" diff --git a/src/libstore/include/nix/build-result.hh b/src/libstore/include/nix/build-result.hh new file mode 100644 index 00000000000..8ff6d00af3a --- /dev/null +++ b/src/libstore/include/nix/build-result.hh @@ -0,0 +1,2 @@ +#warning "Including nix/build-result.hh is deprecated. Please include nix/store/build-result.hh instead." +#include "nix/store/build-result.hh" diff --git a/src/libstore/include/nix/build/derivation-goal.hh b/src/libstore/include/nix/build/derivation-goal.hh new file mode 100644 index 00000000000..d714bfc9db7 --- /dev/null +++ b/src/libstore/include/nix/build/derivation-goal.hh @@ -0,0 +1,2 @@ +#warning "Including nix/build/derivation-goal.hh is deprecated. Please include nix/store/build/derivation-goal.hh instead." +#include "nix/store/build/derivation-goal.hh" diff --git a/src/libstore/include/nix/build/drv-output-substitution-goal.hh b/src/libstore/include/nix/build/drv-output-substitution-goal.hh new file mode 100644 index 00000000000..5bc3db353f1 --- /dev/null +++ b/src/libstore/include/nix/build/drv-output-substitution-goal.hh @@ -0,0 +1,2 @@ +#warning "Including nix/build/drv-output-substitution-goal.hh is deprecated. Please include nix/store/build/drv-output-substitution-goal.hh instead." +#include "nix/store/build/drv-output-substitution-goal.hh" diff --git a/src/libstore/include/nix/build/goal.hh b/src/libstore/include/nix/build/goal.hh new file mode 100644 index 00000000000..5d74763f4ed --- /dev/null +++ b/src/libstore/include/nix/build/goal.hh @@ -0,0 +1,2 @@ +#warning "Including nix/build/goal.hh is deprecated. Please include nix/store/build/goal.hh instead." +#include "nix/store/build/goal.hh" diff --git a/src/libstore/include/nix/build/hook-instance.hh b/src/libstore/include/nix/build/hook-instance.hh new file mode 100644 index 00000000000..bdd93f6f129 --- /dev/null +++ b/src/libstore/include/nix/build/hook-instance.hh @@ -0,0 +1,2 @@ +#warning "Including nix/build/hook-instance.hh is deprecated. Please include nix/store/build/hook-instance.hh instead." +#include "nix/store/build/hook-instance.hh" diff --git a/src/libstore/include/nix/build/local-derivation-goal.hh b/src/libstore/include/nix/build/local-derivation-goal.hh new file mode 100644 index 00000000000..99fc1e74d1b --- /dev/null +++ b/src/libstore/include/nix/build/local-derivation-goal.hh @@ -0,0 +1,2 @@ +#warning "Including nix/build/local-derivation-goal.hh is deprecated. Please include nix/store/build/local-derivation-goal.hh instead." +#include "nix/store/build/local-derivation-goal.hh" diff --git a/src/libstore/include/nix/build/personality.hh b/src/libstore/include/nix/build/personality.hh new file mode 100644 index 00000000000..527674fe281 --- /dev/null +++ b/src/libstore/include/nix/build/personality.hh @@ -0,0 +1,2 @@ +#warning "Including nix/build/personality.hh is deprecated. Please include nix/store/build/personality.hh instead." +#include "nix/store/build/personality.hh" diff --git a/src/libstore/include/nix/build/substitution-goal.hh b/src/libstore/include/nix/build/substitution-goal.hh new file mode 100644 index 00000000000..04c14bce776 --- /dev/null +++ b/src/libstore/include/nix/build/substitution-goal.hh @@ -0,0 +1,2 @@ +#warning "Including nix/build/substitution-goal.hh is deprecated. Please include nix/store/build/substitution-goal.hh instead." +#include "nix/store/build/substitution-goal.hh" diff --git a/src/libstore/include/nix/build/worker.hh b/src/libstore/include/nix/build/worker.hh new file mode 100644 index 00000000000..3b682b1b935 --- /dev/null +++ b/src/libstore/include/nix/build/worker.hh @@ -0,0 +1,2 @@ +#warning "Including nix/build/worker.hh is deprecated. Please include nix/store/build/worker.hh instead." +#include "nix/store/build/worker.hh" diff --git a/src/libstore/include/nix/builtins.hh b/src/libstore/include/nix/builtins.hh new file mode 100644 index 00000000000..78d1af9dde8 --- /dev/null +++ b/src/libstore/include/nix/builtins.hh @@ -0,0 +1,2 @@ +#warning "Including nix/builtins.hh is deprecated. Please include nix/store/builtins.hh instead." +#include "nix/store/builtins.hh" diff --git a/src/libstore/include/nix/builtins/buildenv.hh b/src/libstore/include/nix/builtins/buildenv.hh new file mode 100644 index 00000000000..813aac24b4e --- /dev/null +++ b/src/libstore/include/nix/builtins/buildenv.hh @@ -0,0 +1,2 @@ +#warning "Including nix/builtins/buildenv.hh is deprecated. Please include nix/store/builtins/buildenv.hh instead." +#include "nix/store/builtins/buildenv.hh" diff --git a/src/libstore/include/nix/content-address.hh b/src/libstore/include/nix/content-address.hh new file mode 100644 index 00000000000..cac239428f2 --- /dev/null +++ b/src/libstore/include/nix/content-address.hh @@ -0,0 +1,2 @@ +#warning "Including nix/content-address.hh is deprecated. Please include nix/store/content-address.hh instead." +#include "nix/store/content-address.hh" diff --git a/src/libstore/include/nix/crypto.hh b/src/libstore/include/nix/crypto.hh new file mode 100644 index 00000000000..a3518e424db --- /dev/null +++ b/src/libstore/include/nix/crypto.hh @@ -0,0 +1,2 @@ +#warning "Including nix/crypto.hh is deprecated. Please include nix/store/crypto.hh instead." +#include "nix/store/crypto.hh" diff --git a/src/libstore/include/nix/daemon.hh b/src/libstore/include/nix/daemon.hh new file mode 100644 index 00000000000..97679b28629 --- /dev/null +++ b/src/libstore/include/nix/daemon.hh @@ -0,0 +1,2 @@ +#warning "Including nix/daemon.hh is deprecated. Please include nix/store/daemon.hh instead." +#include "nix/store/daemon.hh" diff --git a/src/libstore/include/nix/derivations.hh b/src/libstore/include/nix/derivations.hh new file mode 100644 index 00000000000..65caa82369d --- /dev/null +++ b/src/libstore/include/nix/derivations.hh @@ -0,0 +1,2 @@ +#warning "Including nix/derivations.hh is deprecated. Please include nix/store/derivations.hh instead." +#include "nix/store/derivations.hh" diff --git a/src/libstore/include/nix/derived-path.hh b/src/libstore/include/nix/derived-path.hh new file mode 100644 index 00000000000..0f3075eef2c --- /dev/null +++ b/src/libstore/include/nix/derived-path.hh @@ -0,0 +1,2 @@ +#warning "Including nix/derived-path.hh is deprecated. Please include nix/store/derived-path.hh instead." +#include "nix/store/derived-path.hh" diff --git a/src/libstore/include/nix/filetransfer.hh b/src/libstore/include/nix/filetransfer.hh new file mode 100644 index 00000000000..757bad24b9d --- /dev/null +++ b/src/libstore/include/nix/filetransfer.hh @@ -0,0 +1,2 @@ +#warning "Including nix/filetransfer.hh is deprecated. Please include nix/store/filetransfer.hh instead." +#include "nix/store/filetransfer.hh" diff --git a/src/libstore/include/nix/fs-accessor.hh b/src/libstore/include/nix/fs-accessor.hh new file mode 100644 index 00000000000..e2357cfbcc7 --- /dev/null +++ b/src/libstore/include/nix/fs-accessor.hh @@ -0,0 +1,2 @@ +#warning "Including nix/fs-accessor.hh is deprecated. Please include nix/store/fs-accessor.hh instead." +#include "nix/store/fs-accessor.hh" diff --git a/src/libstore/include/nix/gc-store.hh b/src/libstore/include/nix/gc-store.hh new file mode 100644 index 00000000000..5c448d93e1d --- /dev/null +++ b/src/libstore/include/nix/gc-store.hh @@ -0,0 +1,2 @@ +#warning "Including nix/gc-store.hh is deprecated. Please include nix/store/gc-store.hh instead." +#include "nix/store/gc-store.hh" diff --git a/src/libstore/include/nix/globals.hh b/src/libstore/include/nix/globals.hh new file mode 100644 index 00000000000..cee5b0ab49a --- /dev/null +++ b/src/libstore/include/nix/globals.hh @@ -0,0 +1,2 @@ +#warning "Including nix/globals.hh is deprecated. Please include nix/store/globals.hh instead." +#include "nix/store/globals.hh" diff --git a/src/libstore/include/nix/local-fs-store.hh b/src/libstore/include/nix/local-fs-store.hh new file mode 100644 index 00000000000..6a2713c2ff0 --- /dev/null +++ b/src/libstore/include/nix/local-fs-store.hh @@ -0,0 +1,2 @@ +#warning "Including nix/local-fs-store.hh is deprecated. Please include nix/store/local-fs-store.hh instead." +#include "nix/store/local-fs-store.hh" diff --git a/src/libstore/include/nix/local-store.hh b/src/libstore/include/nix/local-store.hh new file mode 100644 index 00000000000..373b3d6c893 --- /dev/null +++ b/src/libstore/include/nix/local-store.hh @@ -0,0 +1,2 @@ +#warning "Including nix/local-store.hh is deprecated. Please include nix/store/local-store.hh instead." +#include "nix/store/local-store.hh" diff --git a/src/libstore/include/nix/lock.hh b/src/libstore/include/nix/lock.hh new file mode 100644 index 00000000000..31480d8c17d --- /dev/null +++ b/src/libstore/include/nix/lock.hh @@ -0,0 +1,2 @@ +#warning "Including nix/lock.hh is deprecated. Please include nix/store/lock.hh instead." +#include "nix/store/lock.hh" diff --git a/src/libstore/include/nix/log-store.hh b/src/libstore/include/nix/log-store.hh new file mode 100644 index 00000000000..09a3850ea48 --- /dev/null +++ b/src/libstore/include/nix/log-store.hh @@ -0,0 +1,2 @@ +#warning "Including nix/log-store.hh is deprecated. Please include nix/store/log-store.hh instead." +#include "nix/store/log-store.hh" diff --git a/src/libstore/include/nix/machines.hh b/src/libstore/include/nix/machines.hh new file mode 100644 index 00000000000..df2f32978c7 --- /dev/null +++ b/src/libstore/include/nix/machines.hh @@ -0,0 +1,2 @@ +#warning "Including nix/machines.hh is deprecated. Please include nix/store/machines.hh instead." +#include "nix/store/machines.hh" diff --git a/src/libstore/include/nix/make-content-addressed.hh b/src/libstore/include/nix/make-content-addressed.hh new file mode 100644 index 00000000000..aa31bb3d314 --- /dev/null +++ b/src/libstore/include/nix/make-content-addressed.hh @@ -0,0 +1,2 @@ +#warning "Including nix/make-content-addressed.hh is deprecated. Please include nix/store/make-content-addressed.hh instead." +#include "nix/store/make-content-addressed.hh" diff --git a/src/libstore/include/nix/names.hh b/src/libstore/include/nix/names.hh new file mode 100644 index 00000000000..12d739c2953 --- /dev/null +++ b/src/libstore/include/nix/names.hh @@ -0,0 +1,2 @@ +#warning "Including nix/names.hh is deprecated. Please include nix/store/names.hh instead." +#include "nix/store/names.hh" diff --git a/src/libstore/include/nix/nar-accessor.hh b/src/libstore/include/nix/nar-accessor.hh new file mode 100644 index 00000000000..662676b9c71 --- /dev/null +++ b/src/libstore/include/nix/nar-accessor.hh @@ -0,0 +1,2 @@ +#warning "Including nix/nar-accessor.hh is deprecated. Please include nix/store/nar-accessor.hh instead." +#include "nix/store/nar-accessor.hh" diff --git a/src/libstore/include/nix/nar-info-disk-cache.hh b/src/libstore/include/nix/nar-info-disk-cache.hh new file mode 100644 index 00000000000..093e9b87101 --- /dev/null +++ b/src/libstore/include/nix/nar-info-disk-cache.hh @@ -0,0 +1,2 @@ +#warning "Including nix/nar-info-disk-cache.hh is deprecated. Please include nix/store/nar-info-disk-cache.hh instead." +#include "nix/store/nar-info-disk-cache.hh" diff --git a/src/libstore/include/nix/nar-info.hh b/src/libstore/include/nix/nar-info.hh new file mode 100644 index 00000000000..1f87d6509d5 --- /dev/null +++ b/src/libstore/include/nix/nar-info.hh @@ -0,0 +1,2 @@ +#warning "Including nix/nar-info.hh is deprecated. Please include nix/store/nar-info.hh instead." +#include "nix/store/nar-info.hh" diff --git a/src/libstore/include/nix/outputs-spec.hh b/src/libstore/include/nix/outputs-spec.hh new file mode 100644 index 00000000000..811958cbe63 --- /dev/null +++ b/src/libstore/include/nix/outputs-spec.hh @@ -0,0 +1,2 @@ +#warning "Including nix/outputs-spec.hh is deprecated. Please include nix/store/outputs-spec.hh instead." +#include "nix/store/outputs-spec.hh" diff --git a/src/libstore/include/nix/parsed-derivations.hh b/src/libstore/include/nix/parsed-derivations.hh new file mode 100644 index 00000000000..f82a0f41eb6 --- /dev/null +++ b/src/libstore/include/nix/parsed-derivations.hh @@ -0,0 +1,2 @@ +#warning "Including nix/parsed-derivations.hh is deprecated. Please include nix/store/parsed-derivations.hh instead." +#include "nix/store/parsed-derivations.hh" diff --git a/src/libstore/include/nix/path-info.hh b/src/libstore/include/nix/path-info.hh new file mode 100644 index 00000000000..73866459d6c --- /dev/null +++ b/src/libstore/include/nix/path-info.hh @@ -0,0 +1,2 @@ +#warning "Including nix/path-info.hh is deprecated. Please include nix/store/path-info.hh instead." +#include "nix/store/path-info.hh" diff --git a/src/libstore/include/nix/path-regex.hh b/src/libstore/include/nix/path-regex.hh new file mode 100644 index 00000000000..3b5d6430038 --- /dev/null +++ b/src/libstore/include/nix/path-regex.hh @@ -0,0 +1,2 @@ +#warning "Including nix/path-regex.hh is deprecated. Please include nix/store/path-regex.hh instead." +#include "nix/store/path-regex.hh" diff --git a/src/libstore/include/nix/path-with-outputs.hh b/src/libstore/include/nix/path-with-outputs.hh new file mode 100644 index 00000000000..82ce4589e03 --- /dev/null +++ b/src/libstore/include/nix/path-with-outputs.hh @@ -0,0 +1,2 @@ +#warning "Including nix/path-with-outputs.hh is deprecated. Please include nix/store/path-with-outputs.hh instead." +#include "nix/store/path-with-outputs.hh" diff --git a/src/libstore/include/nix/path.hh b/src/libstore/include/nix/path.hh new file mode 100644 index 00000000000..260891ddf64 --- /dev/null +++ b/src/libstore/include/nix/path.hh @@ -0,0 +1,2 @@ +#warning "Including nix/path.hh is deprecated. Please include nix/store/path.hh instead." +#include "nix/store/path.hh" diff --git a/src/libstore/include/nix/pathlocks.hh b/src/libstore/include/nix/pathlocks.hh new file mode 100644 index 00000000000..6d77a1bc6cf --- /dev/null +++ b/src/libstore/include/nix/pathlocks.hh @@ -0,0 +1,2 @@ +#warning "Including nix/pathlocks.hh is deprecated. Please include nix/store/pathlocks.hh instead." +#include "nix/store/pathlocks.hh" diff --git a/src/libstore/include/nix/profiles.hh b/src/libstore/include/nix/profiles.hh new file mode 100644 index 00000000000..f2e71095695 --- /dev/null +++ b/src/libstore/include/nix/profiles.hh @@ -0,0 +1,2 @@ +#warning "Including nix/profiles.hh is deprecated. Please include nix/store/profiles.hh instead." +#include "nix/store/profiles.hh" diff --git a/src/libstore/include/nix/realisation.hh b/src/libstore/include/nix/realisation.hh new file mode 100644 index 00000000000..f2f170e4ddd --- /dev/null +++ b/src/libstore/include/nix/realisation.hh @@ -0,0 +1,2 @@ +#warning "Including nix/realisation.hh is deprecated. Please include nix/store/realisation.hh instead." +#include "nix/store/realisation.hh" diff --git a/src/libstore/include/nix/references.hh b/src/libstore/include/nix/references.hh new file mode 100644 index 00000000000..3c9f21c4caa --- /dev/null +++ b/src/libstore/include/nix/references.hh @@ -0,0 +1,2 @@ +#warning "Including nix/references.hh is deprecated. Please include nix/store/references.hh instead." +#include "nix/store/references.hh" diff --git a/src/libstore/include/nix/remote-fs-accessor.hh b/src/libstore/include/nix/remote-fs-accessor.hh new file mode 100644 index 00000000000..beecb03c406 --- /dev/null +++ b/src/libstore/include/nix/remote-fs-accessor.hh @@ -0,0 +1,2 @@ +#warning "Including nix/remote-fs-accessor.hh is deprecated. Please include nix/store/remote-fs-accessor.hh instead." +#include "nix/store/remote-fs-accessor.hh" diff --git a/src/libstore/include/nix/remote-store.hh b/src/libstore/include/nix/remote-store.hh new file mode 100644 index 00000000000..f02b00e8de9 --- /dev/null +++ b/src/libstore/include/nix/remote-store.hh @@ -0,0 +1,2 @@ +#warning "Including nix/remote-store.hh is deprecated. Please include nix/store/remote-store.hh instead." +#include "nix/store/remote-store.hh" diff --git a/src/libstore/include/nix/repair-flag.hh b/src/libstore/include/nix/repair-flag.hh new file mode 100644 index 00000000000..8a43b84b7c3 --- /dev/null +++ b/src/libstore/include/nix/repair-flag.hh @@ -0,0 +1,2 @@ +#warning "Including nix/repair-flag.hh is deprecated. Please include nix/store/repair-flag.hh instead." +#include "nix/store/repair-flag.hh" diff --git a/src/libstore/include/nix/s3-binary-cache-store.hh b/src/libstore/include/nix/s3-binary-cache-store.hh new file mode 100644 index 00000000000..ff87cd6f3a3 --- /dev/null +++ b/src/libstore/include/nix/s3-binary-cache-store.hh @@ -0,0 +1,2 @@ +#warning "Including nix/s3-binary-cache-store.hh is deprecated. Please include nix/store/s3-binary-cache-store.hh instead." +#include "nix/store/s3-binary-cache-store.hh" diff --git a/src/libstore/include/nix/s3.hh b/src/libstore/include/nix/s3.hh new file mode 100644 index 00000000000..862b6ab8f56 --- /dev/null +++ b/src/libstore/include/nix/s3.hh @@ -0,0 +1,2 @@ +#warning "Including nix/s3.hh is deprecated. Please include nix/store/s3.hh instead." +#include "nix/store/s3.hh" diff --git a/src/libstore/include/nix/serve-protocol.hh b/src/libstore/include/nix/serve-protocol.hh new file mode 100644 index 00000000000..a4ee2b0a3cc --- /dev/null +++ b/src/libstore/include/nix/serve-protocol.hh @@ -0,0 +1,2 @@ +#warning "Including nix/serve-protocol.hh is deprecated. Please include nix/store/serve-protocol.hh instead." +#include "nix/store/serve-protocol.hh" diff --git a/src/libstore/include/nix/sqlite.hh b/src/libstore/include/nix/sqlite.hh new file mode 100644 index 00000000000..cbb3ce054ba --- /dev/null +++ b/src/libstore/include/nix/sqlite.hh @@ -0,0 +1,2 @@ +#warning "Including nix/sqlite.hh is deprecated. Please include nix/store/sqlite.hh instead." +#include "nix/store/sqlite.hh" diff --git a/src/libstore/include/nix/ssh.hh b/src/libstore/include/nix/ssh.hh new file mode 100644 index 00000000000..76e4f083e27 --- /dev/null +++ b/src/libstore/include/nix/ssh.hh @@ -0,0 +1,2 @@ +#warning "Including nix/ssh.hh is deprecated. Please include nix/store/ssh.hh instead." +#include "nix/store/ssh.hh" diff --git a/src/libstore/include/nix/store-api.hh b/src/libstore/include/nix/store-api.hh new file mode 100644 index 00000000000..18444af0bab --- /dev/null +++ b/src/libstore/include/nix/store-api.hh @@ -0,0 +1,2 @@ +#warning "Including nix/store-api.hh is deprecated. Please include nix/store/store-api.hh instead." +#include "nix/store/store-api.hh" diff --git a/src/libstore/include/nix/store-cast.hh b/src/libstore/include/nix/store-cast.hh new file mode 100644 index 00000000000..057ba39c4d5 --- /dev/null +++ b/src/libstore/include/nix/store-cast.hh @@ -0,0 +1,2 @@ +#warning "Including nix/store-cast.hh is deprecated. Please include nix/store/store-cast.hh instead." +#include "nix/store/store-cast.hh" diff --git a/src/libstore/include/nix/uds-remote-store.hh b/src/libstore/include/nix/uds-remote-store.hh new file mode 100644 index 00000000000..7abc62256e5 --- /dev/null +++ b/src/libstore/include/nix/uds-remote-store.hh @@ -0,0 +1,2 @@ +#warning "Including nix/uds-remote-store.hh is deprecated. Please include nix/store/uds-remote-store.hh instead." +#include "nix/store/uds-remote-store.hh" diff --git a/src/libstore/include/nix/worker-protocol.hh b/src/libstore/include/nix/worker-protocol.hh new file mode 100644 index 00000000000..e467bf01fbb --- /dev/null +++ b/src/libstore/include/nix/worker-protocol.hh @@ -0,0 +1,2 @@ +#warning "Including nix/worker-protocol.hh is deprecated. Please include nix/store/worker-protocol.hh instead." +#include "nix/store/worker-protocol.hh" diff --git a/src/libstore/local.mk b/src/libstore/local.mk index 3defea82854..9d5844b00eb 100644 --- a/src/libstore/local.mk +++ b/src/libstore/local.mk @@ -68,6 +68,19 @@ clean-files += $(d)/schema.sql.gen.hh $(d)/ca-specific-schema.sql.gen.hh $(eval $(call install-file-in, $(d)/nix-store.pc, $(libdir)/pkgconfig, 0644)) +# old include paths + +$(foreach i, $(wildcard src/libstore/include/nix/*.hh), \ + $(eval $(call install-file-in, $(i), $(includedir)/nix, 0644))) + +$(foreach i, $(wildcard src/libstore/include/nix/builtins/*.hh), \ + $(eval $(call install-file-in, $(i), $(includedir)/nix/builtins, 0644))) + +$(foreach i, $(wildcard src/libstore/include/nix/build/*.hh), \ + $(eval $(call install-file-in, $(i), $(includedir)/nix/build, 0644))) + +# new include paths + $(foreach i, $(wildcard src/libstore/include/nix/store/*.hh), \ $(eval $(call install-file-in, $(i), $(includedir)/nix/store, 0644))) diff --git a/src/libutil/include/nix/abstract-setting-to-json.hh b/src/libutil/include/nix/abstract-setting-to-json.hh new file mode 100644 index 00000000000..38a97e91da5 --- /dev/null +++ b/src/libutil/include/nix/abstract-setting-to-json.hh @@ -0,0 +1,2 @@ +#warning "Including nix/abstract-setting-to-json.hh is deprecated. Please include nix/util/abstract-setting-to-json.hh instead." +#include "nix/util/abstract-setting-to-json.hh" diff --git a/src/libutil/include/nix/ansicolor.hh b/src/libutil/include/nix/ansicolor.hh new file mode 100644 index 00000000000..9bbc6c6b3ae --- /dev/null +++ b/src/libutil/include/nix/ansicolor.hh @@ -0,0 +1,2 @@ +#warning "Including nix/ansicolor.hh is deprecated. Please include nix/util/ansicolor.hh instead." +#include "nix/util/ansicolor.hh" diff --git a/src/libutil/include/nix/archive.hh b/src/libutil/include/nix/archive.hh new file mode 100644 index 00000000000..4b4b077453d --- /dev/null +++ b/src/libutil/include/nix/archive.hh @@ -0,0 +1,2 @@ +#warning "Including nix/archive.hh is deprecated. Please include nix/util/archive.hh instead." +#include "nix/util/archive.hh" diff --git a/src/libutil/include/nix/args.hh b/src/libutil/include/nix/args.hh new file mode 100644 index 00000000000..76c7b9e4b36 --- /dev/null +++ b/src/libutil/include/nix/args.hh @@ -0,0 +1,2 @@ +#warning "Including nix/args.hh is deprecated. Please include nix/util/args.hh instead." +#include "nix/util/args.hh" diff --git a/src/libutil/include/nix/callback.hh b/src/libutil/include/nix/callback.hh new file mode 100644 index 00000000000..d8aee129a3c --- /dev/null +++ b/src/libutil/include/nix/callback.hh @@ -0,0 +1,2 @@ +#warning "Including nix/callback.hh is deprecated. Please include nix/util/callback.hh instead." +#include "nix/util/callback.hh" diff --git a/src/libutil/include/nix/canon-path.hh b/src/libutil/include/nix/canon-path.hh new file mode 100644 index 00000000000..60e83eb663b --- /dev/null +++ b/src/libutil/include/nix/canon-path.hh @@ -0,0 +1,2 @@ +#warning "Including nix/canon-path.hh is deprecated. Please include nix/util/canon-path.hh instead." +#include "nix/util/canon-path.hh" diff --git a/src/libutil/include/nix/cgroup.hh b/src/libutil/include/nix/cgroup.hh new file mode 100644 index 00000000000..580aa805ed6 --- /dev/null +++ b/src/libutil/include/nix/cgroup.hh @@ -0,0 +1,2 @@ +#warning "Including nix/cgroup.hh is deprecated. Please include nix/util/cgroup.hh instead." +#include "nix/util/cgroup.hh" diff --git a/src/libutil/include/nix/chunked-vector.hh b/src/libutil/include/nix/chunked-vector.hh new file mode 100644 index 00000000000..0ba3a3d3cf3 --- /dev/null +++ b/src/libutil/include/nix/chunked-vector.hh @@ -0,0 +1,2 @@ +#warning "Including nix/chunked-vector.hh is deprecated. Please include nix/util/chunked-vector.hh instead." +#include "nix/util/chunked-vector.hh" diff --git a/src/libutil/include/nix/closure.hh b/src/libutil/include/nix/closure.hh new file mode 100644 index 00000000000..46982717358 --- /dev/null +++ b/src/libutil/include/nix/closure.hh @@ -0,0 +1,2 @@ +#warning "Including nix/closure.hh is deprecated. Please include nix/util/closure.hh instead." +#include "nix/util/closure.hh" diff --git a/src/libutil/include/nix/comparator.hh b/src/libutil/include/nix/comparator.hh new file mode 100644 index 00000000000..e068cc972e2 --- /dev/null +++ b/src/libutil/include/nix/comparator.hh @@ -0,0 +1,2 @@ +#warning "Including nix/comparator.hh is deprecated. Please include nix/util/comparator.hh instead." +#include "nix/util/comparator.hh" diff --git a/src/libutil/include/nix/compression.hh b/src/libutil/include/nix/compression.hh new file mode 100644 index 00000000000..6d031710b34 --- /dev/null +++ b/src/libutil/include/nix/compression.hh @@ -0,0 +1,2 @@ +#warning "Including nix/compression.hh is deprecated. Please include nix/util/compression.hh instead." +#include "nix/util/compression.hh" diff --git a/src/libutil/include/nix/compute-levels.hh b/src/libutil/include/nix/compute-levels.hh new file mode 100644 index 00000000000..f9a8279d78a --- /dev/null +++ b/src/libutil/include/nix/compute-levels.hh @@ -0,0 +1,2 @@ +#warning "Including nix/compute-levels.hh is deprecated. Please include nix/util/compute-levels.hh instead." +#include "nix/util/compute-levels.hh" diff --git a/src/libutil/include/nix/config.hh b/src/libutil/include/nix/config.hh new file mode 100644 index 00000000000..273c284c5c5 --- /dev/null +++ b/src/libutil/include/nix/config.hh @@ -0,0 +1,2 @@ +#warning "Including nix/config.hh is deprecated. Please include nix/util/config.hh instead." +#include "nix/util/config.hh" diff --git a/src/libutil/include/nix/error.hh b/src/libutil/include/nix/error.hh new file mode 100644 index 00000000000..b5554a84536 --- /dev/null +++ b/src/libutil/include/nix/error.hh @@ -0,0 +1,2 @@ +#warning "Including nix/error.hh is deprecated. Please include nix/util/error.hh instead." +#include "nix/util/error.hh" diff --git a/src/libutil/include/nix/experimental-features.hh b/src/libutil/include/nix/experimental-features.hh new file mode 100644 index 00000000000..2d9cb356347 --- /dev/null +++ b/src/libutil/include/nix/experimental-features.hh @@ -0,0 +1,2 @@ +#warning "Including nix/experimental-features.hh is deprecated. Please include nix/util/experimental-features.hh instead." +#include "nix/util/experimental-features.hh" diff --git a/src/libutil/include/nix/finally.hh b/src/libutil/include/nix/finally.hh new file mode 100644 index 00000000000..a6e989767cf --- /dev/null +++ b/src/libutil/include/nix/finally.hh @@ -0,0 +1,2 @@ +#warning "Including nix/finally.hh is deprecated. Please include nix/util/finally.hh instead." +#include "nix/util/finally.hh" diff --git a/src/libutil/include/nix/fmt.hh b/src/libutil/include/nix/fmt.hh new file mode 100644 index 00000000000..3da05b63900 --- /dev/null +++ b/src/libutil/include/nix/fmt.hh @@ -0,0 +1,2 @@ +#warning "Including nix/fmt.hh is deprecated. Please include nix/util/fmt.hh instead." +#include "nix/util/fmt.hh" diff --git a/src/libutil/include/nix/git.hh b/src/libutil/include/nix/git.hh new file mode 100644 index 00000000000..d8fdb53d2d2 --- /dev/null +++ b/src/libutil/include/nix/git.hh @@ -0,0 +1,2 @@ +#warning "Including nix/git.hh is deprecated. Please include nix/util/git.hh instead." +#include "nix/util/git.hh" diff --git a/src/libutil/include/nix/hash.hh b/src/libutil/include/nix/hash.hh new file mode 100644 index 00000000000..f97ae3b05f6 --- /dev/null +++ b/src/libutil/include/nix/hash.hh @@ -0,0 +1,2 @@ +#warning "Including nix/hash.hh is deprecated. Please include nix/util/hash.hh instead." +#include "nix/util/hash.hh" diff --git a/src/libutil/include/nix/hilite.hh b/src/libutil/include/nix/hilite.hh new file mode 100644 index 00000000000..039700dff7c --- /dev/null +++ b/src/libutil/include/nix/hilite.hh @@ -0,0 +1,2 @@ +#warning "Including nix/hilite.hh is deprecated. Please include nix/util/hilite.hh instead." +#include "nix/util/hilite.hh" diff --git a/src/libutil/include/nix/json-impls.hh b/src/libutil/include/nix/json-impls.hh new file mode 100644 index 00000000000..07c6bc628fc --- /dev/null +++ b/src/libutil/include/nix/json-impls.hh @@ -0,0 +1,2 @@ +#warning "Including nix/json-impls.hh is deprecated. Please include nix/util/json-impls.hh instead." +#include "nix/util/json-impls.hh" diff --git a/src/libutil/include/nix/json-utils.hh b/src/libutil/include/nix/json-utils.hh new file mode 100644 index 00000000000..69b3bd8ffd0 --- /dev/null +++ b/src/libutil/include/nix/json-utils.hh @@ -0,0 +1,2 @@ +#warning "Including nix/json-utils.hh is deprecated. Please include nix/util/json-utils.hh instead." +#include "nix/util/json-utils.hh" diff --git a/src/libutil/include/nix/logging.hh b/src/libutil/include/nix/logging.hh new file mode 100644 index 00000000000..138a21d9450 --- /dev/null +++ b/src/libutil/include/nix/logging.hh @@ -0,0 +1,2 @@ +#warning "Including nix/logging.hh is deprecated. Please include nix/util/logging.hh instead." +#include "nix/util/logging.hh" diff --git a/src/libutil/include/nix/lru-cache.hh b/src/libutil/include/nix/lru-cache.hh new file mode 100644 index 00000000000..e098e8efb21 --- /dev/null +++ b/src/libutil/include/nix/lru-cache.hh @@ -0,0 +1,2 @@ +#warning "Including nix/lru-cache.hh is deprecated. Please include nix/util/lru-cache.hh instead." +#include "nix/util/lru-cache.hh" diff --git a/src/libutil/include/nix/monitor-fd.hh b/src/libutil/include/nix/monitor-fd.hh new file mode 100644 index 00000000000..cb42029e92a --- /dev/null +++ b/src/libutil/include/nix/monitor-fd.hh @@ -0,0 +1,2 @@ +#warning "Including nix/monitor-fd.hh is deprecated. Please include nix/util/monitor-fd.hh instead." +#include "nix/util/monitor-fd.hh" diff --git a/src/libutil/include/nix/namespaces.hh b/src/libutil/include/nix/namespaces.hh new file mode 100644 index 00000000000..58abe850268 --- /dev/null +++ b/src/libutil/include/nix/namespaces.hh @@ -0,0 +1,2 @@ +#warning "Including nix/namespaces.hh is deprecated. Please include nix/util/namespaces.hh instead." +#include "nix/util/namespaces.hh" diff --git a/src/libutil/include/nix/pool.hh b/src/libutil/include/nix/pool.hh new file mode 100644 index 00000000000..0b75427c7cc --- /dev/null +++ b/src/libutil/include/nix/pool.hh @@ -0,0 +1,2 @@ +#warning "Including nix/pool.hh is deprecated. Please include nix/util/pool.hh instead." +#include "nix/util/pool.hh" diff --git a/src/libutil/include/nix/ref.hh b/src/libutil/include/nix/ref.hh new file mode 100644 index 00000000000..c7cf9770bd8 --- /dev/null +++ b/src/libutil/include/nix/ref.hh @@ -0,0 +1,2 @@ +#warning "Including nix/ref.hh is deprecated. Please include nix/util/ref.hh instead." +#include "nix/util/ref.hh" diff --git a/src/libutil/include/nix/regex-combinators.hh b/src/libutil/include/nix/regex-combinators.hh new file mode 100644 index 00000000000..1e5fdf72f66 --- /dev/null +++ b/src/libutil/include/nix/regex-combinators.hh @@ -0,0 +1,2 @@ +#warning "Including nix/regex-combinators.hh is deprecated. Please include nix/util/regex-combinators.hh instead." +#include "nix/util/regex-combinators.hh" diff --git a/src/libutil/include/nix/serialise.hh b/src/libutil/include/nix/serialise.hh new file mode 100644 index 00000000000..3548d42e225 --- /dev/null +++ b/src/libutil/include/nix/serialise.hh @@ -0,0 +1,2 @@ +#warning "Including nix/serialise.hh is deprecated. Please include nix/util/serialise.hh instead." +#include "nix/util/serialise.hh" diff --git a/src/libutil/include/nix/split.hh b/src/libutil/include/nix/split.hh new file mode 100644 index 00000000000..5f0d5726eed --- /dev/null +++ b/src/libutil/include/nix/split.hh @@ -0,0 +1,2 @@ +#warning "Including nix/split.hh is deprecated. Please include nix/util/split.hh instead." +#include "nix/util/split.hh" diff --git a/src/libutil/include/nix/suggestions.hh b/src/libutil/include/nix/suggestions.hh new file mode 100644 index 00000000000..c44992bf992 --- /dev/null +++ b/src/libutil/include/nix/suggestions.hh @@ -0,0 +1,2 @@ +#warning "Including nix/suggestions.hh is deprecated. Please include nix/util/suggestions.hh instead." +#include "nix/util/suggestions.hh" diff --git a/src/libutil/include/nix/sync.hh b/src/libutil/include/nix/sync.hh new file mode 100644 index 00000000000..1b85f0e8f55 --- /dev/null +++ b/src/libutil/include/nix/sync.hh @@ -0,0 +1,2 @@ +#warning "Including nix/sync.hh is deprecated. Please include nix/util/sync.hh instead." +#include "nix/util/sync.hh" diff --git a/src/libutil/include/nix/tarfile.hh b/src/libutil/include/nix/tarfile.hh new file mode 100644 index 00000000000..be7a495a4c1 --- /dev/null +++ b/src/libutil/include/nix/tarfile.hh @@ -0,0 +1,2 @@ +#warning "Including nix/tarfile.hh is deprecated. Please include nix/util/tarfile.hh instead." +#include "nix/util/tarfile.hh" diff --git a/src/libutil/include/nix/thread-pool.hh b/src/libutil/include/nix/thread-pool.hh new file mode 100644 index 00000000000..d1855cd2d78 --- /dev/null +++ b/src/libutil/include/nix/thread-pool.hh @@ -0,0 +1,2 @@ +#warning "Including nix/thread-pool.hh is deprecated. Please include nix/util/thread-pool.hh instead." +#include "nix/util/thread-pool.hh" diff --git a/src/libutil/include/nix/topo-sort.hh b/src/libutil/include/nix/topo-sort.hh new file mode 100644 index 00000000000..2e33270a632 --- /dev/null +++ b/src/libutil/include/nix/topo-sort.hh @@ -0,0 +1,2 @@ +#warning "Including nix/topo-sort.hh is deprecated. Please include nix/util/topo-sort.hh instead." +#include "nix/util/topo-sort.hh" diff --git a/src/libutil/include/nix/types.hh b/src/libutil/include/nix/types.hh new file mode 100644 index 00000000000..5a3de81fe77 --- /dev/null +++ b/src/libutil/include/nix/types.hh @@ -0,0 +1,2 @@ +#warning "Including nix/types.hh is deprecated. Please include nix/util/types.hh instead." +#include "nix/util/types.hh" diff --git a/src/libutil/include/nix/url-parts.hh b/src/libutil/include/nix/url-parts.hh new file mode 100644 index 00000000000..eddfcf4a754 --- /dev/null +++ b/src/libutil/include/nix/url-parts.hh @@ -0,0 +1,2 @@ +#warning "Including nix/url-parts.hh is deprecated. Please include nix/util/url-parts.hh instead." +#include "nix/util/url-parts.hh" diff --git a/src/libutil/include/nix/url.hh b/src/libutil/include/nix/url.hh new file mode 100644 index 00000000000..78f9606fd7a --- /dev/null +++ b/src/libutil/include/nix/url.hh @@ -0,0 +1,2 @@ +#warning "Including nix/url.hh is deprecated. Please include nix/util/url.hh instead." +#include "nix/util/url.hh" diff --git a/src/libutil/include/nix/util.hh b/src/libutil/include/nix/util.hh new file mode 100644 index 00000000000..05a659ae423 --- /dev/null +++ b/src/libutil/include/nix/util.hh @@ -0,0 +1,2 @@ +#warning "Including nix/util.hh is deprecated. Please include nix/util/util.hh instead." +#include "nix/util/util.hh" diff --git a/src/libutil/include/nix/xml-writer.hh b/src/libutil/include/nix/xml-writer.hh new file mode 100644 index 00000000000..ccab798a16f --- /dev/null +++ b/src/libutil/include/nix/xml-writer.hh @@ -0,0 +1,2 @@ +#warning "Including nix/xml-writer.hh is deprecated. Please include nix/util/xml-writer.hh instead." +#include "nix/util/xml-writer.hh" diff --git a/src/libutil/local.mk b/src/libutil/local.mk index 7e43ff9f37d..dbdf784c423 100644 --- a/src/libutil/local.mk +++ b/src/libutil/local.mk @@ -14,5 +14,12 @@ ifeq ($(HAVE_LIBCPUID), 1) libutil_LDFLAGS += -lcpuid endif +# old include paths + +$(foreach i, $(wildcard src/libutil/include/nix/*.hh), \ + $(eval $(call install-file-in, $(i), $(includedir)/nix, 0644))) + +# new include paths + $(foreach i, $(wildcard src/libutil/include/nix/util/*.hh), \ $(eval $(call install-file-in, $(i), $(includedir)/nix/util, 0644))) From 69f024420c4e237ef3a9b72dc195513367ac6558 Mon Sep 17 00:00:00 2001 From: Andrea Bedini Date: Mon, 20 Feb 2023 17:05:56 +0800 Subject: [PATCH 19/21] Whitespace --- src/libcmd/local.mk | 4 ++-- src/libexpr/local.mk | 12 ++++++------ src/libfetchers/local.mk | 6 +++--- src/libmain/local.mk | 4 ++-- src/libstore/local.mk | 12 ++++++------ src/libutil/local.mk | 4 ++-- 6 files changed, 21 insertions(+), 21 deletions(-) diff --git a/src/libcmd/local.mk b/src/libcmd/local.mk index bf42c537d43..ad21b9d5278 100644 --- a/src/libcmd/local.mk +++ b/src/libcmd/local.mk @@ -24,9 +24,9 @@ $(eval $(call install-file-in, $(d)/nix-cmd.pc, $(libdir)/pkgconfig, 0644)) # old include paths $(foreach i, $(wildcard src/libcmd/include/nix/*.hh), \ - $(eval $(call install-file-in, $(i), $(includedir)/nix, 0644))) + $(eval $(call install-file-in, $(i), $(includedir)/nix, 0644))) # new include paths $(foreach i, $(wildcard src/libcmd/include/nix/cmd/*.hh), \ - $(eval $(call install-file-in, $(i), $(includedir)/nix/cmd, 0644))) + $(eval $(call install-file-in, $(i), $(includedir)/nix/cmd, 0644))) diff --git a/src/libexpr/local.mk b/src/libexpr/local.mk index 7b985e7f984..98dd8ad22bb 100644 --- a/src/libexpr/local.mk +++ b/src/libexpr/local.mk @@ -45,24 +45,24 @@ $(eval $(call install-file-in, $(d)/nix-expr.pc, $(libdir)/pkgconfig, 0644)) # old include paths $(foreach i, $(wildcard src/libexpr/include/nix/*.hh), \ - $(eval $(call install-file-in, $(i), $(includedir)/nix, 0644))) + $(eval $(call install-file-in, $(i), $(includedir)/nix, 0644))) $(foreach i, $(wildcard src/libexpr/include/nix/value/*.hh), \ - $(eval $(call install-file-in, $(i), $(includedir)/nix/value, 0644))) + $(eval $(call install-file-in, $(i), $(includedir)/nix/value, 0644))) $(foreach i, $(wildcard src/libexpr/include/nix/flake/*.hh), \ - $(eval $(call install-file-in, $(i), $(includedir)/nix/flake, 0644))) + $(eval $(call install-file-in, $(i), $(includedir)/nix/flake, 0644))) # new include paths $(foreach i, $(wildcard src/libexpr/include/nix/expr/*.hh), \ - $(eval $(call install-file-in, $(i), $(includedir)/nix/expr, 0644))) + $(eval $(call install-file-in, $(i), $(includedir)/nix/expr, 0644))) $(foreach i, $(wildcard src/libexpr/include/nix/expr/value/*.hh), \ - $(eval $(call install-file-in, $(i), $(includedir)/nix/expr/value, 0644))) + $(eval $(call install-file-in, $(i), $(includedir)/nix/expr/value, 0644))) $(foreach i, $(wildcard src/libexpr/include/nix/expr/flake/*.hh), \ - $(eval $(call install-file-in, $(i), $(includedir)/nix/expr/flake, 0644))) + $(eval $(call install-file-in, $(i), $(includedir)/nix/expr/flake, 0644))) $(d)/primops.cc: $(d)/imported-drv-to-derivation.nix.gen.hh $(d)/primops/derivation.nix.gen.hh $(d)/fetchurl.nix.gen.hh diff --git a/src/libfetchers/local.mk b/src/libfetchers/local.mk index 1c81651f9cb..1d10b653170 100644 --- a/src/libfetchers/local.mk +++ b/src/libfetchers/local.mk @@ -9,7 +9,7 @@ libfetchers_SOURCES := $(wildcard $(d)/*.cc) libfetchers_CXXFLAGS += \ -Isrc/libfetchers/include \ -Isrc/libutil/include \ - -Isrc/libstore/include + -Isrc/libstore/include libfetchers_LDFLAGS += -pthread @@ -18,9 +18,9 @@ libfetchers_LIBS = libutil libstore # old include paths $(foreach i, $(wildcard src/libfetchers/include/nix/*.hh), \ - $(eval $(call install-file-in, $(i), $(includedir)/nix, 0644))) + $(eval $(call install-file-in, $(i), $(includedir)/nix, 0644))) # new include paths $(foreach i, $(wildcard src/libfetchers/include/nix/fetchers/*.hh), \ - $(eval $(call install-file-in, $(i), $(includedir)/nix/fetchers, 0644))) + $(eval $(call install-file-in, $(i), $(includedir)/nix/fetchers, 0644))) diff --git a/src/libmain/local.mk b/src/libmain/local.mk index 96064b71afc..5a237a73db9 100644 --- a/src/libmain/local.mk +++ b/src/libmain/local.mk @@ -22,9 +22,9 @@ $(eval $(call install-file-in, $(d)/nix-main.pc, $(libdir)/pkgconfig, 0644)) # old include paths $(foreach i, $(wildcard src/libmain/include/nix/*.hh), \ - $(eval $(call install-file-in, $(i), $(includedir)/nix, 0644))) + $(eval $(call install-file-in, $(i), $(includedir)/nix, 0644))) # new include paths $(foreach i, $(wildcard src/libmain/include/nix/main/*.hh), \ - $(eval $(call install-file-in, $(i), $(includedir)/nix/main, 0644))) + $(eval $(call install-file-in, $(i), $(includedir)/nix/main, 0644))) diff --git a/src/libstore/local.mk b/src/libstore/local.mk index 9d5844b00eb..f913d31a6c7 100644 --- a/src/libstore/local.mk +++ b/src/libstore/local.mk @@ -71,21 +71,21 @@ $(eval $(call install-file-in, $(d)/nix-store.pc, $(libdir)/pkgconfig, 0644)) # old include paths $(foreach i, $(wildcard src/libstore/include/nix/*.hh), \ - $(eval $(call install-file-in, $(i), $(includedir)/nix, 0644))) + $(eval $(call install-file-in, $(i), $(includedir)/nix, 0644))) $(foreach i, $(wildcard src/libstore/include/nix/builtins/*.hh), \ - $(eval $(call install-file-in, $(i), $(includedir)/nix/builtins, 0644))) + $(eval $(call install-file-in, $(i), $(includedir)/nix/builtins, 0644))) $(foreach i, $(wildcard src/libstore/include/nix/build/*.hh), \ - $(eval $(call install-file-in, $(i), $(includedir)/nix/build, 0644))) + $(eval $(call install-file-in, $(i), $(includedir)/nix/build, 0644))) # new include paths $(foreach i, $(wildcard src/libstore/include/nix/store/*.hh), \ - $(eval $(call install-file-in, $(i), $(includedir)/nix/store, 0644))) + $(eval $(call install-file-in, $(i), $(includedir)/nix/store, 0644))) $(foreach i, $(wildcard src/libstore/include/nix/store/builtins/*.hh), \ - $(eval $(call install-file-in, $(i), $(includedir)/nix/store/builtins, 0644))) + $(eval $(call install-file-in, $(i), $(includedir)/nix/store/builtins, 0644))) $(foreach i, $(wildcard src/libstore/include/nix/store/build/*.hh), \ - $(eval $(call install-file-in, $(i), $(includedir)/nix/store/build, 0644))) + $(eval $(call install-file-in, $(i), $(includedir)/nix/store/build, 0644))) diff --git a/src/libutil/local.mk b/src/libutil/local.mk index dbdf784c423..589c3a04f1d 100644 --- a/src/libutil/local.mk +++ b/src/libutil/local.mk @@ -17,9 +17,9 @@ endif # old include paths $(foreach i, $(wildcard src/libutil/include/nix/*.hh), \ - $(eval $(call install-file-in, $(i), $(includedir)/nix, 0644))) + $(eval $(call install-file-in, $(i), $(includedir)/nix, 0644))) # new include paths $(foreach i, $(wildcard src/libutil/include/nix/util/*.hh), \ - $(eval $(call install-file-in, $(i), $(includedir)/nix/util, 0644))) + $(eval $(call install-file-in, $(i), $(includedir)/nix/util, 0644))) From 1ce1aeef672ab41a7db7424873c3a1f9bb1c68dc Mon Sep 17 00:00:00 2001 From: Andrea Bedini Date: Tue, 21 Feb 2023 09:16:56 +0800 Subject: [PATCH 20/21] Revert "Fix #5832" This reverts commit 746f4d567b159cab74fe64935f62c60d781daf98. --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 3f487c56ce2..09b3651b91f 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -AC_INIT([nix],m4_esyscmd(bash -c "echo -n $(cat ./.version)$VERSION_SUFFIX")) +AC_INIT([nix],[m4_esyscmd(bash -c "echo -n $(cat ./.version)$VERSION_SUFFIX")]) AC_CONFIG_MACRO_DIRS([m4]) AC_CONFIG_SRCDIR(README.md) AC_CONFIG_AUX_DIR(config) From 878ad8a49301620ffc4f21ea9fcea6a660a4b299 Mon Sep 17 00:00:00 2001 From: Andrea Bedini Date: Tue, 21 Feb 2023 14:49:29 +0800 Subject: [PATCH 21/21] Revert "Add include shims with deprecation warning" This reverts commit a205add350aed8e6c3cca785920438cdceabfb5b. --- src/libcmd/include/nix/command.hh | 2 -- src/libcmd/include/nix/common-eval-args.hh | 2 -- src/libcmd/include/nix/installable-derived-path.hh | 2 -- src/libcmd/include/nix/installables.hh | 2 -- src/libcmd/include/nix/legacy.hh | 2 -- src/libcmd/include/nix/markdown.hh | 2 -- src/libcmd/local.mk | 9 +-------- src/libexpr/include/nix/attr-path.hh | 2 -- src/libexpr/include/nix/attr-set.hh | 2 -- src/libexpr/include/nix/eval-cache.hh | 2 -- src/libexpr/include/nix/eval-inline.hh | 2 -- src/libexpr/include/nix/eval.hh | 2 -- src/libexpr/include/nix/flake/flake.hh | 2 -- src/libexpr/include/nix/flake/flakeref.hh | 2 -- src/libexpr/include/nix/flake/lockfile.hh | 2 -- src/libexpr/include/nix/function-trace.hh | 2 -- src/libexpr/include/nix/get-drvs.hh | 2 -- src/libexpr/include/nix/json-to-value.hh | 2 -- src/libexpr/include/nix/nixexpr.hh | 2 -- src/libexpr/include/nix/primops.hh | 2 -- src/libexpr/include/nix/symbol-table.hh | 2 -- src/libexpr/include/nix/value-to-json.hh | 2 -- src/libexpr/include/nix/value-to-xml.hh | 2 -- src/libexpr/include/nix/value.hh | 2 -- src/libexpr/include/nix/value/context.hh | 2 -- src/libexpr/local.mk | 13 ------------- src/libfetchers/include/nix/attrs.hh | 2 -- src/libfetchers/include/nix/cache.hh | 2 -- src/libfetchers/include/nix/fetch-settings.hh | 2 -- src/libfetchers/include/nix/fetchers.hh | 2 -- src/libfetchers/include/nix/registry.hh | 2 -- src/libfetchers/local.mk | 7 ------- src/libmain/include/nix/common-args.hh | 2 -- src/libmain/include/nix/loggers.hh | 2 -- src/libmain/include/nix/progress-bar.hh | 2 -- src/libmain/include/nix/shared.hh | 2 -- src/libmain/local.mk | 7 ------- src/libstore/include/nix/binary-cache-store.hh | 2 -- src/libstore/include/nix/build-result.hh | 2 -- src/libstore/include/nix/build/derivation-goal.hh | 2 -- .../nix/build/drv-output-substitution-goal.hh | 2 -- src/libstore/include/nix/build/goal.hh | 2 -- src/libstore/include/nix/build/hook-instance.hh | 2 -- .../include/nix/build/local-derivation-goal.hh | 2 -- src/libstore/include/nix/build/personality.hh | 2 -- src/libstore/include/nix/build/substitution-goal.hh | 2 -- src/libstore/include/nix/build/worker.hh | 2 -- src/libstore/include/nix/builtins.hh | 2 -- src/libstore/include/nix/builtins/buildenv.hh | 2 -- src/libstore/include/nix/content-address.hh | 2 -- src/libstore/include/nix/crypto.hh | 2 -- src/libstore/include/nix/daemon.hh | 2 -- src/libstore/include/nix/derivations.hh | 2 -- src/libstore/include/nix/derived-path.hh | 2 -- src/libstore/include/nix/filetransfer.hh | 2 -- src/libstore/include/nix/fs-accessor.hh | 2 -- src/libstore/include/nix/gc-store.hh | 2 -- src/libstore/include/nix/globals.hh | 2 -- src/libstore/include/nix/local-fs-store.hh | 2 -- src/libstore/include/nix/local-store.hh | 2 -- src/libstore/include/nix/lock.hh | 2 -- src/libstore/include/nix/log-store.hh | 2 -- src/libstore/include/nix/machines.hh | 2 -- src/libstore/include/nix/make-content-addressed.hh | 2 -- src/libstore/include/nix/names.hh | 2 -- src/libstore/include/nix/nar-accessor.hh | 2 -- src/libstore/include/nix/nar-info-disk-cache.hh | 2 -- src/libstore/include/nix/nar-info.hh | 2 -- src/libstore/include/nix/outputs-spec.hh | 2 -- src/libstore/include/nix/parsed-derivations.hh | 2 -- src/libstore/include/nix/path-info.hh | 2 -- src/libstore/include/nix/path-regex.hh | 2 -- src/libstore/include/nix/path-with-outputs.hh | 2 -- src/libstore/include/nix/path.hh | 2 -- src/libstore/include/nix/pathlocks.hh | 2 -- src/libstore/include/nix/profiles.hh | 2 -- src/libstore/include/nix/realisation.hh | 2 -- src/libstore/include/nix/references.hh | 2 -- src/libstore/include/nix/remote-fs-accessor.hh | 2 -- src/libstore/include/nix/remote-store.hh | 2 -- src/libstore/include/nix/repair-flag.hh | 2 -- src/libstore/include/nix/s3-binary-cache-store.hh | 2 -- src/libstore/include/nix/s3.hh | 2 -- src/libstore/include/nix/serve-protocol.hh | 2 -- src/libstore/include/nix/sqlite.hh | 2 -- src/libstore/include/nix/ssh.hh | 2 -- src/libstore/include/nix/store-api.hh | 2 -- src/libstore/include/nix/store-cast.hh | 2 -- src/libstore/include/nix/uds-remote-store.hh | 2 -- src/libstore/include/nix/worker-protocol.hh | 2 -- src/libstore/local.mk | 13 ------------- src/libutil/include/nix/abstract-setting-to-json.hh | 2 -- src/libutil/include/nix/ansicolor.hh | 2 -- src/libutil/include/nix/archive.hh | 2 -- src/libutil/include/nix/args.hh | 2 -- src/libutil/include/nix/callback.hh | 2 -- src/libutil/include/nix/canon-path.hh | 2 -- src/libutil/include/nix/cgroup.hh | 2 -- src/libutil/include/nix/chunked-vector.hh | 2 -- src/libutil/include/nix/closure.hh | 2 -- src/libutil/include/nix/comparator.hh | 2 -- src/libutil/include/nix/compression.hh | 2 -- src/libutil/include/nix/compute-levels.hh | 2 -- src/libutil/include/nix/config.hh | 2 -- src/libutil/include/nix/error.hh | 2 -- src/libutil/include/nix/experimental-features.hh | 2 -- src/libutil/include/nix/finally.hh | 2 -- src/libutil/include/nix/fmt.hh | 2 -- src/libutil/include/nix/git.hh | 2 -- src/libutil/include/nix/hash.hh | 2 -- src/libutil/include/nix/hilite.hh | 2 -- src/libutil/include/nix/json-impls.hh | 2 -- src/libutil/include/nix/json-utils.hh | 2 -- src/libutil/include/nix/logging.hh | 2 -- src/libutil/include/nix/lru-cache.hh | 2 -- src/libutil/include/nix/monitor-fd.hh | 2 -- src/libutil/include/nix/namespaces.hh | 2 -- src/libutil/include/nix/pool.hh | 2 -- src/libutil/include/nix/ref.hh | 2 -- src/libutil/include/nix/regex-combinators.hh | 2 -- src/libutil/include/nix/serialise.hh | 2 -- src/libutil/include/nix/split.hh | 2 -- src/libutil/include/nix/suggestions.hh | 2 -- src/libutil/include/nix/sync.hh | 2 -- src/libutil/include/nix/tarfile.hh | 2 -- src/libutil/include/nix/thread-pool.hh | 2 -- src/libutil/include/nix/topo-sort.hh | 2 -- src/libutil/include/nix/types.hh | 2 -- src/libutil/include/nix/url-parts.hh | 2 -- src/libutil/include/nix/url.hh | 2 -- src/libutil/include/nix/util.hh | 2 -- src/libutil/include/nix/xml-writer.hh | 2 -- src/libutil/local.mk | 7 ------- 133 files changed, 1 insertion(+), 309 deletions(-) delete mode 100644 src/libcmd/include/nix/command.hh delete mode 100644 src/libcmd/include/nix/common-eval-args.hh delete mode 100644 src/libcmd/include/nix/installable-derived-path.hh delete mode 100644 src/libcmd/include/nix/installables.hh delete mode 100644 src/libcmd/include/nix/legacy.hh delete mode 100644 src/libcmd/include/nix/markdown.hh delete mode 100644 src/libexpr/include/nix/attr-path.hh delete mode 100644 src/libexpr/include/nix/attr-set.hh delete mode 100644 src/libexpr/include/nix/eval-cache.hh delete mode 100644 src/libexpr/include/nix/eval-inline.hh delete mode 100644 src/libexpr/include/nix/eval.hh delete mode 100644 src/libexpr/include/nix/flake/flake.hh delete mode 100644 src/libexpr/include/nix/flake/flakeref.hh delete mode 100644 src/libexpr/include/nix/flake/lockfile.hh delete mode 100644 src/libexpr/include/nix/function-trace.hh delete mode 100644 src/libexpr/include/nix/get-drvs.hh delete mode 100644 src/libexpr/include/nix/json-to-value.hh delete mode 100644 src/libexpr/include/nix/nixexpr.hh delete mode 100644 src/libexpr/include/nix/primops.hh delete mode 100644 src/libexpr/include/nix/symbol-table.hh delete mode 100644 src/libexpr/include/nix/value-to-json.hh delete mode 100644 src/libexpr/include/nix/value-to-xml.hh delete mode 100644 src/libexpr/include/nix/value.hh delete mode 100644 src/libexpr/include/nix/value/context.hh delete mode 100644 src/libfetchers/include/nix/attrs.hh delete mode 100644 src/libfetchers/include/nix/cache.hh delete mode 100644 src/libfetchers/include/nix/fetch-settings.hh delete mode 100644 src/libfetchers/include/nix/fetchers.hh delete mode 100644 src/libfetchers/include/nix/registry.hh delete mode 100644 src/libmain/include/nix/common-args.hh delete mode 100644 src/libmain/include/nix/loggers.hh delete mode 100644 src/libmain/include/nix/progress-bar.hh delete mode 100644 src/libmain/include/nix/shared.hh delete mode 100644 src/libstore/include/nix/binary-cache-store.hh delete mode 100644 src/libstore/include/nix/build-result.hh delete mode 100644 src/libstore/include/nix/build/derivation-goal.hh delete mode 100644 src/libstore/include/nix/build/drv-output-substitution-goal.hh delete mode 100644 src/libstore/include/nix/build/goal.hh delete mode 100644 src/libstore/include/nix/build/hook-instance.hh delete mode 100644 src/libstore/include/nix/build/local-derivation-goal.hh delete mode 100644 src/libstore/include/nix/build/personality.hh delete mode 100644 src/libstore/include/nix/build/substitution-goal.hh delete mode 100644 src/libstore/include/nix/build/worker.hh delete mode 100644 src/libstore/include/nix/builtins.hh delete mode 100644 src/libstore/include/nix/builtins/buildenv.hh delete mode 100644 src/libstore/include/nix/content-address.hh delete mode 100644 src/libstore/include/nix/crypto.hh delete mode 100644 src/libstore/include/nix/daemon.hh delete mode 100644 src/libstore/include/nix/derivations.hh delete mode 100644 src/libstore/include/nix/derived-path.hh delete mode 100644 src/libstore/include/nix/filetransfer.hh delete mode 100644 src/libstore/include/nix/fs-accessor.hh delete mode 100644 src/libstore/include/nix/gc-store.hh delete mode 100644 src/libstore/include/nix/globals.hh delete mode 100644 src/libstore/include/nix/local-fs-store.hh delete mode 100644 src/libstore/include/nix/local-store.hh delete mode 100644 src/libstore/include/nix/lock.hh delete mode 100644 src/libstore/include/nix/log-store.hh delete mode 100644 src/libstore/include/nix/machines.hh delete mode 100644 src/libstore/include/nix/make-content-addressed.hh delete mode 100644 src/libstore/include/nix/names.hh delete mode 100644 src/libstore/include/nix/nar-accessor.hh delete mode 100644 src/libstore/include/nix/nar-info-disk-cache.hh delete mode 100644 src/libstore/include/nix/nar-info.hh delete mode 100644 src/libstore/include/nix/outputs-spec.hh delete mode 100644 src/libstore/include/nix/parsed-derivations.hh delete mode 100644 src/libstore/include/nix/path-info.hh delete mode 100644 src/libstore/include/nix/path-regex.hh delete mode 100644 src/libstore/include/nix/path-with-outputs.hh delete mode 100644 src/libstore/include/nix/path.hh delete mode 100644 src/libstore/include/nix/pathlocks.hh delete mode 100644 src/libstore/include/nix/profiles.hh delete mode 100644 src/libstore/include/nix/realisation.hh delete mode 100644 src/libstore/include/nix/references.hh delete mode 100644 src/libstore/include/nix/remote-fs-accessor.hh delete mode 100644 src/libstore/include/nix/remote-store.hh delete mode 100644 src/libstore/include/nix/repair-flag.hh delete mode 100644 src/libstore/include/nix/s3-binary-cache-store.hh delete mode 100644 src/libstore/include/nix/s3.hh delete mode 100644 src/libstore/include/nix/serve-protocol.hh delete mode 100644 src/libstore/include/nix/sqlite.hh delete mode 100644 src/libstore/include/nix/ssh.hh delete mode 100644 src/libstore/include/nix/store-api.hh delete mode 100644 src/libstore/include/nix/store-cast.hh delete mode 100644 src/libstore/include/nix/uds-remote-store.hh delete mode 100644 src/libstore/include/nix/worker-protocol.hh delete mode 100644 src/libutil/include/nix/abstract-setting-to-json.hh delete mode 100644 src/libutil/include/nix/ansicolor.hh delete mode 100644 src/libutil/include/nix/archive.hh delete mode 100644 src/libutil/include/nix/args.hh delete mode 100644 src/libutil/include/nix/callback.hh delete mode 100644 src/libutil/include/nix/canon-path.hh delete mode 100644 src/libutil/include/nix/cgroup.hh delete mode 100644 src/libutil/include/nix/chunked-vector.hh delete mode 100644 src/libutil/include/nix/closure.hh delete mode 100644 src/libutil/include/nix/comparator.hh delete mode 100644 src/libutil/include/nix/compression.hh delete mode 100644 src/libutil/include/nix/compute-levels.hh delete mode 100644 src/libutil/include/nix/config.hh delete mode 100644 src/libutil/include/nix/error.hh delete mode 100644 src/libutil/include/nix/experimental-features.hh delete mode 100644 src/libutil/include/nix/finally.hh delete mode 100644 src/libutil/include/nix/fmt.hh delete mode 100644 src/libutil/include/nix/git.hh delete mode 100644 src/libutil/include/nix/hash.hh delete mode 100644 src/libutil/include/nix/hilite.hh delete mode 100644 src/libutil/include/nix/json-impls.hh delete mode 100644 src/libutil/include/nix/json-utils.hh delete mode 100644 src/libutil/include/nix/logging.hh delete mode 100644 src/libutil/include/nix/lru-cache.hh delete mode 100644 src/libutil/include/nix/monitor-fd.hh delete mode 100644 src/libutil/include/nix/namespaces.hh delete mode 100644 src/libutil/include/nix/pool.hh delete mode 100644 src/libutil/include/nix/ref.hh delete mode 100644 src/libutil/include/nix/regex-combinators.hh delete mode 100644 src/libutil/include/nix/serialise.hh delete mode 100644 src/libutil/include/nix/split.hh delete mode 100644 src/libutil/include/nix/suggestions.hh delete mode 100644 src/libutil/include/nix/sync.hh delete mode 100644 src/libutil/include/nix/tarfile.hh delete mode 100644 src/libutil/include/nix/thread-pool.hh delete mode 100644 src/libutil/include/nix/topo-sort.hh delete mode 100644 src/libutil/include/nix/types.hh delete mode 100644 src/libutil/include/nix/url-parts.hh delete mode 100644 src/libutil/include/nix/url.hh delete mode 100644 src/libutil/include/nix/util.hh delete mode 100644 src/libutil/include/nix/xml-writer.hh diff --git a/src/libcmd/include/nix/command.hh b/src/libcmd/include/nix/command.hh deleted file mode 100644 index 490a54e594d..00000000000 --- a/src/libcmd/include/nix/command.hh +++ /dev/null @@ -1,2 +0,0 @@ -#warning "Including nix/command.hh is deprecated. Include nix/cmd/command.hh instead." -#include "nix/cmd/command.hh" diff --git a/src/libcmd/include/nix/common-eval-args.hh b/src/libcmd/include/nix/common-eval-args.hh deleted file mode 100644 index 0e92a0fca1d..00000000000 --- a/src/libcmd/include/nix/common-eval-args.hh +++ /dev/null @@ -1,2 +0,0 @@ -#warning "Including nix/common-eval-args.hh is deprecated. Include nix/cmd/common-eval-args.hh instead." -#include "nix/cmd/common-eval-args.hh" diff --git a/src/libcmd/include/nix/installable-derived-path.hh b/src/libcmd/include/nix/installable-derived-path.hh deleted file mode 100644 index 504f9c4961a..00000000000 --- a/src/libcmd/include/nix/installable-derived-path.hh +++ /dev/null @@ -1,2 +0,0 @@ -#warning "Including nix/installable-derived-path.hh is deprecated. Include nix/cmd/installable-derived-path.hh instead." -#include "nix/cmd/installable-derived-path.hh" diff --git a/src/libcmd/include/nix/installables.hh b/src/libcmd/include/nix/installables.hh deleted file mode 100644 index 1d1f75ddd88..00000000000 --- a/src/libcmd/include/nix/installables.hh +++ /dev/null @@ -1,2 +0,0 @@ -#warning "Including nix/installables.hh is deprecated. Include nix/cmd/installables.hh instead." -#include "nix/cmd/installables.hh" diff --git a/src/libcmd/include/nix/legacy.hh b/src/libcmd/include/nix/legacy.hh deleted file mode 100644 index 246f394fb47..00000000000 --- a/src/libcmd/include/nix/legacy.hh +++ /dev/null @@ -1,2 +0,0 @@ -#warning "Including nix/legacy.hh is deprecated. Include nix/cmd/legacy.hh instead." -#include "nix/cmd/legacy.hh" diff --git a/src/libcmd/include/nix/markdown.hh b/src/libcmd/include/nix/markdown.hh deleted file mode 100644 index 70346f7bb6a..00000000000 --- a/src/libcmd/include/nix/markdown.hh +++ /dev/null @@ -1,2 +0,0 @@ -#warning "Including nix/markdown.hh is deprecated. Include nix/cmd/markdown.hh instead." -#include "nix/cmd/markdown.hh" diff --git a/src/libcmd/local.mk b/src/libcmd/local.mk index 41a9076dce1..f5091eed95f 100644 --- a/src/libcmd/local.mk +++ b/src/libcmd/local.mk @@ -12,7 +12,7 @@ libcmd_CXXFLAGS += \ -Isrc/libfetchers/include \ -Isrc/libmain/include \ -Isrc/libstore/include \ - -Isrc/libutil/include + -Isrc/libutil/include libcmd_LDFLAGS = $(EDITLINE_LIBS) $(LOWDOWN_LIBS) -pthread @@ -20,12 +20,5 @@ libcmd_LIBS = libstore libutil libexpr libmain libfetchers $(eval $(call install-file-in, $(d)/nix-cmd.pc, $(libdir)/pkgconfig, 0644)) -# old include paths - -$(foreach i, $(wildcard src/libcmd/include/nix/*.hh), \ - $(eval $(call install-file-in, $(i), $(includedir)/nix, 0644))) - -# new include paths - $(foreach i, $(wildcard src/libcmd/include/nix/cmd/*.hh), \ $(eval $(call install-file-in, $(i), $(includedir)/nix/cmd, 0644))) diff --git a/src/libexpr/include/nix/attr-path.hh b/src/libexpr/include/nix/attr-path.hh deleted file mode 100644 index 5ecf64e0345..00000000000 --- a/src/libexpr/include/nix/attr-path.hh +++ /dev/null @@ -1,2 +0,0 @@ -#warning "Including nix/attr-path.hh is deprecated. Please include nix/expr/attr-path.hh instead." -#include "nix/expr/attr-path.hh" diff --git a/src/libexpr/include/nix/attr-set.hh b/src/libexpr/include/nix/attr-set.hh deleted file mode 100644 index 77d80bd5d1f..00000000000 --- a/src/libexpr/include/nix/attr-set.hh +++ /dev/null @@ -1,2 +0,0 @@ -#warning "Including nix/attr-set.hh is deprecated. Please include nix/expr/attr-set.hh instead." -#include "nix/expr/attr-set.hh" diff --git a/src/libexpr/include/nix/eval-cache.hh b/src/libexpr/include/nix/eval-cache.hh deleted file mode 100644 index 89336990e1c..00000000000 --- a/src/libexpr/include/nix/eval-cache.hh +++ /dev/null @@ -1,2 +0,0 @@ -#warning "Including nix/eval-cache.hh is deprecated. Please include nix/expr/eval-cache.hh instead." -#include "nix/expr/eval-cache.hh" diff --git a/src/libexpr/include/nix/eval-inline.hh b/src/libexpr/include/nix/eval-inline.hh deleted file mode 100644 index d54b6ea7883..00000000000 --- a/src/libexpr/include/nix/eval-inline.hh +++ /dev/null @@ -1,2 +0,0 @@ -#warning "Including nix/eval-inline.hh is deprecated. Please include nix/expr/eval-inline.hh instead." -#include "nix/expr/eval-inline.hh" diff --git a/src/libexpr/include/nix/eval.hh b/src/libexpr/include/nix/eval.hh deleted file mode 100644 index 92e92e43016..00000000000 --- a/src/libexpr/include/nix/eval.hh +++ /dev/null @@ -1,2 +0,0 @@ -#warning "Including nix/eval.hh is deprecated. Please include nix/expr/eval.hh instead." -#include "nix/expr/eval.hh" diff --git a/src/libexpr/include/nix/flake/flake.hh b/src/libexpr/include/nix/flake/flake.hh deleted file mode 100644 index cd67ed74000..00000000000 --- a/src/libexpr/include/nix/flake/flake.hh +++ /dev/null @@ -1,2 +0,0 @@ -#warning "Including nix/flake/flake.hh is deprecated. Please include nix/expr/flake/flake.hh instead." -#include "nix/expr/flake/flake.hh" diff --git a/src/libexpr/include/nix/flake/flakeref.hh b/src/libexpr/include/nix/flake/flakeref.hh deleted file mode 100644 index 3c82476e547..00000000000 --- a/src/libexpr/include/nix/flake/flakeref.hh +++ /dev/null @@ -1,2 +0,0 @@ -#warning "Including nix/flake/flakeref.hh is deprecated. Please include nix/expr/flake/flakeref.hh instead." -#include "nix/expr/flake/flakeref.hh" diff --git a/src/libexpr/include/nix/flake/lockfile.hh b/src/libexpr/include/nix/flake/lockfile.hh deleted file mode 100644 index 602422af62e..00000000000 --- a/src/libexpr/include/nix/flake/lockfile.hh +++ /dev/null @@ -1,2 +0,0 @@ -#warning "Including nix/flake/lockfile.hh is deprecated. Please include nix/expr/flake/lockfile.hh instead." -#include "nix/expr/flake/lockfile.hh" diff --git a/src/libexpr/include/nix/function-trace.hh b/src/libexpr/include/nix/function-trace.hh deleted file mode 100644 index f1729dbc47f..00000000000 --- a/src/libexpr/include/nix/function-trace.hh +++ /dev/null @@ -1,2 +0,0 @@ -#warning "Including nix/function-trace.hh is deprecated. Please include nix/expr/function-trace.hh instead." -#include "nix/expr/function-trace.hh" diff --git a/src/libexpr/include/nix/get-drvs.hh b/src/libexpr/include/nix/get-drvs.hh deleted file mode 100644 index 29a5379cda7..00000000000 --- a/src/libexpr/include/nix/get-drvs.hh +++ /dev/null @@ -1,2 +0,0 @@ -#warning "Including nix/get-drvs.hh is deprecated. Please include nix/expr/get-drvs.hh instead." -#include "nix/expr/get-drvs.hh" diff --git a/src/libexpr/include/nix/json-to-value.hh b/src/libexpr/include/nix/json-to-value.hh deleted file mode 100644 index 15ab368e493..00000000000 --- a/src/libexpr/include/nix/json-to-value.hh +++ /dev/null @@ -1,2 +0,0 @@ -#warning "Including nix/json-to-value.hh is deprecated. Please include nix/expr/json-to-value.hh instead." -#include "nix/expr/json-to-value.hh" diff --git a/src/libexpr/include/nix/nixexpr.hh b/src/libexpr/include/nix/nixexpr.hh deleted file mode 100644 index 1714763a561..00000000000 --- a/src/libexpr/include/nix/nixexpr.hh +++ /dev/null @@ -1,2 +0,0 @@ -#warning "Including nix/nixexpr.hh is deprecated. Please include nix/expr/nixexpr.hh instead." -#include "nix/expr/nixexpr.hh" diff --git a/src/libexpr/include/nix/primops.hh b/src/libexpr/include/nix/primops.hh deleted file mode 100644 index 392dd83a7a6..00000000000 --- a/src/libexpr/include/nix/primops.hh +++ /dev/null @@ -1,2 +0,0 @@ -#warning "Including nix/primops.hh is deprecated. Please include nix/expr/primops.hh instead." -#include "nix/expr/primops.hh" diff --git a/src/libexpr/include/nix/symbol-table.hh b/src/libexpr/include/nix/symbol-table.hh deleted file mode 100644 index 42bd1bb439d..00000000000 --- a/src/libexpr/include/nix/symbol-table.hh +++ /dev/null @@ -1,2 +0,0 @@ -#warning "Including nix/symbol-table.hh is deprecated. Please include nix/expr/symbol-table.hh instead." -#include "nix/expr/symbol-table.hh" diff --git a/src/libexpr/include/nix/value-to-json.hh b/src/libexpr/include/nix/value-to-json.hh deleted file mode 100644 index 4f9bbae0c3b..00000000000 --- a/src/libexpr/include/nix/value-to-json.hh +++ /dev/null @@ -1,2 +0,0 @@ -#warning "Including nix/value-to-json.hh is deprecated. Please include nix/expr/value-to-json.hh instead." -#include "nix/expr/value-to-json.hh" diff --git a/src/libexpr/include/nix/value-to-xml.hh b/src/libexpr/include/nix/value-to-xml.hh deleted file mode 100644 index 94ba22ff5f7..00000000000 --- a/src/libexpr/include/nix/value-to-xml.hh +++ /dev/null @@ -1,2 +0,0 @@ -#warning "Including nix/value-to-xml.hh is deprecated. Please include nix/expr/value-to-xml.hh instead." -#include "nix/expr/value-to-xml.hh" diff --git a/src/libexpr/include/nix/value.hh b/src/libexpr/include/nix/value.hh deleted file mode 100644 index 9f6b496e148..00000000000 --- a/src/libexpr/include/nix/value.hh +++ /dev/null @@ -1,2 +0,0 @@ -#warning "Including nix/value.hh is deprecated. Please include nix/expr/value.hh instead." -#include "nix/expr/value.hh" diff --git a/src/libexpr/include/nix/value/context.hh b/src/libexpr/include/nix/value/context.hh deleted file mode 100644 index d024ad56b27..00000000000 --- a/src/libexpr/include/nix/value/context.hh +++ /dev/null @@ -1,2 +0,0 @@ -#warning "Including nix/value/context.hh is deprecated. Please include nix/expr/value/context.hh instead." -#include "nix/expr/value/context.hh" diff --git a/src/libexpr/local.mk b/src/libexpr/local.mk index 98dd8ad22bb..157cbae7382 100644 --- a/src/libexpr/local.mk +++ b/src/libexpr/local.mk @@ -42,19 +42,6 @@ clean-files += $(d)/parser-tab.cc $(d)/parser-tab.hh $(d)/lexer-tab.cc $(d)/lexe $(eval $(call install-file-in, $(d)/nix-expr.pc, $(libdir)/pkgconfig, 0644)) -# old include paths - -$(foreach i, $(wildcard src/libexpr/include/nix/*.hh), \ - $(eval $(call install-file-in, $(i), $(includedir)/nix, 0644))) - -$(foreach i, $(wildcard src/libexpr/include/nix/value/*.hh), \ - $(eval $(call install-file-in, $(i), $(includedir)/nix/value, 0644))) - -$(foreach i, $(wildcard src/libexpr/include/nix/flake/*.hh), \ - $(eval $(call install-file-in, $(i), $(includedir)/nix/flake, 0644))) - -# new include paths - $(foreach i, $(wildcard src/libexpr/include/nix/expr/*.hh), \ $(eval $(call install-file-in, $(i), $(includedir)/nix/expr, 0644))) diff --git a/src/libfetchers/include/nix/attrs.hh b/src/libfetchers/include/nix/attrs.hh deleted file mode 100644 index d6a69c504c4..00000000000 --- a/src/libfetchers/include/nix/attrs.hh +++ /dev/null @@ -1,2 +0,0 @@ -#warning "Including nix/attrs.hh is deprecated. Please include nix/fetchers/attrs.hh instead." -#include "nix/fetchers/attrs.hh" diff --git a/src/libfetchers/include/nix/cache.hh b/src/libfetchers/include/nix/cache.hh deleted file mode 100644 index 7657b5f8fd2..00000000000 --- a/src/libfetchers/include/nix/cache.hh +++ /dev/null @@ -1,2 +0,0 @@ -#warning "Including nix/cache.hh is deprecated. Please include nix/fetchers/cache.hh instead." -#include "nix/fetchers/cache.hh" diff --git a/src/libfetchers/include/nix/fetch-settings.hh b/src/libfetchers/include/nix/fetch-settings.hh deleted file mode 100644 index b0394b16626..00000000000 --- a/src/libfetchers/include/nix/fetch-settings.hh +++ /dev/null @@ -1,2 +0,0 @@ -#warning "Including nix/fetch-settings.hh is deprecated. Please include nix/fetchers/fetch-settings.hh instead." -#include "nix/fetchers/fetch-settings.hh" diff --git a/src/libfetchers/include/nix/fetchers.hh b/src/libfetchers/include/nix/fetchers.hh deleted file mode 100644 index c5a5678e3bf..00000000000 --- a/src/libfetchers/include/nix/fetchers.hh +++ /dev/null @@ -1,2 +0,0 @@ -#warning "Including nix/fetchers.hh is deprecated. Please include nix/fetchers/fetchers.hh instead." -#include "nix/fetchers/fetchers.hh" diff --git a/src/libfetchers/include/nix/registry.hh b/src/libfetchers/include/nix/registry.hh deleted file mode 100644 index 4d7a364114b..00000000000 --- a/src/libfetchers/include/nix/registry.hh +++ /dev/null @@ -1,2 +0,0 @@ -#warning "Including nix/registry.hh is deprecated. Please include nix/fetchers/registry.hh instead." -#include "nix/fetchers/registry.hh" diff --git a/src/libfetchers/local.mk b/src/libfetchers/local.mk index 1d10b653170..954b2b3935d 100644 --- a/src/libfetchers/local.mk +++ b/src/libfetchers/local.mk @@ -15,12 +15,5 @@ libfetchers_LDFLAGS += -pthread libfetchers_LIBS = libutil libstore -# old include paths - -$(foreach i, $(wildcard src/libfetchers/include/nix/*.hh), \ - $(eval $(call install-file-in, $(i), $(includedir)/nix, 0644))) - -# new include paths - $(foreach i, $(wildcard src/libfetchers/include/nix/fetchers/*.hh), \ $(eval $(call install-file-in, $(i), $(includedir)/nix/fetchers, 0644))) diff --git a/src/libmain/include/nix/common-args.hh b/src/libmain/include/nix/common-args.hh deleted file mode 100644 index 7510648146e..00000000000 --- a/src/libmain/include/nix/common-args.hh +++ /dev/null @@ -1,2 +0,0 @@ -#warning "Including nix/common-args.hh is deprecated. Please include nix/main/common-args.hh instead." -#include "nix/main/common-args.hh" diff --git a/src/libmain/include/nix/loggers.hh b/src/libmain/include/nix/loggers.hh deleted file mode 100644 index e346a6c23f5..00000000000 --- a/src/libmain/include/nix/loggers.hh +++ /dev/null @@ -1,2 +0,0 @@ -#warning "Including nix/loggers.hh is deprecated. Please include nix/main/loggers.hh instead." -#include "nix/main/loggers.hh" diff --git a/src/libmain/include/nix/progress-bar.hh b/src/libmain/include/nix/progress-bar.hh deleted file mode 100644 index b15e0f5c2b9..00000000000 --- a/src/libmain/include/nix/progress-bar.hh +++ /dev/null @@ -1,2 +0,0 @@ -#warning "Including nix/progress-bar.hh is deprecated. Please include nix/main/progress-bar.hh instead." -#include "nix/main/progress-bar.hh" diff --git a/src/libmain/include/nix/shared.hh b/src/libmain/include/nix/shared.hh deleted file mode 100644 index a2530026725..00000000000 --- a/src/libmain/include/nix/shared.hh +++ /dev/null @@ -1,2 +0,0 @@ -#warning "Including nix/shared.hh is deprecated. Please include nix/main/shared.hh instead." -#include "nix/main/shared.hh" diff --git a/src/libmain/local.mk b/src/libmain/local.mk index 5a237a73db9..c1161bcda5a 100644 --- a/src/libmain/local.mk +++ b/src/libmain/local.mk @@ -19,12 +19,5 @@ libmain_ALLOW_UNDEFINED = 1 $(eval $(call install-file-in, $(d)/nix-main.pc, $(libdir)/pkgconfig, 0644)) -# old include paths - -$(foreach i, $(wildcard src/libmain/include/nix/*.hh), \ - $(eval $(call install-file-in, $(i), $(includedir)/nix, 0644))) - -# new include paths - $(foreach i, $(wildcard src/libmain/include/nix/main/*.hh), \ $(eval $(call install-file-in, $(i), $(includedir)/nix/main, 0644))) diff --git a/src/libstore/include/nix/binary-cache-store.hh b/src/libstore/include/nix/binary-cache-store.hh deleted file mode 100644 index aedebcb3643..00000000000 --- a/src/libstore/include/nix/binary-cache-store.hh +++ /dev/null @@ -1,2 +0,0 @@ -#warning "Including nix/binary-cache-store.hh is deprecated. Please include nix/store/binary-cache-store.hh instead." -#include "nix/store/binary-cache-store.hh" diff --git a/src/libstore/include/nix/build-result.hh b/src/libstore/include/nix/build-result.hh deleted file mode 100644 index 8ff6d00af3a..00000000000 --- a/src/libstore/include/nix/build-result.hh +++ /dev/null @@ -1,2 +0,0 @@ -#warning "Including nix/build-result.hh is deprecated. Please include nix/store/build-result.hh instead." -#include "nix/store/build-result.hh" diff --git a/src/libstore/include/nix/build/derivation-goal.hh b/src/libstore/include/nix/build/derivation-goal.hh deleted file mode 100644 index d714bfc9db7..00000000000 --- a/src/libstore/include/nix/build/derivation-goal.hh +++ /dev/null @@ -1,2 +0,0 @@ -#warning "Including nix/build/derivation-goal.hh is deprecated. Please include nix/store/build/derivation-goal.hh instead." -#include "nix/store/build/derivation-goal.hh" diff --git a/src/libstore/include/nix/build/drv-output-substitution-goal.hh b/src/libstore/include/nix/build/drv-output-substitution-goal.hh deleted file mode 100644 index 5bc3db353f1..00000000000 --- a/src/libstore/include/nix/build/drv-output-substitution-goal.hh +++ /dev/null @@ -1,2 +0,0 @@ -#warning "Including nix/build/drv-output-substitution-goal.hh is deprecated. Please include nix/store/build/drv-output-substitution-goal.hh instead." -#include "nix/store/build/drv-output-substitution-goal.hh" diff --git a/src/libstore/include/nix/build/goal.hh b/src/libstore/include/nix/build/goal.hh deleted file mode 100644 index 5d74763f4ed..00000000000 --- a/src/libstore/include/nix/build/goal.hh +++ /dev/null @@ -1,2 +0,0 @@ -#warning "Including nix/build/goal.hh is deprecated. Please include nix/store/build/goal.hh instead." -#include "nix/store/build/goal.hh" diff --git a/src/libstore/include/nix/build/hook-instance.hh b/src/libstore/include/nix/build/hook-instance.hh deleted file mode 100644 index bdd93f6f129..00000000000 --- a/src/libstore/include/nix/build/hook-instance.hh +++ /dev/null @@ -1,2 +0,0 @@ -#warning "Including nix/build/hook-instance.hh is deprecated. Please include nix/store/build/hook-instance.hh instead." -#include "nix/store/build/hook-instance.hh" diff --git a/src/libstore/include/nix/build/local-derivation-goal.hh b/src/libstore/include/nix/build/local-derivation-goal.hh deleted file mode 100644 index 99fc1e74d1b..00000000000 --- a/src/libstore/include/nix/build/local-derivation-goal.hh +++ /dev/null @@ -1,2 +0,0 @@ -#warning "Including nix/build/local-derivation-goal.hh is deprecated. Please include nix/store/build/local-derivation-goal.hh instead." -#include "nix/store/build/local-derivation-goal.hh" diff --git a/src/libstore/include/nix/build/personality.hh b/src/libstore/include/nix/build/personality.hh deleted file mode 100644 index 527674fe281..00000000000 --- a/src/libstore/include/nix/build/personality.hh +++ /dev/null @@ -1,2 +0,0 @@ -#warning "Including nix/build/personality.hh is deprecated. Please include nix/store/build/personality.hh instead." -#include "nix/store/build/personality.hh" diff --git a/src/libstore/include/nix/build/substitution-goal.hh b/src/libstore/include/nix/build/substitution-goal.hh deleted file mode 100644 index 04c14bce776..00000000000 --- a/src/libstore/include/nix/build/substitution-goal.hh +++ /dev/null @@ -1,2 +0,0 @@ -#warning "Including nix/build/substitution-goal.hh is deprecated. Please include nix/store/build/substitution-goal.hh instead." -#include "nix/store/build/substitution-goal.hh" diff --git a/src/libstore/include/nix/build/worker.hh b/src/libstore/include/nix/build/worker.hh deleted file mode 100644 index 3b682b1b935..00000000000 --- a/src/libstore/include/nix/build/worker.hh +++ /dev/null @@ -1,2 +0,0 @@ -#warning "Including nix/build/worker.hh is deprecated. Please include nix/store/build/worker.hh instead." -#include "nix/store/build/worker.hh" diff --git a/src/libstore/include/nix/builtins.hh b/src/libstore/include/nix/builtins.hh deleted file mode 100644 index 78d1af9dde8..00000000000 --- a/src/libstore/include/nix/builtins.hh +++ /dev/null @@ -1,2 +0,0 @@ -#warning "Including nix/builtins.hh is deprecated. Please include nix/store/builtins.hh instead." -#include "nix/store/builtins.hh" diff --git a/src/libstore/include/nix/builtins/buildenv.hh b/src/libstore/include/nix/builtins/buildenv.hh deleted file mode 100644 index 813aac24b4e..00000000000 --- a/src/libstore/include/nix/builtins/buildenv.hh +++ /dev/null @@ -1,2 +0,0 @@ -#warning "Including nix/builtins/buildenv.hh is deprecated. Please include nix/store/builtins/buildenv.hh instead." -#include "nix/store/builtins/buildenv.hh" diff --git a/src/libstore/include/nix/content-address.hh b/src/libstore/include/nix/content-address.hh deleted file mode 100644 index cac239428f2..00000000000 --- a/src/libstore/include/nix/content-address.hh +++ /dev/null @@ -1,2 +0,0 @@ -#warning "Including nix/content-address.hh is deprecated. Please include nix/store/content-address.hh instead." -#include "nix/store/content-address.hh" diff --git a/src/libstore/include/nix/crypto.hh b/src/libstore/include/nix/crypto.hh deleted file mode 100644 index a3518e424db..00000000000 --- a/src/libstore/include/nix/crypto.hh +++ /dev/null @@ -1,2 +0,0 @@ -#warning "Including nix/crypto.hh is deprecated. Please include nix/store/crypto.hh instead." -#include "nix/store/crypto.hh" diff --git a/src/libstore/include/nix/daemon.hh b/src/libstore/include/nix/daemon.hh deleted file mode 100644 index 97679b28629..00000000000 --- a/src/libstore/include/nix/daemon.hh +++ /dev/null @@ -1,2 +0,0 @@ -#warning "Including nix/daemon.hh is deprecated. Please include nix/store/daemon.hh instead." -#include "nix/store/daemon.hh" diff --git a/src/libstore/include/nix/derivations.hh b/src/libstore/include/nix/derivations.hh deleted file mode 100644 index 65caa82369d..00000000000 --- a/src/libstore/include/nix/derivations.hh +++ /dev/null @@ -1,2 +0,0 @@ -#warning "Including nix/derivations.hh is deprecated. Please include nix/store/derivations.hh instead." -#include "nix/store/derivations.hh" diff --git a/src/libstore/include/nix/derived-path.hh b/src/libstore/include/nix/derived-path.hh deleted file mode 100644 index 0f3075eef2c..00000000000 --- a/src/libstore/include/nix/derived-path.hh +++ /dev/null @@ -1,2 +0,0 @@ -#warning "Including nix/derived-path.hh is deprecated. Please include nix/store/derived-path.hh instead." -#include "nix/store/derived-path.hh" diff --git a/src/libstore/include/nix/filetransfer.hh b/src/libstore/include/nix/filetransfer.hh deleted file mode 100644 index 757bad24b9d..00000000000 --- a/src/libstore/include/nix/filetransfer.hh +++ /dev/null @@ -1,2 +0,0 @@ -#warning "Including nix/filetransfer.hh is deprecated. Please include nix/store/filetransfer.hh instead." -#include "nix/store/filetransfer.hh" diff --git a/src/libstore/include/nix/fs-accessor.hh b/src/libstore/include/nix/fs-accessor.hh deleted file mode 100644 index e2357cfbcc7..00000000000 --- a/src/libstore/include/nix/fs-accessor.hh +++ /dev/null @@ -1,2 +0,0 @@ -#warning "Including nix/fs-accessor.hh is deprecated. Please include nix/store/fs-accessor.hh instead." -#include "nix/store/fs-accessor.hh" diff --git a/src/libstore/include/nix/gc-store.hh b/src/libstore/include/nix/gc-store.hh deleted file mode 100644 index 5c448d93e1d..00000000000 --- a/src/libstore/include/nix/gc-store.hh +++ /dev/null @@ -1,2 +0,0 @@ -#warning "Including nix/gc-store.hh is deprecated. Please include nix/store/gc-store.hh instead." -#include "nix/store/gc-store.hh" diff --git a/src/libstore/include/nix/globals.hh b/src/libstore/include/nix/globals.hh deleted file mode 100644 index cee5b0ab49a..00000000000 --- a/src/libstore/include/nix/globals.hh +++ /dev/null @@ -1,2 +0,0 @@ -#warning "Including nix/globals.hh is deprecated. Please include nix/store/globals.hh instead." -#include "nix/store/globals.hh" diff --git a/src/libstore/include/nix/local-fs-store.hh b/src/libstore/include/nix/local-fs-store.hh deleted file mode 100644 index 6a2713c2ff0..00000000000 --- a/src/libstore/include/nix/local-fs-store.hh +++ /dev/null @@ -1,2 +0,0 @@ -#warning "Including nix/local-fs-store.hh is deprecated. Please include nix/store/local-fs-store.hh instead." -#include "nix/store/local-fs-store.hh" diff --git a/src/libstore/include/nix/local-store.hh b/src/libstore/include/nix/local-store.hh deleted file mode 100644 index 373b3d6c893..00000000000 --- a/src/libstore/include/nix/local-store.hh +++ /dev/null @@ -1,2 +0,0 @@ -#warning "Including nix/local-store.hh is deprecated. Please include nix/store/local-store.hh instead." -#include "nix/store/local-store.hh" diff --git a/src/libstore/include/nix/lock.hh b/src/libstore/include/nix/lock.hh deleted file mode 100644 index 31480d8c17d..00000000000 --- a/src/libstore/include/nix/lock.hh +++ /dev/null @@ -1,2 +0,0 @@ -#warning "Including nix/lock.hh is deprecated. Please include nix/store/lock.hh instead." -#include "nix/store/lock.hh" diff --git a/src/libstore/include/nix/log-store.hh b/src/libstore/include/nix/log-store.hh deleted file mode 100644 index 09a3850ea48..00000000000 --- a/src/libstore/include/nix/log-store.hh +++ /dev/null @@ -1,2 +0,0 @@ -#warning "Including nix/log-store.hh is deprecated. Please include nix/store/log-store.hh instead." -#include "nix/store/log-store.hh" diff --git a/src/libstore/include/nix/machines.hh b/src/libstore/include/nix/machines.hh deleted file mode 100644 index df2f32978c7..00000000000 --- a/src/libstore/include/nix/machines.hh +++ /dev/null @@ -1,2 +0,0 @@ -#warning "Including nix/machines.hh is deprecated. Please include nix/store/machines.hh instead." -#include "nix/store/machines.hh" diff --git a/src/libstore/include/nix/make-content-addressed.hh b/src/libstore/include/nix/make-content-addressed.hh deleted file mode 100644 index aa31bb3d314..00000000000 --- a/src/libstore/include/nix/make-content-addressed.hh +++ /dev/null @@ -1,2 +0,0 @@ -#warning "Including nix/make-content-addressed.hh is deprecated. Please include nix/store/make-content-addressed.hh instead." -#include "nix/store/make-content-addressed.hh" diff --git a/src/libstore/include/nix/names.hh b/src/libstore/include/nix/names.hh deleted file mode 100644 index 12d739c2953..00000000000 --- a/src/libstore/include/nix/names.hh +++ /dev/null @@ -1,2 +0,0 @@ -#warning "Including nix/names.hh is deprecated. Please include nix/store/names.hh instead." -#include "nix/store/names.hh" diff --git a/src/libstore/include/nix/nar-accessor.hh b/src/libstore/include/nix/nar-accessor.hh deleted file mode 100644 index 662676b9c71..00000000000 --- a/src/libstore/include/nix/nar-accessor.hh +++ /dev/null @@ -1,2 +0,0 @@ -#warning "Including nix/nar-accessor.hh is deprecated. Please include nix/store/nar-accessor.hh instead." -#include "nix/store/nar-accessor.hh" diff --git a/src/libstore/include/nix/nar-info-disk-cache.hh b/src/libstore/include/nix/nar-info-disk-cache.hh deleted file mode 100644 index 093e9b87101..00000000000 --- a/src/libstore/include/nix/nar-info-disk-cache.hh +++ /dev/null @@ -1,2 +0,0 @@ -#warning "Including nix/nar-info-disk-cache.hh is deprecated. Please include nix/store/nar-info-disk-cache.hh instead." -#include "nix/store/nar-info-disk-cache.hh" diff --git a/src/libstore/include/nix/nar-info.hh b/src/libstore/include/nix/nar-info.hh deleted file mode 100644 index 1f87d6509d5..00000000000 --- a/src/libstore/include/nix/nar-info.hh +++ /dev/null @@ -1,2 +0,0 @@ -#warning "Including nix/nar-info.hh is deprecated. Please include nix/store/nar-info.hh instead." -#include "nix/store/nar-info.hh" diff --git a/src/libstore/include/nix/outputs-spec.hh b/src/libstore/include/nix/outputs-spec.hh deleted file mode 100644 index 811958cbe63..00000000000 --- a/src/libstore/include/nix/outputs-spec.hh +++ /dev/null @@ -1,2 +0,0 @@ -#warning "Including nix/outputs-spec.hh is deprecated. Please include nix/store/outputs-spec.hh instead." -#include "nix/store/outputs-spec.hh" diff --git a/src/libstore/include/nix/parsed-derivations.hh b/src/libstore/include/nix/parsed-derivations.hh deleted file mode 100644 index f82a0f41eb6..00000000000 --- a/src/libstore/include/nix/parsed-derivations.hh +++ /dev/null @@ -1,2 +0,0 @@ -#warning "Including nix/parsed-derivations.hh is deprecated. Please include nix/store/parsed-derivations.hh instead." -#include "nix/store/parsed-derivations.hh" diff --git a/src/libstore/include/nix/path-info.hh b/src/libstore/include/nix/path-info.hh deleted file mode 100644 index 73866459d6c..00000000000 --- a/src/libstore/include/nix/path-info.hh +++ /dev/null @@ -1,2 +0,0 @@ -#warning "Including nix/path-info.hh is deprecated. Please include nix/store/path-info.hh instead." -#include "nix/store/path-info.hh" diff --git a/src/libstore/include/nix/path-regex.hh b/src/libstore/include/nix/path-regex.hh deleted file mode 100644 index 3b5d6430038..00000000000 --- a/src/libstore/include/nix/path-regex.hh +++ /dev/null @@ -1,2 +0,0 @@ -#warning "Including nix/path-regex.hh is deprecated. Please include nix/store/path-regex.hh instead." -#include "nix/store/path-regex.hh" diff --git a/src/libstore/include/nix/path-with-outputs.hh b/src/libstore/include/nix/path-with-outputs.hh deleted file mode 100644 index 82ce4589e03..00000000000 --- a/src/libstore/include/nix/path-with-outputs.hh +++ /dev/null @@ -1,2 +0,0 @@ -#warning "Including nix/path-with-outputs.hh is deprecated. Please include nix/store/path-with-outputs.hh instead." -#include "nix/store/path-with-outputs.hh" diff --git a/src/libstore/include/nix/path.hh b/src/libstore/include/nix/path.hh deleted file mode 100644 index 260891ddf64..00000000000 --- a/src/libstore/include/nix/path.hh +++ /dev/null @@ -1,2 +0,0 @@ -#warning "Including nix/path.hh is deprecated. Please include nix/store/path.hh instead." -#include "nix/store/path.hh" diff --git a/src/libstore/include/nix/pathlocks.hh b/src/libstore/include/nix/pathlocks.hh deleted file mode 100644 index 6d77a1bc6cf..00000000000 --- a/src/libstore/include/nix/pathlocks.hh +++ /dev/null @@ -1,2 +0,0 @@ -#warning "Including nix/pathlocks.hh is deprecated. Please include nix/store/pathlocks.hh instead." -#include "nix/store/pathlocks.hh" diff --git a/src/libstore/include/nix/profiles.hh b/src/libstore/include/nix/profiles.hh deleted file mode 100644 index f2e71095695..00000000000 --- a/src/libstore/include/nix/profiles.hh +++ /dev/null @@ -1,2 +0,0 @@ -#warning "Including nix/profiles.hh is deprecated. Please include nix/store/profiles.hh instead." -#include "nix/store/profiles.hh" diff --git a/src/libstore/include/nix/realisation.hh b/src/libstore/include/nix/realisation.hh deleted file mode 100644 index f2f170e4ddd..00000000000 --- a/src/libstore/include/nix/realisation.hh +++ /dev/null @@ -1,2 +0,0 @@ -#warning "Including nix/realisation.hh is deprecated. Please include nix/store/realisation.hh instead." -#include "nix/store/realisation.hh" diff --git a/src/libstore/include/nix/references.hh b/src/libstore/include/nix/references.hh deleted file mode 100644 index 3c9f21c4caa..00000000000 --- a/src/libstore/include/nix/references.hh +++ /dev/null @@ -1,2 +0,0 @@ -#warning "Including nix/references.hh is deprecated. Please include nix/store/references.hh instead." -#include "nix/store/references.hh" diff --git a/src/libstore/include/nix/remote-fs-accessor.hh b/src/libstore/include/nix/remote-fs-accessor.hh deleted file mode 100644 index beecb03c406..00000000000 --- a/src/libstore/include/nix/remote-fs-accessor.hh +++ /dev/null @@ -1,2 +0,0 @@ -#warning "Including nix/remote-fs-accessor.hh is deprecated. Please include nix/store/remote-fs-accessor.hh instead." -#include "nix/store/remote-fs-accessor.hh" diff --git a/src/libstore/include/nix/remote-store.hh b/src/libstore/include/nix/remote-store.hh deleted file mode 100644 index f02b00e8de9..00000000000 --- a/src/libstore/include/nix/remote-store.hh +++ /dev/null @@ -1,2 +0,0 @@ -#warning "Including nix/remote-store.hh is deprecated. Please include nix/store/remote-store.hh instead." -#include "nix/store/remote-store.hh" diff --git a/src/libstore/include/nix/repair-flag.hh b/src/libstore/include/nix/repair-flag.hh deleted file mode 100644 index 8a43b84b7c3..00000000000 --- a/src/libstore/include/nix/repair-flag.hh +++ /dev/null @@ -1,2 +0,0 @@ -#warning "Including nix/repair-flag.hh is deprecated. Please include nix/store/repair-flag.hh instead." -#include "nix/store/repair-flag.hh" diff --git a/src/libstore/include/nix/s3-binary-cache-store.hh b/src/libstore/include/nix/s3-binary-cache-store.hh deleted file mode 100644 index ff87cd6f3a3..00000000000 --- a/src/libstore/include/nix/s3-binary-cache-store.hh +++ /dev/null @@ -1,2 +0,0 @@ -#warning "Including nix/s3-binary-cache-store.hh is deprecated. Please include nix/store/s3-binary-cache-store.hh instead." -#include "nix/store/s3-binary-cache-store.hh" diff --git a/src/libstore/include/nix/s3.hh b/src/libstore/include/nix/s3.hh deleted file mode 100644 index 862b6ab8f56..00000000000 --- a/src/libstore/include/nix/s3.hh +++ /dev/null @@ -1,2 +0,0 @@ -#warning "Including nix/s3.hh is deprecated. Please include nix/store/s3.hh instead." -#include "nix/store/s3.hh" diff --git a/src/libstore/include/nix/serve-protocol.hh b/src/libstore/include/nix/serve-protocol.hh deleted file mode 100644 index a4ee2b0a3cc..00000000000 --- a/src/libstore/include/nix/serve-protocol.hh +++ /dev/null @@ -1,2 +0,0 @@ -#warning "Including nix/serve-protocol.hh is deprecated. Please include nix/store/serve-protocol.hh instead." -#include "nix/store/serve-protocol.hh" diff --git a/src/libstore/include/nix/sqlite.hh b/src/libstore/include/nix/sqlite.hh deleted file mode 100644 index cbb3ce054ba..00000000000 --- a/src/libstore/include/nix/sqlite.hh +++ /dev/null @@ -1,2 +0,0 @@ -#warning "Including nix/sqlite.hh is deprecated. Please include nix/store/sqlite.hh instead." -#include "nix/store/sqlite.hh" diff --git a/src/libstore/include/nix/ssh.hh b/src/libstore/include/nix/ssh.hh deleted file mode 100644 index 76e4f083e27..00000000000 --- a/src/libstore/include/nix/ssh.hh +++ /dev/null @@ -1,2 +0,0 @@ -#warning "Including nix/ssh.hh is deprecated. Please include nix/store/ssh.hh instead." -#include "nix/store/ssh.hh" diff --git a/src/libstore/include/nix/store-api.hh b/src/libstore/include/nix/store-api.hh deleted file mode 100644 index 18444af0bab..00000000000 --- a/src/libstore/include/nix/store-api.hh +++ /dev/null @@ -1,2 +0,0 @@ -#warning "Including nix/store-api.hh is deprecated. Please include nix/store/store-api.hh instead." -#include "nix/store/store-api.hh" diff --git a/src/libstore/include/nix/store-cast.hh b/src/libstore/include/nix/store-cast.hh deleted file mode 100644 index 057ba39c4d5..00000000000 --- a/src/libstore/include/nix/store-cast.hh +++ /dev/null @@ -1,2 +0,0 @@ -#warning "Including nix/store-cast.hh is deprecated. Please include nix/store/store-cast.hh instead." -#include "nix/store/store-cast.hh" diff --git a/src/libstore/include/nix/uds-remote-store.hh b/src/libstore/include/nix/uds-remote-store.hh deleted file mode 100644 index 7abc62256e5..00000000000 --- a/src/libstore/include/nix/uds-remote-store.hh +++ /dev/null @@ -1,2 +0,0 @@ -#warning "Including nix/uds-remote-store.hh is deprecated. Please include nix/store/uds-remote-store.hh instead." -#include "nix/store/uds-remote-store.hh" diff --git a/src/libstore/include/nix/worker-protocol.hh b/src/libstore/include/nix/worker-protocol.hh deleted file mode 100644 index e467bf01fbb..00000000000 --- a/src/libstore/include/nix/worker-protocol.hh +++ /dev/null @@ -1,2 +0,0 @@ -#warning "Including nix/worker-protocol.hh is deprecated. Please include nix/store/worker-protocol.hh instead." -#include "nix/store/worker-protocol.hh" diff --git a/src/libstore/local.mk b/src/libstore/local.mk index f913d31a6c7..bade5dd68e9 100644 --- a/src/libstore/local.mk +++ b/src/libstore/local.mk @@ -68,19 +68,6 @@ clean-files += $(d)/schema.sql.gen.hh $(d)/ca-specific-schema.sql.gen.hh $(eval $(call install-file-in, $(d)/nix-store.pc, $(libdir)/pkgconfig, 0644)) -# old include paths - -$(foreach i, $(wildcard src/libstore/include/nix/*.hh), \ - $(eval $(call install-file-in, $(i), $(includedir)/nix, 0644))) - -$(foreach i, $(wildcard src/libstore/include/nix/builtins/*.hh), \ - $(eval $(call install-file-in, $(i), $(includedir)/nix/builtins, 0644))) - -$(foreach i, $(wildcard src/libstore/include/nix/build/*.hh), \ - $(eval $(call install-file-in, $(i), $(includedir)/nix/build, 0644))) - -# new include paths - $(foreach i, $(wildcard src/libstore/include/nix/store/*.hh), \ $(eval $(call install-file-in, $(i), $(includedir)/nix/store, 0644))) diff --git a/src/libutil/include/nix/abstract-setting-to-json.hh b/src/libutil/include/nix/abstract-setting-to-json.hh deleted file mode 100644 index 38a97e91da5..00000000000 --- a/src/libutil/include/nix/abstract-setting-to-json.hh +++ /dev/null @@ -1,2 +0,0 @@ -#warning "Including nix/abstract-setting-to-json.hh is deprecated. Please include nix/util/abstract-setting-to-json.hh instead." -#include "nix/util/abstract-setting-to-json.hh" diff --git a/src/libutil/include/nix/ansicolor.hh b/src/libutil/include/nix/ansicolor.hh deleted file mode 100644 index 9bbc6c6b3ae..00000000000 --- a/src/libutil/include/nix/ansicolor.hh +++ /dev/null @@ -1,2 +0,0 @@ -#warning "Including nix/ansicolor.hh is deprecated. Please include nix/util/ansicolor.hh instead." -#include "nix/util/ansicolor.hh" diff --git a/src/libutil/include/nix/archive.hh b/src/libutil/include/nix/archive.hh deleted file mode 100644 index 4b4b077453d..00000000000 --- a/src/libutil/include/nix/archive.hh +++ /dev/null @@ -1,2 +0,0 @@ -#warning "Including nix/archive.hh is deprecated. Please include nix/util/archive.hh instead." -#include "nix/util/archive.hh" diff --git a/src/libutil/include/nix/args.hh b/src/libutil/include/nix/args.hh deleted file mode 100644 index 76c7b9e4b36..00000000000 --- a/src/libutil/include/nix/args.hh +++ /dev/null @@ -1,2 +0,0 @@ -#warning "Including nix/args.hh is deprecated. Please include nix/util/args.hh instead." -#include "nix/util/args.hh" diff --git a/src/libutil/include/nix/callback.hh b/src/libutil/include/nix/callback.hh deleted file mode 100644 index d8aee129a3c..00000000000 --- a/src/libutil/include/nix/callback.hh +++ /dev/null @@ -1,2 +0,0 @@ -#warning "Including nix/callback.hh is deprecated. Please include nix/util/callback.hh instead." -#include "nix/util/callback.hh" diff --git a/src/libutil/include/nix/canon-path.hh b/src/libutil/include/nix/canon-path.hh deleted file mode 100644 index 60e83eb663b..00000000000 --- a/src/libutil/include/nix/canon-path.hh +++ /dev/null @@ -1,2 +0,0 @@ -#warning "Including nix/canon-path.hh is deprecated. Please include nix/util/canon-path.hh instead." -#include "nix/util/canon-path.hh" diff --git a/src/libutil/include/nix/cgroup.hh b/src/libutil/include/nix/cgroup.hh deleted file mode 100644 index 580aa805ed6..00000000000 --- a/src/libutil/include/nix/cgroup.hh +++ /dev/null @@ -1,2 +0,0 @@ -#warning "Including nix/cgroup.hh is deprecated. Please include nix/util/cgroup.hh instead." -#include "nix/util/cgroup.hh" diff --git a/src/libutil/include/nix/chunked-vector.hh b/src/libutil/include/nix/chunked-vector.hh deleted file mode 100644 index 0ba3a3d3cf3..00000000000 --- a/src/libutil/include/nix/chunked-vector.hh +++ /dev/null @@ -1,2 +0,0 @@ -#warning "Including nix/chunked-vector.hh is deprecated. Please include nix/util/chunked-vector.hh instead." -#include "nix/util/chunked-vector.hh" diff --git a/src/libutil/include/nix/closure.hh b/src/libutil/include/nix/closure.hh deleted file mode 100644 index 46982717358..00000000000 --- a/src/libutil/include/nix/closure.hh +++ /dev/null @@ -1,2 +0,0 @@ -#warning "Including nix/closure.hh is deprecated. Please include nix/util/closure.hh instead." -#include "nix/util/closure.hh" diff --git a/src/libutil/include/nix/comparator.hh b/src/libutil/include/nix/comparator.hh deleted file mode 100644 index e068cc972e2..00000000000 --- a/src/libutil/include/nix/comparator.hh +++ /dev/null @@ -1,2 +0,0 @@ -#warning "Including nix/comparator.hh is deprecated. Please include nix/util/comparator.hh instead." -#include "nix/util/comparator.hh" diff --git a/src/libutil/include/nix/compression.hh b/src/libutil/include/nix/compression.hh deleted file mode 100644 index 6d031710b34..00000000000 --- a/src/libutil/include/nix/compression.hh +++ /dev/null @@ -1,2 +0,0 @@ -#warning "Including nix/compression.hh is deprecated. Please include nix/util/compression.hh instead." -#include "nix/util/compression.hh" diff --git a/src/libutil/include/nix/compute-levels.hh b/src/libutil/include/nix/compute-levels.hh deleted file mode 100644 index f9a8279d78a..00000000000 --- a/src/libutil/include/nix/compute-levels.hh +++ /dev/null @@ -1,2 +0,0 @@ -#warning "Including nix/compute-levels.hh is deprecated. Please include nix/util/compute-levels.hh instead." -#include "nix/util/compute-levels.hh" diff --git a/src/libutil/include/nix/config.hh b/src/libutil/include/nix/config.hh deleted file mode 100644 index 273c284c5c5..00000000000 --- a/src/libutil/include/nix/config.hh +++ /dev/null @@ -1,2 +0,0 @@ -#warning "Including nix/config.hh is deprecated. Please include nix/util/config.hh instead." -#include "nix/util/config.hh" diff --git a/src/libutil/include/nix/error.hh b/src/libutil/include/nix/error.hh deleted file mode 100644 index b5554a84536..00000000000 --- a/src/libutil/include/nix/error.hh +++ /dev/null @@ -1,2 +0,0 @@ -#warning "Including nix/error.hh is deprecated. Please include nix/util/error.hh instead." -#include "nix/util/error.hh" diff --git a/src/libutil/include/nix/experimental-features.hh b/src/libutil/include/nix/experimental-features.hh deleted file mode 100644 index 2d9cb356347..00000000000 --- a/src/libutil/include/nix/experimental-features.hh +++ /dev/null @@ -1,2 +0,0 @@ -#warning "Including nix/experimental-features.hh is deprecated. Please include nix/util/experimental-features.hh instead." -#include "nix/util/experimental-features.hh" diff --git a/src/libutil/include/nix/finally.hh b/src/libutil/include/nix/finally.hh deleted file mode 100644 index a6e989767cf..00000000000 --- a/src/libutil/include/nix/finally.hh +++ /dev/null @@ -1,2 +0,0 @@ -#warning "Including nix/finally.hh is deprecated. Please include nix/util/finally.hh instead." -#include "nix/util/finally.hh" diff --git a/src/libutil/include/nix/fmt.hh b/src/libutil/include/nix/fmt.hh deleted file mode 100644 index 3da05b63900..00000000000 --- a/src/libutil/include/nix/fmt.hh +++ /dev/null @@ -1,2 +0,0 @@ -#warning "Including nix/fmt.hh is deprecated. Please include nix/util/fmt.hh instead." -#include "nix/util/fmt.hh" diff --git a/src/libutil/include/nix/git.hh b/src/libutil/include/nix/git.hh deleted file mode 100644 index d8fdb53d2d2..00000000000 --- a/src/libutil/include/nix/git.hh +++ /dev/null @@ -1,2 +0,0 @@ -#warning "Including nix/git.hh is deprecated. Please include nix/util/git.hh instead." -#include "nix/util/git.hh" diff --git a/src/libutil/include/nix/hash.hh b/src/libutil/include/nix/hash.hh deleted file mode 100644 index f97ae3b05f6..00000000000 --- a/src/libutil/include/nix/hash.hh +++ /dev/null @@ -1,2 +0,0 @@ -#warning "Including nix/hash.hh is deprecated. Please include nix/util/hash.hh instead." -#include "nix/util/hash.hh" diff --git a/src/libutil/include/nix/hilite.hh b/src/libutil/include/nix/hilite.hh deleted file mode 100644 index 039700dff7c..00000000000 --- a/src/libutil/include/nix/hilite.hh +++ /dev/null @@ -1,2 +0,0 @@ -#warning "Including nix/hilite.hh is deprecated. Please include nix/util/hilite.hh instead." -#include "nix/util/hilite.hh" diff --git a/src/libutil/include/nix/json-impls.hh b/src/libutil/include/nix/json-impls.hh deleted file mode 100644 index 07c6bc628fc..00000000000 --- a/src/libutil/include/nix/json-impls.hh +++ /dev/null @@ -1,2 +0,0 @@ -#warning "Including nix/json-impls.hh is deprecated. Please include nix/util/json-impls.hh instead." -#include "nix/util/json-impls.hh" diff --git a/src/libutil/include/nix/json-utils.hh b/src/libutil/include/nix/json-utils.hh deleted file mode 100644 index 69b3bd8ffd0..00000000000 --- a/src/libutil/include/nix/json-utils.hh +++ /dev/null @@ -1,2 +0,0 @@ -#warning "Including nix/json-utils.hh is deprecated. Please include nix/util/json-utils.hh instead." -#include "nix/util/json-utils.hh" diff --git a/src/libutil/include/nix/logging.hh b/src/libutil/include/nix/logging.hh deleted file mode 100644 index 138a21d9450..00000000000 --- a/src/libutil/include/nix/logging.hh +++ /dev/null @@ -1,2 +0,0 @@ -#warning "Including nix/logging.hh is deprecated. Please include nix/util/logging.hh instead." -#include "nix/util/logging.hh" diff --git a/src/libutil/include/nix/lru-cache.hh b/src/libutil/include/nix/lru-cache.hh deleted file mode 100644 index e098e8efb21..00000000000 --- a/src/libutil/include/nix/lru-cache.hh +++ /dev/null @@ -1,2 +0,0 @@ -#warning "Including nix/lru-cache.hh is deprecated. Please include nix/util/lru-cache.hh instead." -#include "nix/util/lru-cache.hh" diff --git a/src/libutil/include/nix/monitor-fd.hh b/src/libutil/include/nix/monitor-fd.hh deleted file mode 100644 index cb42029e92a..00000000000 --- a/src/libutil/include/nix/monitor-fd.hh +++ /dev/null @@ -1,2 +0,0 @@ -#warning "Including nix/monitor-fd.hh is deprecated. Please include nix/util/monitor-fd.hh instead." -#include "nix/util/monitor-fd.hh" diff --git a/src/libutil/include/nix/namespaces.hh b/src/libutil/include/nix/namespaces.hh deleted file mode 100644 index 58abe850268..00000000000 --- a/src/libutil/include/nix/namespaces.hh +++ /dev/null @@ -1,2 +0,0 @@ -#warning "Including nix/namespaces.hh is deprecated. Please include nix/util/namespaces.hh instead." -#include "nix/util/namespaces.hh" diff --git a/src/libutil/include/nix/pool.hh b/src/libutil/include/nix/pool.hh deleted file mode 100644 index 0b75427c7cc..00000000000 --- a/src/libutil/include/nix/pool.hh +++ /dev/null @@ -1,2 +0,0 @@ -#warning "Including nix/pool.hh is deprecated. Please include nix/util/pool.hh instead." -#include "nix/util/pool.hh" diff --git a/src/libutil/include/nix/ref.hh b/src/libutil/include/nix/ref.hh deleted file mode 100644 index c7cf9770bd8..00000000000 --- a/src/libutil/include/nix/ref.hh +++ /dev/null @@ -1,2 +0,0 @@ -#warning "Including nix/ref.hh is deprecated. Please include nix/util/ref.hh instead." -#include "nix/util/ref.hh" diff --git a/src/libutil/include/nix/regex-combinators.hh b/src/libutil/include/nix/regex-combinators.hh deleted file mode 100644 index 1e5fdf72f66..00000000000 --- a/src/libutil/include/nix/regex-combinators.hh +++ /dev/null @@ -1,2 +0,0 @@ -#warning "Including nix/regex-combinators.hh is deprecated. Please include nix/util/regex-combinators.hh instead." -#include "nix/util/regex-combinators.hh" diff --git a/src/libutil/include/nix/serialise.hh b/src/libutil/include/nix/serialise.hh deleted file mode 100644 index 3548d42e225..00000000000 --- a/src/libutil/include/nix/serialise.hh +++ /dev/null @@ -1,2 +0,0 @@ -#warning "Including nix/serialise.hh is deprecated. Please include nix/util/serialise.hh instead." -#include "nix/util/serialise.hh" diff --git a/src/libutil/include/nix/split.hh b/src/libutil/include/nix/split.hh deleted file mode 100644 index 5f0d5726eed..00000000000 --- a/src/libutil/include/nix/split.hh +++ /dev/null @@ -1,2 +0,0 @@ -#warning "Including nix/split.hh is deprecated. Please include nix/util/split.hh instead." -#include "nix/util/split.hh" diff --git a/src/libutil/include/nix/suggestions.hh b/src/libutil/include/nix/suggestions.hh deleted file mode 100644 index c44992bf992..00000000000 --- a/src/libutil/include/nix/suggestions.hh +++ /dev/null @@ -1,2 +0,0 @@ -#warning "Including nix/suggestions.hh is deprecated. Please include nix/util/suggestions.hh instead." -#include "nix/util/suggestions.hh" diff --git a/src/libutil/include/nix/sync.hh b/src/libutil/include/nix/sync.hh deleted file mode 100644 index 1b85f0e8f55..00000000000 --- a/src/libutil/include/nix/sync.hh +++ /dev/null @@ -1,2 +0,0 @@ -#warning "Including nix/sync.hh is deprecated. Please include nix/util/sync.hh instead." -#include "nix/util/sync.hh" diff --git a/src/libutil/include/nix/tarfile.hh b/src/libutil/include/nix/tarfile.hh deleted file mode 100644 index be7a495a4c1..00000000000 --- a/src/libutil/include/nix/tarfile.hh +++ /dev/null @@ -1,2 +0,0 @@ -#warning "Including nix/tarfile.hh is deprecated. Please include nix/util/tarfile.hh instead." -#include "nix/util/tarfile.hh" diff --git a/src/libutil/include/nix/thread-pool.hh b/src/libutil/include/nix/thread-pool.hh deleted file mode 100644 index d1855cd2d78..00000000000 --- a/src/libutil/include/nix/thread-pool.hh +++ /dev/null @@ -1,2 +0,0 @@ -#warning "Including nix/thread-pool.hh is deprecated. Please include nix/util/thread-pool.hh instead." -#include "nix/util/thread-pool.hh" diff --git a/src/libutil/include/nix/topo-sort.hh b/src/libutil/include/nix/topo-sort.hh deleted file mode 100644 index 2e33270a632..00000000000 --- a/src/libutil/include/nix/topo-sort.hh +++ /dev/null @@ -1,2 +0,0 @@ -#warning "Including nix/topo-sort.hh is deprecated. Please include nix/util/topo-sort.hh instead." -#include "nix/util/topo-sort.hh" diff --git a/src/libutil/include/nix/types.hh b/src/libutil/include/nix/types.hh deleted file mode 100644 index 5a3de81fe77..00000000000 --- a/src/libutil/include/nix/types.hh +++ /dev/null @@ -1,2 +0,0 @@ -#warning "Including nix/types.hh is deprecated. Please include nix/util/types.hh instead." -#include "nix/util/types.hh" diff --git a/src/libutil/include/nix/url-parts.hh b/src/libutil/include/nix/url-parts.hh deleted file mode 100644 index eddfcf4a754..00000000000 --- a/src/libutil/include/nix/url-parts.hh +++ /dev/null @@ -1,2 +0,0 @@ -#warning "Including nix/url-parts.hh is deprecated. Please include nix/util/url-parts.hh instead." -#include "nix/util/url-parts.hh" diff --git a/src/libutil/include/nix/url.hh b/src/libutil/include/nix/url.hh deleted file mode 100644 index 78f9606fd7a..00000000000 --- a/src/libutil/include/nix/url.hh +++ /dev/null @@ -1,2 +0,0 @@ -#warning "Including nix/url.hh is deprecated. Please include nix/util/url.hh instead." -#include "nix/util/url.hh" diff --git a/src/libutil/include/nix/util.hh b/src/libutil/include/nix/util.hh deleted file mode 100644 index 05a659ae423..00000000000 --- a/src/libutil/include/nix/util.hh +++ /dev/null @@ -1,2 +0,0 @@ -#warning "Including nix/util.hh is deprecated. Please include nix/util/util.hh instead." -#include "nix/util/util.hh" diff --git a/src/libutil/include/nix/xml-writer.hh b/src/libutil/include/nix/xml-writer.hh deleted file mode 100644 index ccab798a16f..00000000000 --- a/src/libutil/include/nix/xml-writer.hh +++ /dev/null @@ -1,2 +0,0 @@ -#warning "Including nix/xml-writer.hh is deprecated. Please include nix/util/xml-writer.hh instead." -#include "nix/util/xml-writer.hh" diff --git a/src/libutil/local.mk b/src/libutil/local.mk index 589c3a04f1d..0042b9c7ae8 100644 --- a/src/libutil/local.mk +++ b/src/libutil/local.mk @@ -14,12 +14,5 @@ ifeq ($(HAVE_LIBCPUID), 1) libutil_LDFLAGS += -lcpuid endif -# old include paths - -$(foreach i, $(wildcard src/libutil/include/nix/*.hh), \ - $(eval $(call install-file-in, $(i), $(includedir)/nix, 0644))) - -# new include paths - $(foreach i, $(wildcard src/libutil/include/nix/util/*.hh), \ $(eval $(call install-file-in, $(i), $(includedir)/nix/util, 0644)))