Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

Merge commit 'refs/top-bases/top' into top

This commit is contained in:
Brian Behlendorf 2008-12-09 14:44:37 -08:00
parent d1a86d5dce 2d14f7ffcb
commit ab7628083b
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile.in
View File

@ -52,7 +52,7 @@ DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
$(top_srcdir)/zfs/lib/libspl/include/sys/Makefile.in \ $(top_srcdir)/zfs/lib/libspl/include/sys/Makefile.in \
$(top_srcdir)/zfs/lib/libumem/Makefile.in \ $(top_srcdir)/zfs/lib/libumem/Makefile.in \
$(top_srcdir)/zfs/lib/libumem/include/Makefile.in \ $(top_srcdir)/zfs/lib/libumem/include/Makefile.in \
$(top_srcdir)/zfs/lib/libumem/sys/Makefile.in \ $(top_srcdir)/zfs/lib/libumem/include/sys/Makefile.in \
$(top_srcdir)/zfs/lib/libuutil/Makefile.in \ $(top_srcdir)/zfs/lib/libuutil/Makefile.in \
$(top_srcdir)/zfs/lib/libuutil/include/Makefile.in \ $(top_srcdir)/zfs/lib/libuutil/include/Makefile.in \
$(top_srcdir)/zfs/lib/libzcommon/Makefile.in \ $(top_srcdir)/zfs/lib/libzcommon/Makefile.in \
@ -319,9 +319,9 @@ zfs/lib/libzfs/Makefile: $(top_builddir)/config.status $(top_srcdir)/zfs/lib/lib
cd $(top_builddir) && $(SHELL) ./config.status $@ cd $(top_builddir) && $(SHELL) ./config.status $@
zfs/lib/libumem/include/Makefile: $(top_builddir)/config.status $(top_srcdir)/zfs/lib/libumem/include/Makefile.in zfs/lib/libumem/include/Makefile: $(top_builddir)/config.status $(top_srcdir)/zfs/lib/libumem/include/Makefile.in
cd $(top_builddir) && $(SHELL) ./config.status $@ cd $(top_builddir) && $(SHELL) ./config.status $@
zfs/lib/libumem/Makefile: $(top_builddir)/config.status $(top_srcdir)/zfs/lib/libumem/Makefile.in zfs/lib/libumem/include/sys/Makefile: $(top_builddir)/config.status $(top_srcdir)/zfs/lib/libumem/include/sys/Makefile.in
cd $(top_builddir) && $(SHELL) ./config.status $@ cd $(top_builddir) && $(SHELL) ./config.status $@
zfs/lib/libumem/sys/Makefile: $(top_builddir)/config.status $(top_srcdir)/zfs/lib/libumem/sys/Makefile.in zfs/lib/libumem/Makefile: $(top_builddir)/config.status $(top_srcdir)/zfs/lib/libumem/Makefile.in
cd $(top_builddir) && $(SHELL) ./config.status $@ cd $(top_builddir) && $(SHELL) ./config.status $@
zfs/lib/libzcommon/include/Makefile: $(top_builddir)/config.status $(top_srcdir)/zfs/lib/libzcommon/include/Makefile.in zfs/lib/libzcommon/include/Makefile: $(top_builddir)/config.status $(top_srcdir)/zfs/lib/libzcommon/include/Makefile.in
cd $(top_builddir) && $(SHELL) ./config.status $@ cd $(top_builddir) && $(SHELL) ./config.status $@
@ -507,7 +507,7 @@ distclean-tags:
distdir: $(DISTFILES) distdir: $(DISTFILES)
$(am__remove_distdir) $(am__remove_distdir)
mkdir $(distdir) mkdir $(distdir)
$(mkdir_p) $(distdir)/config $(distdir)/zfs $(distdir)/zfs/lib $(distdir)/zfs/lib/libavl $(distdir)/zfs/lib/libavl/include $(distdir)/zfs/lib/libavl/include/sys $(distdir)/zfs/lib/libnvpair $(distdir)/zfs/lib/libnvpair/include $(distdir)/zfs/lib/libnvpair/include/sys $(distdir)/zfs/lib/libspl $(distdir)/zfs/lib/libspl/include $(distdir)/zfs/lib/libspl/include/sys $(distdir)/zfs/lib/libumem $(distdir)/zfs/lib/libumem/include $(distdir)/zfs/lib/libumem/sys $(distdir)/zfs/lib/libuutil $(distdir)/zfs/lib/libuutil/include $(distdir)/zfs/lib/libzcommon $(distdir)/zfs/lib/libzcommon/include $(distdir)/zfs/lib/libzcommon/include/sys $(distdir)/zfs/lib/libzcommon/include/sys/fm $(distdir)/zfs/lib/libzcommon/include/sys/fm/fs $(distdir)/zfs/lib/libzcommon/include/sys/fs $(distdir)/zfs/lib/libzfs $(distdir)/zfs/lib/libzfs/include $(distdir)/zfs/lib/libzpios $(distdir)/zfs/lib/libzpool $(distdir)/zfs/zcmd $(distdir)/zfs/zcmd/zdb $(distdir)/zfs/zcmd/zdump $(distdir)/zfs/zcmd/zfs $(distdir)/zfs/zcmd/zinject $(distdir)/zfs/zcmd/zpios $(distdir)/zfs/zcmd/zpool $(distdir)/zfs/zcmd/ztest $(mkdir_p) $(distdir)/config $(distdir)/zfs $(distdir)/zfs/lib $(distdir)/zfs/lib/libavl $(distdir)/zfs/lib/libavl/include $(distdir)/zfs/lib/libavl/include/sys $(distdir)/zfs/lib/libnvpair $(distdir)/zfs/lib/libnvpair/include $(distdir)/zfs/lib/libnvpair/include/sys $(distdir)/zfs/lib/libspl $(distdir)/zfs/lib/libspl/include $(distdir)/zfs/lib/libspl/include/sys $(distdir)/zfs/lib/libumem $(distdir)/zfs/lib/libumem/include $(distdir)/zfs/lib/libumem/include/sys $(distdir)/zfs/lib/libuutil $(distdir)/zfs/lib/libuutil/include $(distdir)/zfs/lib/libzcommon $(distdir)/zfs/lib/libzcommon/include $(distdir)/zfs/lib/libzcommon/include/sys $(distdir)/zfs/lib/libzcommon/include/sys/fm $(distdir)/zfs/lib/libzcommon/include/sys/fm/fs $(distdir)/zfs/lib/libzcommon/include/sys/fs $(distdir)/zfs/lib/libzfs $(distdir)/zfs/lib/libzfs/include $(distdir)/zfs/lib/libzpios $(distdir)/zfs/lib/libzpool $(distdir)/zfs/zcmd $(distdir)/zfs/zcmd/zdb $(distdir)/zfs/zcmd/zdump $(distdir)/zfs/zcmd/zfs $(distdir)/zfs/zcmd/zinject $(distdir)/zfs/zcmd/zpios $(distdir)/zfs/zcmd/zpool $(distdir)/zfs/zcmd/ztest
@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
list='$(DISTFILES)'; for file in $$list; do \ list='$(DISTFILES)'; for file in $$list; do \

4
configure vendored
View File

@ -19945,7 +19945,7 @@ rm -f conftest*
#AC_DEFINE([HAVE_UNICODE], 1, ["None"]) #AC_DEFINE([HAVE_UNICODE], 1, ["None"])
#AC_DEFINE([HAVE_INTTYPES], 1, [Define to 1 if unint16 defined in <sys/types.h> header file]) #AC_DEFINE([HAVE_INTTYPES], 1, [Define to 1 if unint16 defined in <sys/types.h> header file])
ac_config_files="$ac_config_files Makefile config/Makefile doc/Makefile scripts/Makefile zfs/Makefile zfs/lib/Makefile zfs/lib/libnvpair/include/sys/Makefile zfs/lib/libnvpair/include/Makefile zfs/lib/libnvpair/Makefile zfs/lib/libavl/include/sys/Makefile zfs/lib/libavl/include/Makefile zfs/lib/libavl/Makefile zfs/lib/libuutil/include/Makefile zfs/lib/libuutil/Makefile zfs/lib/libzfs/include/Makefile zfs/lib/libzfs/Makefile zfs/lib/libumem/include/Makefile zfs/lib/libumem/Makefile zfs/lib/libumem/sys/Makefile zfs/lib/libzcommon/include/Makefile zfs/lib/libzcommon/include/sys/fm/fs/Makefile zfs/lib/libzcommon/include/sys/fm/Makefile zfs/lib/libzcommon/include/sys/Makefile zfs/lib/libzcommon/include/sys/fs/Makefile zfs/lib/libzcommon/Makefile zfs/lib/libzpool/Makefile zfs/lib/libspl/include/sys/Makefile zfs/lib/libspl/include/Makefile zfs/lib/libspl/Makefile zfs/lib/libzpios/Makefile zfs/zcmd/ztest/Makefile zfs/zcmd/Makefile zfs/zcmd/zfs/Makefile zfs/zcmd/zdb/Makefile zfs/zcmd/zinject/Makefile zfs/zcmd/zdump/Makefile zfs/zcmd/zpool/Makefile zfs/zcmd/zpios/Makefile" ac_config_files="$ac_config_files Makefile config/Makefile doc/Makefile scripts/Makefile zfs/Makefile zfs/lib/Makefile zfs/lib/libnvpair/include/sys/Makefile zfs/lib/libnvpair/include/Makefile zfs/lib/libnvpair/Makefile zfs/lib/libavl/include/sys/Makefile zfs/lib/libavl/include/Makefile zfs/lib/libavl/Makefile zfs/lib/libuutil/include/Makefile zfs/lib/libuutil/Makefile zfs/lib/libzfs/include/Makefile zfs/lib/libzfs/Makefile zfs/lib/libumem/include/Makefile zfs/lib/libumem/include/sys/Makefile zfs/lib/libumem/Makefile zfs/lib/libzcommon/include/Makefile zfs/lib/libzcommon/include/sys/fm/fs/Makefile zfs/lib/libzcommon/include/sys/fm/Makefile zfs/lib/libzcommon/include/sys/Makefile zfs/lib/libzcommon/include/sys/fs/Makefile zfs/lib/libzcommon/Makefile zfs/lib/libzpool/Makefile zfs/lib/libspl/include/sys/Makefile zfs/lib/libspl/include/Makefile zfs/lib/libspl/Makefile zfs/lib/libzpios/Makefile zfs/zcmd/ztest/Makefile zfs/zcmd/Makefile zfs/zcmd/zfs/Makefile zfs/zcmd/zdb/Makefile zfs/zcmd/zinject/Makefile zfs/zcmd/zdump/Makefile zfs/zcmd/zpool/Makefile zfs/zcmd/zpios/Makefile"
cat >confcache <<\_ACEOF cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure # This file is a shell script that caches the results of configure
@ -20527,8 +20527,8 @@ do
"zfs/lib/libzfs/include/Makefile" ) CONFIG_FILES="$CONFIG_FILES zfs/lib/libzfs/include/Makefile" ;; "zfs/lib/libzfs/include/Makefile" ) CONFIG_FILES="$CONFIG_FILES zfs/lib/libzfs/include/Makefile" ;;
"zfs/lib/libzfs/Makefile" ) CONFIG_FILES="$CONFIG_FILES zfs/lib/libzfs/Makefile" ;; "zfs/lib/libzfs/Makefile" ) CONFIG_FILES="$CONFIG_FILES zfs/lib/libzfs/Makefile" ;;
"zfs/lib/libumem/include/Makefile" ) CONFIG_FILES="$CONFIG_FILES zfs/lib/libumem/include/Makefile" ;; "zfs/lib/libumem/include/Makefile" ) CONFIG_FILES="$CONFIG_FILES zfs/lib/libumem/include/Makefile" ;;
"zfs/lib/libumem/include/sys/Makefile" ) CONFIG_FILES="$CONFIG_FILES zfs/lib/libumem/include/sys/Makefile" ;;
"zfs/lib/libumem/Makefile" ) CONFIG_FILES="$CONFIG_FILES zfs/lib/libumem/Makefile" ;; "zfs/lib/libumem/Makefile" ) CONFIG_FILES="$CONFIG_FILES zfs/lib/libumem/Makefile" ;;
"zfs/lib/libumem/sys/Makefile" ) CONFIG_FILES="$CONFIG_FILES zfs/lib/libumem/sys/Makefile" ;;
"zfs/lib/libzcommon/include/Makefile" ) CONFIG_FILES="$CONFIG_FILES zfs/lib/libzcommon/include/Makefile" ;; "zfs/lib/libzcommon/include/Makefile" ) CONFIG_FILES="$CONFIG_FILES zfs/lib/libzcommon/include/Makefile" ;;
"zfs/lib/libzcommon/include/sys/fm/fs/Makefile" ) CONFIG_FILES="$CONFIG_FILES zfs/lib/libzcommon/include/sys/fm/fs/Makefile" ;; "zfs/lib/libzcommon/include/sys/fm/fs/Makefile" ) CONFIG_FILES="$CONFIG_FILES zfs/lib/libzcommon/include/sys/fm/fs/Makefile" ;;
"zfs/lib/libzcommon/include/sys/fm/Makefile" ) CONFIG_FILES="$CONFIG_FILES zfs/lib/libzcommon/include/sys/fm/Makefile" ;; "zfs/lib/libzcommon/include/sys/fm/Makefile" ) CONFIG_FILES="$CONFIG_FILES zfs/lib/libzcommon/include/sys/fm/Makefile" ;;

2
configure.ac
View File

@ -118,8 +118,8 @@ AC_CONFIG_FILES([ Makefile
zfs/lib/libzfs/include/Makefile zfs/lib/libzfs/include/Makefile
zfs/lib/libzfs/Makefile zfs/lib/libzfs/Makefile
zfs/lib/libumem/include/Makefile zfs/lib/libumem/include/Makefile
zfs/lib/libumem/include/sys/Makefile
zfs/lib/libumem/Makefile zfs/lib/libumem/Makefile
zfs/lib/libumem/sys/Makefile
zfs/lib/libzcommon/include/Makefile zfs/lib/libzcommon/include/Makefile
zfs/lib/libzcommon/include/sys/fm/fs/Makefile zfs/lib/libzcommon/include/sys/fm/fs/Makefile
zfs/lib/libzcommon/include/sys/fm/Makefile zfs/lib/libzcommon/include/sys/fm/Makefile