Prefix META_ALIAS with SPL_

diff --git a/Makefile.in b/Makefile.in
index d387b77a351887df71dbe048dd79427556c1a5b6..8eea6c97d4da5c2bbc28507ab5198ac4601e4ba8 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -124,7 +124,6 @@ MAINT = @MAINT@
 MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
-META_ALIAS = @META_ALIAS@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -137,6 +136,7 @@ RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
+SPL_META_ALIAS = @SPL_META_ALIAS@
 SPL_META_AUTHOR = @SPL_META_AUTHOR@
 SPL_META_DATA = @SPL_META_DATA@
 SPL_META_LT_AGE = @SPL_META_LT_AGE@

diff --git a/cmd/Makefile.in b/cmd/Makefile.in
index 2a49bc5f2f18fe7e9650bd1a4a4b1f872a5a2f67..e31c3bdcd19fb622503b5ea397a99a7836f91642 100644 (file)
--- a/cmd/Makefile.in
+++ b/cmd/Makefile.in
@@ -120,7 +120,6 @@ MAINT = @MAINT@
 MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
-META_ALIAS = @META_ALIAS@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -133,6 +132,7 @@ RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
+SPL_META_ALIAS = @SPL_META_ALIAS@
 SPL_META_AUTHOR = @SPL_META_AUTHOR@
 SPL_META_DATA = @SPL_META_DATA@
 SPL_META_LT_AGE = @SPL_META_LT_AGE@

diff --git a/config/spl-meta.m4 b/config/spl-meta.m4
index e58ed673ffd60c9928c35c9832ed69504b57b040..0fd1f65d09a20155b1ddf5a09ef28608a7495957 100644 (file)
--- a/config/spl-meta.m4
+++ b/config/spl-meta.m4
@@ -38,14 +38,14 @@ AC_DEFUN([SPL_AC_META], [
                fi
 
                if test -n "$SPL_META_NAME" -a -n "$SPL_META_VERSION"; then
-                               META_ALIAS="$SPL_META_NAME-$SPL_META_VERSION"
+                               SPL_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"],
+                                       SPL_META_ALIAS="$SPL_META_ALIAS-$SPL_META_RELEASE"
+                               AC_DEFINE_UNQUOTED([SPL_META_ALIAS],
+                                       ["$SPL_META_ALIAS"],
                                        [Define the project alias string.] 
                                )
-                               AC_SUBST([META_ALIAS])
+                               AC_SUBST([SPL_META_ALIAS])
                fi
 
                SPL_META_DATA=_SPL_AC_META_GETVAL([DATE]);

diff --git a/configure b/configure
index 16f877f9140e4f9836a0bb35b35c344075046304..c0b771407c438026a48da71c74fe10e562630415 100755 (executable)
--- a/configure
+++ b/configure
@@ -462,7 +462,7 @@ ac_includes_default="\
 # include <unistd.h>
 #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 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_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 SPL_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.
@@ -1570,12 +1570,12 @@ _ACEOF
                fi
 
                if test -n "$SPL_META_NAME" -a -n "$SPL_META_VERSION"; then
-                               META_ALIAS="$SPL_META_NAME-$SPL_META_VERSION"
+                               SPL_META_ALIAS="$SPL_META_NAME-$SPL_META_VERSION"
                                test -n "$SPL_META_RELEASE" &&
-                                       META_ALIAS="$META_ALIAS-$SPL_META_RELEASE"
+                                       SPL_META_ALIAS="$SPL_META_ALIAS-$SPL_META_RELEASE"
 
 cat >>confdefs.h <<_ACEOF
-#define META_ALIAS "$META_ALIAS"
+#define SPL_META_ALIAS "$SPL_META_ALIAS"
 _ACEOF
 
 
@@ -21105,7 +21105,7 @@ s,@LIBS@,$LIBS,;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,@SPL_META_ALIAS@,$SPL_META_ALIAS,;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

diff --git a/include/Makefile.in b/include/Makefile.in
index 8e36757ab719c40ab9e1ce401dd495ab1153b8cd..acbd552fa921c56ca0df7920fef571a869f50968 100644 (file)
--- a/include/Makefile.in
+++ b/include/Makefile.in
@@ -106,7 +106,6 @@ MAINT = @MAINT@
 MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
-META_ALIAS = @META_ALIAS@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -119,6 +118,7 @@ RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
+SPL_META_ALIAS = @SPL_META_ALIAS@
 SPL_META_AUTHOR = @SPL_META_AUTHOR@
 SPL_META_DATA = @SPL_META_DATA@
 SPL_META_LT_AGE = @SPL_META_LT_AGE@

diff --git a/include/sys/Makefile.in b/include/sys/Makefile.in
index 3c3d50c3d9028581f668b700562b07a2907724d6..d03422b0f333447925edf1b4e3ebade9e50fb6b1 100644 (file)
--- a/include/sys/Makefile.in
+++ b/include/sys/Makefile.in
@@ -97,7 +97,6 @@ MAINT = @MAINT@
 MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
-META_ALIAS = @META_ALIAS@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -110,6 +109,7 @@ RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
+SPL_META_ALIAS = @SPL_META_ALIAS@
 SPL_META_AUTHOR = @SPL_META_AUTHOR@
 SPL_META_DATA = @SPL_META_DATA@
 SPL_META_LT_AGE = @SPL_META_LT_AGE@

diff --git a/lib/Makefile.in b/lib/Makefile.in
index 0390165f3315b8d27345452513b79d4bfc116c5e..e4097785b6020fbc52c836dbc5f4b94125196ad6 100644 (file)
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -114,7 +114,6 @@ MAINT = @MAINT@
 MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
-META_ALIAS = @META_ALIAS@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -127,6 +126,7 @@ RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
+SPL_META_ALIAS = @SPL_META_ALIAS@
 SPL_META_AUTHOR = @SPL_META_AUTHOR@
 SPL_META_DATA = @SPL_META_DATA@
 SPL_META_LT_AGE = @SPL_META_LT_AGE@

diff --git a/scripts/Makefile.in b/scripts/Makefile.in
index 269c3080abc033b9dfa668f668ff850adbdb966b..e82088e590008979aa15a546f2423cbc28a2887c 100644 (file)
--- a/scripts/Makefile.in
+++ b/scripts/Makefile.in
@@ -98,7 +98,6 @@ MAINT = @MAINT@
 MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
-META_ALIAS = @META_ALIAS@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -111,6 +110,7 @@ RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
+SPL_META_ALIAS = @SPL_META_ALIAS@
 SPL_META_AUTHOR = @SPL_META_AUTHOR@
 SPL_META_DATA = @SPL_META_DATA@
 SPL_META_LT_AGE = @SPL_META_LT_AGE@

diff --git a/spl_config.h.in b/spl_config.h.in
index 64b00244ad85594a132863854ad819bbaf0b8540..dfca13d099f7e466fd2c1f05a180760588bae0be 100644 (file)
--- a/spl_config.h.in
+++ b/spl_config.h.in
@@ -108,9 +108,6 @@
 /* Define to 1 if you have the <unistd.h> header file. */
 #undef HAVE_UNISTD_H
 
-/* Define the project alias string. */
-#undef META_ALIAS
-
 /* Define to 1 to disable debug tracing */
 #undef NDEBUG
 
@@ -132,6 +129,9 @@
 /* Define to the version of this package. */
 #undef PACKAGE_VERSION
 
+/* Define the project alias string. */
+#undef SPL_META_ALIAS
+
 /* Define the project author. */
 #undef SPL_META_AUTHOR