From abc3ca149d719cca5c807f38030d01f61e97d87d Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Wed, 26 Nov 2008 13:09:37 -0800 Subject: [PATCH] Prefix all META_* #defines with SPL to prevent colisions which include our spl_config.h. Dependent packages may do this to leverage the autoconf check we have already run aganst the kernel. --- Makefile.in | 16 ++++---- cmd/Makefile.in | 16 ++++---- config/spl-meta.m4 | 82 ++++++++++++++++++++-------------------- configure | 84 ++++++++++++++++++++--------------------- configure.ac | 2 +- include/Makefile.in | 16 ++++---- include/sys/Makefile.in | 16 ++++---- lib/Makefile.in | 16 ++++---- scripts/Makefile.in | 16 ++++---- spl_config.h.in | 48 +++++++++++------------ 10 files changed, 156 insertions(+), 156 deletions(-) diff --git a/Makefile.in b/Makefile.in index e70fe61682..d387b77a35 100644 --- a/Makefile.in +++ b/Makefile.in @@ -125,14 +125,6 @@ MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ META_ALIAS = @META_ALIAS@ -META_AUTHOR = @META_AUTHOR@ -META_DATE = @META_DATE@ -META_LT_AGE = @META_LT_AGE@ -META_LT_CURRENT = @META_LT_CURRENT@ -META_LT_REVISION = @META_LT_REVISION@ -META_NAME = @META_NAME@ -META_RELEASE = @META_RELEASE@ -META_VERSION = @META_VERSION@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ @@ -145,6 +137,14 @@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ +SPL_META_AUTHOR = @SPL_META_AUTHOR@ +SPL_META_DATA = @SPL_META_DATA@ +SPL_META_LT_AGE = @SPL_META_LT_AGE@ +SPL_META_LT_CURRENT = @SPL_META_LT_CURRENT@ +SPL_META_LT_REVISION = @SPL_META_LT_REVISION@ +SPL_META_NAME = @SPL_META_NAME@ +SPL_META_RELEASE = @SPL_META_RELEASE@ +SPL_META_VERSION = @SPL_META_VERSION@ STRIP = @STRIP@ VERSION = @VERSION@ ac_ct_AR = @ac_ct_AR@ diff --git a/cmd/Makefile.in b/cmd/Makefile.in index 901f698266..2a49bc5f2f 100644 --- a/cmd/Makefile.in +++ b/cmd/Makefile.in @@ -121,14 +121,6 @@ MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ META_ALIAS = @META_ALIAS@ -META_AUTHOR = @META_AUTHOR@ -META_DATE = @META_DATE@ -META_LT_AGE = @META_LT_AGE@ -META_LT_CURRENT = @META_LT_CURRENT@ -META_LT_REVISION = @META_LT_REVISION@ -META_NAME = @META_NAME@ -META_RELEASE = @META_RELEASE@ -META_VERSION = @META_VERSION@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ @@ -141,6 +133,14 @@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ +SPL_META_AUTHOR = @SPL_META_AUTHOR@ +SPL_META_DATA = @SPL_META_DATA@ +SPL_META_LT_AGE = @SPL_META_LT_AGE@ +SPL_META_LT_CURRENT = @SPL_META_LT_CURRENT@ +SPL_META_LT_REVISION = @SPL_META_LT_REVISION@ +SPL_META_NAME = @SPL_META_NAME@ +SPL_META_RELEASE = @SPL_META_RELEASE@ +SPL_META_VERSION = @SPL_META_VERSION@ STRIP = @STRIP@ VERSION = @VERSION@ ac_ct_AR = @ac_ct_AR@ diff --git a/config/spl-meta.m4 b/config/spl-meta.m4 index 62c30e9f90..e58ed673ff 100644 --- a/config/spl-meta.m4 +++ b/config/spl-meta.m4 @@ -13,34 +13,34 @@ AC_DEFUN([SPL_AC_META], [ if test -f "$META"; then _spl_ac_meta_got_file=yes - META_NAME=_SPL_AC_META_GETVAL([(?:NAME|PROJECT|PACKAGE)]); - if test -n "$META_NAME"; then - AC_DEFINE_UNQUOTED([META_NAME], ["$META_NAME"], + SPL_META_NAME=_SPL_AC_META_GETVAL([(?:NAME|PROJECT|PACKAGE)]); + if test -n "$SPL_META_NAME"; then + AC_DEFINE_UNQUOTED([SPL_META_NAME], ["$SPL_META_NAME"], [Define the project name.] ) - AC_SUBST([META_NAME]) + AC_SUBST([SPL_META_NAME]) fi - META_VERSION=_SPL_AC_META_GETVAL([VERSION]); - if test -n "$META_VERSION"; then - AC_DEFINE_UNQUOTED([META_VERSION], ["$META_VERSION"], + SPL_META_VERSION=_SPL_AC_META_GETVAL([VERSION]); + if test -n "$SPL_META_VERSION"; then + AC_DEFINE_UNQUOTED([SPL_META_VERSION], ["$SPL_META_VERSION"], [Define the project version.] ) - AC_SUBST([META_VERSION]) + AC_SUBST([SPL_META_VERSION]) fi - META_RELEASE=_SPL_AC_META_GETVAL([RELEASE]); - if test -n "$META_RELEASE"; then - AC_DEFINE_UNQUOTED([META_RELEASE], ["$META_RELEASE"], + SPL_META_RELEASE=_SPL_AC_META_GETVAL([RELEASE]); + if test -n "$SPL_META_RELEASE"; then + AC_DEFINE_UNQUOTED([SPL_META_RELEASE], ["$SPL_META_RELEASE"], [Define the project release.] ) - AC_SUBST([META_RELEASE]) + AC_SUBST([SPL_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 "$SPL_META_NAME" -a -n "$SPL_META_VERSION"; then + META_ALIAS="$SPL_META_NAME-$SPL_META_VERSION" + test -n "$SPL_META_RELEASE" && + META_ALIAS="$META_ALIAS-$SPL_META_RELEASE" AC_DEFINE_UNQUOTED([META_ALIAS], ["$META_ALIAS"], [Define the project alias string.] @@ -48,49 +48,49 @@ AC_DEFUN([SPL_AC_META], [ AC_SUBST([META_ALIAS]) fi - META_DATE=_SPL_AC_META_GETVAL([DATE]); - if test -n "$META_DATE"; then - AC_DEFINE_UNQUOTED([META_DATE], ["$META_DATE"], + SPL_META_DATA=_SPL_AC_META_GETVAL([DATE]); + if test -n "$SPL_META_DATA"; then + AC_DEFINE_UNQUOTED([SPL_META_DATA], ["$SPL_META_DATA"], [Define the project release date.] ) - AC_SUBST([META_DATE]) + AC_SUBST([SPL_META_DATA]) fi - META_AUTHOR=_SPL_AC_META_GETVAL([AUTHOR]); - if test -n "$META_AUTHOR"; then - AC_DEFINE_UNQUOTED([META_AUTHOR], ["$META_AUTHOR"], + SPL_META_AUTHOR=_SPL_AC_META_GETVAL([AUTHOR]); + if test -n "$SPL_META_AUTHOR"; then + AC_DEFINE_UNQUOTED([SPL_META_AUTHOR], ["$SPL_META_AUTHOR"], [Define the project author.] ) - AC_SUBST([META_AUTHOR]) + AC_SUBST([SPL_META_AUTHOR]) fi m4_pattern_allow([^LT_(CURRENT|REVISION|AGE)$]) - META_LT_CURRENT=_SPL_AC_META_GETVAL([LT_CURRENT]); - META_LT_REVISION=_SPL_AC_META_GETVAL([LT_REVISION]); - META_LT_AGE=_SPL_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"], + SPL_META_LT_CURRENT=_SPL_AC_META_GETVAL([LT_CURRENT]); + SPL_META_LT_REVISION=_SPL_AC_META_GETVAL([LT_REVISION]); + SPL_META_LT_AGE=_SPL_AC_META_GETVAL([LT_AGE]); + if test -n "$SPL_META_LT_CURRENT" \ + -o -n "$SPL_META_LT_REVISION" \ + -o -n "$SPL_META_LT_AGE"; then + test -n "$SPL_META_LT_CURRENT" || SPL_META_LT_CURRENT="0" + test -n "$SPL_META_LT_REVISION" || SPL_META_LT_REVISION="0" + test -n "$SPL_META_LT_AGE" || SPL_META_LT_AGE="0" + AC_DEFINE_UNQUOTED([SPL_META_LT_CURRENT], + ["$SPL_META_LT_CURRENT"], [Define the libtool library 'current' version information.] ) - AC_DEFINE_UNQUOTED([META_LT_REVISION], - ["$META_LT_REVISION"], + AC_DEFINE_UNQUOTED([SPL_META_LT_REVISION], + ["$SPL_META_LT_REVISION"], [Define the libtool library 'revision' version information.] ) - AC_DEFINE_UNQUOTED([META_LT_AGE], ["$META_LT_AGE"], + AC_DEFINE_UNQUOTED([SPL_META_LT_AGE], ["$SPL_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([SPL_META_LT_CURRENT]) + AC_SUBST([SPL_META_LT_REVISION]) + AC_SUBST([SPL_META_LT_AGE]) fi fi diff --git a/configure b/configure index 8fa6783b86..16f877f914 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 META_NAME META_VERSION META_RELEASE META_ALIAS META_DATE META_AUTHOR META_LT_CURRENT META_LT_REVISION 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 LINUX LINUX_OBJ kmoduledir KERNELMAKE_PARAMS KERNELCPPFLAGS KERNELCFLAGS 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 SPL_META_NAME SPL_META_VERSION SPL_META_RELEASE META_ALIAS SPL_META_DATA SPL_META_AUTHOR SPL_META_LT_CURRENT SPL_META_LT_REVISION SPL_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 LINUX LINUX_OBJ kmoduledir KERNELMAKE_PARAMS KERNELCPPFLAGS KERNELCFLAGS LIBOBJS LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -1512,7 +1512,7 @@ echo $ECHO_N "checking metadata... $ECHO_C" >&6 if test -f "$META"; then _spl_ac_meta_got_file=yes - META_NAME=`perl -n\ + SPL_META_NAME=`perl -n\ -e "BEGIN { \\$key=shift @ARGV; }"\ -e "next unless s/^\s*\\$key[:=]//i;"\ -e "s/^((?:[^'\"#]*(?:(['\"])[^\2]*\2)*)*)#.*/\\$1/;"\ @@ -1522,16 +1522,16 @@ echo $ECHO_N "checking metadata... $ECHO_C" >&6 -e "\\$val=\\$_;"\ -e "END { print \\$val if defined \\$val; }"\ '(?:NAME|PROJECT|PACKAGE)' $META`; - if test -n "$META_NAME"; then + if test -n "$SPL_META_NAME"; then cat >>confdefs.h <<_ACEOF -#define META_NAME "$META_NAME" +#define SPL_META_NAME "$SPL_META_NAME" _ACEOF fi - META_VERSION=`perl -n\ + SPL_META_VERSION=`perl -n\ -e "BEGIN { \\$key=shift @ARGV; }"\ -e "next unless s/^\s*\\$key[:=]//i;"\ -e "s/^((?:[^'\"#]*(?:(['\"])[^\2]*\2)*)*)#.*/\\$1/;"\ @@ -1541,16 +1541,16 @@ _ACEOF -e "\\$val=\\$_;"\ -e "END { print \\$val if defined \\$val; }"\ 'VERSION' $META`; - if test -n "$META_VERSION"; then + if test -n "$SPL_META_VERSION"; then cat >>confdefs.h <<_ACEOF -#define META_VERSION "$META_VERSION" +#define SPL_META_VERSION "$SPL_META_VERSION" _ACEOF fi - META_RELEASE=`perl -n\ + SPL_META_RELEASE=`perl -n\ -e "BEGIN { \\$key=shift @ARGV; }"\ -e "next unless s/^\s*\\$key[:=]//i;"\ -e "s/^((?:[^'\"#]*(?:(['\"])[^\2]*\2)*)*)#.*/\\$1/;"\ @@ -1560,19 +1560,19 @@ _ACEOF -e "\\$val=\\$_;"\ -e "END { print \\$val if defined \\$val; }"\ 'RELEASE' $META`; - if test -n "$META_RELEASE"; then + if test -n "$SPL_META_RELEASE"; then cat >>confdefs.h <<_ACEOF -#define META_RELEASE "$META_RELEASE" +#define SPL_META_RELEASE "$SPL_META_RELEASE" _ACEOF 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 "$SPL_META_NAME" -a -n "$SPL_META_VERSION"; then + META_ALIAS="$SPL_META_NAME-$SPL_META_VERSION" + test -n "$SPL_META_RELEASE" && + META_ALIAS="$META_ALIAS-$SPL_META_RELEASE" cat >>confdefs.h <<_ACEOF #define META_ALIAS "$META_ALIAS" @@ -1581,7 +1581,7 @@ _ACEOF fi - META_DATE=`perl -n\ + SPL_META_DATA=`perl -n\ -e "BEGIN { \\$key=shift @ARGV; }"\ -e "next unless s/^\s*\\$key[:=]//i;"\ -e "s/^((?:[^'\"#]*(?:(['\"])[^\2]*\2)*)*)#.*/\\$1/;"\ @@ -1591,16 +1591,16 @@ _ACEOF -e "\\$val=\\$_;"\ -e "END { print \\$val if defined \\$val; }"\ 'DATE' $META`; - if test -n "$META_DATE"; then + if test -n "$SPL_META_DATA"; then cat >>confdefs.h <<_ACEOF -#define META_DATE "$META_DATE" +#define SPL_META_DATA "$SPL_META_DATA" _ACEOF fi - META_AUTHOR=`perl -n\ + SPL_META_AUTHOR=`perl -n\ -e "BEGIN { \\$key=shift @ARGV; }"\ -e "next unless s/^\s*\\$key[:=]//i;"\ -e "s/^((?:[^'\"#]*(?:(['\"])[^\2]*\2)*)*)#.*/\\$1/;"\ @@ -1610,17 +1610,17 @@ _ACEOF -e "\\$val=\\$_;"\ -e "END { print \\$val if defined \\$val; }"\ 'AUTHOR' $META`; - if test -n "$META_AUTHOR"; then + if test -n "$SPL_META_AUTHOR"; then cat >>confdefs.h <<_ACEOF -#define META_AUTHOR "$META_AUTHOR" +#define SPL_META_AUTHOR "$SPL_META_AUTHOR" _ACEOF fi - META_LT_CURRENT=`perl -n\ + SPL_META_LT_CURRENT=`perl -n\ -e "BEGIN { \\$key=shift @ARGV; }"\ -e "next unless s/^\s*\\$key[:=]//i;"\ -e "s/^((?:[^'\"#]*(?:(['\"])[^\2]*\2)*)*)#.*/\\$1/;"\ @@ -1630,7 +1630,7 @@ _ACEOF -e "\\$val=\\$_;"\ -e "END { print \\$val if defined \\$val; }"\ 'LT_CURRENT' $META`; - META_LT_REVISION=`perl -n\ + SPL_META_LT_REVISION=`perl -n\ -e "BEGIN { \\$key=shift @ARGV; }"\ -e "next unless s/^\s*\\$key[:=]//i;"\ -e "s/^((?:[^'\"#]*(?:(['\"])[^\2]*\2)*)*)#.*/\\$1/;"\ @@ -1640,7 +1640,7 @@ _ACEOF -e "\\$val=\\$_;"\ -e "END { print \\$val if defined \\$val; }"\ 'LT_REVISION' $META`; - META_LT_AGE=`perl -n\ + SPL_META_LT_AGE=`perl -n\ -e "BEGIN { \\$key=shift @ARGV; }"\ -e "next unless s/^\s*\\$key[:=]//i;"\ -e "s/^((?:[^'\"#]*(?:(['\"])[^\2]*\2)*)*)#.*/\\$1/;"\ @@ -1650,25 +1650,25 @@ _ACEOF -e "\\$val=\\$_;"\ -e "END { print \\$val if defined \\$val; }"\ 'LT_AGE' $META`; - 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" + if test -n "$SPL_META_LT_CURRENT" \ + -o -n "$SPL_META_LT_REVISION" \ + -o -n "$SPL_META_LT_AGE"; then + test -n "$SPL_META_LT_CURRENT" || SPL_META_LT_CURRENT="0" + test -n "$SPL_META_LT_REVISION" || SPL_META_LT_REVISION="0" + test -n "$SPL_META_LT_AGE" || SPL_META_LT_AGE="0" cat >>confdefs.h <<_ACEOF -#define META_LT_CURRENT "$META_LT_CURRENT" +#define SPL_META_LT_CURRENT "$SPL_META_LT_CURRENT" _ACEOF cat >>confdefs.h <<_ACEOF -#define META_LT_REVISION "$META_LT_REVISION" +#define SPL_META_LT_REVISION "$SPL_META_LT_REVISION" _ACEOF cat >>confdefs.h <<_ACEOF -#define META_LT_AGE "$META_LT_AGE" +#define SPL_META_LT_AGE "$SPL_META_LT_AGE" _ACEOF @@ -2069,8 +2069,8 @@ fi # Define the identity of the package. - PACKAGE=$META_NAME - VERSION=$META_VERSION + PACKAGE=$SPL_META_NAME + VERSION=$SPL_META_VERSION cat >>confdefs.h <<_ACEOF @@ -21102,15 +21102,15 @@ s,@ECHO_C@,$ECHO_C,;t t s,@ECHO_N@,$ECHO_N,;t t s,@ECHO_T@,$ECHO_T,;t t s,@LIBS@,$LIBS,;t t -s,@META_NAME@,$META_NAME,;t t -s,@META_VERSION@,$META_VERSION,;t t -s,@META_RELEASE@,$META_RELEASE,;t t +s,@SPL_META_NAME@,$SPL_META_NAME,;t t +s,@SPL_META_VERSION@,$SPL_META_VERSION,;t t +s,@SPL_META_RELEASE@,$SPL_META_RELEASE,;t t s,@META_ALIAS@,$META_ALIAS,;t t -s,@META_DATE@,$META_DATE,;t t -s,@META_AUTHOR@,$META_AUTHOR,;t t -s,@META_LT_CURRENT@,$META_LT_CURRENT,;t t -s,@META_LT_REVISION@,$META_LT_REVISION,;t t -s,@META_LT_AGE@,$META_LT_AGE,;t t +s,@SPL_META_DATA@,$SPL_META_DATA,;t t +s,@SPL_META_AUTHOR@,$SPL_META_AUTHOR,;t t +s,@SPL_META_LT_CURRENT@,$SPL_META_LT_CURRENT,;t t +s,@SPL_META_LT_REVISION@,$SPL_META_LT_REVISION,;t t +s,@SPL_META_LT_AGE@,$SPL_META_LT_AGE,;t t s,@build@,$build,;t t s,@build_cpu@,$build_cpu,;t t s,@build_vendor@,$build_vendor,;t t diff --git a/configure.ac b/configure.ac index 5a86b246b8..ca19adc4ed 100644 --- a/configure.ac +++ b/configure.ac @@ -28,7 +28,7 @@ AC_INIT SPL_AC_META AC_CONFIG_AUX_DIR([config]) AC_CANONICAL_SYSTEM -AM_INIT_AUTOMAKE([$META_NAME], [$META_VERSION]) +AM_INIT_AUTOMAKE([$SPL_META_NAME], [$SPL_META_VERSION]) AC_CONFIG_HEADERS([spl_config.h]) AM_MAINTAINER_MODE diff --git a/include/Makefile.in b/include/Makefile.in index 4b27a5208b..8e36757ab7 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -107,14 +107,6 @@ MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ META_ALIAS = @META_ALIAS@ -META_AUTHOR = @META_AUTHOR@ -META_DATE = @META_DATE@ -META_LT_AGE = @META_LT_AGE@ -META_LT_CURRENT = @META_LT_CURRENT@ -META_LT_REVISION = @META_LT_REVISION@ -META_NAME = @META_NAME@ -META_RELEASE = @META_RELEASE@ -META_VERSION = @META_VERSION@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ @@ -127,6 +119,14 @@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ +SPL_META_AUTHOR = @SPL_META_AUTHOR@ +SPL_META_DATA = @SPL_META_DATA@ +SPL_META_LT_AGE = @SPL_META_LT_AGE@ +SPL_META_LT_CURRENT = @SPL_META_LT_CURRENT@ +SPL_META_LT_REVISION = @SPL_META_LT_REVISION@ +SPL_META_NAME = @SPL_META_NAME@ +SPL_META_RELEASE = @SPL_META_RELEASE@ +SPL_META_VERSION = @SPL_META_VERSION@ STRIP = @STRIP@ VERSION = @VERSION@ ac_ct_AR = @ac_ct_AR@ diff --git a/include/sys/Makefile.in b/include/sys/Makefile.in index 6dc6ac98eb..3c3d50c3d9 100644 --- a/include/sys/Makefile.in +++ b/include/sys/Makefile.in @@ -98,14 +98,6 @@ MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ META_ALIAS = @META_ALIAS@ -META_AUTHOR = @META_AUTHOR@ -META_DATE = @META_DATE@ -META_LT_AGE = @META_LT_AGE@ -META_LT_CURRENT = @META_LT_CURRENT@ -META_LT_REVISION = @META_LT_REVISION@ -META_NAME = @META_NAME@ -META_RELEASE = @META_RELEASE@ -META_VERSION = @META_VERSION@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ @@ -118,6 +110,14 @@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ +SPL_META_AUTHOR = @SPL_META_AUTHOR@ +SPL_META_DATA = @SPL_META_DATA@ +SPL_META_LT_AGE = @SPL_META_LT_AGE@ +SPL_META_LT_CURRENT = @SPL_META_LT_CURRENT@ +SPL_META_LT_REVISION = @SPL_META_LT_REVISION@ +SPL_META_NAME = @SPL_META_NAME@ +SPL_META_RELEASE = @SPL_META_RELEASE@ +SPL_META_VERSION = @SPL_META_VERSION@ STRIP = @STRIP@ VERSION = @VERSION@ ac_ct_AR = @ac_ct_AR@ diff --git a/lib/Makefile.in b/lib/Makefile.in index 2640798805..0390165f33 100644 --- a/lib/Makefile.in +++ b/lib/Makefile.in @@ -115,14 +115,6 @@ MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ META_ALIAS = @META_ALIAS@ -META_AUTHOR = @META_AUTHOR@ -META_DATE = @META_DATE@ -META_LT_AGE = @META_LT_AGE@ -META_LT_CURRENT = @META_LT_CURRENT@ -META_LT_REVISION = @META_LT_REVISION@ -META_NAME = @META_NAME@ -META_RELEASE = @META_RELEASE@ -META_VERSION = @META_VERSION@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ @@ -135,6 +127,14 @@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ +SPL_META_AUTHOR = @SPL_META_AUTHOR@ +SPL_META_DATA = @SPL_META_DATA@ +SPL_META_LT_AGE = @SPL_META_LT_AGE@ +SPL_META_LT_CURRENT = @SPL_META_LT_CURRENT@ +SPL_META_LT_REVISION = @SPL_META_LT_REVISION@ +SPL_META_NAME = @SPL_META_NAME@ +SPL_META_RELEASE = @SPL_META_RELEASE@ +SPL_META_VERSION = @SPL_META_VERSION@ STRIP = @STRIP@ VERSION = @VERSION@ ac_ct_AR = @ac_ct_AR@ diff --git a/scripts/Makefile.in b/scripts/Makefile.in index 026feee216..269c3080ab 100644 --- a/scripts/Makefile.in +++ b/scripts/Makefile.in @@ -99,14 +99,6 @@ MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ META_ALIAS = @META_ALIAS@ -META_AUTHOR = @META_AUTHOR@ -META_DATE = @META_DATE@ -META_LT_AGE = @META_LT_AGE@ -META_LT_CURRENT = @META_LT_CURRENT@ -META_LT_REVISION = @META_LT_REVISION@ -META_NAME = @META_NAME@ -META_RELEASE = @META_RELEASE@ -META_VERSION = @META_VERSION@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ @@ -119,6 +111,14 @@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ +SPL_META_AUTHOR = @SPL_META_AUTHOR@ +SPL_META_DATA = @SPL_META_DATA@ +SPL_META_LT_AGE = @SPL_META_LT_AGE@ +SPL_META_LT_CURRENT = @SPL_META_LT_CURRENT@ +SPL_META_LT_REVISION = @SPL_META_LT_REVISION@ +SPL_META_NAME = @SPL_META_NAME@ +SPL_META_RELEASE = @SPL_META_RELEASE@ +SPL_META_VERSION = @SPL_META_VERSION@ STRIP = @STRIP@ VERSION = @VERSION@ ac_ct_AR = @ac_ct_AR@ diff --git a/spl_config.h.in b/spl_config.h.in index 09d0d917a2..64b00244ad 100644 --- a/spl_config.h.in +++ b/spl_config.h.in @@ -111,30 +111,6 @@ /* Define the project alias string. */ #undef META_ALIAS -/* Define the project author. */ -#undef META_AUTHOR - -/* Define the project release date. */ -#undef META_DATE - -/* Define the libtool library 'age' version information. */ -#undef META_LT_AGE - -/* Define the libtool library 'current' version information. */ -#undef META_LT_CURRENT - -/* Define the libtool library 'revision' version information. */ -#undef META_LT_REVISION - -/* Define the project name. */ -#undef META_NAME - -/* Define the project release. */ -#undef META_RELEASE - -/* Define the project version. */ -#undef META_VERSION - /* Define to 1 to disable debug tracing */ #undef NDEBUG @@ -156,6 +132,30 @@ /* Define to the version of this package. */ #undef PACKAGE_VERSION +/* Define the project author. */ +#undef SPL_META_AUTHOR + +/* Define the project release date. */ +#undef SPL_META_DATA + +/* Define the libtool library 'age' version information. */ +#undef SPL_META_LT_AGE + +/* Define the libtool library 'current' version information. */ +#undef SPL_META_LT_CURRENT + +/* Define the libtool library 'revision' version information. */ +#undef SPL_META_LT_REVISION + +/* Define the project name. */ +#undef SPL_META_NAME + +/* Define the project release. */ +#undef SPL_META_RELEASE + +/* Define the project version. */ +#undef SPL_META_VERSION + /* Define to 1 if you have the ANSI C header files. */ #undef STDC_HEADERS