From e3d5b2a9006638745be7596c9de7d4a5f4a08ea6 Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Wed, 1 Jul 2009 11:37:26 -0700 Subject: [PATCH] Refresh autogen products --- Makefile.in | 139 ++++-- cmd/Makefile.in | 12 +- cmd/zdb/Makefile.in | 12 +- cmd/zfs/Makefile.in | 12 +- cmd/zinject/Makefile.in | 12 +- cmd/zpios/Makefile.in | 12 +- cmd/zpool/Makefile.in | 12 +- cmd/ztest/Makefile.in | 12 +- config/Makefile.in | 12 +- configure | 613 ++++++++++++++++++++------- doc/Makefile.in | 12 +- lib/Makefile.in | 12 +- lib/libavl/Makefile.in | 12 +- lib/libnvpair/Makefile.in | 12 +- lib/libspl/Makefile.in | 12 +- lib/libspl/asm-i386/Makefile.in | 12 +- lib/libspl/asm-powerpc64/Makefile.in | 14 +- lib/libspl/asm-x86_64/Makefile.in | 12 +- lib/libspl/include/Makefile.in | 48 ++- lib/libunicode/Makefile.in | 12 +- lib/libuutil/Makefile.in | 12 +- lib/libzfs/Makefile.in | 12 +- lib/libzpool/Makefile.in | 12 +- lib/libzpool/include/Makefile.in | 46 +- scripts/Makefile.in | 12 +- scripts/zpios-profile/Makefile.in | 12 +- scripts/zpios-test/Makefile.in | 12 +- scripts/zpool-config/Makefile.in | 12 +- zfs_config.h.in | 2 + 29 files changed, 821 insertions(+), 317 deletions(-) diff --git a/Makefile.in b/Makefile.in index 3f7b1e84a9..c000c64261 100644 --- a/Makefile.in +++ b/Makefile.in @@ -13,6 +13,7 @@ # PARTICULAR PURPOSE. @SET_MAKE@ + srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ @@ -36,11 +37,11 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ -subdir = . -DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(srcdir)/zfs.spec.in \ - $(srcdir)/zfs_config.h.in $(top_srcdir)/configure \ - $(top_srcdir)/module/Makefile.in \ +DIST_COMMON = README $(am__configure_deps) $(noinst_HEADERS) \ + $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(srcdir)/zfs-modules.spec.in $(srcdir)/zfs.spec.in \ + $(srcdir)/zfs_config.h.in $(top_srcdir)/config/rpm.am \ + $(top_srcdir)/configure $(top_srcdir)/module/Makefile.in \ $(top_srcdir)/module/avl/Makefile.in \ $(top_srcdir)/module/nvpair/Makefile.in \ $(top_srcdir)/module/unicode/Makefile.in \ @@ -48,6 +49,7 @@ DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ $(top_srcdir)/module/zfs/Makefile.in \ $(top_srcdir)/module/zpios/Makefile.in AUTHORS COPYING \ ChangeLog TODO +subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/kernel-bio-args.m4 \ $(top_srcdir)/config/kernel.m4 \ @@ -68,7 +70,7 @@ CONFIG_HEADER = zfs_config.h CONFIG_CLEAN_FILES = module/Makefile module/avl/Makefile \ module/nvpair/Makefile module/unicode/Makefile \ module/zcommon/Makefile module/zfs/Makefile \ - module/zpios/Makefile zfs.spec + module/zpios/Makefile zfs.spec zfs-modules.spec SOURCES = DIST_SOURCES = RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ @@ -77,9 +79,10 @@ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ install-recursive installcheck-recursive installdirs-recursive \ pdf-recursive ps-recursive uninstall-info-recursive \ uninstall-recursive +HEADERS = $(noinst_HEADERS) ETAGS = etags CTAGS = ctags -DIST_SUBDIRS = $(SUBDIRS) +DIST_SUBDIRS = config doc scripts lib cmd module DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) distdir = $(PACKAGE)-$(VERSION) top_distdir = $(distdir) @@ -107,6 +110,10 @@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CMDDIR = @CMDDIR@ +CONFIG_KERNEL_FALSE = @CONFIG_KERNEL_FALSE@ +CONFIG_KERNEL_TRUE = @CONFIG_KERNEL_TRUE@ +CONFIG_USER_FALSE = @CONFIG_USER_FALSE@ +CONFIG_USER_TRUE = @CONFIG_USER_TRUE@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ @@ -138,6 +145,7 @@ LIBTOOL = @LIBTOOL@ LICENSE = @LICENSE@ LINUX = @LINUX@ LINUX_OBJ = @LINUX_OBJ@ +LINUX_SYMBOLS = @LINUX_SYMBOLS@ LINUX_VERSION = @LINUX_VERSION@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ @@ -158,11 +166,14 @@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ +SPL = @SPL@ +SPL_OBJ = @SPL_OBJ@ +SPL_SYMBOLS = @SPL_SYMBOLS@ +SPL_VERSION = @SPL_VERSION@ STRIP = @STRIP@ TARGET_ARCH = @TARGET_ARCH@ TARGET_ARCH_DIR = @TARGET_ARCH_DIR@ TOPDIR = @TOPDIR@ -UNAME = @UNAME@ VERSION = @VERSION@ ZFS_CONFIG = @ZFS_CONFIG@ ZFS_META_ALIAS = @ZFS_META_ALIAS@ @@ -215,25 +226,26 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ -splsrc = @splsrc@ -splsymvers = @splsymvers@ sysconfdir = @sysconfdir@ target = @target@ target_alias = @target_alias@ target_cpu = @target_cpu@ target_os = @target_os@ target_vendor = @target_vendor@ -SUBDIRS = config doc scripts lib cmd module +@CONFIG_USER_TRUE@USER_DIR = config doc scripts lib cmd +@CONFIG_KERNEL_TRUE@KERNEL_DIR = module +SUBDIRS = $(USER_DIR) $(KERNEL_DIR) AUTOMAKE_OPTIONS = foreign dist-zip -EXTRA_DIST = autogen.sh zfs.spec.in META DISCLAIMER GIT \ - OPENSOLARIS.LICENSE ZFS.RELEASE +EXTRA_DIST = autogen.sh zfs.spec.in zfs-modules.spec.in META \ + DISCLAIMER GIT OPENSOLARIS.LICENSE ZFS.RELEASE +noinst_HEADERS = zfs_config.h zfs_unconfig.h all: zfs_config.h $(MAKE) $(AM_MAKEFLAGS) all-recursive .SUFFIXES: am--refresh: @: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/config/rpm.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -297,6 +309,8 @@ module/zpios/Makefile: $(top_builddir)/config.status $(top_srcdir)/module/zpios/ cd $(top_builddir) && $(SHELL) ./config.status $@ zfs.spec: $(top_builddir)/config.status $(srcdir)/zfs.spec.in cd $(top_builddir) && $(SHELL) ./config.status $@ +zfs-modules.spec: $(top_builddir)/config.status $(srcdir)/zfs-modules.spec.in + cd $(top_builddir) && $(SHELL) ./config.status $@ mostlyclean-libtool: -rm -f *.lo @@ -583,7 +597,7 @@ distcleancheck: distclean exit 1; } >&2 check-am: all-am check: check-recursive -all-am: Makefile zfs_config.h +all-am: Makefile $(HEADERS) zfs_config.h installdirs: installdirs-recursive installdirs-am: install: install-recursive @@ -610,6 +624,7 @@ distclean-generic: maintainer-clean-generic: @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." +@CONFIG_KERNEL_FALSE@install-data-local: clean: clean-recursive clean-am: clean-generic clean-libtool mostlyclean-am @@ -678,6 +693,52 @@ uninstall-info: uninstall-info-recursive mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \ tags tags-recursive uninstall uninstall-am uninstall-info-am +rpm-local: + mkdir -p $(rpmbuild)/TMP && \ + mkdir -p $(rpmbuild)/BUILD && \ + mkdir -p $(rpmbuild)/RPMS && \ + mkdir -p $(rpmbuild)/SRPMS && \ + mkdir -p $(rpmbuild)/SPECS && cp $(rpmspec) $(rpmbuild)/SPECS && \ + mkdir -p $(rpmbuild)/SOURCES && cp $(distdir).tar.gz $(rpmbuild)/SOURCES + +srpm-common: dist + rpmpkg=$(pkg)-$(ZFS_META_VERSION)-$(ZFS_META_RELEASE).src.rpm; \ + rpmspec=$(pkg).spec; \ + rpmbuild=`mktemp -t -d $(PACKAGE)-build-$$USER-XXXXXXXX`; \ + $(MAKE) $(AM_MAKEFLAGS) \ + rpmbuild="$$rpmbuild" \ + rpmspec="$$rpmspec" \ + rpm-local || exit 1; \ + /usr/bin/rpmbuild \ + --define "_tmppath $$rpmbuild/TMP" \ + --define "_topdir $$rpmbuild" \ + --define "build_src_rpm 1" \ + --define "dist %{nil}" \ + --nodeps -bs $$rpmbuild/SPECS/$$rpmspec || exit 1; \ + cp $$rpmbuild/SRPMS/$$rpmpkg . || exit 1; \ + $(RM) -R $$rpmbuild + +rpm-common: + rpmpkg=$(pkg)-$(ZFS_META_VERSION)-$(ZFS_META_RELEASE).src.rpm; \ + rpmspec=$(pkg).spec; \ + rpmbuild=`mktemp -t -d $(PACKAGE)-build-$$USER-XXXXXXXX`; \ + $(MAKE) $(AM_MAKEFLAGS) \ + rpmbuild="$$rpmbuild" \ + rpmspec="$$rpmspec" \ + rpm-local || exit 1; \ + /usr/bin/rpmbuild \ + --define "_tmppath $$rpmbuild/TMP" \ + --define "_topdir $$rpmbuild" \ + --define "dist %{nil}" \ + --define "require_kdir $(LINUX)" \ + --define "require_kobj $(LINUX_OBJ)" \ + --define "require_kver $(LINUX_VERSION)" \ + --define "require_spldir $(SPL)" \ + --define "require_splobj $(SPL_OBJ)" \ + --define "require_splver $(SPL_VERSION)" \ + --nodeps --rebuild $$rpmpkg || exit 1; \ + cp $$rpmbuild/RPMS/*/* . || exit 1; \ + $(RM) -R $$rpmbuild distclean-local:: -$(RM) -R autom4te*.cache @@ -691,10 +752,11 @@ distclean-local:: -o -name '.script-config' \) \ -type f -print | xargs $(RM) -install-data-local: - /bin/mkdir -p $(DESTDIR)/$(LINUX)/include/zfs - $(INSTALL) module/Module.symvers $(DESTDIR)/$(LINUX)/include/zfs - $(INSTALL) zfs_config.h $(DESTDIR)/$(LINUX)/include/zfs +@CONFIG_KERNEL_TRUE@install-data-local: +@CONFIG_KERNEL_TRUE@ instdest=$(DESTDIR)/${prefix}/src/zfs-$(ZFS_META_VERSION); \ +@CONFIG_KERNEL_TRUE@ for instfile in $(noinst_HEADERS) module/$(LINUX_SYMBOLS); do \ +@CONFIG_KERNEL_TRUE@ $(INSTALL) -D $$instfile $$instdest/$$instfile; \ +@CONFIG_KERNEL_TRUE@ done ctags: $(RM) $(top_srcdir)/tags @@ -706,30 +768,25 @@ etags: tags: ctags etags -rpm-local: - mkdir -p $(rpmbuild)/TMP && \ - mkdir -p $(rpmbuild)/BUILD && \ - mkdir -p $(rpmbuild)/RPMS && \ - mkdir -p $(rpmbuild)/SRPMS && \ - mkdir -p $(rpmbuild)/SPECS && cp $(PACKAGE).spec $(rpmbuild)/SPECS && \ - mkdir -p $(rpmbuild)/SOURCES && cp $(distdir).tar.gz $(rpmbuild)/SOURCES +srpm-modules: + $(MAKE) $(AM_MAKEFLAGS) pkg="${PACKAGE}-modules" srpm-common -srpm: dist - rpmbuild=`mktemp -t -d $(PACKAGE)-build-$$USER-XXXXXXXX`; \ - $(MAKE) $(AM_MAKEFLAGS) rpmbuild="$$rpmbuild" rpm-local || exit 1; \ - /usr/bin/rpmbuild --define "_tmppath $$rpmbuild/TMP" --define "_topdir $$rpmbuild" --define "build_src_rpm 1" --define "dist %{nil}" --nodeps -bs $$rpmbuild/SPECS/$(PACKAGE).spec || exit 1; \ - cp $$rpmbuild/SRPMS/$(distdir)-$(ZFS_META_RELEASE).src.rpm . || exit 1;\ - $(RM) -R $$rpmbuild +srpm-utils: + $(MAKE) $(AM_MAKEFLAGS) pkg="${PACKAGE}" srpm-common -# Use 'make rpm LINUX_VERSION=2.x.y-z' to rebuild the source RPM -# against any installed kernel-devel-2.x.y-z package. This will -# override the LINUX_VERSION detected at configure time. -rpm: srpm - rpmbuild=`mktemp -t -d $(PACKAGE)-build-$$USER-XXXXXXXX`; \ - $(MAKE) $(AM_MAKEFLAGS) rpmbuild="$$rpmbuild" rpm-local || exit 1; \ - /usr/bin/rpmbuild --define "_tmppath $$rpmbuild/TMP" --define "_topdir $$rpmbuild" --define "dist %{nil}" --define "require_kver $(LINUX_VERSION)" --nodeps --rebuild $(distdir)-$(ZFS_META_RELEASE).src.rpm || exit 1; \ - cp $$rpmbuild/RPMS/*/* . || exit 1; \ - $(RM) -R $$rpmbuild +srpm: srpm-modules srpm-utils + +rpm-modules: srpm-modules + $(MAKE) $(AM_MAKEFLAGS) pkg="${PACKAGE}-modules" rpm-common + +rpm-utils: srpm-utils + $(MAKE) $(AM_MAKEFLAGS) pkg="${PACKAGE}" rpm-common + +rpm-modules: srpm-modules + +rpm-utils: srpm-utils + +rpm: rpm-modules rpm-utils # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/cmd/Makefile.in b/cmd/Makefile.in index 5ae6776917..4a2f47a9a3 100644 --- a/cmd/Makefile.in +++ b/cmd/Makefile.in @@ -82,6 +82,10 @@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CMDDIR = @CMDDIR@ +CONFIG_KERNEL_FALSE = @CONFIG_KERNEL_FALSE@ +CONFIG_KERNEL_TRUE = @CONFIG_KERNEL_TRUE@ +CONFIG_USER_FALSE = @CONFIG_USER_FALSE@ +CONFIG_USER_TRUE = @CONFIG_USER_TRUE@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ @@ -113,6 +117,7 @@ LIBTOOL = @LIBTOOL@ LICENSE = @LICENSE@ LINUX = @LINUX@ LINUX_OBJ = @LINUX_OBJ@ +LINUX_SYMBOLS = @LINUX_SYMBOLS@ LINUX_VERSION = @LINUX_VERSION@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ @@ -133,11 +138,14 @@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ +SPL = @SPL@ +SPL_OBJ = @SPL_OBJ@ +SPL_SYMBOLS = @SPL_SYMBOLS@ +SPL_VERSION = @SPL_VERSION@ STRIP = @STRIP@ TARGET_ARCH = @TARGET_ARCH@ TARGET_ARCH_DIR = @TARGET_ARCH_DIR@ TOPDIR = @TOPDIR@ -UNAME = @UNAME@ VERSION = @VERSION@ ZFS_CONFIG = @ZFS_CONFIG@ ZFS_META_ALIAS = @ZFS_META_ALIAS@ @@ -190,8 +198,6 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ -splsrc = @splsrc@ -splsymvers = @splsymvers@ sysconfdir = @sysconfdir@ target = @target@ target_alias = @target_alias@ diff --git a/cmd/zdb/Makefile.in b/cmd/zdb/Makefile.in index 44ebe7104f..884fcfa25e 100644 --- a/cmd/zdb/Makefile.in +++ b/cmd/zdb/Makefile.in @@ -100,6 +100,10 @@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CMDDIR = @CMDDIR@ +CONFIG_KERNEL_FALSE = @CONFIG_KERNEL_FALSE@ +CONFIG_KERNEL_TRUE = @CONFIG_KERNEL_TRUE@ +CONFIG_USER_FALSE = @CONFIG_USER_FALSE@ +CONFIG_USER_TRUE = @CONFIG_USER_TRUE@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ @@ -131,6 +135,7 @@ LIBTOOL = @LIBTOOL@ LICENSE = @LICENSE@ LINUX = @LINUX@ LINUX_OBJ = @LINUX_OBJ@ +LINUX_SYMBOLS = @LINUX_SYMBOLS@ LINUX_VERSION = @LINUX_VERSION@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ @@ -151,11 +156,14 @@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ +SPL = @SPL@ +SPL_OBJ = @SPL_OBJ@ +SPL_SYMBOLS = @SPL_SYMBOLS@ +SPL_VERSION = @SPL_VERSION@ STRIP = @STRIP@ TARGET_ARCH = @TARGET_ARCH@ TARGET_ARCH_DIR = @TARGET_ARCH_DIR@ TOPDIR = @TOPDIR@ -UNAME = @UNAME@ VERSION = @VERSION@ ZFS_CONFIG = @ZFS_CONFIG@ ZFS_META_ALIAS = @ZFS_META_ALIAS@ @@ -208,8 +216,6 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ -splsrc = @splsrc@ -splsymvers = @splsymvers@ sysconfdir = @sysconfdir@ target = @target@ target_alias = @target_alias@ diff --git a/cmd/zfs/Makefile.in b/cmd/zfs/Makefile.in index 15684d2740..e3e49f510b 100644 --- a/cmd/zfs/Makefile.in +++ b/cmd/zfs/Makefile.in @@ -100,6 +100,10 @@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CMDDIR = @CMDDIR@ +CONFIG_KERNEL_FALSE = @CONFIG_KERNEL_FALSE@ +CONFIG_KERNEL_TRUE = @CONFIG_KERNEL_TRUE@ +CONFIG_USER_FALSE = @CONFIG_USER_FALSE@ +CONFIG_USER_TRUE = @CONFIG_USER_TRUE@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ @@ -131,6 +135,7 @@ LIBTOOL = @LIBTOOL@ LICENSE = @LICENSE@ LINUX = @LINUX@ LINUX_OBJ = @LINUX_OBJ@ +LINUX_SYMBOLS = @LINUX_SYMBOLS@ LINUX_VERSION = @LINUX_VERSION@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ @@ -151,11 +156,14 @@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ +SPL = @SPL@ +SPL_OBJ = @SPL_OBJ@ +SPL_SYMBOLS = @SPL_SYMBOLS@ +SPL_VERSION = @SPL_VERSION@ STRIP = @STRIP@ TARGET_ARCH = @TARGET_ARCH@ TARGET_ARCH_DIR = @TARGET_ARCH_DIR@ TOPDIR = @TOPDIR@ -UNAME = @UNAME@ VERSION = @VERSION@ ZFS_CONFIG = @ZFS_CONFIG@ ZFS_META_ALIAS = @ZFS_META_ALIAS@ @@ -208,8 +216,6 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ -splsrc = @splsrc@ -splsymvers = @splsymvers@ sysconfdir = @sysconfdir@ target = @target@ target_alias = @target_alias@ diff --git a/cmd/zinject/Makefile.in b/cmd/zinject/Makefile.in index 6b85c55b3b..435e723014 100644 --- a/cmd/zinject/Makefile.in +++ b/cmd/zinject/Makefile.in @@ -100,6 +100,10 @@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CMDDIR = @CMDDIR@ +CONFIG_KERNEL_FALSE = @CONFIG_KERNEL_FALSE@ +CONFIG_KERNEL_TRUE = @CONFIG_KERNEL_TRUE@ +CONFIG_USER_FALSE = @CONFIG_USER_FALSE@ +CONFIG_USER_TRUE = @CONFIG_USER_TRUE@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ @@ -131,6 +135,7 @@ LIBTOOL = @LIBTOOL@ LICENSE = @LICENSE@ LINUX = @LINUX@ LINUX_OBJ = @LINUX_OBJ@ +LINUX_SYMBOLS = @LINUX_SYMBOLS@ LINUX_VERSION = @LINUX_VERSION@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ @@ -151,11 +156,14 @@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ +SPL = @SPL@ +SPL_OBJ = @SPL_OBJ@ +SPL_SYMBOLS = @SPL_SYMBOLS@ +SPL_VERSION = @SPL_VERSION@ STRIP = @STRIP@ TARGET_ARCH = @TARGET_ARCH@ TARGET_ARCH_DIR = @TARGET_ARCH_DIR@ TOPDIR = @TOPDIR@ -UNAME = @UNAME@ VERSION = @VERSION@ ZFS_CONFIG = @ZFS_CONFIG@ ZFS_META_ALIAS = @ZFS_META_ALIAS@ @@ -208,8 +216,6 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ -splsrc = @splsrc@ -splsymvers = @splsymvers@ sysconfdir = @sysconfdir@ target = @target@ target_alias = @target_alias@ diff --git a/cmd/zpios/Makefile.in b/cmd/zpios/Makefile.in index 2385c19748..2ba1311d2b 100644 --- a/cmd/zpios/Makefile.in +++ b/cmd/zpios/Makefile.in @@ -94,6 +94,10 @@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CMDDIR = @CMDDIR@ +CONFIG_KERNEL_FALSE = @CONFIG_KERNEL_FALSE@ +CONFIG_KERNEL_TRUE = @CONFIG_KERNEL_TRUE@ +CONFIG_USER_FALSE = @CONFIG_USER_FALSE@ +CONFIG_USER_TRUE = @CONFIG_USER_TRUE@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ @@ -125,6 +129,7 @@ LIBTOOL = @LIBTOOL@ LICENSE = @LICENSE@ LINUX = @LINUX@ LINUX_OBJ = @LINUX_OBJ@ +LINUX_SYMBOLS = @LINUX_SYMBOLS@ LINUX_VERSION = @LINUX_VERSION@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ @@ -145,11 +150,14 @@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ +SPL = @SPL@ +SPL_OBJ = @SPL_OBJ@ +SPL_SYMBOLS = @SPL_SYMBOLS@ +SPL_VERSION = @SPL_VERSION@ STRIP = @STRIP@ TARGET_ARCH = @TARGET_ARCH@ TARGET_ARCH_DIR = @TARGET_ARCH_DIR@ TOPDIR = @TOPDIR@ -UNAME = @UNAME@ VERSION = @VERSION@ ZFS_CONFIG = @ZFS_CONFIG@ ZFS_META_ALIAS = @ZFS_META_ALIAS@ @@ -202,8 +210,6 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ -splsrc = @splsrc@ -splsymvers = @splsymvers@ sysconfdir = @sysconfdir@ target = @target@ target_alias = @target_alias@ diff --git a/cmd/zpool/Makefile.in b/cmd/zpool/Makefile.in index afda2ec4c5..151d8c7579 100644 --- a/cmd/zpool/Makefile.in +++ b/cmd/zpool/Makefile.in @@ -101,6 +101,10 @@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CMDDIR = @CMDDIR@ +CONFIG_KERNEL_FALSE = @CONFIG_KERNEL_FALSE@ +CONFIG_KERNEL_TRUE = @CONFIG_KERNEL_TRUE@ +CONFIG_USER_FALSE = @CONFIG_USER_FALSE@ +CONFIG_USER_TRUE = @CONFIG_USER_TRUE@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ @@ -132,6 +136,7 @@ LIBTOOL = @LIBTOOL@ LICENSE = @LICENSE@ LINUX = @LINUX@ LINUX_OBJ = @LINUX_OBJ@ +LINUX_SYMBOLS = @LINUX_SYMBOLS@ LINUX_VERSION = @LINUX_VERSION@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ @@ -152,11 +157,14 @@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ +SPL = @SPL@ +SPL_OBJ = @SPL_OBJ@ +SPL_SYMBOLS = @SPL_SYMBOLS@ +SPL_VERSION = @SPL_VERSION@ STRIP = @STRIP@ TARGET_ARCH = @TARGET_ARCH@ TARGET_ARCH_DIR = @TARGET_ARCH_DIR@ TOPDIR = @TOPDIR@ -UNAME = @UNAME@ VERSION = @VERSION@ ZFS_CONFIG = @ZFS_CONFIG@ ZFS_META_ALIAS = @ZFS_META_ALIAS@ @@ -209,8 +217,6 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ -splsrc = @splsrc@ -splsymvers = @splsymvers@ sysconfdir = @sysconfdir@ target = @target@ target_alias = @target_alias@ diff --git a/cmd/ztest/Makefile.in b/cmd/ztest/Makefile.in index 1abfd643b7..00a2896cfe 100644 --- a/cmd/ztest/Makefile.in +++ b/cmd/ztest/Makefile.in @@ -100,6 +100,10 @@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CMDDIR = @CMDDIR@ +CONFIG_KERNEL_FALSE = @CONFIG_KERNEL_FALSE@ +CONFIG_KERNEL_TRUE = @CONFIG_KERNEL_TRUE@ +CONFIG_USER_FALSE = @CONFIG_USER_FALSE@ +CONFIG_USER_TRUE = @CONFIG_USER_TRUE@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ @@ -131,6 +135,7 @@ LIBTOOL = @LIBTOOL@ LICENSE = @LICENSE@ LINUX = @LINUX@ LINUX_OBJ = @LINUX_OBJ@ +LINUX_SYMBOLS = @LINUX_SYMBOLS@ LINUX_VERSION = @LINUX_VERSION@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ @@ -151,11 +156,14 @@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ +SPL = @SPL@ +SPL_OBJ = @SPL_OBJ@ +SPL_SYMBOLS = @SPL_SYMBOLS@ +SPL_VERSION = @SPL_VERSION@ STRIP = @STRIP@ TARGET_ARCH = @TARGET_ARCH@ TARGET_ARCH_DIR = @TARGET_ARCH_DIR@ TOPDIR = @TOPDIR@ -UNAME = @UNAME@ VERSION = @VERSION@ ZFS_CONFIG = @ZFS_CONFIG@ ZFS_META_ALIAS = @ZFS_META_ALIAS@ @@ -208,8 +216,6 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ -splsrc = @splsrc@ -splsymvers = @splsymvers@ sysconfdir = @sysconfdir@ target = @target@ target_alias = @target_alias@ diff --git a/config/Makefile.in b/config/Makefile.in index d04b765290..20c7b9ef26 100644 --- a/config/Makefile.in +++ b/config/Makefile.in @@ -74,6 +74,10 @@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CMDDIR = @CMDDIR@ +CONFIG_KERNEL_FALSE = @CONFIG_KERNEL_FALSE@ +CONFIG_KERNEL_TRUE = @CONFIG_KERNEL_TRUE@ +CONFIG_USER_FALSE = @CONFIG_USER_FALSE@ +CONFIG_USER_TRUE = @CONFIG_USER_TRUE@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ @@ -105,6 +109,7 @@ LIBTOOL = @LIBTOOL@ LICENSE = @LICENSE@ LINUX = @LINUX@ LINUX_OBJ = @LINUX_OBJ@ +LINUX_SYMBOLS = @LINUX_SYMBOLS@ LINUX_VERSION = @LINUX_VERSION@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ @@ -125,11 +130,14 @@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ +SPL = @SPL@ +SPL_OBJ = @SPL_OBJ@ +SPL_SYMBOLS = @SPL_SYMBOLS@ +SPL_VERSION = @SPL_VERSION@ STRIP = @STRIP@ TARGET_ARCH = @TARGET_ARCH@ TARGET_ARCH_DIR = @TARGET_ARCH_DIR@ TOPDIR = @TOPDIR@ -UNAME = @UNAME@ VERSION = @VERSION@ ZFS_CONFIG = @ZFS_CONFIG@ ZFS_META_ALIAS = @ZFS_META_ALIAS@ @@ -182,8 +190,6 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ -splsrc = @splsrc@ -splsymvers = @splsymvers@ sysconfdir = @sysconfdir@ target = @target@ target_alias = @target_alias@ diff --git a/configure b/configure index e97dba9dfe..cc2b803f01 100755 --- a/configure +++ b/configure @@ -462,7 +462,7 @@ ac_includes_default="\ # include #endif" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS ZFS_META_NAME ZFS_META_VERSION ZFS_META_RELEASE ZFS_META_ALIAS ZFS_META_DATA ZFS_META_AUTHOR ZFS_META_LT_CURRENT ZFS_META_LT_REVISION ZFS_META_LT_AGE build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE SED EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL CCAS CCASFLAGS LINUX LINUX_OBJ LINUX_VERSION splsrc splsymvers LICENSE UNAME TOPDIR BUILDDIR LIBDIR CMDDIR MODDIR ZFS_CONFIG KERNELMAKE_PARAMS KERNELCPPFLAGS TARGET_ARCH TARGET_ARCH_DIR LIBOBJS LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS ZFS_META_NAME ZFS_META_VERSION ZFS_META_RELEASE ZFS_META_ALIAS ZFS_META_DATA ZFS_META_AUTHOR ZFS_META_LT_CURRENT ZFS_META_LT_REVISION ZFS_META_LT_AGE build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE SED EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL CCAS CCASFLAGS LICENSE TOPDIR BUILDDIR LIBDIR CMDDIR MODDIR ZFS_CONFIG LINUX LINUX_OBJ LINUX_VERSION LINUX_SYMBOLS SPL SPL_OBJ SPL_VERSION SPL_SYMBOLS KERNELMAKE_PARAMS KERNELCPPFLAGS TARGET_ARCH TARGET_ARCH_DIR CONFIG_USER_TRUE CONFIG_USER_FALSE CONFIG_KERNEL_TRUE CONFIG_KERNEL_FALSE LIBOBJS LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -1052,11 +1052,11 @@ Optional Packages: both] --with-tags[=TAGS] include additional configurations [automatic] + --with-config=CONFIG Config file 'kernel|user|all' --with-linux=PATH Path to kernel source --with-linux-obj=PATH Path to kernel build objects --with-spl=PATH Path to spl source --with-spl-obj=PATH Path to spl build objects - --with-config=CONFIG Config file 'kernel|user|all' Some influential environment variables: CC C compiler command @@ -2221,6 +2221,8 @@ am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -' ac_config_headers="$ac_config_headers zfs_config.h" + + echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5 echo $ECHO_N "checking whether to enable maintainer-specific portions of Makefiles... $ECHO_C" >&6 # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given. @@ -3997,7 +3999,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 4000 "configure"' > conftest.$ac_ext + echo '#line 4002 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -5596,7 +5598,7 @@ fi # Provide some information about the compiler. -echo "$as_me:5599:" \ +echo "$as_me:5601:" \ "checking for Fortran 77 compiler version" >&5 ac_compiler=`set X $ac_compile; echo $2` { (eval echo "$as_me:$LINENO: \"$ac_compiler --version &5\"") >&5 @@ -6659,11 +6661,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6662: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6664: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:6666: \$? = $ac_status" >&5 + echo "$as_me:6668: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -6927,11 +6929,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6930: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6932: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:6934: \$? = $ac_status" >&5 + echo "$as_me:6936: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -7031,11 +7033,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7034: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7036: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:7038: \$? = $ac_status" >&5 + echo "$as_me:7040: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -8500,7 +8502,7 @@ linux*) libsuff= case "$host_cpu" in x86_64*|s390x*|powerpc64*) - echo '#line 8503 "configure"' > conftest.$ac_ext + echo '#line 8505 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -9397,7 +9399,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext <&5) + (eval echo "\"\$as_me:11845: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:11847: \$? = $ac_status" >&5 + echo "$as_me:11849: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -11944,11 +11946,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:11947: $lt_compile\"" >&5) + (eval echo "\"\$as_me:11949: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:11951: \$? = $ac_status" >&5 + echo "$as_me:11953: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -12480,7 +12482,7 @@ linux*) libsuff= case "$host_cpu" in x86_64*|s390x*|powerpc64*) - echo '#line 12483 "configure"' > conftest.$ac_ext + echo '#line 12485 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -13538,11 +13540,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:13541: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13543: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:13545: \$? = $ac_status" >&5 + echo "$as_me:13547: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -13642,11 +13644,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:13645: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13647: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:13649: \$? = $ac_status" >&5 + echo "$as_me:13651: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -15091,7 +15093,7 @@ linux*) libsuff= case "$host_cpu" in x86_64*|s390x*|powerpc64*) - echo '#line 15094 "configure"' > conftest.$ac_ext + echo '#line 15096 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -15869,11 +15871,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15872: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15874: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:15876: \$? = $ac_status" >&5 + echo "$as_me:15878: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -16137,11 +16139,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:16140: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16142: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:16144: \$? = $ac_status" >&5 + echo "$as_me:16146: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -16241,11 +16243,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:16244: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16246: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:16248: \$? = $ac_status" >&5 + echo "$as_me:16250: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -17710,7 +17712,7 @@ linux*) libsuff= case "$host_cpu" in x86_64*|s390x*|powerpc64*) - echo '#line 17713 "configure"' > conftest.$ac_ext + echo '#line 17715 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -18944,11 +18946,56 @@ test "${CCASFLAGS+set}" = set || CCASFLAGS=$CFLAGS + echo "$as_me:$LINENO: checking zfs license" >&5 +echo $ECHO_N "checking zfs license... $ECHO_C" >&6 + LICENSE=`grep MODULE_LICENSE module/zfs/zfs_ioctl.c | cut -f2 -d'"'` + echo "$as_me:$LINENO: result: $LICENSE" >&5 +echo "${ECHO_T}$LICENSE" >&6 + if test "$LICENSE" = GPL; then + +cat >>confdefs.h <<\_ACEOF +#define HAVE_GPL_ONLY_SYMBOLS 1 +_ACEOF + + fi + + + + + TOPDIR=`readlink -f ${srcdir}` + BUILDDIR=$TOPDIR + LIBDIR=$TOPDIR/lib + CMDDIR=$TOPDIR/cmd + MODDIR=$TOPDIR/module + + + + + + + + ZFS_CONFIG=all + +# Check whether --with-config or --without-config was given. +if test "${with_config+set}" = set; then + withval="$with_config" + ZFS_CONFIG="$withval" +fi; + + echo "$as_me:$LINENO: checking zfs config" >&5 +echo $ECHO_N "checking zfs config... $ECHO_C" >&6 + echo "$as_me:$LINENO: result: $ZFS_CONFIG" >&5 +echo "${ECHO_T}$ZFS_CONFIG" >&6; + + + case "$ZFS_CONFIG" in + kernel) + # Check whether --with-linux or --without-linux was given. if test "${with_linux+set}" = set; then withval="$with_linux" - kernelsrc="$withval"; kernelbuild="$withval" + kernelsrc="$withval" fi; @@ -18962,11 +19009,10 @@ fi; echo $ECHO_N "checking kernel source directory... $ECHO_C" >&6 if test -z "$kernelsrc"; then sourcelink=`ls -1d /usr/src/kernels/* /usr/src/linux-* \ - 2>/dev/null | grep -v obj | tail -1` + 2>/dev/null | grep -v obj | tail -1` if test -e $sourcelink; then kernelsrc=`readlink -f ${sourcelink}` - kernelbuild= else echo "$as_me:$LINENO: result: Not found" >&5 echo "${ECHO_T}Not found" >&6 @@ -18988,11 +19034,15 @@ echo "$as_me: error: echo "${ECHO_T}$kernelsrc" >&6 echo "$as_me:$LINENO: checking kernel build directory" >&5 echo $ECHO_N "checking kernel build directory... $ECHO_C" >&6 - if test -z "$kernelbuild" && test -d ${kernelsrc}-obj; then - kernelbuild=${kernelsrc}-obj/`arch`/`arch` - else - kernelbuild=${kernelsrc} - fi + if test -z "$kernelbuild"; then + if test -d ${kernelsrc}-obj; then + kernelbuild=${kernelsrc}-obj/`arch`/`arch` + elif test -d `dirname ${kernelsrc}`/build-`arch`; then + kernelbuild=`dirname ${kernelsrc}`/build-`arch` + else + kernelbuild=${kernelsrc} + fi + fi echo "$as_me:$LINENO: result: $kernelbuild" >&5 echo "${ECHO_T}$kernelbuild" >&6 @@ -19011,7 +19061,7 @@ echo $ECHO_N "checking kernel source version... $ECHO_C" >&6 kernsrcver=`(echo "#include "; echo "kernsrcver=UTS_RELEASE") | - cpp -I $kernelbuild/include | + cpp -I $kernelbuild/include | grep "^kernsrcver=" | cut -d \" -f 2` fi @@ -19039,11 +19089,24 @@ echo "${ECHO_T}$kernsrcver" >&6 + echo "$as_me:$LINENO: checking kernel file name for module symbols" >&5 +echo $ECHO_N "checking kernel file name for module symbols... $ECHO_C" >&6 + if grep -q Modules.symvers $LINUX/scripts/Makefile.modpost; then + LINUX_SYMBOLS=Modules.symvers + else + LINUX_SYMBOLS=Module.symvers + fi + echo "$as_me:$LINENO: result: $LINUX_SYMBOLS" >&5 +echo "${ECHO_T}$LINUX_SYMBOLS" >&6 + + + + # Check whether --with-spl or --without-spl was given. if test "${with_spl+set}" = set; then withval="$with_spl" - splsrc="$withval"; splbuild="$withval" + splsrc="$withval" fi; @@ -19057,19 +19120,12 @@ fi; echo "$as_me:$LINENO: checking spl source directory" >&5 echo $ECHO_N "checking spl source directory... $ECHO_C" >&6 if test -z "$splsrc"; then - sourcelink=${LINUX}/include/spl - buildlink=${LINUX_OBJ}/include/spl + sourcelink=`ls -1d /usr/src/spl-*/${LINUX_VERSION} \ + 2>/dev/null | tail -1` if test -e $sourcelink; then splsrc=`readlink -f ${sourcelink}` - fi - if test -e $buildlink; then - splbuild=`readlink -f ${buildlink}` - fi - if test -z "$splsrc"; then - splsrc=$splbuild - fi - if test -z "$splsrc" -o -z "$splbuild"; then + else echo "$as_me:$LINENO: result: Not found" >&5 echo "${ECHO_T}Not found" >&6 { { echo "$as_me:$LINENO: error: @@ -19082,7 +19138,7 @@ echo "$as_me: error: fi else if test "$splsrc" = "NONE"; then - splsymvers=NONE + splbuild=NONE splsrcver=NONE fi fi @@ -19091,45 +19147,25 @@ echo "$as_me: error: echo "${ECHO_T}$splsrc" >&6 echo "$as_me:$LINENO: checking spl build directory" >&5 echo $ECHO_N "checking spl build directory... $ECHO_C" >&6 + if test -z "$splbuild"; then + if test -d ${splsrc}/module; then + splbuild=${splsrc}/module + else + splbuild=${splsrc} + fi + fi echo "$as_me:$LINENO: result: $splbuild" >&5 echo "${ECHO_T}$splbuild" >&6 - echo "$as_me:$LINENO: checking spl Module{s}.symvers" >&5 -echo $ECHO_N "checking spl Module{s}.symvers... $ECHO_C" >&6 - if test -r $splbuild/module/Module.symvers; then - splsymvers=$splbuild/module/Module.symvers - elif test -r $splbuild/module/Modules.symvers; then - splsymvers=$splbuild/module/Modules.symvers - elif test -r $kernelbuild/include/spl/Module.symvers; then - splsymvers=$kernelbuild/include/spl/Module.symvers - elif test -r $kernelbuild/include/spl/Modules.symvers; then - splsymvers=$kernelbuild/include/spl/Modules.symvers - fi - - if test -z "$splsymvers"; then - echo "$as_me:$LINENO: result: Not found" >&5 -echo "${ECHO_T}Not found" >&6 - { { echo "$as_me:$LINENO: error: - *** Cannot find extra Module{s}.symvers in the spl source. - *** Please prepare the spl source before running this script" >&5 -echo "$as_me: error: - *** Cannot find extra Module{s}.symvers in the spl source. - *** Please prepare the spl source before running this script" >&2;} - { (exit 1); exit 1; }; } - fi - - echo "$as_me:$LINENO: result: $splsymvers" >&5 -echo "${ECHO_T}$splsymvers" >&6 - echo "$as_me:$LINENO: checking spl source version" >&5 echo $ECHO_N "checking spl source version... $ECHO_C" >&6 - if test -r $splbuild/spl_config.h && - fgrep -q SPL_META_VERSION $splbuild/spl_config.h; then + if test -r $splsrc/spl_config.h && + fgrep -q SPL_META_VERSION $splsrc/spl_config.h; then splsrcver=`(echo "#include "; echo "splsrcver=SPL_META_VERSION") | - cpp -I $splbuild | - grep "^splsrcver=" | cut -d \" -f 2` + cpp -I $splsrc | + grep "^splsrcver=" | cut -d \" -f 2` fi if test -z "$splsrcver"; then @@ -19147,70 +19183,36 @@ echo "$as_me: error: echo "$as_me:$LINENO: result: $splsrcver" >&5 echo "${ECHO_T}$splsrcver" >&6 + SPL=${splsrc} + SPL_OBJ=${splbuild} + SPL_VERSION=${splsrcver} - echo "$as_me:$LINENO: checking zfs license" >&5 -echo $ECHO_N "checking zfs license... $ECHO_C" >&6 - LICENSE=`grep MODULE_LICENSE module/zfs/zfs_ioctl.c | cut -f2 -d'"'` - echo "$as_me:$LINENO: result: $LICENSE" >&5 -echo "${ECHO_T}$LICENSE" >&6 - if test "$LICENSE" = GPL; then -cat >>confdefs.h <<\_ACEOF -#define HAVE_GPL_ONLY_SYMBOLS 1 -_ACEOF + echo "$as_me:$LINENO: checking spl file name for module symbols" >&5 +echo $ECHO_N "checking spl file name for module symbols... $ECHO_C" >&6 + + if test -r $SPL_OBJ/Module.symvers; then + SPL_SYMBOLS=Module.symvers + elif test -r $SPL_OBJ/Modules.symvers; then + SPL_SYMBOLS=Modules.symvers + else + echo "$as_me:$LINENO: result: Not found" >&5 +echo "${ECHO_T}Not found" >&6 + { { echo "$as_me:$LINENO: error: + *** Cannot find extra Module{s}.symvers in the spl source. + *** Please prepare the spl source before running this script" >&5 +echo "$as_me: error: + *** Cannot find extra Module{s}.symvers in the spl source. + *** Please prepare the spl source before running this script" >&2;} + { (exit 1); exit 1; }; } fi - - - - - TOPDIR=`/bin/pwd` - BUILDDIR=$TOPDIR - LIBDIR=$TOPDIR/lib - CMDDIR=$TOPDIR/cmd - MODDIR=$TOPDIR/module - UNAME=`uname -r | cut -d- -f1` - - if test -z "$ZFS_CONFIG"; then - ZFS_CONFIG=all - fi - - - - - - - - - - -# Check whether --with-zfs-config or --without-zfs-config was given. -if test "${with_zfs_config+set}" = set; then - withval="$with_zfs_config" - ZFS_CONFIG="$withval" -fi; - - echo "$as_me:$LINENO: checking zfs config" >&5 -echo $ECHO_N "checking zfs config... $ECHO_C" >&6 - echo "$as_me:$LINENO: result: $ZFS_CONFIG" >&5 -echo "${ECHO_T}$ZFS_CONFIG" >&6; - - case "$ZFS_CONFIG" in - kernel) - KERNELMAKE_PARAMS="V=1" - - KERNELCPPFLAGS="$KERNELCPPFLAGS -Werror -DHAVE_SPL -D_KERNEL" - KERNELCPPFLAGS="$KERNELCPPFLAGS -DTEXT_DOMAIN=\\\"zfs-linux-kernel\\\"" - KERNELCPPFLAGS="$KERNELCPPFLAGS -I$splsrc -I$splsrc/include -I$TOPDIR" - - if test "$kernelbuild" != "$kernelsrc"; then - KERNELMAKE_PARAMS="$KERNELMAKE_PARAMS O=$kernelbuild" - fi - + echo "$as_me:$LINENO: result: $SPL_SYMBOLS" >&5 +echo "${ECHO_T}$SPL_SYMBOLS" >&6 @@ -19284,6 +19286,19 @@ fi EXTRA_KCFLAGS="$tmp_flags" + + KERNELMAKE_PARAMS="V=1" + + KERNELCPPFLAGS="$KERNELCPPFLAGS -Werror -DHAVE_SPL -D_KERNEL" + KERNELCPPFLAGS="$KERNELCPPFLAGS -DTEXT_DOMAIN=\\\"zfs-linux-kernel\\\"" + KERNELCPPFLAGS="$KERNELCPPFLAGS -I$TOPDIR -I$SPL -I$SPL/include" + + if test "$LINUX_OBJ" != "$LINUX"; then + KERNELMAKE_PARAMS="$KERNELMAKE_PARAMS O=$LINUX_OBJ" + fi + + + ;; user) @@ -19937,16 +19952,229 @@ fi ;; all) - KERNELMAKE_PARAMS="V=1" - KERNELCPPFLAGS="$KERNELCPPFLAGS -Werror -DHAVE_SPL -D_KERNEL" - KERNELCPPFLAGS="$KERNELCPPFLAGS -DTEXT_DOMAIN=\\\"zfs-linux-kernel\\\"" - KERNELCPPFLAGS="$KERNELCPPFLAGS -I$splsrc -I$splsrc/include -I$TOPDIR" - if test "$kernelbuild" != "$kernelsrc"; then - KERNELMAKE_PARAMS="$KERNELMAKE_PARAMS O=$kernelbuild" +# Check whether --with-linux or --without-linux was given. +if test "${with_linux+set}" = set; then + withval="$with_linux" + kernelsrc="$withval" +fi; + + +# Check whether --with-linux-obj or --without-linux-obj was given. +if test "${with_linux_obj+set}" = set; then + withval="$with_linux_obj" + kernelbuild="$withval" +fi; + + echo "$as_me:$LINENO: checking kernel source directory" >&5 +echo $ECHO_N "checking kernel source directory... $ECHO_C" >&6 + if test -z "$kernelsrc"; then + sourcelink=`ls -1d /usr/src/kernels/* /usr/src/linux-* \ + 2>/dev/null | grep -v obj | tail -1` + + if test -e $sourcelink; then + kernelsrc=`readlink -f ${sourcelink}` + else + echo "$as_me:$LINENO: result: Not found" >&5 +echo "${ECHO_T}Not found" >&6 + { { echo "$as_me:$LINENO: error: + *** Please specify the location of the kernel source + *** with the '--with-linux=PATH' option" >&5 +echo "$as_me: error: + *** Please specify the location of the kernel source + *** with the '--with-linux=PATH' option" >&2;} + { (exit 1); exit 1; }; } + fi + else + if test "$kernelsrc" = "NONE"; then + kernsrcver=NONE + fi fi + echo "$as_me:$LINENO: result: $kernelsrc" >&5 +echo "${ECHO_T}$kernelsrc" >&6 + echo "$as_me:$LINENO: checking kernel build directory" >&5 +echo $ECHO_N "checking kernel build directory... $ECHO_C" >&6 + if test -z "$kernelbuild"; then + if test -d ${kernelsrc}-obj; then + kernelbuild=${kernelsrc}-obj/`arch`/`arch` + elif test -d `dirname ${kernelsrc}`/build-`arch`; then + kernelbuild=`dirname ${kernelsrc}`/build-`arch` + else + kernelbuild=${kernelsrc} + fi + fi + echo "$as_me:$LINENO: result: $kernelbuild" >&5 +echo "${ECHO_T}$kernelbuild" >&6 + + echo "$as_me:$LINENO: checking kernel source version" >&5 +echo $ECHO_N "checking kernel source version... $ECHO_C" >&6 + if test -r $kernelbuild/include/linux/version.h && + fgrep -q UTS_RELEASE $kernelbuild/include/linux/version.h; then + + kernsrcver=`(echo "#include "; + echo "kernsrcver=UTS_RELEASE") | + cpp -I $kernelbuild/include | + grep "^kernsrcver=" | cut -d \" -f 2` + + elif test -r $kernelbuild/include/linux/utsrelease.h && + fgrep -q UTS_RELEASE $kernelbuild/include/linux/utsrelease.h; then + + kernsrcver=`(echo "#include "; + echo "kernsrcver=UTS_RELEASE") | + cpp -I $kernelbuild/include | + grep "^kernsrcver=" | cut -d \" -f 2` + fi + + if test -z "$kernsrcver"; then + echo "$as_me:$LINENO: result: Not found" >&5 +echo "${ECHO_T}Not found" >&6 + { { echo "$as_me:$LINENO: error: + *** Cannot determine the version of the linux kernel source. + *** Please prepare the kernel before running this script" >&5 +echo "$as_me: error: + *** Cannot determine the version of the linux kernel source. + *** Please prepare the kernel before running this script" >&2;} + { (exit 1); exit 1; }; } + fi + + echo "$as_me:$LINENO: result: $kernsrcver" >&5 +echo "${ECHO_T}$kernsrcver" >&6 + + LINUX=${kernelsrc} + LINUX_OBJ=${kernelbuild} + LINUX_VERSION=${kernsrcver} + + + + + + + echo "$as_me:$LINENO: checking kernel file name for module symbols" >&5 +echo $ECHO_N "checking kernel file name for module symbols... $ECHO_C" >&6 + if grep -q Modules.symvers $LINUX/scripts/Makefile.modpost; then + LINUX_SYMBOLS=Modules.symvers + else + LINUX_SYMBOLS=Module.symvers + fi + echo "$as_me:$LINENO: result: $LINUX_SYMBOLS" >&5 +echo "${ECHO_T}$LINUX_SYMBOLS" >&6 + + + + + +# Check whether --with-spl or --without-spl was given. +if test "${with_spl+set}" = set; then + withval="$with_spl" + splsrc="$withval" +fi; + + +# Check whether --with-spl-obj or --without-spl-obj was given. +if test "${with_spl_obj+set}" = set; then + withval="$with_spl_obj" + splbuild="$withval" +fi; + + + echo "$as_me:$LINENO: checking spl source directory" >&5 +echo $ECHO_N "checking spl source directory... $ECHO_C" >&6 + if test -z "$splsrc"; then + sourcelink=`ls -1d /usr/src/spl-*/${LINUX_VERSION} \ + 2>/dev/null | tail -1` + + if test -e $sourcelink; then + splsrc=`readlink -f ${sourcelink}` + else + echo "$as_me:$LINENO: result: Not found" >&5 +echo "${ECHO_T}Not found" >&6 + { { echo "$as_me:$LINENO: error: + *** Please specify the location of the spl source + *** with the '--with-spl=PATH' option" >&5 +echo "$as_me: error: + *** Please specify the location of the spl source + *** with the '--with-spl=PATH' option" >&2;} + { (exit 1); exit 1; }; } + fi + else + if test "$splsrc" = "NONE"; then + splbuild=NONE + splsrcver=NONE + fi + fi + + echo "$as_me:$LINENO: result: $splsrc" >&5 +echo "${ECHO_T}$splsrc" >&6 + echo "$as_me:$LINENO: checking spl build directory" >&5 +echo $ECHO_N "checking spl build directory... $ECHO_C" >&6 + if test -z "$splbuild"; then + if test -d ${splsrc}/module; then + splbuild=${splsrc}/module + else + splbuild=${splsrc} + fi + fi + echo "$as_me:$LINENO: result: $splbuild" >&5 +echo "${ECHO_T}$splbuild" >&6 + + echo "$as_me:$LINENO: checking spl source version" >&5 +echo $ECHO_N "checking spl source version... $ECHO_C" >&6 + if test -r $splsrc/spl_config.h && + fgrep -q SPL_META_VERSION $splsrc/spl_config.h; then + + splsrcver=`(echo "#include "; + echo "splsrcver=SPL_META_VERSION") | + cpp -I $splsrc | + grep "^splsrcver=" | cut -d \" -f 2` + fi + + if test -z "$splsrcver"; then + echo "$as_me:$LINENO: result: Not found" >&5 +echo "${ECHO_T}Not found" >&6 + { { echo "$as_me:$LINENO: error: + *** Cannot determine the version of the spl source. + *** Please prepare the spl source before running this script" >&5 +echo "$as_me: error: + *** Cannot determine the version of the spl source. + *** Please prepare the spl source before running this script" >&2;} + { (exit 1); exit 1; }; } + fi + + echo "$as_me:$LINENO: result: $splsrcver" >&5 +echo "${ECHO_T}$splsrcver" >&6 + + SPL=${splsrc} + SPL_OBJ=${splbuild} + SPL_VERSION=${splsrcver} + + + + + + + echo "$as_me:$LINENO: checking spl file name for module symbols" >&5 +echo $ECHO_N "checking spl file name for module symbols... $ECHO_C" >&6 + + if test -r $SPL_OBJ/Module.symvers; then + SPL_SYMBOLS=Module.symvers + elif test -r $SPL_OBJ/Modules.symvers; then + SPL_SYMBOLS=Modules.symvers + else + echo "$as_me:$LINENO: result: Not found" >&5 +echo "${ECHO_T}Not found" >&6 + { { echo "$as_me:$LINENO: error: + *** Cannot find extra Module{s}.symvers in the spl source. + *** Please prepare the spl source before running this script" >&5 +echo "$as_me: error: + *** Cannot find extra Module{s}.symvers in the spl source. + *** Please prepare the spl source before running this script" >&2;} + { (exit 1); exit 1; }; } + fi + + echo "$as_me:$LINENO: result: $SPL_SYMBOLS" >&5 +echo "${ECHO_T}$SPL_SYMBOLS" >&6 @@ -20021,6 +20249,19 @@ fi EXTRA_KCFLAGS="$tmp_flags" + KERNELMAKE_PARAMS="V=1" + + KERNELCPPFLAGS="$KERNELCPPFLAGS -Werror -DHAVE_SPL -D_KERNEL" + KERNELCPPFLAGS="$KERNELCPPFLAGS -DTEXT_DOMAIN=\\\"zfs-linux-kernel\\\"" + KERNELCPPFLAGS="$KERNELCPPFLAGS -I$TOPDIR -I$SPL -I$SPL/include" + + if test "$LINUX_OBJ" != "$LINUX"; then + KERNELMAKE_PARAMS="$KERNELMAKE_PARAMS O=$LINUX_OBJ" + fi + + + + echo "$as_me:$LINENO: checking for target arch" >&5 @@ -20683,21 +20924,44 @@ echo "$as_me: error: Bad value \"$ZFS_CONFIG\" for --with-config, esac + +if test "$ZFS_CONFIG" = user || + test "$ZFS_CONFIG" = all; then + CONFIG_USER_TRUE= + CONFIG_USER_FALSE='#' +else + CONFIG_USER_TRUE='#' + CONFIG_USER_FALSE= +fi + + + +if test "$ZFS_CONFIG" = kernel || + test "$ZFS_CONFIG" = all; then + CONFIG_KERNEL_TRUE= + CONFIG_KERNEL_FALSE='#' +else + CONFIG_KERNEL_TRUE='#' + CONFIG_KERNEL_FALSE= +fi + + + SCRIPT_CONFIG=.script-config rm -f ${SCRIPT_CONFIG} - echo "KERNELSRC=${LINUX}" >>${SCRIPT_CONFIG} - echo "KERNELBUILD=${LINUX_OBJ}" >>${SCRIPT_CONFIG} - echo "KERNELSRCVER=$kernsrcver" >>${SCRIPT_CONFIG} - echo >>${SCRIPT_CONFIG} - echo "SPLSRC=$splsrc" >>${SCRIPT_CONFIG} - echo "SPLBUILD=$splbuild" >>${SCRIPT_CONFIG} - echo "SPLSRCVER=$splsrcver" >>${SCRIPT_CONFIG} - echo "SPLSYMVERS=$splsymvers" >>${SCRIPT_CONFIG} - echo >>${SCRIPT_CONFIG} - echo "TOPDIR=${TOPDIR}" >>${SCRIPT_CONFIG} - echo "LIBDIR=${LIBDIR}" >>${SCRIPT_CONFIG} - echo "CMDDIR=${CMDDIR}" >>${SCRIPT_CONFIG} - echo "MODDIR=${MODDIR}" >>${SCRIPT_CONFIG} + echo "KERNELSRC=${LINUX}" >>${SCRIPT_CONFIG} + echo "KERNELBUILD=${LINUX_OBJ}" >>${SCRIPT_CONFIG} + echo "KERNELSRCVER=${LINUX_VERSION}" >>${SCRIPT_CONFIG} + echo >>${SCRIPT_CONFIG} + echo "SPLSRC=${SPL}" >>${SCRIPT_CONFIG} + echo "SPLBUILD=${SPL_OBJ}" >>${SCRIPT_CONFIG} + echo "SPLSRCVER=${SPL_VERSION}" >>${SCRIPT_CONFIG} + echo >>${SCRIPT_CONFIG} + echo "TOPDIR=${TOPDIR}" >>${SCRIPT_CONFIG} + echo "BUILDDIR=${BUILDDIR}" >>${SCRIPT_CONFIG} + echo "LIBDIR=${LIBDIR}" >>${SCRIPT_CONFIG} + echo "CMDDIR=${CMDDIR}" >>${SCRIPT_CONFIG} + echo "MODDIR=${MODDIR}" >>${SCRIPT_CONFIG} @@ -20735,7 +20999,7 @@ _ACEOF fi - ac_config_files="$ac_config_files Makefile config/Makefile doc/Makefile lib/Makefile lib/libspl/Makefile lib/libspl/asm-i386/Makefile lib/libspl/asm-x86_64/Makefile lib/libspl/asm-powerpc64/Makefile lib/libspl/include/Makefile lib/libavl/Makefile lib/libnvpair/Makefile lib/libunicode/Makefile lib/libuutil/Makefile lib/libzpool/Makefile lib/libzpool/include/Makefile lib/libzfs/Makefile cmd/Makefile cmd/zdb/Makefile cmd/zfs/Makefile cmd/zinject/Makefile cmd/zpool/Makefile cmd/ztest/Makefile cmd/zpios/Makefile module/Makefile module/avl/Makefile module/nvpair/Makefile module/unicode/Makefile module/zcommon/Makefile module/zfs/Makefile module/zpios/Makefile scripts/Makefile scripts/zpool-config/Makefile scripts/zpios-test/Makefile scripts/zpios-profile/Makefile zfs.spec" + ac_config_files="$ac_config_files Makefile config/Makefile doc/Makefile lib/Makefile lib/libspl/Makefile lib/libspl/asm-i386/Makefile lib/libspl/asm-x86_64/Makefile lib/libspl/asm-powerpc64/Makefile lib/libspl/include/Makefile lib/libavl/Makefile lib/libnvpair/Makefile lib/libunicode/Makefile lib/libuutil/Makefile lib/libzpool/Makefile lib/libzpool/include/Makefile lib/libzfs/Makefile cmd/Makefile cmd/zdb/Makefile cmd/zfs/Makefile cmd/zinject/Makefile cmd/zpool/Makefile cmd/ztest/Makefile cmd/zpios/Makefile module/Makefile module/avl/Makefile module/nvpair/Makefile module/unicode/Makefile module/zcommon/Makefile module/zfs/Makefile module/zpios/Makefile scripts/Makefile scripts/zpool-config/Makefile scripts/zpios-test/Makefile scripts/zpios-profile/Makefile zfs.spec zfs-modules.spec" cat >confcache <<\_ACEOF @@ -20857,6 +21121,20 @@ echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined. Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi +if test -z "${CONFIG_USER_TRUE}" && test -z "${CONFIG_USER_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"CONFIG_USER\" was never defined. +Usually this means the macro was only invoked conditionally." >&5 +echo "$as_me: error: conditional \"CONFIG_USER\" was never defined. +Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } +fi +if test -z "${CONFIG_KERNEL_TRUE}" && test -z "${CONFIG_KERNEL_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"CONFIG_KERNEL\" was never defined. +Usually this means the macro was only invoked conditionally." >&5 +echo "$as_me: error: conditional \"CONFIG_KERNEL\" was never defined. +Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } +fi : ${CONFIG_STATUS=./config.status} ac_clean_files_save=$ac_clean_files @@ -21336,6 +21614,7 @@ do "scripts/zpios-test/Makefile" ) CONFIG_FILES="$CONFIG_FILES scripts/zpios-test/Makefile" ;; "scripts/zpios-profile/Makefile" ) CONFIG_FILES="$CONFIG_FILES scripts/zpios-profile/Makefile" ;; "zfs.spec" ) CONFIG_FILES="$CONFIG_FILES zfs.spec" ;; + "zfs-modules.spec" ) CONFIG_FILES="$CONFIG_FILES zfs-modules.spec" ;; "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; "zfs_config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS zfs_config.h" ;; *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 @@ -21507,23 +21786,29 @@ s,@ac_ct_F77@,$ac_ct_F77,;t t s,@LIBTOOL@,$LIBTOOL,;t t s,@CCAS@,$CCAS,;t t s,@CCASFLAGS@,$CCASFLAGS,;t t -s,@LINUX@,$LINUX,;t t -s,@LINUX_OBJ@,$LINUX_OBJ,;t t -s,@LINUX_VERSION@,$LINUX_VERSION,;t t -s,@splsrc@,$splsrc,;t t -s,@splsymvers@,$splsymvers,;t t s,@LICENSE@,$LICENSE,;t t -s,@UNAME@,$UNAME,;t t s,@TOPDIR@,$TOPDIR,;t t s,@BUILDDIR@,$BUILDDIR,;t t s,@LIBDIR@,$LIBDIR,;t t s,@CMDDIR@,$CMDDIR,;t t s,@MODDIR@,$MODDIR,;t t s,@ZFS_CONFIG@,$ZFS_CONFIG,;t t +s,@LINUX@,$LINUX,;t t +s,@LINUX_OBJ@,$LINUX_OBJ,;t t +s,@LINUX_VERSION@,$LINUX_VERSION,;t t +s,@LINUX_SYMBOLS@,$LINUX_SYMBOLS,;t t +s,@SPL@,$SPL,;t t +s,@SPL_OBJ@,$SPL_OBJ,;t t +s,@SPL_VERSION@,$SPL_VERSION,;t t +s,@SPL_SYMBOLS@,$SPL_SYMBOLS,;t t s,@KERNELMAKE_PARAMS@,$KERNELMAKE_PARAMS,;t t s,@KERNELCPPFLAGS@,$KERNELCPPFLAGS,;t t s,@TARGET_ARCH@,$TARGET_ARCH,;t t s,@TARGET_ARCH_DIR@,$TARGET_ARCH_DIR,;t t +s,@CONFIG_USER_TRUE@,$CONFIG_USER_TRUE,;t t +s,@CONFIG_USER_FALSE@,$CONFIG_USER_FALSE,;t t +s,@CONFIG_KERNEL_TRUE@,$CONFIG_KERNEL_TRUE,;t t +s,@CONFIG_KERNEL_FALSE@,$CONFIG_KERNEL_FALSE,;t t s,@LIBOBJS@,$LIBOBJS,;t t s,@LTLIBOBJS@,$LTLIBOBJS,;t t CEOF diff --git a/doc/Makefile.in b/doc/Makefile.in index 69dfe53f8c..8d885990c6 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -73,6 +73,10 @@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CMDDIR = @CMDDIR@ +CONFIG_KERNEL_FALSE = @CONFIG_KERNEL_FALSE@ +CONFIG_KERNEL_TRUE = @CONFIG_KERNEL_TRUE@ +CONFIG_USER_FALSE = @CONFIG_USER_FALSE@ +CONFIG_USER_TRUE = @CONFIG_USER_TRUE@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ @@ -104,6 +108,7 @@ LIBTOOL = @LIBTOOL@ LICENSE = @LICENSE@ LINUX = @LINUX@ LINUX_OBJ = @LINUX_OBJ@ +LINUX_SYMBOLS = @LINUX_SYMBOLS@ LINUX_VERSION = @LINUX_VERSION@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ @@ -124,11 +129,14 @@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ +SPL = @SPL@ +SPL_OBJ = @SPL_OBJ@ +SPL_SYMBOLS = @SPL_SYMBOLS@ +SPL_VERSION = @SPL_VERSION@ STRIP = @STRIP@ TARGET_ARCH = @TARGET_ARCH@ TARGET_ARCH_DIR = @TARGET_ARCH_DIR@ TOPDIR = @TOPDIR@ -UNAME = @UNAME@ VERSION = @VERSION@ ZFS_CONFIG = @ZFS_CONFIG@ ZFS_META_ALIAS = @ZFS_META_ALIAS@ @@ -181,8 +189,6 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ -splsrc = @splsrc@ -splsymvers = @splsymvers@ sysconfdir = @sysconfdir@ target = @target@ target_alias = @target_alias@ diff --git a/lib/Makefile.in b/lib/Makefile.in index 8cb336805d..74576cb10f 100644 --- a/lib/Makefile.in +++ b/lib/Makefile.in @@ -82,6 +82,10 @@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CMDDIR = @CMDDIR@ +CONFIG_KERNEL_FALSE = @CONFIG_KERNEL_FALSE@ +CONFIG_KERNEL_TRUE = @CONFIG_KERNEL_TRUE@ +CONFIG_USER_FALSE = @CONFIG_USER_FALSE@ +CONFIG_USER_TRUE = @CONFIG_USER_TRUE@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ @@ -113,6 +117,7 @@ LIBTOOL = @LIBTOOL@ LICENSE = @LICENSE@ LINUX = @LINUX@ LINUX_OBJ = @LINUX_OBJ@ +LINUX_SYMBOLS = @LINUX_SYMBOLS@ LINUX_VERSION = @LINUX_VERSION@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ @@ -133,11 +138,14 @@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ +SPL = @SPL@ +SPL_OBJ = @SPL_OBJ@ +SPL_SYMBOLS = @SPL_SYMBOLS@ +SPL_VERSION = @SPL_VERSION@ STRIP = @STRIP@ TARGET_ARCH = @TARGET_ARCH@ TARGET_ARCH_DIR = @TARGET_ARCH_DIR@ TOPDIR = @TOPDIR@ -UNAME = @UNAME@ VERSION = @VERSION@ ZFS_CONFIG = @ZFS_CONFIG@ ZFS_META_ALIAS = @ZFS_META_ALIAS@ @@ -190,8 +198,6 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ -splsrc = @splsrc@ -splsymvers = @splsymvers@ sysconfdir = @sysconfdir@ target = @target@ target_alias = @target_alias@ diff --git a/lib/libavl/Makefile.in b/lib/libavl/Makefile.in index fccd4ef827..8fc8694490 100644 --- a/lib/libavl/Makefile.in +++ b/lib/libavl/Makefile.in @@ -99,6 +99,10 @@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CMDDIR = @CMDDIR@ +CONFIG_KERNEL_FALSE = @CONFIG_KERNEL_FALSE@ +CONFIG_KERNEL_TRUE = @CONFIG_KERNEL_TRUE@ +CONFIG_USER_FALSE = @CONFIG_USER_FALSE@ +CONFIG_USER_TRUE = @CONFIG_USER_TRUE@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ @@ -130,6 +134,7 @@ LIBTOOL = @LIBTOOL@ LICENSE = @LICENSE@ LINUX = @LINUX@ LINUX_OBJ = @LINUX_OBJ@ +LINUX_SYMBOLS = @LINUX_SYMBOLS@ LINUX_VERSION = @LINUX_VERSION@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ @@ -150,11 +155,14 @@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ +SPL = @SPL@ +SPL_OBJ = @SPL_OBJ@ +SPL_SYMBOLS = @SPL_SYMBOLS@ +SPL_VERSION = @SPL_VERSION@ STRIP = @STRIP@ TARGET_ARCH = @TARGET_ARCH@ TARGET_ARCH_DIR = @TARGET_ARCH_DIR@ TOPDIR = @TOPDIR@ -UNAME = @UNAME@ VERSION = @VERSION@ ZFS_CONFIG = @ZFS_CONFIG@ ZFS_META_ALIAS = @ZFS_META_ALIAS@ @@ -207,8 +215,6 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ -splsrc = @splsrc@ -splsymvers = @splsymvers@ sysconfdir = @sysconfdir@ target = @target@ target_alias = @target_alias@ diff --git a/lib/libnvpair/Makefile.in b/lib/libnvpair/Makefile.in index 8ed627f0d5..9d74b79d6c 100644 --- a/lib/libnvpair/Makefile.in +++ b/lib/libnvpair/Makefile.in @@ -100,6 +100,10 @@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CMDDIR = @CMDDIR@ +CONFIG_KERNEL_FALSE = @CONFIG_KERNEL_FALSE@ +CONFIG_KERNEL_TRUE = @CONFIG_KERNEL_TRUE@ +CONFIG_USER_FALSE = @CONFIG_USER_FALSE@ +CONFIG_USER_TRUE = @CONFIG_USER_TRUE@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ @@ -131,6 +135,7 @@ LIBTOOL = @LIBTOOL@ LICENSE = @LICENSE@ LINUX = @LINUX@ LINUX_OBJ = @LINUX_OBJ@ +LINUX_SYMBOLS = @LINUX_SYMBOLS@ LINUX_VERSION = @LINUX_VERSION@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ @@ -151,11 +156,14 @@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ +SPL = @SPL@ +SPL_OBJ = @SPL_OBJ@ +SPL_SYMBOLS = @SPL_SYMBOLS@ +SPL_VERSION = @SPL_VERSION@ STRIP = @STRIP@ TARGET_ARCH = @TARGET_ARCH@ TARGET_ARCH_DIR = @TARGET_ARCH_DIR@ TOPDIR = @TOPDIR@ -UNAME = @UNAME@ VERSION = @VERSION@ ZFS_CONFIG = @ZFS_CONFIG@ ZFS_META_ALIAS = @ZFS_META_ALIAS@ @@ -208,8 +216,6 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ -splsrc = @splsrc@ -splsymvers = @splsymvers@ sysconfdir = @sysconfdir@ target = @target@ target_alias = @target_alias@ diff --git a/lib/libspl/Makefile.in b/lib/libspl/Makefile.in index 8072b88764..5f5591592c 100644 --- a/lib/libspl/Makefile.in +++ b/lib/libspl/Makefile.in @@ -110,6 +110,10 @@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CMDDIR = @CMDDIR@ +CONFIG_KERNEL_FALSE = @CONFIG_KERNEL_FALSE@ +CONFIG_KERNEL_TRUE = @CONFIG_KERNEL_TRUE@ +CONFIG_USER_FALSE = @CONFIG_USER_FALSE@ +CONFIG_USER_TRUE = @CONFIG_USER_TRUE@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ @@ -141,6 +145,7 @@ LIBTOOL = @LIBTOOL@ LICENSE = @LICENSE@ LINUX = @LINUX@ LINUX_OBJ = @LINUX_OBJ@ +LINUX_SYMBOLS = @LINUX_SYMBOLS@ LINUX_VERSION = @LINUX_VERSION@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ @@ -161,11 +166,14 @@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ +SPL = @SPL@ +SPL_OBJ = @SPL_OBJ@ +SPL_SYMBOLS = @SPL_SYMBOLS@ +SPL_VERSION = @SPL_VERSION@ STRIP = @STRIP@ TARGET_ARCH = @TARGET_ARCH@ TARGET_ARCH_DIR = @TARGET_ARCH_DIR@ TOPDIR = @TOPDIR@ -UNAME = @UNAME@ VERSION = @VERSION@ ZFS_CONFIG = @ZFS_CONFIG@ ZFS_META_ALIAS = @ZFS_META_ALIAS@ @@ -218,8 +226,6 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ -splsrc = @splsrc@ -splsymvers = @splsymvers@ sysconfdir = @sysconfdir@ target = @target@ target_alias = @target_alias@ diff --git a/lib/libspl/asm-i386/Makefile.in b/lib/libspl/asm-i386/Makefile.in index e7fd864a2e..6205cc58ce 100644 --- a/lib/libspl/asm-i386/Makefile.in +++ b/lib/libspl/asm-i386/Makefile.in @@ -78,6 +78,10 @@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CMDDIR = @CMDDIR@ +CONFIG_KERNEL_FALSE = @CONFIG_KERNEL_FALSE@ +CONFIG_KERNEL_TRUE = @CONFIG_KERNEL_TRUE@ +CONFIG_USER_FALSE = @CONFIG_USER_FALSE@ +CONFIG_USER_TRUE = @CONFIG_USER_TRUE@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ @@ -109,6 +113,7 @@ LIBTOOL = @LIBTOOL@ LICENSE = @LICENSE@ LINUX = @LINUX@ LINUX_OBJ = @LINUX_OBJ@ +LINUX_SYMBOLS = @LINUX_SYMBOLS@ LINUX_VERSION = @LINUX_VERSION@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ @@ -129,11 +134,14 @@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ +SPL = @SPL@ +SPL_OBJ = @SPL_OBJ@ +SPL_SYMBOLS = @SPL_SYMBOLS@ +SPL_VERSION = @SPL_VERSION@ STRIP = @STRIP@ TARGET_ARCH = @TARGET_ARCH@ TARGET_ARCH_DIR = @TARGET_ARCH_DIR@ TOPDIR = @TOPDIR@ -UNAME = @UNAME@ VERSION = @VERSION@ ZFS_CONFIG = @ZFS_CONFIG@ ZFS_META_ALIAS = @ZFS_META_ALIAS@ @@ -186,8 +194,6 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ -splsrc = @splsrc@ -splsymvers = @splsymvers@ sysconfdir = @sysconfdir@ target = @target@ target_alias = @target_alias@ diff --git a/lib/libspl/asm-powerpc64/Makefile.in b/lib/libspl/asm-powerpc64/Makefile.in index 7e39635359..c911d83405 100644 --- a/lib/libspl/asm-powerpc64/Makefile.in +++ b/lib/libspl/asm-powerpc64/Makefile.in @@ -74,6 +74,10 @@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CMDDIR = @CMDDIR@ +CONFIG_KERNEL_FALSE = @CONFIG_KERNEL_FALSE@ +CONFIG_KERNEL_TRUE = @CONFIG_KERNEL_TRUE@ +CONFIG_USER_FALSE = @CONFIG_USER_FALSE@ +CONFIG_USER_TRUE = @CONFIG_USER_TRUE@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ @@ -105,6 +109,7 @@ LIBTOOL = @LIBTOOL@ LICENSE = @LICENSE@ LINUX = @LINUX@ LINUX_OBJ = @LINUX_OBJ@ +LINUX_SYMBOLS = @LINUX_SYMBOLS@ LINUX_VERSION = @LINUX_VERSION@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ @@ -125,11 +130,14 @@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ +SPL = @SPL@ +SPL_OBJ = @SPL_OBJ@ +SPL_SYMBOLS = @SPL_SYMBOLS@ +SPL_VERSION = @SPL_VERSION@ STRIP = @STRIP@ TARGET_ARCH = @TARGET_ARCH@ TARGET_ARCH_DIR = @TARGET_ARCH_DIR@ TOPDIR = @TOPDIR@ -UNAME = @UNAME@ VERSION = @VERSION@ ZFS_CONFIG = @ZFS_CONFIG@ ZFS_META_ALIAS = @ZFS_META_ALIAS@ @@ -182,8 +190,6 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ -splsrc = @splsrc@ -splsymvers = @splsymvers@ sysconfdir = @sysconfdir@ target = @target@ target_alias = @target_alias@ @@ -369,7 +375,7 @@ all-am: $(COMPILE) -c -S ${atomic_SOURCE} -o ${atomic_ASM} clean-generic: - rm ${atomic_ASM} + $(RM) ${atomic_ASM} # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/lib/libspl/asm-x86_64/Makefile.in b/lib/libspl/asm-x86_64/Makefile.in index 61f3c35a6b..b669f902e7 100644 --- a/lib/libspl/asm-x86_64/Makefile.in +++ b/lib/libspl/asm-x86_64/Makefile.in @@ -78,6 +78,10 @@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CMDDIR = @CMDDIR@ +CONFIG_KERNEL_FALSE = @CONFIG_KERNEL_FALSE@ +CONFIG_KERNEL_TRUE = @CONFIG_KERNEL_TRUE@ +CONFIG_USER_FALSE = @CONFIG_USER_FALSE@ +CONFIG_USER_TRUE = @CONFIG_USER_TRUE@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ @@ -109,6 +113,7 @@ LIBTOOL = @LIBTOOL@ LICENSE = @LICENSE@ LINUX = @LINUX@ LINUX_OBJ = @LINUX_OBJ@ +LINUX_SYMBOLS = @LINUX_SYMBOLS@ LINUX_VERSION = @LINUX_VERSION@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ @@ -129,11 +134,14 @@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ +SPL = @SPL@ +SPL_OBJ = @SPL_OBJ@ +SPL_SYMBOLS = @SPL_SYMBOLS@ +SPL_VERSION = @SPL_VERSION@ STRIP = @STRIP@ TARGET_ARCH = @TARGET_ARCH@ TARGET_ARCH_DIR = @TARGET_ARCH_DIR@ TOPDIR = @TOPDIR@ -UNAME = @UNAME@ VERSION = @VERSION@ ZFS_CONFIG = @ZFS_CONFIG@ ZFS_META_ALIAS = @ZFS_META_ALIAS@ @@ -186,8 +194,6 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ -splsrc = @splsrc@ -splsymvers = @splsymvers@ sysconfdir = @sysconfdir@ target = @target@ target_alias = @target_alias@ diff --git a/lib/libspl/include/Makefile.in b/lib/libspl/include/Makefile.in index e99ea1b8d4..6040e4d2a2 100644 --- a/lib/libspl/include/Makefile.in +++ b/lib/libspl/include/Makefile.in @@ -38,7 +38,7 @@ build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ subdir = lib/libspl/include -DIST_COMMON = $(pkginclude_HEADERS) $(srcdir)/Makefile.am \ +DIST_COMMON = $(nobase_pkginclude_HEADERS) $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/kernel-bio-args.m4 \ @@ -65,8 +65,8 @@ am__vpath_adj = case $$p in \ esac; am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; am__installdirs = "$(DESTDIR)$(pkgincludedir)" -pkgincludeHEADERS_INSTALL = $(INSTALL_HEADER) -HEADERS = $(pkginclude_HEADERS) +nobase_pkgincludeHEADERS_INSTALL = $(install_sh_DATA) +HEADERS = $(nobase_pkginclude_HEADERS) ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -86,6 +86,10 @@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CMDDIR = @CMDDIR@ +CONFIG_KERNEL_FALSE = @CONFIG_KERNEL_FALSE@ +CONFIG_KERNEL_TRUE = @CONFIG_KERNEL_TRUE@ +CONFIG_USER_FALSE = @CONFIG_USER_FALSE@ +CONFIG_USER_TRUE = @CONFIG_USER_TRUE@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ @@ -117,6 +121,7 @@ LIBTOOL = @LIBTOOL@ LICENSE = @LICENSE@ LINUX = @LINUX@ LINUX_OBJ = @LINUX_OBJ@ +LINUX_SYMBOLS = @LINUX_SYMBOLS@ LINUX_VERSION = @LINUX_VERSION@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ @@ -137,11 +142,14 @@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ +SPL = @SPL@ +SPL_OBJ = @SPL_OBJ@ +SPL_SYMBOLS = @SPL_SYMBOLS@ +SPL_VERSION = @SPL_VERSION@ STRIP = @STRIP@ TARGET_ARCH = @TARGET_ARCH@ TARGET_ARCH_DIR = @TARGET_ARCH_DIR@ TOPDIR = @TOPDIR@ -UNAME = @UNAME@ VERSION = @VERSION@ ZFS_CONFIG = @ZFS_CONFIG@ ZFS_META_ALIAS = @ZFS_META_ALIAS@ @@ -194,16 +202,14 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ -splsrc = @splsrc@ -splsymvers = @splsymvers@ sysconfdir = @sysconfdir@ target = @target@ target_alias = @target_alias@ target_cpu = @target_cpu@ target_os = @target_os@ target_vendor = @target_vendor@ -pkginclude_HEADERS = *.h ia32/sys/*.h rpc/*.h sys/*.h sys/fm/*.h \ - sys/sysevent/*.h tsol/*.h +nobase_pkginclude_HEADERS = *.h ia32/sys/*.h rpc/*.h sys/*.h \ + sys/fm/*.h sys/sysevent/*.h tsol/*.h all: all-am .SUFFIXES: @@ -246,20 +252,22 @@ clean-libtool: distclean-libtool: -rm -f libtool uninstall-info-am: -install-pkgincludeHEADERS: $(pkginclude_HEADERS) +install-nobase_pkgincludeHEADERS: $(nobase_pkginclude_HEADERS) @$(NORMAL_INSTALL) test -z "$(pkgincludedir)" || $(mkdir_p) "$(DESTDIR)$(pkgincludedir)" - @list='$(pkginclude_HEADERS)'; for p in $$list; do \ + @$(am__vpath_adj_setup) \ + list='$(nobase_pkginclude_HEADERS)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f=$(am__strip_dir) \ - echo " $(pkgincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgincludedir)/$$f'"; \ - $(pkgincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgincludedir)/$$f"; \ + $(am__vpath_adj) \ + echo " $(nobase_pkgincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgincludedir)/$$f'"; \ + $(nobase_pkgincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgincludedir)/$$f"; \ done -uninstall-pkgincludeHEADERS: +uninstall-nobase_pkgincludeHEADERS: @$(NORMAL_UNINSTALL) - @list='$(pkginclude_HEADERS)'; for p in $$list; do \ - f=$(am__strip_dir) \ + @$(am__vpath_adj_setup) \ + list='$(nobase_pkginclude_HEADERS)'; for p in $$list; do \ + $(am__vpath_adj) \ echo " rm -f '$(DESTDIR)$(pkgincludedir)/$$f'"; \ rm -f "$(DESTDIR)$(pkgincludedir)/$$f"; \ done @@ -390,7 +398,7 @@ info: info-am info-am: -install-data-am: install-pkgincludeHEADERS +install-data-am: install-nobase_pkgincludeHEADERS install-exec-am: @@ -416,19 +424,19 @@ ps: ps-am ps-am: -uninstall-am: uninstall-info-am uninstall-pkgincludeHEADERS +uninstall-am: uninstall-info-am uninstall-nobase_pkgincludeHEADERS .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ clean-libtool ctags distclean distclean-generic \ distclean-libtool distclean-tags distdir dvi dvi-am html \ html-am info info-am install install-am install-data \ install-data-am install-exec install-exec-am install-info \ - install-info-am install-man install-pkgincludeHEADERS \ + install-info-am install-man install-nobase_pkgincludeHEADERS \ install-strip installcheck installcheck-am installdirs \ maintainer-clean maintainer-clean-generic mostlyclean \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ tags uninstall uninstall-am uninstall-info-am \ - uninstall-pkgincludeHEADERS + uninstall-nobase_pkgincludeHEADERS # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/lib/libunicode/Makefile.in b/lib/libunicode/Makefile.in index c2f6aa3ec2..db5ffb6d8c 100644 --- a/lib/libunicode/Makefile.in +++ b/lib/libunicode/Makefile.in @@ -99,6 +99,10 @@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CMDDIR = @CMDDIR@ +CONFIG_KERNEL_FALSE = @CONFIG_KERNEL_FALSE@ +CONFIG_KERNEL_TRUE = @CONFIG_KERNEL_TRUE@ +CONFIG_USER_FALSE = @CONFIG_USER_FALSE@ +CONFIG_USER_TRUE = @CONFIG_USER_TRUE@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ @@ -130,6 +134,7 @@ LIBTOOL = @LIBTOOL@ LICENSE = @LICENSE@ LINUX = @LINUX@ LINUX_OBJ = @LINUX_OBJ@ +LINUX_SYMBOLS = @LINUX_SYMBOLS@ LINUX_VERSION = @LINUX_VERSION@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ @@ -150,11 +155,14 @@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ +SPL = @SPL@ +SPL_OBJ = @SPL_OBJ@ +SPL_SYMBOLS = @SPL_SYMBOLS@ +SPL_VERSION = @SPL_VERSION@ STRIP = @STRIP@ TARGET_ARCH = @TARGET_ARCH@ TARGET_ARCH_DIR = @TARGET_ARCH_DIR@ TOPDIR = @TOPDIR@ -UNAME = @UNAME@ VERSION = @VERSION@ ZFS_CONFIG = @ZFS_CONFIG@ ZFS_META_ALIAS = @ZFS_META_ALIAS@ @@ -207,8 +215,6 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ -splsrc = @splsrc@ -splsymvers = @splsymvers@ sysconfdir = @sysconfdir@ target = @target@ target_alias = @target_alias@ diff --git a/lib/libuutil/Makefile.in b/lib/libuutil/Makefile.in index 7f2e52a4ef..e8a23b7002 100644 --- a/lib/libuutil/Makefile.in +++ b/lib/libuutil/Makefile.in @@ -101,6 +101,10 @@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CMDDIR = @CMDDIR@ +CONFIG_KERNEL_FALSE = @CONFIG_KERNEL_FALSE@ +CONFIG_KERNEL_TRUE = @CONFIG_KERNEL_TRUE@ +CONFIG_USER_FALSE = @CONFIG_USER_FALSE@ +CONFIG_USER_TRUE = @CONFIG_USER_TRUE@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ @@ -132,6 +136,7 @@ LIBTOOL = @LIBTOOL@ LICENSE = @LICENSE@ LINUX = @LINUX@ LINUX_OBJ = @LINUX_OBJ@ +LINUX_SYMBOLS = @LINUX_SYMBOLS@ LINUX_VERSION = @LINUX_VERSION@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ @@ -152,11 +157,14 @@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ +SPL = @SPL@ +SPL_OBJ = @SPL_OBJ@ +SPL_SYMBOLS = @SPL_SYMBOLS@ +SPL_VERSION = @SPL_VERSION@ STRIP = @STRIP@ TARGET_ARCH = @TARGET_ARCH@ TARGET_ARCH_DIR = @TARGET_ARCH_DIR@ TOPDIR = @TOPDIR@ -UNAME = @UNAME@ VERSION = @VERSION@ ZFS_CONFIG = @ZFS_CONFIG@ ZFS_META_ALIAS = @ZFS_META_ALIAS@ @@ -209,8 +217,6 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ -splsrc = @splsrc@ -splsymvers = @splsymvers@ sysconfdir = @sysconfdir@ target = @target@ target_alias = @target_alias@ diff --git a/lib/libzfs/Makefile.in b/lib/libzfs/Makefile.in index 2c59f7d304..dd241145c9 100644 --- a/lib/libzfs/Makefile.in +++ b/lib/libzfs/Makefile.in @@ -102,6 +102,10 @@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CMDDIR = @CMDDIR@ +CONFIG_KERNEL_FALSE = @CONFIG_KERNEL_FALSE@ +CONFIG_KERNEL_TRUE = @CONFIG_KERNEL_TRUE@ +CONFIG_USER_FALSE = @CONFIG_USER_FALSE@ +CONFIG_USER_TRUE = @CONFIG_USER_TRUE@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ @@ -133,6 +137,7 @@ LIBTOOL = @LIBTOOL@ LICENSE = @LICENSE@ LINUX = @LINUX@ LINUX_OBJ = @LINUX_OBJ@ +LINUX_SYMBOLS = @LINUX_SYMBOLS@ LINUX_VERSION = @LINUX_VERSION@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ @@ -153,11 +158,14 @@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ +SPL = @SPL@ +SPL_OBJ = @SPL_OBJ@ +SPL_SYMBOLS = @SPL_SYMBOLS@ +SPL_VERSION = @SPL_VERSION@ STRIP = @STRIP@ TARGET_ARCH = @TARGET_ARCH@ TARGET_ARCH_DIR = @TARGET_ARCH_DIR@ TOPDIR = @TOPDIR@ -UNAME = @UNAME@ VERSION = @VERSION@ ZFS_CONFIG = @ZFS_CONFIG@ ZFS_META_ALIAS = @ZFS_META_ALIAS@ @@ -210,8 +218,6 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ -splsrc = @splsrc@ -splsymvers = @splsymvers@ sysconfdir = @sysconfdir@ target = @target@ target_alias = @target_alias@ diff --git a/lib/libzpool/Makefile.in b/lib/libzpool/Makefile.in index 49e2ba4b21..58708aee67 100644 --- a/lib/libzpool/Makefile.in +++ b/lib/libzpool/Makefile.in @@ -119,6 +119,10 @@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CMDDIR = @CMDDIR@ +CONFIG_KERNEL_FALSE = @CONFIG_KERNEL_FALSE@ +CONFIG_KERNEL_TRUE = @CONFIG_KERNEL_TRUE@ +CONFIG_USER_FALSE = @CONFIG_USER_FALSE@ +CONFIG_USER_TRUE = @CONFIG_USER_TRUE@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ @@ -150,6 +154,7 @@ LIBTOOL = @LIBTOOL@ LICENSE = @LICENSE@ LINUX = @LINUX@ LINUX_OBJ = @LINUX_OBJ@ +LINUX_SYMBOLS = @LINUX_SYMBOLS@ LINUX_VERSION = @LINUX_VERSION@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ @@ -170,11 +175,14 @@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ +SPL = @SPL@ +SPL_OBJ = @SPL_OBJ@ +SPL_SYMBOLS = @SPL_SYMBOLS@ +SPL_VERSION = @SPL_VERSION@ STRIP = @STRIP@ TARGET_ARCH = @TARGET_ARCH@ TARGET_ARCH_DIR = @TARGET_ARCH_DIR@ TOPDIR = @TOPDIR@ -UNAME = @UNAME@ VERSION = @VERSION@ ZFS_CONFIG = @ZFS_CONFIG@ ZFS_META_ALIAS = @ZFS_META_ALIAS@ @@ -227,8 +235,6 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ -splsrc = @splsrc@ -splsymvers = @splsymvers@ sysconfdir = @sysconfdir@ target = @target@ target_alias = @target_alias@ diff --git a/lib/libzpool/include/Makefile.in b/lib/libzpool/include/Makefile.in index 89452163a1..aae76fc5c5 100644 --- a/lib/libzpool/include/Makefile.in +++ b/lib/libzpool/include/Makefile.in @@ -38,7 +38,7 @@ build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ subdir = lib/libzpool/include -DIST_COMMON = $(pkginclude_HEADERS) $(srcdir)/Makefile.am \ +DIST_COMMON = $(nobase_pkginclude_HEADERS) $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/kernel-bio-args.m4 \ @@ -65,8 +65,8 @@ am__vpath_adj = case $$p in \ esac; am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; am__installdirs = "$(DESTDIR)$(pkgincludedir)" -pkgincludeHEADERS_INSTALL = $(INSTALL_HEADER) -HEADERS = $(pkginclude_HEADERS) +nobase_pkgincludeHEADERS_INSTALL = $(install_sh_DATA) +HEADERS = $(nobase_pkginclude_HEADERS) ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -86,6 +86,10 @@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CMDDIR = @CMDDIR@ +CONFIG_KERNEL_FALSE = @CONFIG_KERNEL_FALSE@ +CONFIG_KERNEL_TRUE = @CONFIG_KERNEL_TRUE@ +CONFIG_USER_FALSE = @CONFIG_USER_FALSE@ +CONFIG_USER_TRUE = @CONFIG_USER_TRUE@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ @@ -117,6 +121,7 @@ LIBTOOL = @LIBTOOL@ LICENSE = @LICENSE@ LINUX = @LINUX@ LINUX_OBJ = @LINUX_OBJ@ +LINUX_SYMBOLS = @LINUX_SYMBOLS@ LINUX_VERSION = @LINUX_VERSION@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ @@ -137,11 +142,14 @@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ +SPL = @SPL@ +SPL_OBJ = @SPL_OBJ@ +SPL_SYMBOLS = @SPL_SYMBOLS@ +SPL_VERSION = @SPL_VERSION@ STRIP = @STRIP@ TARGET_ARCH = @TARGET_ARCH@ TARGET_ARCH_DIR = @TARGET_ARCH_DIR@ TOPDIR = @TOPDIR@ -UNAME = @UNAME@ VERSION = @VERSION@ ZFS_CONFIG = @ZFS_CONFIG@ ZFS_META_ALIAS = @ZFS_META_ALIAS@ @@ -194,15 +202,13 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ -splsrc = @splsrc@ -splsymvers = @splsymvers@ sysconfdir = @sysconfdir@ target = @target@ target_alias = @target_alias@ target_cpu = @target_cpu@ target_os = @target_os@ target_vendor = @target_vendor@ -pkginclude_HEADERS = sys/*.h +nobase_pkginclude_HEADERS = sys/*.h all: all-am .SUFFIXES: @@ -245,20 +251,22 @@ clean-libtool: distclean-libtool: -rm -f libtool uninstall-info-am: -install-pkgincludeHEADERS: $(pkginclude_HEADERS) +install-nobase_pkgincludeHEADERS: $(nobase_pkginclude_HEADERS) @$(NORMAL_INSTALL) test -z "$(pkgincludedir)" || $(mkdir_p) "$(DESTDIR)$(pkgincludedir)" - @list='$(pkginclude_HEADERS)'; for p in $$list; do \ + @$(am__vpath_adj_setup) \ + list='$(nobase_pkginclude_HEADERS)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f=$(am__strip_dir) \ - echo " $(pkgincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgincludedir)/$$f'"; \ - $(pkgincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgincludedir)/$$f"; \ + $(am__vpath_adj) \ + echo " $(nobase_pkgincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgincludedir)/$$f'"; \ + $(nobase_pkgincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgincludedir)/$$f"; \ done -uninstall-pkgincludeHEADERS: +uninstall-nobase_pkgincludeHEADERS: @$(NORMAL_UNINSTALL) - @list='$(pkginclude_HEADERS)'; for p in $$list; do \ - f=$(am__strip_dir) \ + @$(am__vpath_adj_setup) \ + list='$(nobase_pkginclude_HEADERS)'; for p in $$list; do \ + $(am__vpath_adj) \ echo " rm -f '$(DESTDIR)$(pkgincludedir)/$$f'"; \ rm -f "$(DESTDIR)$(pkgincludedir)/$$f"; \ done @@ -389,7 +397,7 @@ info: info-am info-am: -install-data-am: install-pkgincludeHEADERS +install-data-am: install-nobase_pkgincludeHEADERS install-exec-am: @@ -415,19 +423,19 @@ ps: ps-am ps-am: -uninstall-am: uninstall-info-am uninstall-pkgincludeHEADERS +uninstall-am: uninstall-info-am uninstall-nobase_pkgincludeHEADERS .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ clean-libtool ctags distclean distclean-generic \ distclean-libtool distclean-tags distdir dvi dvi-am html \ html-am info info-am install install-am install-data \ install-data-am install-exec install-exec-am install-info \ - install-info-am install-man install-pkgincludeHEADERS \ + install-info-am install-man install-nobase_pkgincludeHEADERS \ install-strip installcheck installcheck-am installdirs \ maintainer-clean maintainer-clean-generic mostlyclean \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ tags uninstall uninstall-am uninstall-info-am \ - uninstall-pkgincludeHEADERS + uninstall-nobase_pkgincludeHEADERS # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/scripts/Makefile.in b/scripts/Makefile.in index 40462a5fde..32429b87fd 100644 --- a/scripts/Makefile.in +++ b/scripts/Makefile.in @@ -82,6 +82,10 @@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CMDDIR = @CMDDIR@ +CONFIG_KERNEL_FALSE = @CONFIG_KERNEL_FALSE@ +CONFIG_KERNEL_TRUE = @CONFIG_KERNEL_TRUE@ +CONFIG_USER_FALSE = @CONFIG_USER_FALSE@ +CONFIG_USER_TRUE = @CONFIG_USER_TRUE@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ @@ -113,6 +117,7 @@ LIBTOOL = @LIBTOOL@ LICENSE = @LICENSE@ LINUX = @LINUX@ LINUX_OBJ = @LINUX_OBJ@ +LINUX_SYMBOLS = @LINUX_SYMBOLS@ LINUX_VERSION = @LINUX_VERSION@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ @@ -133,11 +138,14 @@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ +SPL = @SPL@ +SPL_OBJ = @SPL_OBJ@ +SPL_SYMBOLS = @SPL_SYMBOLS@ +SPL_VERSION = @SPL_VERSION@ STRIP = @STRIP@ TARGET_ARCH = @TARGET_ARCH@ TARGET_ARCH_DIR = @TARGET_ARCH_DIR@ TOPDIR = @TOPDIR@ -UNAME = @UNAME@ VERSION = @VERSION@ ZFS_CONFIG = @ZFS_CONFIG@ ZFS_META_ALIAS = @ZFS_META_ALIAS@ @@ -190,8 +198,6 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ -splsrc = @splsrc@ -splsymvers = @splsymvers@ sysconfdir = @sysconfdir@ target = @target@ target_alias = @target_alias@ diff --git a/scripts/zpios-profile/Makefile.in b/scripts/zpios-profile/Makefile.in index 6d5b99b256..d7b6af7c2f 100644 --- a/scripts/zpios-profile/Makefile.in +++ b/scripts/zpios-profile/Makefile.in @@ -73,6 +73,10 @@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CMDDIR = @CMDDIR@ +CONFIG_KERNEL_FALSE = @CONFIG_KERNEL_FALSE@ +CONFIG_KERNEL_TRUE = @CONFIG_KERNEL_TRUE@ +CONFIG_USER_FALSE = @CONFIG_USER_FALSE@ +CONFIG_USER_TRUE = @CONFIG_USER_TRUE@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ @@ -104,6 +108,7 @@ LIBTOOL = @LIBTOOL@ LICENSE = @LICENSE@ LINUX = @LINUX@ LINUX_OBJ = @LINUX_OBJ@ +LINUX_SYMBOLS = @LINUX_SYMBOLS@ LINUX_VERSION = @LINUX_VERSION@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ @@ -124,11 +129,14 @@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ +SPL = @SPL@ +SPL_OBJ = @SPL_OBJ@ +SPL_SYMBOLS = @SPL_SYMBOLS@ +SPL_VERSION = @SPL_VERSION@ STRIP = @STRIP@ TARGET_ARCH = @TARGET_ARCH@ TARGET_ARCH_DIR = @TARGET_ARCH_DIR@ TOPDIR = @TOPDIR@ -UNAME = @UNAME@ VERSION = @VERSION@ ZFS_CONFIG = @ZFS_CONFIG@ ZFS_META_ALIAS = @ZFS_META_ALIAS@ @@ -181,8 +189,6 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ -splsrc = @splsrc@ -splsymvers = @splsymvers@ sysconfdir = @sysconfdir@ target = @target@ target_alias = @target_alias@ diff --git a/scripts/zpios-test/Makefile.in b/scripts/zpios-test/Makefile.in index 46549fbb70..3d80ea913a 100644 --- a/scripts/zpios-test/Makefile.in +++ b/scripts/zpios-test/Makefile.in @@ -73,6 +73,10 @@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CMDDIR = @CMDDIR@ +CONFIG_KERNEL_FALSE = @CONFIG_KERNEL_FALSE@ +CONFIG_KERNEL_TRUE = @CONFIG_KERNEL_TRUE@ +CONFIG_USER_FALSE = @CONFIG_USER_FALSE@ +CONFIG_USER_TRUE = @CONFIG_USER_TRUE@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ @@ -104,6 +108,7 @@ LIBTOOL = @LIBTOOL@ LICENSE = @LICENSE@ LINUX = @LINUX@ LINUX_OBJ = @LINUX_OBJ@ +LINUX_SYMBOLS = @LINUX_SYMBOLS@ LINUX_VERSION = @LINUX_VERSION@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ @@ -124,11 +129,14 @@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ +SPL = @SPL@ +SPL_OBJ = @SPL_OBJ@ +SPL_SYMBOLS = @SPL_SYMBOLS@ +SPL_VERSION = @SPL_VERSION@ STRIP = @STRIP@ TARGET_ARCH = @TARGET_ARCH@ TARGET_ARCH_DIR = @TARGET_ARCH_DIR@ TOPDIR = @TOPDIR@ -UNAME = @UNAME@ VERSION = @VERSION@ ZFS_CONFIG = @ZFS_CONFIG@ ZFS_META_ALIAS = @ZFS_META_ALIAS@ @@ -181,8 +189,6 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ -splsrc = @splsrc@ -splsymvers = @splsymvers@ sysconfdir = @sysconfdir@ target = @target@ target_alias = @target_alias@ diff --git a/scripts/zpool-config/Makefile.in b/scripts/zpool-config/Makefile.in index 8c0b443607..a82cf63c6b 100644 --- a/scripts/zpool-config/Makefile.in +++ b/scripts/zpool-config/Makefile.in @@ -73,6 +73,10 @@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CMDDIR = @CMDDIR@ +CONFIG_KERNEL_FALSE = @CONFIG_KERNEL_FALSE@ +CONFIG_KERNEL_TRUE = @CONFIG_KERNEL_TRUE@ +CONFIG_USER_FALSE = @CONFIG_USER_FALSE@ +CONFIG_USER_TRUE = @CONFIG_USER_TRUE@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ @@ -104,6 +108,7 @@ LIBTOOL = @LIBTOOL@ LICENSE = @LICENSE@ LINUX = @LINUX@ LINUX_OBJ = @LINUX_OBJ@ +LINUX_SYMBOLS = @LINUX_SYMBOLS@ LINUX_VERSION = @LINUX_VERSION@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ @@ -124,11 +129,14 @@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ +SPL = @SPL@ +SPL_OBJ = @SPL_OBJ@ +SPL_SYMBOLS = @SPL_SYMBOLS@ +SPL_VERSION = @SPL_VERSION@ STRIP = @STRIP@ TARGET_ARCH = @TARGET_ARCH@ TARGET_ARCH_DIR = @TARGET_ARCH_DIR@ TOPDIR = @TOPDIR@ -UNAME = @UNAME@ VERSION = @VERSION@ ZFS_CONFIG = @ZFS_CONFIG@ ZFS_META_ALIAS = @ZFS_META_ALIAS@ @@ -181,8 +189,6 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ -splsrc = @splsrc@ -splsymvers = @splsymvers@ sysconfdir = @sysconfdir@ target = @target@ target_alias = @target_alias@ diff --git a/zfs_config.h.in b/zfs_config.h.in index 9e387d340a..f6bf1d7701 100644 --- a/zfs_config.h.in +++ b/zfs_config.h.in @@ -120,3 +120,5 @@ #undef PACKAGE_VERSION #undef STDC_HEADERS #undef VERSION + +#include