diff options
| -rw-r--r-- | config/zfs-meta.m4 | 82 | ||||
| -rw-r--r-- | configure.ac | 2 |
2 files changed, 42 insertions, 42 deletions
diff --git a/config/zfs-meta.m4 b/config/zfs-meta.m4 index 199638096..bbe1f9ba0 100644 --- a/config/zfs-meta.m4 +++ b/config/zfs-meta.m4 @@ -13,34 +13,34 @@ AC_DEFUN([ZFS_AC_META], [ if test -f "$META"; then _zfs_ac_meta_got_file=yes - META_NAME=_ZFS_AC_META_GETVAL([(?:NAME|PROJECT|PACKAGE)]); - if test -n "$META_NAME"; then - AC_DEFINE_UNQUOTED([META_NAME], ["$META_NAME"], + ZFS_META_NAME=_ZFS_AC_META_GETVAL([(?:NAME|PROJECT|PACKAGE)]); + if test -n "$ZFS_META_NAME"; then + AC_DEFINE_UNQUOTED([ZFS_META_NAME], ["$ZFS_META_NAME"], [Define the project name.] ) - AC_SUBST([META_NAME]) + AC_SUBST([ZFS_META_NAME]) fi - META_VERSION=_ZFS_AC_META_GETVAL([VERSION]); - if test -n "$META_VERSION"; then - AC_DEFINE_UNQUOTED([META_VERSION], ["$META_VERSION"], + ZFS_META_VERSION=_ZFS_AC_META_GETVAL([VERSION]); + if test -n "$ZFS_META_VERSION"; then + AC_DEFINE_UNQUOTED([ZFS_META_VERSION], ["$ZFS_META_VERSION"], [Define the project version.] ) - AC_SUBST([META_VERSION]) + AC_SUBST([ZFS_META_VERSION]) fi - META_RELEASE=_ZFS_AC_META_GETVAL([RELEASE]); - if test -n "$META_RELEASE"; then - AC_DEFINE_UNQUOTED([META_RELEASE], ["$META_RELEASE"], + ZFS_META_RELEASE=_ZFS_AC_META_GETVAL([RELEASE]); + if test -n "$ZFS_META_RELEASE"; then + AC_DEFINE_UNQUOTED([ZFS_META_RELEASE], ["$ZFS_META_RELEASE"], [Define the project release.] ) - AC_SUBST([META_RELEASE]) + AC_SUBST([ZFS_META_RELEASE]) fi - if test -n "$META_NAME" -a -n "$META_VERSION"; then - META_ALIAS="$META_NAME-$META_VERSION" - test -n "$META_RELEASE" && - META_ALIAS="$META_ALIAS-$META_RELEASE" + if test -n "$ZFS_META_NAME" -a -n "$ZFS_META_VERSION"; then + META_ALIAS="$ZFS_META_NAME-$ZFS_META_VERSION" + test -n "$ZFS_META_RELEASE" && + META_ALIAS="$META_ALIAS-$ZFS_META_RELEASE" AC_DEFINE_UNQUOTED([META_ALIAS], ["$META_ALIAS"], [Define the project alias string.] @@ -48,49 +48,49 @@ AC_DEFUN([ZFS_AC_META], [ AC_SUBST([META_ALIAS]) fi - META_DATE=_ZFS_AC_META_GETVAL([DATE]); - if test -n "$META_DATE"; then - AC_DEFINE_UNQUOTED([META_DATE], ["$META_DATE"], + ZFS_META_DATA=_ZFS_AC_META_GETVAL([DATE]); + if test -n "$ZFS_META_DATA"; then + AC_DEFINE_UNQUOTED([ZFS_META_DATA], ["$ZFS_META_DATA"], [Define the project release date.] ) - AC_SUBST([META_DATE]) + AC_SUBST([ZFS_META_DATA]) fi - META_AUTHOR=_ZFS_AC_META_GETVAL([AUTHOR]); - if test -n "$META_AUTHOR"; then - AC_DEFINE_UNQUOTED([META_AUTHOR], ["$META_AUTHOR"], + ZFS_META_AUTHOR=_ZFS_AC_META_GETVAL([AUTHOR]); + if test -n "$ZFS_META_AUTHOR"; then + AC_DEFINE_UNQUOTED([ZFS_META_AUTHOR], ["$ZFS_META_AUTHOR"], [Define the project author.] ) - AC_SUBST([META_AUTHOR]) + AC_SUBST([ZFS_META_AUTHOR]) fi m4_pattern_allow([^LT_(CURRENT|REVISION|AGE)$]) - META_LT_CURRENT=_ZFS_AC_META_GETVAL([LT_CURRENT]); - META_LT_REVISION=_ZFS_AC_META_GETVAL([LT_REVISION]); - META_LT_AGE=_ZFS_AC_META_GETVAL([LT_AGE]); - if test -n "$META_LT_CURRENT" \ - -o -n "$META_LT_REVISION" \ - -o -n "$META_LT_AGE"; then - test -n "$META_LT_CURRENT" || META_LT_CURRENT="0" - test -n "$META_LT_REVISION" || META_LT_REVISION="0" - test -n "$META_LT_AGE" || META_LT_AGE="0" - AC_DEFINE_UNQUOTED([META_LT_CURRENT], - ["$META_LT_CURRENT"], + ZFS_META_LT_CURRENT=_ZFS_AC_META_GETVAL([LT_CURRENT]); + ZFS_META_LT_REVISION=_ZFS_AC_META_GETVAL([LT_REVISION]); + ZFS_META_LT_AGE=_ZFS_AC_META_GETVAL([LT_AGE]); + if test -n "$ZFS_META_LT_CURRENT" \ + -o -n "$ZFS_META_LT_REVISION" \ + -o -n "$ZFS_META_LT_AGE"; then + test -n "$ZFS_META_LT_CURRENT" || ZFS_META_LT_CURRENT="0" + test -n "$ZFS_META_LT_REVISION" || ZFS_META_LT_REVISION="0" + test -n "$ZFS_META_LT_AGE" || ZFS_META_LT_AGE="0" + AC_DEFINE_UNQUOTED([ZFS_META_LT_CURRENT], + ["$ZFS_META_LT_CURRENT"], [Define the libtool library 'current' version information.] ) - AC_DEFINE_UNQUOTED([META_LT_REVISION], - ["$META_LT_REVISION"], + AC_DEFINE_UNQUOTED([ZFS_META_LT_REVISION], + ["$ZFS_META_LT_REVISION"], [Define the libtool library 'revision' 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' version information.] ) - AC_SUBST([META_LT_CURRENT]) - AC_SUBST([META_LT_REVISION]) - AC_SUBST([META_LT_AGE]) + AC_SUBST([ZFS_META_LT_CURRENT]) + AC_SUBST([ZFS_META_LT_REVISION]) + AC_SUBST([ZFS_META_LT_AGE]) fi fi diff --git a/configure.ac b/configure.ac index bbbc4ca14..8a09cbf1c 100644 --- a/configure.ac +++ b/configure.ac @@ -35,7 +35,7 @@ AC_LANG(C) ZFS_AC_META AC_CONFIG_AUX_DIR([config]) 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]) AM_MAINTAINER_MODE |