diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | META | 6 | ||||
| -rw-r--r-- | Makefile.in | 11 | ||||
| -rw-r--r-- | config/spl-meta.m4 | 112 | ||||
| -rwxr-xr-x | configure | 248 | ||||
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | spl_config.h.in | 27 |
7 files changed, 380 insertions, 34 deletions
@@ -1,3 +1,9 @@ +2008-11-26 Brian Behlendorf <[email protected]> + + * : Tag spl-0.3.5 + + * : Include META file support. + 2008-11-05 Jim Garlick <[email protected]> * : Add autogen.sh products. @@ -0,0 +1,6 @@ +Meta: 1 +Name: spl +Branch: 1.0 +Version: 0.3.5 +Release: 1 +Release-Tags: relext diff --git a/Makefile.in b/Makefile.in index d57d52114..e70fe6168 100644 --- a/Makefile.in +++ b/Makefile.in @@ -47,7 +47,7 @@ DIST_COMMON = $(am__configure_deps) $(srcdir)/Makefile.am \ subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/spl-build.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/config/spl-meta.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ @@ -124,6 +124,15 @@ MAINT = @MAINT@ 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@ diff --git a/config/spl-meta.m4 b/config/spl-meta.m4 new file mode 100644 index 000000000..62c30e9f9 --- /dev/null +++ b/config/spl-meta.m4 @@ -0,0 +1,112 @@ +dnl # +dnl # SPL_AC_META +dnl # Read metadata from the META file. +dnl # +dnl # AUTHOR: +dnl # Chris Dunlap <[email protected]> +dnl # +AC_DEFUN([SPL_AC_META], [ + AC_MSG_CHECKING([metadata]) + + META="$srcdir/META" + _spl_ac_meta_got_file=no + 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"], + [Define the project name.] + ) + AC_SUBST([META_NAME]) + fi + + META_VERSION=_SPL_AC_META_GETVAL([VERSION]); + if test -n "$META_VERSION"; then + AC_DEFINE_UNQUOTED([META_VERSION], ["$META_VERSION"], + [Define the project version.] + ) + AC_SUBST([META_VERSION]) + fi + + META_RELEASE=_SPL_AC_META_GETVAL([RELEASE]); + if test -n "$META_RELEASE"; then + AC_DEFINE_UNQUOTED([META_RELEASE], ["$META_RELEASE"], + [Define the project release.] + ) + AC_SUBST([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" + AC_DEFINE_UNQUOTED([META_ALIAS], + ["$META_ALIAS"], + [Define the project alias string.] + ) + 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"], + [Define the project release date.] + ) + AC_SUBST([META_DATE]) + fi + + META_AUTHOR=_SPL_AC_META_GETVAL([AUTHOR]); + if test -n "$META_AUTHOR"; then + AC_DEFINE_UNQUOTED([META_AUTHOR], ["$META_AUTHOR"], + [Define the project author.] + ) + AC_SUBST([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"], + [Define the libtool library 'current' + version information.] + ) + AC_DEFINE_UNQUOTED([META_LT_REVISION], + ["$META_LT_REVISION"], + [Define the libtool library 'revision' + version information.] + ) + AC_DEFINE_UNQUOTED([META_LT_AGE], ["$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]) + fi + fi + + AC_MSG_RESULT([$_spl_ac_meta_got_file]) + ] +) + +AC_DEFUN([_SPL_AC_META_GETVAL], + [`perl -n\ + -e "BEGIN { \\$key=shift @ARGV; }"\ + -e "next unless s/^\s*\\$key@<:@:=@:>@//i;"\ + -e "s/^((?:@<:@^'\"#@:>@*(?:(@<:@'\"@:>@)@<:@^\2@:>@*\2)*)*)#.*/\\@S|@1/;"\ + -e "s/^\s+//;"\ + -e "s/\s+$//;"\ + -e "s/^(@<:@'\"@:>@)(.*)\1/\\@S|@2/;"\ + -e "\\$val=\\$_;"\ + -e "END { print \\$val if defined \\$val; }"\ + '$1' $META`]dnl +) @@ -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 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 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_files='' # Initialize some variables set by options. @@ -1504,6 +1504,183 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu + echo "$as_me:$LINENO: checking metadata" >&5 +echo $ECHO_N "checking metadata... $ECHO_C" >&6 + + META="$srcdir/META" + _spl_ac_meta_got_file=no + if test -f "$META"; then + _spl_ac_meta_got_file=yes + + META_NAME=`perl -n\ + -e "BEGIN { \\$key=shift @ARGV; }"\ + -e "next unless s/^\s*\\$key[:=]//i;"\ + -e "s/^((?:[^'\"#]*(?:(['\"])[^\2]*\2)*)*)#.*/\\$1/;"\ + -e "s/^\s+//;"\ + -e "s/\s+$//;"\ + -e "s/^(['\"])(.*)\1/\\$2/;"\ + -e "\\$val=\\$_;"\ + -e "END { print \\$val if defined \\$val; }"\ + '(?:NAME|PROJECT|PACKAGE)' $META`; + if test -n "$META_NAME"; then + +cat >>confdefs.h <<_ACEOF +#define META_NAME "$META_NAME" +_ACEOF + + + fi + + META_VERSION=`perl -n\ + -e "BEGIN { \\$key=shift @ARGV; }"\ + -e "next unless s/^\s*\\$key[:=]//i;"\ + -e "s/^((?:[^'\"#]*(?:(['\"])[^\2]*\2)*)*)#.*/\\$1/;"\ + -e "s/^\s+//;"\ + -e "s/\s+$//;"\ + -e "s/^(['\"])(.*)\1/\\$2/;"\ + -e "\\$val=\\$_;"\ + -e "END { print \\$val if defined \\$val; }"\ + 'VERSION' $META`; + if test -n "$META_VERSION"; then + +cat >>confdefs.h <<_ACEOF +#define META_VERSION "$META_VERSION" +_ACEOF + + + fi + + META_RELEASE=`perl -n\ + -e "BEGIN { \\$key=shift @ARGV; }"\ + -e "next unless s/^\s*\\$key[:=]//i;"\ + -e "s/^((?:[^'\"#]*(?:(['\"])[^\2]*\2)*)*)#.*/\\$1/;"\ + -e "s/^\s+//;"\ + -e "s/\s+$//;"\ + -e "s/^(['\"])(.*)\1/\\$2/;"\ + -e "\\$val=\\$_;"\ + -e "END { print \\$val if defined \\$val; }"\ + 'RELEASE' $META`; + if test -n "$META_RELEASE"; then + +cat >>confdefs.h <<_ACEOF +#define META_RELEASE "$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" + +cat >>confdefs.h <<_ACEOF +#define META_ALIAS "$META_ALIAS" +_ACEOF + + + fi + + META_DATE=`perl -n\ + -e "BEGIN { \\$key=shift @ARGV; }"\ + -e "next unless s/^\s*\\$key[:=]//i;"\ + -e "s/^((?:[^'\"#]*(?:(['\"])[^\2]*\2)*)*)#.*/\\$1/;"\ + -e "s/^\s+//;"\ + -e "s/\s+$//;"\ + -e "s/^(['\"])(.*)\1/\\$2/;"\ + -e "\\$val=\\$_;"\ + -e "END { print \\$val if defined \\$val; }"\ + 'DATE' $META`; + if test -n "$META_DATE"; then + +cat >>confdefs.h <<_ACEOF +#define META_DATE "$META_DATE" +_ACEOF + + + fi + + META_AUTHOR=`perl -n\ + -e "BEGIN { \\$key=shift @ARGV; }"\ + -e "next unless s/^\s*\\$key[:=]//i;"\ + -e "s/^((?:[^'\"#]*(?:(['\"])[^\2]*\2)*)*)#.*/\\$1/;"\ + -e "s/^\s+//;"\ + -e "s/\s+$//;"\ + -e "s/^(['\"])(.*)\1/\\$2/;"\ + -e "\\$val=\\$_;"\ + -e "END { print \\$val if defined \\$val; }"\ + 'AUTHOR' $META`; + if test -n "$META_AUTHOR"; then + +cat >>confdefs.h <<_ACEOF +#define META_AUTHOR "$META_AUTHOR" +_ACEOF + + + fi + + + META_LT_CURRENT=`perl -n\ + -e "BEGIN { \\$key=shift @ARGV; }"\ + -e "next unless s/^\s*\\$key[:=]//i;"\ + -e "s/^((?:[^'\"#]*(?:(['\"])[^\2]*\2)*)*)#.*/\\$1/;"\ + -e "s/^\s+//;"\ + -e "s/\s+$//;"\ + -e "s/^(['\"])(.*)\1/\\$2/;"\ + -e "\\$val=\\$_;"\ + -e "END { print \\$val if defined \\$val; }"\ + 'LT_CURRENT' $META`; + META_LT_REVISION=`perl -n\ + -e "BEGIN { \\$key=shift @ARGV; }"\ + -e "next unless s/^\s*\\$key[:=]//i;"\ + -e "s/^((?:[^'\"#]*(?:(['\"])[^\2]*\2)*)*)#.*/\\$1/;"\ + -e "s/^\s+//;"\ + -e "s/\s+$//;"\ + -e "s/^(['\"])(.*)\1/\\$2/;"\ + -e "\\$val=\\$_;"\ + -e "END { print \\$val if defined \\$val; }"\ + 'LT_REVISION' $META`; + META_LT_AGE=`perl -n\ + -e "BEGIN { \\$key=shift @ARGV; }"\ + -e "next unless s/^\s*\\$key[:=]//i;"\ + -e "s/^((?:[^'\"#]*(?:(['\"])[^\2]*\2)*)*)#.*/\\$1/;"\ + -e "s/^\s+//;"\ + -e "s/\s+$//;"\ + -e "s/^(['\"])(.*)\1/\\$2/;"\ + -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" + +cat >>confdefs.h <<_ACEOF +#define META_LT_CURRENT "$META_LT_CURRENT" +_ACEOF + + +cat >>confdefs.h <<_ACEOF +#define META_LT_REVISION "$META_LT_REVISION" +_ACEOF + + +cat >>confdefs.h <<_ACEOF +#define META_LT_AGE "$META_LT_AGE" +_ACEOF + + + + + fi + fi + + echo "$as_me:$LINENO: result: $_spl_ac_meta_got_file" >&5 +echo "${ECHO_T}$_spl_ac_meta_got_file" >&6 + + ac_aux_dir= for ac_dir in config $srcdir/config; do if test -f $ac_dir/install-sh; then @@ -1892,8 +2069,8 @@ fi # Define the identity of the package. - PACKAGE=spl - VERSION=0.3.4 + PACKAGE=$META_NAME + VERSION=$META_VERSION cat >>confdefs.h <<_ACEOF @@ -3801,7 +3978,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 3804 "configure"' > conftest.$ac_ext + echo '#line 3981 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -5400,7 +5577,7 @@ fi # Provide some information about the compiler. -echo "$as_me:5403:" \ +echo "$as_me:5580:" \ "checking for Fortran 77 compiler version" >&5 ac_compiler=`set X $ac_compile; echo $2` { (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5 @@ -6463,11 +6640,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6466: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6643: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:6470: \$? = $ac_status" >&5 + echo "$as_me:6647: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -6731,11 +6908,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6734: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6911: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:6738: \$? = $ac_status" >&5 + echo "$as_me:6915: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -6835,11 +7012,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6838: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7015: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:6842: \$? = $ac_status" >&5 + echo "$as_me:7019: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -8304,7 +8481,7 @@ linux*) libsuff= case "$host_cpu" in x86_64*|s390x*|powerpc64*) - echo '#line 8307 "configure"' > conftest.$ac_ext + echo '#line 8484 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -9201,7 +9378,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 9204 "configure" +#line 9381 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -9301,7 +9478,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 9304 "configure" +#line 9481 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11644,11 +11821,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:11647: $lt_compile\"" >&5) + (eval echo "\"\$as_me:11824: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:11651: \$? = $ac_status" >&5 + echo "$as_me:11828: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -11748,11 +11925,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:11751: $lt_compile\"" >&5) + (eval echo "\"\$as_me:11928: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:11755: \$? = $ac_status" >&5 + echo "$as_me:11932: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -12284,7 +12461,7 @@ linux*) libsuff= case "$host_cpu" in x86_64*|s390x*|powerpc64*) - echo '#line 12287 "configure"' > conftest.$ac_ext + echo '#line 12464 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -13342,11 +13519,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:13345: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13522: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:13349: \$? = $ac_status" >&5 + echo "$as_me:13526: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -13446,11 +13623,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:13449: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13626: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:13453: \$? = $ac_status" >&5 + echo "$as_me:13630: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -14895,7 +15072,7 @@ linux*) libsuff= case "$host_cpu" in x86_64*|s390x*|powerpc64*) - echo '#line 14898 "configure"' > conftest.$ac_ext + echo '#line 15075 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -15673,11 +15850,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15676: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15853: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:15680: \$? = $ac_status" >&5 + echo "$as_me:15857: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -15941,11 +16118,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15944: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16121: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:15948: \$? = $ac_status" >&5 + echo "$as_me:16125: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -16045,11 +16222,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:16048: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16225: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:16052: \$? = $ac_status" >&5 + echo "$as_me:16229: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -17514,7 +17691,7 @@ linux*) libsuff= case "$host_cpu" in x86_64*|s390x*|powerpc64*) - echo '#line 17517 "configure"' > conftest.$ac_ext + echo '#line 17694 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -20925,6 +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,@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,@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 5fb7c92de..5a86b246b 100644 --- a/configure.ac +++ b/configure.ac @@ -25,10 +25,10 @@ */ AC_INIT - +SPL_AC_META AC_CONFIG_AUX_DIR([config]) AC_CANONICAL_SYSTEM -AM_INIT_AUTOMAKE(spl, 0.3.4) +AM_INIT_AUTOMAKE([$META_NAME], [$META_VERSION]) AC_CONFIG_HEADERS([spl_config.h]) AM_MAINTAINER_MODE diff --git a/spl_config.h.in b/spl_config.h.in index cf1faaae3..09d0d917a 100644 --- a/spl_config.h.in +++ b/spl_config.h.in @@ -108,6 +108,33 @@ /* Define to 1 if you have the <unistd.h> header file. */ #undef HAVE_UNISTD_H +/* 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 |