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

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

This commit is contained in:
Brian Behlendorf 2008-11-26 13:14:15 -08:00
parent 93e1db01db cb9c044bf6
commit b2f7352587
2 changed files with 42 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
config/zfs-meta.m4
View File

@ -13,34 +13,34 @@ AC_DEFUN([ZFS_AC_META], [
if test -f "$META"; then if test -f "$META"; then
_zfs_ac_meta_got_file=yes _zfs_ac_meta_got_file=yes
META_NAME=_ZFS_AC_META_GETVAL([(?:NAME|PROJECT|PACKAGE)]); ZFS_META_NAME=_ZFS_AC_META_GETVAL([(?:NAME|PROJECT|PACKAGE)]);
if test -n "$META_NAME"; then if test -n "$ZFS_META_NAME"; then
AC_DEFINE_UNQUOTED([META_NAME], ["$META_NAME"], AC_DEFINE_UNQUOTED([ZFS_META_NAME], ["$ZFS_META_NAME"],
[Define the project name.] [Define the project name.]
) )
AC_SUBST([META_NAME]) AC_SUBST([ZFS_META_NAME])
fi fi
META_VERSION=_ZFS_AC_META_GETVAL([VERSION]); ZFS_META_VERSION=_ZFS_AC_META_GETVAL([VERSION]);
if test -n "$META_VERSION"; then if test -n "$ZFS_META_VERSION"; then
AC_DEFINE_UNQUOTED([META_VERSION], ["$META_VERSION"], AC_DEFINE_UNQUOTED([ZFS_META_VERSION], ["$ZFS_META_VERSION"],
[Define the project version.] [Define the project version.]
) )
AC_SUBST([META_VERSION]) AC_SUBST([ZFS_META_VERSION])
fi fi
META_RELEASE=_ZFS_AC_META_GETVAL([RELEASE]); ZFS_META_RELEASE=_ZFS_AC_META_GETVAL([RELEASE]);
if test -n "$META_RELEASE"; then if test -n "$ZFS_META_RELEASE"; then
AC_DEFINE_UNQUOTED([META_RELEASE], ["$META_RELEASE"], AC_DEFINE_UNQUOTED([ZFS_META_RELEASE], ["$ZFS_META_RELEASE"],
[Define the project release.] [Define the project release.]
) )
AC_SUBST([META_RELEASE]) AC_SUBST([ZFS_META_RELEASE])
fi fi
if test -n "$META_NAME" -a -n "$META_VERSION"; then if test -n "$ZFS_META_NAME" -a -n "$ZFS_META_VERSION"; then
META_ALIAS="$META_NAME-$META_VERSION" META_ALIAS="$ZFS_META_NAME-$ZFS_META_VERSION"
test -n "$META_RELEASE" && test -n "$ZFS_META_RELEASE" &&
META_ALIAS="$META_ALIAS-$META_RELEASE" META_ALIAS="$META_ALIAS-$ZFS_META_RELEASE"
AC_DEFINE_UNQUOTED([META_ALIAS], AC_DEFINE_UNQUOTED([META_ALIAS],
["$META_ALIAS"], ["$META_ALIAS"],
[Define the project alias string.] [Define the project alias string.]
@ -48,49 +48,49 @@ AC_DEFUN([ZFS_AC_META], [
AC_SUBST([META_ALIAS]) AC_SUBST([META_ALIAS])
fi fi
META_DATE=_ZFS_AC_META_GETVAL([DATE]); ZFS_META_DATA=_ZFS_AC_META_GETVAL([DATE]);
if test -n "$META_DATE"; then if test -n "$ZFS_META_DATA"; then
AC_DEFINE_UNQUOTED([META_DATE], ["$META_DATE"], AC_DEFINE_UNQUOTED([ZFS_META_DATA], ["$ZFS_META_DATA"],
[Define the project release date.] [Define the project release date.]
) )
AC_SUBST([META_DATE]) AC_SUBST([ZFS_META_DATA])
fi fi
META_AUTHOR=_ZFS_AC_META_GETVAL([AUTHOR]); ZFS_META_AUTHOR=_ZFS_AC_META_GETVAL([AUTHOR]);
if test -n "$META_AUTHOR"; then if test -n "$ZFS_META_AUTHOR"; then
AC_DEFINE_UNQUOTED([META_AUTHOR], ["$META_AUTHOR"], AC_DEFINE_UNQUOTED([ZFS_META_AUTHOR], ["$ZFS_META_AUTHOR"],
[Define the project author.] [Define the project author.]
) )
AC_SUBST([META_AUTHOR]) AC_SUBST([ZFS_META_AUTHOR])
fi fi
m4_pattern_allow([^LT_(CURRENT|REVISION|AGE)$]) m4_pattern_allow([^LT_(CURRENT|REVISION|AGE)$])
META_LT_CURRENT=_ZFS_AC_META_GETVAL([LT_CURRENT]); ZFS_META_LT_CURRENT=_ZFS_AC_META_GETVAL([LT_CURRENT]);
META_LT_REVISION=_ZFS_AC_META_GETVAL([LT_REVISION]); ZFS_META_LT_REVISION=_ZFS_AC_META_GETVAL([LT_REVISION]);
META_LT_AGE=_ZFS_AC_META_GETVAL([LT_AGE]); ZFS_META_LT_AGE=_ZFS_AC_META_GETVAL([LT_AGE]);
if test -n "$META_LT_CURRENT" \ if test -n "$ZFS_META_LT_CURRENT" \
-o -n "$META_LT_REVISION" \ -o -n "$ZFS_META_LT_REVISION" \
-o -n "$META_LT_AGE"; then -o -n "$ZFS_META_LT_AGE"; then
test -n "$META_LT_CURRENT" || META_LT_CURRENT="0" test -n "$ZFS_META_LT_CURRENT" || ZFS_META_LT_CURRENT="0"
test -n "$META_LT_REVISION" || META_LT_REVISION="0" test -n "$ZFS_META_LT_REVISION" || ZFS_META_LT_REVISION="0"
test -n "$META_LT_AGE" || META_LT_AGE="0" test -n "$ZFS_META_LT_AGE" || ZFS_META_LT_AGE="0"
AC_DEFINE_UNQUOTED([META_LT_CURRENT], AC_DEFINE_UNQUOTED([ZFS_META_LT_CURRENT],
["$META_LT_CURRENT"], ["$ZFS_META_LT_CURRENT"],
[Define the libtool library 'current' [Define the libtool library 'current'
version information.] version information.]
) )
AC_DEFINE_UNQUOTED([META_LT_REVISION], AC_DEFINE_UNQUOTED([ZFS_META_LT_REVISION],
["$META_LT_REVISION"], ["$ZFS_META_LT_REVISION"],
[Define the libtool library 'revision' [Define the libtool library 'revision'
version information.] version information.]
) )
AC_DEFINE_UNQUOTED([META_LT_AGE], ["$META_LT_AGE"], AC_DEFINE_UNQUOTED([ZFS_META_LT_AGE], ["$ZFS_META_LT_AGE"],
[Define the libtool library 'age' [Define the libtool library 'age'
version information.] version information.]
) )
AC_SUBST([META_LT_CURRENT]) AC_SUBST([ZFS_META_LT_CURRENT])
AC_SUBST([META_LT_REVISION]) AC_SUBST([ZFS_META_LT_REVISION])
AC_SUBST([META_LT_AGE]) AC_SUBST([ZFS_META_LT_AGE])
fi fi
fi fi

2
configure.ac
View File

@ -35,7 +35,7 @@ AC_LANG(C)
ZFS_AC_META ZFS_AC_META
AC_CONFIG_AUX_DIR([config]) AC_CONFIG_AUX_DIR([config])
AC_CANONICAL_SYSTEM AC_CANONICAL_SYSTEM
AM_INIT_AUTOMAKE([$META_NAME], [$META_VERSION]) AM_INIT_AUTOMAKE([$ZFS_META_NAME], [$ZFS_META_VERSION])
AC_CONFIG_HEADERS([zfs_config.h]) AC_CONFIG_HEADERS([zfs_config.h])
AM_MAINTAINER_MODE AM_MAINTAINER_MODE