From e1b736ecc81b70ac39d0a81e7f4f2df853641a9d Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Tue, 10 Mar 2009 11:42:01 -0700 Subject: [PATCH] Refresh autogen products --- Makefile.in | 133 +++++++++++++++++++++++------ cmd/Makefile.in | 2 + cmd/zdb/Makefile.in | 2 + cmd/zfs/Makefile.in | 2 + cmd/zinject/Makefile.in | 2 + cmd/zpios/Makefile.in | 2 + cmd/zpool/Makefile.in | 2 + cmd/ztest/Makefile.in | 2 + config/Makefile.in | 2 + configure | 137 +++++++++++++++--------------- doc/Makefile.in | 2 + lib/Makefile.in | 2 + lib/libavl/Makefile.in | 2 + lib/libnvpair/Makefile.in | 2 + lib/libspl/Makefile.in | 2 + lib/libunicode/Makefile.in | 2 + lib/libuutil/Makefile.in | 2 + lib/libzfs/Makefile.in | 2 + lib/libzpool/Makefile.in | 2 + scripts/Makefile.in | 2 + scripts/zpios-profile/Makefile.in | 2 + scripts/zpios-test/Makefile.in | 2 + scripts/zpool-config/Makefile.in | 2 + 23 files changed, 217 insertions(+), 95 deletions(-) diff --git a/Makefile.in b/Makefile.in index 966aa6db37..e3d8d45b3c 100644 --- a/Makefile.in +++ b/Makefile.in @@ -13,6 +13,7 @@ # PARTICULAR PURPOSE. @SET_MAKE@ + srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ @@ -37,8 +38,9 @@ build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ subdir = . -DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(srcdir)/zfs_config.h.in \ +DIST_COMMON = README $(am__configure_deps) $(include_HEADERS) \ + $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(srcdir)/zfs.spec.in $(srcdir)/zfs_config.h.in \ $(top_srcdir)/configure $(top_srcdir)/module/Makefile.in \ $(top_srcdir)/module/avl/Makefile.in \ $(top_srcdir)/module/avl/include/Makefile.in \ @@ -85,7 +87,7 @@ CONFIG_CLEAN_FILES = module/Makefile module/avl/Makefile \ module/zcommon/include/sys/fs/Makefile \ module/zcommon/include/sys/fm/Makefile \ module/zcommon/include/sys/fm/fs/Makefile module/zfs/Makefile \ - module/zpios/Makefile module/zpios/include/Makefile + module/zpios/Makefile module/zpios/include/Makefile zfs.spec SOURCES = DIST_SOURCES = RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ @@ -94,6 +96,15 @@ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ install-recursive installcheck-recursive installdirs-recursive \ pdf-recursive ps-recursive uninstall-info-recursive \ uninstall-recursive +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +am__installdirs = "$(DESTDIR)$(includedir)" +includeHEADERS_INSTALL = $(INSTALL_HEADER) +HEADERS = $(include_HEADERS) ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) @@ -152,6 +163,7 @@ LIBDIR = @LIBDIR@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ +LICENSE = @LICENSE@ LINUX = @LINUX@ LINUX_OBJ = @LINUX_OBJ@ LN_S = @LN_S@ @@ -177,6 +189,7 @@ STRIP = @STRIP@ TOPDIR = @TOPDIR@ UNAME = @UNAME@ VERSION = @VERSION@ +ZFS_CONFIG = @ZFS_CONFIG@ ZFS_META_ALIAS = @ZFS_META_ALIAS@ ZFS_META_AUTHOR = @ZFS_META_AUTHOR@ ZFS_META_DATA = @ZFS_META_DATA@ @@ -236,10 +249,11 @@ target_alias = @target_alias@ target_cpu = @target_cpu@ target_os = @target_os@ target_vendor = @target_vendor@ -AUTOMAKE_OPTIONS = foreign dist-zip -EXTRA_DIST = autogen.sh AUTHORS COPYING COPYRIGHT ChangeLog DISCLAIMER \ - GIT META OPENSOLARIS.LICENSE README ZFS.RELEASE SUBDIRS = config doc scripts lib cmd module +AUTOMAKE_OPTIONS = foreign dist-zip +EXTRA_DIST = autogen.sh zfs.spec.in META DISCLAIMER GIT \ + OPENSOLARIS.LICENSE ZFS.RELEASE +include_HEADERS = zfs_config.h all: zfs_config.h $(MAKE) $(AM_MAKEFLAGS) all-recursive @@ -332,6 +346,8 @@ module/zpios/Makefile: $(top_builddir)/config.status $(top_srcdir)/module/zpios/ cd $(top_builddir) && $(SHELL) ./config.status $@ module/zpios/include/Makefile: $(top_builddir)/config.status $(top_srcdir)/module/zpios/include/Makefile.in cd $(top_builddir) && $(SHELL) ./config.status $@ +zfs.spec: $(top_builddir)/config.status $(srcdir)/zfs.spec.in + cd $(top_builddir) && $(SHELL) ./config.status $@ mostlyclean-libtool: -rm -f *.lo @@ -342,6 +358,23 @@ clean-libtool: distclean-libtool: -rm -f libtool uninstall-info-am: +install-includeHEADERS: $(include_HEADERS) + @$(NORMAL_INSTALL) + test -z "$(includedir)" || $(mkdir_p) "$(DESTDIR)$(includedir)" + @list='$(include_HEADERS)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + f=$(am__strip_dir) \ + echo " $(includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(includedir)/$$f'"; \ + $(includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(includedir)/$$f"; \ + done + +uninstall-includeHEADERS: + @$(NORMAL_UNINSTALL) + @list='$(include_HEADERS)'; for p in $$list; do \ + f=$(am__strip_dir) \ + echo " rm -f '$(DESTDIR)$(includedir)/$$f'"; \ + rm -f "$(DESTDIR)$(includedir)/$$f"; \ + done # This directory's subdirectories are mostly independent; you can cd # into them and run `make' without going through this Makefile. @@ -422,7 +455,6 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) $(AWK) ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ mkid -fID $$unique -tags: TAGS TAGS: tags-recursive $(HEADERS) $(SOURCES) zfs_config.h.in $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) @@ -452,7 +484,6 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) zfs_config.h.in $(TAGS_DEPENDENCIES) $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ $$tags $$unique; \ fi -ctags: CTAGS CTAGS: ctags-recursive $(HEADERS) $(SOURCES) zfs_config.h.in $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ @@ -478,7 +509,7 @@ distclean-tags: distdir: $(DISTFILES) $(am__remove_distdir) mkdir $(distdir) - $(mkdir_p) $(distdir)/config $(distdir)/module $(distdir)/module/avl $(distdir)/module/avl/include $(distdir)/module/avl/include/sys $(distdir)/module/nvpair $(distdir)/module/nvpair/include $(distdir)/module/nvpair/include/sys $(distdir)/module/unicode $(distdir)/module/unicode/include $(distdir)/module/unicode/include/sys $(distdir)/module/zcommon $(distdir)/module/zcommon/include $(distdir)/module/zcommon/include/sys $(distdir)/module/zcommon/include/sys/fm $(distdir)/module/zcommon/include/sys/fm/fs $(distdir)/module/zcommon/include/sys/fs $(distdir)/module/zfs $(distdir)/module/zpios $(distdir)/module/zpios/include + $(mkdir_p) $(distdir)/. $(distdir)/config $(distdir)/module $(distdir)/module/avl $(distdir)/module/avl/include $(distdir)/module/avl/include/sys $(distdir)/module/nvpair $(distdir)/module/nvpair/include $(distdir)/module/nvpair/include/sys $(distdir)/module/unicode $(distdir)/module/unicode/include $(distdir)/module/unicode/include/sys $(distdir)/module/zcommon $(distdir)/module/zcommon/include $(distdir)/module/zcommon/include/sys $(distdir)/module/zcommon/include/sys/fm $(distdir)/module/zcommon/include/sys/fm/fs $(distdir)/module/zcommon/include/sys/fs $(distdir)/module/zfs $(distdir)/module/zpios $(distdir)/module/zpios/include @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ list='$(DISTFILES)'; for file in $$list; do \ @@ -620,9 +651,12 @@ 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: + for dir in "$(DESTDIR)$(includedir)"; do \ + test -z "$$dir" || $(mkdir_p) "$$dir"; \ + done install: install-recursive install-exec: install-exec-recursive install-data: install-data-recursive @@ -655,7 +689,7 @@ distclean: distclean-recursive -rm -f $(am__CONFIG_DISTCLEAN_FILES) -rm -f Makefile distclean-am: clean-am distclean-generic distclean-hdr \ - distclean-libtool distclean-tags + distclean-libtool distclean-local distclean-tags dvi: dvi-recursive @@ -667,7 +701,7 @@ info: info-recursive info-am: -install-data-am: +install-data-am: install-data-local install-includeHEADERS install-exec-am: @@ -695,7 +729,7 @@ ps: ps-recursive ps-am: -uninstall-am: uninstall-info-am +uninstall-am: uninstall-includeHEADERS uninstall-info-am uninstall-info: uninstall-info-recursive @@ -704,20 +738,69 @@ uninstall-info: uninstall-info-recursive ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \ dist-shar dist-tarZ dist-zip distcheck distclean \ distclean-generic distclean-hdr distclean-libtool \ - distclean-recursive distclean-tags distcleancheck distdir \ - distuninstallcheck 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-strip installcheck installcheck-am installdirs \ - installdirs-am maintainer-clean maintainer-clean-generic \ - maintainer-clean-recursive mostlyclean mostlyclean-generic \ - mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \ - tags tags-recursive uninstall uninstall-am uninstall-info-am + distclean-local distclean-recursive distclean-tags \ + distcleancheck distdir distuninstallcheck dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-data-local install-exec \ + install-exec-am install-includeHEADERS install-info \ + install-info-am install-man install-strip installcheck \ + installcheck-am installdirs installdirs-am maintainer-clean \ + maintainer-clean-generic maintainer-clean-recursive \ + mostlyclean mostlyclean-generic mostlyclean-libtool \ + mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \ + uninstall uninstall-am uninstall-includeHEADERS \ + uninstall-info-am -.PHONY: rpm -rpms: dist-bzip2 - rpmbuild -ta $(distdir).tar.bz2 +distclean-local:: + -$(RM) -R autom4te*.cache + -find . \( -name SCCS -o -name BitKeeper -o -name .svn -o -name CVS \ + -o -name .pc -o -name .hg -o -name .git \) -prune -o \ + \( -name '*.orig' -o -name '*.rej' -o -name '*~' \ + -o -name '*.bak' -o -name '#*#' -o -name '.*.orig' \ + -o -name '.*.rej' -o -name 'aclocal.m4' -o -size 0 \ + -o -name '*%' -o -name '.*.cmd' -o -name 'core' \ + -o -name 'Makefile' -o -name 'Module.symvers' \ + -o -name '.script-config' \) \ + -type f -print | xargs $(RM) + +install-data-local: + $(INSTALL) module/Module.symvers $(DESTDIR)/$(includedir) + +ctags: + $(RM) $(top_srcdir)/tags + find $(top_srcdir) -name .git -prune -o -name '*.[hc]' | xargs ctags + +etags: + $(RM) $(top_srcdir)/TAGS + find $(top_srcdir) -name .pc -prune -o -name '*.[hc]' | xargs etags -a + +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: 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 + +# 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 # 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 800c492e50..d286976ac5 100644 --- a/cmd/Makefile.in +++ b/cmd/Makefile.in @@ -108,6 +108,7 @@ LIBDIR = @LIBDIR@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ +LICENSE = @LICENSE@ LINUX = @LINUX@ LINUX_OBJ = @LINUX_OBJ@ LN_S = @LN_S@ @@ -133,6 +134,7 @@ STRIP = @STRIP@ TOPDIR = @TOPDIR@ UNAME = @UNAME@ VERSION = @VERSION@ +ZFS_CONFIG = @ZFS_CONFIG@ ZFS_META_ALIAS = @ZFS_META_ALIAS@ ZFS_META_AUTHOR = @ZFS_META_AUTHOR@ ZFS_META_DATA = @ZFS_META_DATA@ diff --git a/cmd/zdb/Makefile.in b/cmd/zdb/Makefile.in index 0d12dfe8d5..6a97c4a643 100644 --- a/cmd/zdb/Makefile.in +++ b/cmd/zdb/Makefile.in @@ -126,6 +126,7 @@ LIBDIR = @LIBDIR@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ +LICENSE = @LICENSE@ LINUX = @LINUX@ LINUX_OBJ = @LINUX_OBJ@ LN_S = @LN_S@ @@ -151,6 +152,7 @@ STRIP = @STRIP@ TOPDIR = @TOPDIR@ UNAME = @UNAME@ VERSION = @VERSION@ +ZFS_CONFIG = @ZFS_CONFIG@ ZFS_META_ALIAS = @ZFS_META_ALIAS@ ZFS_META_AUTHOR = @ZFS_META_AUTHOR@ ZFS_META_DATA = @ZFS_META_DATA@ diff --git a/cmd/zfs/Makefile.in b/cmd/zfs/Makefile.in index 8be650ff65..0645cb724e 100644 --- a/cmd/zfs/Makefile.in +++ b/cmd/zfs/Makefile.in @@ -126,6 +126,7 @@ LIBDIR = @LIBDIR@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ +LICENSE = @LICENSE@ LINUX = @LINUX@ LINUX_OBJ = @LINUX_OBJ@ LN_S = @LN_S@ @@ -151,6 +152,7 @@ STRIP = @STRIP@ TOPDIR = @TOPDIR@ UNAME = @UNAME@ VERSION = @VERSION@ +ZFS_CONFIG = @ZFS_CONFIG@ ZFS_META_ALIAS = @ZFS_META_ALIAS@ ZFS_META_AUTHOR = @ZFS_META_AUTHOR@ ZFS_META_DATA = @ZFS_META_DATA@ diff --git a/cmd/zinject/Makefile.in b/cmd/zinject/Makefile.in index e8966343f6..e9fd3614dc 100644 --- a/cmd/zinject/Makefile.in +++ b/cmd/zinject/Makefile.in @@ -126,6 +126,7 @@ LIBDIR = @LIBDIR@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ +LICENSE = @LICENSE@ LINUX = @LINUX@ LINUX_OBJ = @LINUX_OBJ@ LN_S = @LN_S@ @@ -151,6 +152,7 @@ STRIP = @STRIP@ TOPDIR = @TOPDIR@ UNAME = @UNAME@ VERSION = @VERSION@ +ZFS_CONFIG = @ZFS_CONFIG@ ZFS_META_ALIAS = @ZFS_META_ALIAS@ ZFS_META_AUTHOR = @ZFS_META_AUTHOR@ ZFS_META_DATA = @ZFS_META_DATA@ diff --git a/cmd/zpios/Makefile.in b/cmd/zpios/Makefile.in index d94253d815..18da03d719 100644 --- a/cmd/zpios/Makefile.in +++ b/cmd/zpios/Makefile.in @@ -120,6 +120,7 @@ LIBDIR = @LIBDIR@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ +LICENSE = @LICENSE@ LINUX = @LINUX@ LINUX_OBJ = @LINUX_OBJ@ LN_S = @LN_S@ @@ -145,6 +146,7 @@ STRIP = @STRIP@ TOPDIR = @TOPDIR@ UNAME = @UNAME@ VERSION = @VERSION@ +ZFS_CONFIG = @ZFS_CONFIG@ ZFS_META_ALIAS = @ZFS_META_ALIAS@ ZFS_META_AUTHOR = @ZFS_META_AUTHOR@ ZFS_META_DATA = @ZFS_META_DATA@ diff --git a/cmd/zpool/Makefile.in b/cmd/zpool/Makefile.in index a78c4772ae..e525b170ef 100644 --- a/cmd/zpool/Makefile.in +++ b/cmd/zpool/Makefile.in @@ -127,6 +127,7 @@ LIBDIR = @LIBDIR@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ +LICENSE = @LICENSE@ LINUX = @LINUX@ LINUX_OBJ = @LINUX_OBJ@ LN_S = @LN_S@ @@ -152,6 +153,7 @@ STRIP = @STRIP@ TOPDIR = @TOPDIR@ UNAME = @UNAME@ VERSION = @VERSION@ +ZFS_CONFIG = @ZFS_CONFIG@ ZFS_META_ALIAS = @ZFS_META_ALIAS@ ZFS_META_AUTHOR = @ZFS_META_AUTHOR@ ZFS_META_DATA = @ZFS_META_DATA@ diff --git a/cmd/ztest/Makefile.in b/cmd/ztest/Makefile.in index 9feaf076cb..2425663e80 100644 --- a/cmd/ztest/Makefile.in +++ b/cmd/ztest/Makefile.in @@ -126,6 +126,7 @@ LIBDIR = @LIBDIR@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ +LICENSE = @LICENSE@ LINUX = @LINUX@ LINUX_OBJ = @LINUX_OBJ@ LN_S = @LN_S@ @@ -151,6 +152,7 @@ STRIP = @STRIP@ TOPDIR = @TOPDIR@ UNAME = @UNAME@ VERSION = @VERSION@ +ZFS_CONFIG = @ZFS_CONFIG@ ZFS_META_ALIAS = @ZFS_META_ALIAS@ ZFS_META_AUTHOR = @ZFS_META_AUTHOR@ ZFS_META_DATA = @ZFS_META_DATA@ diff --git a/config/Makefile.in b/config/Makefile.in index acac29750a..bb56a56f2b 100644 --- a/config/Makefile.in +++ b/config/Makefile.in @@ -100,6 +100,7 @@ LIBDIR = @LIBDIR@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ +LICENSE = @LICENSE@ LINUX = @LINUX@ LINUX_OBJ = @LINUX_OBJ@ LN_S = @LN_S@ @@ -125,6 +126,7 @@ STRIP = @STRIP@ TOPDIR = @TOPDIR@ UNAME = @UNAME@ VERSION = @VERSION@ +ZFS_CONFIG = @ZFS_CONFIG@ ZFS_META_ALIAS = @ZFS_META_ALIAS@ ZFS_META_AUTHOR = @ZFS_META_AUTHOR@ ZFS_META_DATA = @ZFS_META_DATA@ diff --git a/configure b/configure index 0ee1cd6f59..78bf8d935a 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 kmoduledir splsrc splsymvers UNAME TOPDIR BUILDDIR LIBDIR CMDDIR MODDIR KERNELMAKE_PARAMS KERNELCPPFLAGS 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 LINUX LINUX_OBJ kmoduledir splsrc splsymvers LICENSE UNAME TOPDIR BUILDDIR LIBDIR CMDDIR MODDIR ZFS_CONFIG KERNELMAKE_PARAMS KERNELCPPFLAGS LIBOBJS LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -18939,12 +18939,6 @@ test "${CCASFLAGS+set}" = set || CCASFLAGS=$CFLAGS -zfsconfig=all -kernelsrc= -kernelbuild= -splsrc= -splbuild= - ver=`uname -r` @@ -19059,31 +19053,15 @@ 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 - splbuild= - sourcelink=/tmp/`whoami`/spl - buildlink=/tmp/`whoami`/spl - - if test -e $sourcelink; then - splsrc=`(cd $sourcelink; /bin/pwd)` - fi - if test -e $buildlink; then - splbuild=`(cd $buildlink; /bin/pwd)` - fi - if test -z "$splsrc"; then - splsrc=$splbuild - fi - fi - if test -z "$splsrc" -o -z "$splbuild"; then - sourcelink=/lib/modules/${ver}/source - buildlink=/lib/modules/${ver}/build + sourcelink=${LINUX}/include/spl + buildlink=${LINUX_OBJ}/include/spl if test -e $sourcelink; then - splsrc=`(cd $sourcelink; /bin/pwd)` + splsrc=`readlink -f ${sourcelink}` fi if test -e $buildlink; then - splbuild=`(cd $buildlink; /bin/pwd)` + splbuild=`readlink -f ${buildlink}` fi if test -z "$splsrc"; then splsrc=$splbuild @@ -19108,6 +19086,29 @@ echo $ECHO_N "checking spl build directory... $ECHO_C" >&6 echo "$as_me:$LINENO: result: $splbuild" >&5 echo "${ECHO_T}$splbuild" >&6 + echo "$as_me:$LINENO: checking spl Module.symvers" >&5 +echo $ECHO_N "checking spl Module.symvers... $ECHO_C" >&6 + if test -r $splbuild/module/Module.symvers; then + splsymvers=$splbuild/module/Module.symvers + elif test -r $kernelbuild/include/spl/Module.symvers; then + splsymvers=$kernelbuild/include/spl/Module.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.symvers in the spl source. + *** Please prepare the spl source before running this script" >&5 +echo "$as_me: error: + *** Cannot find extra Module.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 && @@ -19134,38 +19135,16 @@ echo "$as_me: error: echo "$as_me:$LINENO: result: $splsrcver" >&5 echo "${ECHO_T}$splsrcver" >&6 - echo "$as_me:$LINENO: checking spl Module.symvers" >&5 -echo $ECHO_N "checking spl Module.symvers... $ECHO_C" >&6 - if test -r $splbuild/module/Module.symvers; then - splsymvers=$splbuild/module/Module.symvers - elif test -r $kernelbuild/Module.symvers; then - splsymvers=$kernelbuild/Module.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.symvers in the spl source. - *** Please prepare the spl source before running this script" >&5 -echo "$as_me: error: - *** Cannot find extra Module.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 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 + 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 @@ -19175,6 +19154,8 @@ _ACEOF + + TOPDIR=`/bin/pwd` BUILDDIR=$TOPDIR LIBDIR=$TOPDIR/lib @@ -19182,6 +19163,10 @@ _ACEOF MODDIR=$TOPDIR/module UNAME=`uname -r | cut -d- -f1` + if test -z "$ZFS_CONFIG"; then + ZFS_CONFIG=all + fi + @@ -19194,15 +19179,15 @@ _ACEOF # Check whether --with-zfs-config or --without-zfs-config was given. if test "${with_zfs_config+set}" = set; then withval="$with_zfs_config" - zfsconfig="$withval" + 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: $zfsconfig" >&5 -echo "${ECHO_T}$zfsconfig" >&6; + echo "$as_me:$LINENO: result: $ZFS_CONFIG" >&5 +echo "${ECHO_T}$ZFS_CONFIG" >&6; - case "$zfsconfig" in + case "$ZFS_CONFIG" in kernel) KERNELMAKE_PARAMS="V=1" @@ -19256,9 +19241,10 @@ main (void) _ACEOF -rm -f build/conftest.o build/conftest.mod.c build/conftest.ko build/Makefile -echo "obj-m := conftest.o" >build/Makefile -if { ac_try='cp conftest.c build && make modules CC="$CC" LINUXINCLUDE="-Iinclude -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build' + + rm -Rf build && mkdir -p build + echo "obj-m := conftest.o" >build/Makefile + if { ac_try='cp conftest.c build && make modules CC="$CC" LINUXINCLUDE="-Iinclude -Iinclude2 -I$LINUX/include -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -19282,12 +19268,15 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 + + fi -rm -f build/conftest.o build/conftest.mod.c build/conftest.mod.o build/conftest.ko build/conftest.c conftest.c + + rm -Rf build + EXTRA_KCFLAGS="$tmp_flags" @@ -19662,9 +19651,10 @@ main (void) _ACEOF -rm -f build/conftest.o build/conftest.mod.c build/conftest.ko build/Makefile -echo "obj-m := conftest.o" >build/Makefile -if { ac_try='cp conftest.c build && make modules CC="$CC" LINUXINCLUDE="-Iinclude -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build' + + rm -Rf build && mkdir -p build + echo "obj-m := conftest.o" >build/Makefile + if { ac_try='cp conftest.c build && make modules CC="$CC" LINUXINCLUDE="-Iinclude -Iinclude2 -I$LINUX/include -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -19688,12 +19678,15 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 + + fi -rm -f build/conftest.o build/conftest.mod.c build/conftest.mod.o build/conftest.ko build/conftest.c conftest.c + + rm -Rf build + EXTRA_KCFLAGS="$tmp_flags" @@ -20018,9 +20011,9 @@ echo "${ECHO_T}yes" >&6 *) echo "$as_me:$LINENO: result: Error!" >&5 echo "${ECHO_T}Error!" >&6 - { { echo "$as_me:$LINENO: error: Bad value \"$zfsconfig\" for --with-config, + { { echo "$as_me:$LINENO: error: Bad value \"$ZFS_CONFIG\" for --with-config, user kernel|user|all" >&5 -echo "$as_me: error: Bad value \"$zfsconfig\" for --with-config, +echo "$as_me: error: Bad value \"$ZFS_CONFIG\" for --with-config, user kernel|user|all" >&2;} { (exit 1); exit 1; }; } ;; esac @@ -20078,7 +20071,8 @@ _ACEOF fi - ac_config_files="$ac_config_files Makefile config/Makefile doc/Makefile lib/Makefile lib/libspl/Makefile lib/libavl/Makefile lib/libnvpair/Makefile lib/libunicode/Makefile lib/libuutil/Makefile lib/libzpool/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/avl/include/Makefile module/avl/include/sys/Makefile module/nvpair/Makefile module/nvpair/include/Makefile module/nvpair/include/sys/Makefile module/unicode/Makefile module/unicode/include/Makefile module/unicode/include/sys/Makefile module/zcommon/Makefile module/zcommon/include/Makefile module/zcommon/include/sys/Makefile module/zcommon/include/sys/fs/Makefile module/zcommon/include/sys/fm/Makefile module/zcommon/include/sys/fm/fs/Makefile module/zfs/Makefile module/zpios/Makefile module/zpios/include/Makefile scripts/Makefile scripts/zpool-config/Makefile scripts/zpios-test/Makefile scripts/zpios-profile/Makefile" + ac_config_files="$ac_config_files Makefile config/Makefile doc/Makefile lib/Makefile lib/libspl/Makefile lib/libavl/Makefile lib/libnvpair/Makefile lib/libunicode/Makefile lib/libuutil/Makefile lib/libzpool/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/avl/include/Makefile module/avl/include/sys/Makefile module/nvpair/Makefile module/nvpair/include/Makefile module/nvpair/include/sys/Makefile module/unicode/Makefile module/unicode/include/Makefile module/unicode/include/sys/Makefile module/zcommon/Makefile module/zcommon/include/Makefile module/zcommon/include/sys/Makefile module/zcommon/include/sys/fs/Makefile module/zcommon/include/sys/fm/Makefile module/zcommon/include/sys/fm/fs/Makefile module/zfs/Makefile module/zpios/Makefile module/zpios/include/Makefile scripts/Makefile scripts/zpool-config/Makefile scripts/zpios-test/Makefile scripts/zpios-profile/Makefile zfs.spec" + cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -20684,6 +20678,7 @@ do "scripts/zpool-config/Makefile" ) CONFIG_FILES="$CONFIG_FILES scripts/zpool-config/Makefile" ;; "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" ;; "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 @@ -20860,12 +20855,14 @@ s,@LINUX_OBJ@,$LINUX_OBJ,;t t s,@kmoduledir@,$kmoduledir,;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,@KERNELMAKE_PARAMS@,$KERNELMAKE_PARAMS,;t t s,@KERNELCPPFLAGS@,$KERNELCPPFLAGS,;t t s,@LIBOBJS@,$LIBOBJS,;t t diff --git a/doc/Makefile.in b/doc/Makefile.in index 685b4ffcfe..54b5686219 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -99,6 +99,7 @@ LIBDIR = @LIBDIR@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ +LICENSE = @LICENSE@ LINUX = @LINUX@ LINUX_OBJ = @LINUX_OBJ@ LN_S = @LN_S@ @@ -124,6 +125,7 @@ STRIP = @STRIP@ TOPDIR = @TOPDIR@ UNAME = @UNAME@ VERSION = @VERSION@ +ZFS_CONFIG = @ZFS_CONFIG@ ZFS_META_ALIAS = @ZFS_META_ALIAS@ ZFS_META_AUTHOR = @ZFS_META_AUTHOR@ ZFS_META_DATA = @ZFS_META_DATA@ diff --git a/lib/Makefile.in b/lib/Makefile.in index 18f16d59c0..be2f3f4f98 100644 --- a/lib/Makefile.in +++ b/lib/Makefile.in @@ -108,6 +108,7 @@ LIBDIR = @LIBDIR@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ +LICENSE = @LICENSE@ LINUX = @LINUX@ LINUX_OBJ = @LINUX_OBJ@ LN_S = @LN_S@ @@ -133,6 +134,7 @@ STRIP = @STRIP@ TOPDIR = @TOPDIR@ UNAME = @UNAME@ VERSION = @VERSION@ +ZFS_CONFIG = @ZFS_CONFIG@ ZFS_META_ALIAS = @ZFS_META_ALIAS@ ZFS_META_AUTHOR = @ZFS_META_AUTHOR@ ZFS_META_DATA = @ZFS_META_DATA@ diff --git a/lib/libavl/Makefile.in b/lib/libavl/Makefile.in index e13aa14515..ce347f5de5 100644 --- a/lib/libavl/Makefile.in +++ b/lib/libavl/Makefile.in @@ -125,6 +125,7 @@ LIBDIR = @LIBDIR@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ +LICENSE = @LICENSE@ LINUX = @LINUX@ LINUX_OBJ = @LINUX_OBJ@ LN_S = @LN_S@ @@ -150,6 +151,7 @@ STRIP = @STRIP@ TOPDIR = @TOPDIR@ UNAME = @UNAME@ VERSION = @VERSION@ +ZFS_CONFIG = @ZFS_CONFIG@ ZFS_META_ALIAS = @ZFS_META_ALIAS@ ZFS_META_AUTHOR = @ZFS_META_AUTHOR@ ZFS_META_DATA = @ZFS_META_DATA@ diff --git a/lib/libnvpair/Makefile.in b/lib/libnvpair/Makefile.in index 4b0169d1bd..3408111f6b 100644 --- a/lib/libnvpair/Makefile.in +++ b/lib/libnvpair/Makefile.in @@ -126,6 +126,7 @@ LIBDIR = @LIBDIR@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ +LICENSE = @LICENSE@ LINUX = @LINUX@ LINUX_OBJ = @LINUX_OBJ@ LN_S = @LN_S@ @@ -151,6 +152,7 @@ STRIP = @STRIP@ TOPDIR = @TOPDIR@ UNAME = @UNAME@ VERSION = @VERSION@ +ZFS_CONFIG = @ZFS_CONFIG@ ZFS_META_ALIAS = @ZFS_META_ALIAS@ ZFS_META_AUTHOR = @ZFS_META_AUTHOR@ ZFS_META_DATA = @ZFS_META_DATA@ diff --git a/lib/libspl/Makefile.in b/lib/libspl/Makefile.in index da3e114c15..a630d4c6ad 100644 --- a/lib/libspl/Makefile.in +++ b/lib/libspl/Makefile.in @@ -130,6 +130,7 @@ LIBDIR = @LIBDIR@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ +LICENSE = @LICENSE@ LINUX = @LINUX@ LINUX_OBJ = @LINUX_OBJ@ LN_S = @LN_S@ @@ -155,6 +156,7 @@ STRIP = @STRIP@ TOPDIR = @TOPDIR@ UNAME = @UNAME@ VERSION = @VERSION@ +ZFS_CONFIG = @ZFS_CONFIG@ ZFS_META_ALIAS = @ZFS_META_ALIAS@ ZFS_META_AUTHOR = @ZFS_META_AUTHOR@ ZFS_META_DATA = @ZFS_META_DATA@ diff --git a/lib/libunicode/Makefile.in b/lib/libunicode/Makefile.in index 504d7a135f..06bd0b11b2 100644 --- a/lib/libunicode/Makefile.in +++ b/lib/libunicode/Makefile.in @@ -125,6 +125,7 @@ LIBDIR = @LIBDIR@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ +LICENSE = @LICENSE@ LINUX = @LINUX@ LINUX_OBJ = @LINUX_OBJ@ LN_S = @LN_S@ @@ -150,6 +151,7 @@ STRIP = @STRIP@ TOPDIR = @TOPDIR@ UNAME = @UNAME@ VERSION = @VERSION@ +ZFS_CONFIG = @ZFS_CONFIG@ ZFS_META_ALIAS = @ZFS_META_ALIAS@ ZFS_META_AUTHOR = @ZFS_META_AUTHOR@ ZFS_META_DATA = @ZFS_META_DATA@ diff --git a/lib/libuutil/Makefile.in b/lib/libuutil/Makefile.in index a519a5bd37..5a0329d9b0 100644 --- a/lib/libuutil/Makefile.in +++ b/lib/libuutil/Makefile.in @@ -127,6 +127,7 @@ LIBDIR = @LIBDIR@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ +LICENSE = @LICENSE@ LINUX = @LINUX@ LINUX_OBJ = @LINUX_OBJ@ LN_S = @LN_S@ @@ -152,6 +153,7 @@ STRIP = @STRIP@ TOPDIR = @TOPDIR@ UNAME = @UNAME@ VERSION = @VERSION@ +ZFS_CONFIG = @ZFS_CONFIG@ ZFS_META_ALIAS = @ZFS_META_ALIAS@ ZFS_META_AUTHOR = @ZFS_META_AUTHOR@ ZFS_META_DATA = @ZFS_META_DATA@ diff --git a/lib/libzfs/Makefile.in b/lib/libzfs/Makefile.in index 26c37ab0c6..464b646cc5 100644 --- a/lib/libzfs/Makefile.in +++ b/lib/libzfs/Makefile.in @@ -128,6 +128,7 @@ LIBDIR = @LIBDIR@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ +LICENSE = @LICENSE@ LINUX = @LINUX@ LINUX_OBJ = @LINUX_OBJ@ LN_S = @LN_S@ @@ -153,6 +154,7 @@ STRIP = @STRIP@ TOPDIR = @TOPDIR@ UNAME = @UNAME@ VERSION = @VERSION@ +ZFS_CONFIG = @ZFS_CONFIG@ ZFS_META_ALIAS = @ZFS_META_ALIAS@ ZFS_META_AUTHOR = @ZFS_META_AUTHOR@ ZFS_META_DATA = @ZFS_META_DATA@ diff --git a/lib/libzpool/Makefile.in b/lib/libzpool/Makefile.in index dda2c07496..29c81182ef 100644 --- a/lib/libzpool/Makefile.in +++ b/lib/libzpool/Makefile.in @@ -138,6 +138,7 @@ LIBDIR = @LIBDIR@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ +LICENSE = @LICENSE@ LINUX = @LINUX@ LINUX_OBJ = @LINUX_OBJ@ LN_S = @LN_S@ @@ -163,6 +164,7 @@ STRIP = @STRIP@ TOPDIR = @TOPDIR@ UNAME = @UNAME@ VERSION = @VERSION@ +ZFS_CONFIG = @ZFS_CONFIG@ ZFS_META_ALIAS = @ZFS_META_ALIAS@ ZFS_META_AUTHOR = @ZFS_META_AUTHOR@ ZFS_META_DATA = @ZFS_META_DATA@ diff --git a/scripts/Makefile.in b/scripts/Makefile.in index 4a7a079582..d4f538753a 100644 --- a/scripts/Makefile.in +++ b/scripts/Makefile.in @@ -108,6 +108,7 @@ LIBDIR = @LIBDIR@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ +LICENSE = @LICENSE@ LINUX = @LINUX@ LINUX_OBJ = @LINUX_OBJ@ LN_S = @LN_S@ @@ -133,6 +134,7 @@ STRIP = @STRIP@ TOPDIR = @TOPDIR@ UNAME = @UNAME@ VERSION = @VERSION@ +ZFS_CONFIG = @ZFS_CONFIG@ ZFS_META_ALIAS = @ZFS_META_ALIAS@ ZFS_META_AUTHOR = @ZFS_META_AUTHOR@ ZFS_META_DATA = @ZFS_META_DATA@ diff --git a/scripts/zpios-profile/Makefile.in b/scripts/zpios-profile/Makefile.in index c9b73162f1..9673d6b40d 100644 --- a/scripts/zpios-profile/Makefile.in +++ b/scripts/zpios-profile/Makefile.in @@ -99,6 +99,7 @@ LIBDIR = @LIBDIR@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ +LICENSE = @LICENSE@ LINUX = @LINUX@ LINUX_OBJ = @LINUX_OBJ@ LN_S = @LN_S@ @@ -124,6 +125,7 @@ STRIP = @STRIP@ TOPDIR = @TOPDIR@ UNAME = @UNAME@ VERSION = @VERSION@ +ZFS_CONFIG = @ZFS_CONFIG@ ZFS_META_ALIAS = @ZFS_META_ALIAS@ ZFS_META_AUTHOR = @ZFS_META_AUTHOR@ ZFS_META_DATA = @ZFS_META_DATA@ diff --git a/scripts/zpios-test/Makefile.in b/scripts/zpios-test/Makefile.in index e4653144d6..5a526c848a 100644 --- a/scripts/zpios-test/Makefile.in +++ b/scripts/zpios-test/Makefile.in @@ -99,6 +99,7 @@ LIBDIR = @LIBDIR@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ +LICENSE = @LICENSE@ LINUX = @LINUX@ LINUX_OBJ = @LINUX_OBJ@ LN_S = @LN_S@ @@ -124,6 +125,7 @@ STRIP = @STRIP@ TOPDIR = @TOPDIR@ UNAME = @UNAME@ VERSION = @VERSION@ +ZFS_CONFIG = @ZFS_CONFIG@ ZFS_META_ALIAS = @ZFS_META_ALIAS@ ZFS_META_AUTHOR = @ZFS_META_AUTHOR@ ZFS_META_DATA = @ZFS_META_DATA@ diff --git a/scripts/zpool-config/Makefile.in b/scripts/zpool-config/Makefile.in index bc009c1abb..8b5032ebf8 100644 --- a/scripts/zpool-config/Makefile.in +++ b/scripts/zpool-config/Makefile.in @@ -99,6 +99,7 @@ LIBDIR = @LIBDIR@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ +LICENSE = @LICENSE@ LINUX = @LINUX@ LINUX_OBJ = @LINUX_OBJ@ LN_S = @LN_S@ @@ -124,6 +125,7 @@ STRIP = @STRIP@ TOPDIR = @TOPDIR@ UNAME = @UNAME@ VERSION = @VERSION@ +ZFS_CONFIG = @ZFS_CONFIG@ ZFS_META_ALIAS = @ZFS_META_ALIAS@ ZFS_META_AUTHOR = @ZFS_META_AUTHOR@ ZFS_META_DATA = @ZFS_META_DATA@