diff --git a/Makefile.in b/Makefile.in index 97dcd04a91..b064acee6f 100644 --- a/Makefile.in +++ b/Makefile.in @@ -161,7 +161,6 @@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LIBUUID = @LIBUUID@ -LICENSE = @LICENSE@ LINUX = @LINUX@ LINUX_OBJ = @LINUX_OBJ@ LINUX_SYMBOLS = @LINUX_SYMBOLS@ @@ -199,6 +198,7 @@ ZFS_CONFIG = @ZFS_CONFIG@ ZFS_META_ALIAS = @ZFS_META_ALIAS@ ZFS_META_AUTHOR = @ZFS_META_AUTHOR@ ZFS_META_DATA = @ZFS_META_DATA@ +ZFS_META_LICENSE = @ZFS_META_LICENSE@ ZFS_META_LT_AGE = @ZFS_META_LT_AGE@ ZFS_META_LT_CURRENT = @ZFS_META_LT_CURRENT@ ZFS_META_LT_REVISION = @ZFS_META_LT_REVISION@ diff --git a/cmd/Makefile.in b/cmd/Makefile.in index 291e368df2..304a97e1fb 100644 --- a/cmd/Makefile.in +++ b/cmd/Makefile.in @@ -133,7 +133,6 @@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LIBUUID = @LIBUUID@ -LICENSE = @LICENSE@ LINUX = @LINUX@ LINUX_OBJ = @LINUX_OBJ@ LINUX_SYMBOLS = @LINUX_SYMBOLS@ @@ -171,6 +170,7 @@ ZFS_CONFIG = @ZFS_CONFIG@ ZFS_META_ALIAS = @ZFS_META_ALIAS@ ZFS_META_AUTHOR = @ZFS_META_AUTHOR@ ZFS_META_DATA = @ZFS_META_DATA@ +ZFS_META_LICENSE = @ZFS_META_LICENSE@ ZFS_META_LT_AGE = @ZFS_META_LT_AGE@ ZFS_META_LT_CURRENT = @ZFS_META_LT_CURRENT@ ZFS_META_LT_REVISION = @ZFS_META_LT_REVISION@ diff --git a/cmd/zdb/Makefile.in b/cmd/zdb/Makefile.in index cf5c7c3bc2..24ad526d47 100644 --- a/cmd/zdb/Makefile.in +++ b/cmd/zdb/Makefile.in @@ -152,7 +152,6 @@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LIBUUID = @LIBUUID@ -LICENSE = @LICENSE@ LINUX = @LINUX@ LINUX_OBJ = @LINUX_OBJ@ LINUX_SYMBOLS = @LINUX_SYMBOLS@ @@ -190,6 +189,7 @@ ZFS_CONFIG = @ZFS_CONFIG@ ZFS_META_ALIAS = @ZFS_META_ALIAS@ ZFS_META_AUTHOR = @ZFS_META_AUTHOR@ ZFS_META_DATA = @ZFS_META_DATA@ +ZFS_META_LICENSE = @ZFS_META_LICENSE@ ZFS_META_LT_AGE = @ZFS_META_LT_AGE@ ZFS_META_LT_CURRENT = @ZFS_META_LT_CURRENT@ ZFS_META_LT_REVISION = @ZFS_META_LT_REVISION@ diff --git a/cmd/zfs/Makefile.in b/cmd/zfs/Makefile.in index 6ce02fe20e..70eba762cf 100644 --- a/cmd/zfs/Makefile.in +++ b/cmd/zfs/Makefile.in @@ -152,7 +152,6 @@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LIBUUID = @LIBUUID@ -LICENSE = @LICENSE@ LINUX = @LINUX@ LINUX_OBJ = @LINUX_OBJ@ LINUX_SYMBOLS = @LINUX_SYMBOLS@ @@ -190,6 +189,7 @@ ZFS_CONFIG = @ZFS_CONFIG@ ZFS_META_ALIAS = @ZFS_META_ALIAS@ ZFS_META_AUTHOR = @ZFS_META_AUTHOR@ ZFS_META_DATA = @ZFS_META_DATA@ +ZFS_META_LICENSE = @ZFS_META_LICENSE@ ZFS_META_LT_AGE = @ZFS_META_LT_AGE@ ZFS_META_LT_CURRENT = @ZFS_META_LT_CURRENT@ ZFS_META_LT_REVISION = @ZFS_META_LT_REVISION@ diff --git a/cmd/zinject/Makefile.in b/cmd/zinject/Makefile.in index aa27b07f32..73b530e26c 100644 --- a/cmd/zinject/Makefile.in +++ b/cmd/zinject/Makefile.in @@ -152,7 +152,6 @@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LIBUUID = @LIBUUID@ -LICENSE = @LICENSE@ LINUX = @LINUX@ LINUX_OBJ = @LINUX_OBJ@ LINUX_SYMBOLS = @LINUX_SYMBOLS@ @@ -190,6 +189,7 @@ ZFS_CONFIG = @ZFS_CONFIG@ ZFS_META_ALIAS = @ZFS_META_ALIAS@ ZFS_META_AUTHOR = @ZFS_META_AUTHOR@ ZFS_META_DATA = @ZFS_META_DATA@ +ZFS_META_LICENSE = @ZFS_META_LICENSE@ ZFS_META_LT_AGE = @ZFS_META_LT_AGE@ ZFS_META_LT_CURRENT = @ZFS_META_LT_CURRENT@ ZFS_META_LT_REVISION = @ZFS_META_LT_REVISION@ diff --git a/cmd/zpios/Makefile.in b/cmd/zpios/Makefile.in index b2926f5653..0c6777f97e 100644 --- a/cmd/zpios/Makefile.in +++ b/cmd/zpios/Makefile.in @@ -145,7 +145,6 @@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LIBUUID = @LIBUUID@ -LICENSE = @LICENSE@ LINUX = @LINUX@ LINUX_OBJ = @LINUX_OBJ@ LINUX_SYMBOLS = @LINUX_SYMBOLS@ @@ -183,6 +182,7 @@ ZFS_CONFIG = @ZFS_CONFIG@ ZFS_META_ALIAS = @ZFS_META_ALIAS@ ZFS_META_AUTHOR = @ZFS_META_AUTHOR@ ZFS_META_DATA = @ZFS_META_DATA@ +ZFS_META_LICENSE = @ZFS_META_LICENSE@ ZFS_META_LT_AGE = @ZFS_META_LT_AGE@ ZFS_META_LT_CURRENT = @ZFS_META_LT_CURRENT@ ZFS_META_LT_REVISION = @ZFS_META_LT_REVISION@ diff --git a/cmd/zpool/Makefile.in b/cmd/zpool/Makefile.in index c381435713..28ed7ad6c0 100644 --- a/cmd/zpool/Makefile.in +++ b/cmd/zpool/Makefile.in @@ -153,7 +153,6 @@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LIBUUID = @LIBUUID@ -LICENSE = @LICENSE@ LINUX = @LINUX@ LINUX_OBJ = @LINUX_OBJ@ LINUX_SYMBOLS = @LINUX_SYMBOLS@ @@ -191,6 +190,7 @@ ZFS_CONFIG = @ZFS_CONFIG@ ZFS_META_ALIAS = @ZFS_META_ALIAS@ ZFS_META_AUTHOR = @ZFS_META_AUTHOR@ ZFS_META_DATA = @ZFS_META_DATA@ +ZFS_META_LICENSE = @ZFS_META_LICENSE@ ZFS_META_LT_AGE = @ZFS_META_LT_AGE@ ZFS_META_LT_CURRENT = @ZFS_META_LT_CURRENT@ ZFS_META_LT_REVISION = @ZFS_META_LT_REVISION@ diff --git a/cmd/zpool_id/Makefile.in b/cmd/zpool_id/Makefile.in index e73c735b47..85ea97bb42 100644 --- a/cmd/zpool_id/Makefile.in +++ b/cmd/zpool_id/Makefile.in @@ -129,7 +129,6 @@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LIBUUID = @LIBUUID@ -LICENSE = @LICENSE@ LINUX = @LINUX@ LINUX_OBJ = @LINUX_OBJ@ LINUX_SYMBOLS = @LINUX_SYMBOLS@ @@ -167,6 +166,7 @@ ZFS_CONFIG = @ZFS_CONFIG@ ZFS_META_ALIAS = @ZFS_META_ALIAS@ ZFS_META_AUTHOR = @ZFS_META_AUTHOR@ ZFS_META_DATA = @ZFS_META_DATA@ +ZFS_META_LICENSE = @ZFS_META_LICENSE@ ZFS_META_LT_AGE = @ZFS_META_LT_AGE@ ZFS_META_LT_CURRENT = @ZFS_META_LT_CURRENT@ ZFS_META_LT_REVISION = @ZFS_META_LT_REVISION@ diff --git a/cmd/ztest/Makefile.in b/cmd/ztest/Makefile.in index 423a62dfe9..581faae096 100644 --- a/cmd/ztest/Makefile.in +++ b/cmd/ztest/Makefile.in @@ -152,7 +152,6 @@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LIBUUID = @LIBUUID@ -LICENSE = @LICENSE@ LINUX = @LINUX@ LINUX_OBJ = @LINUX_OBJ@ LINUX_SYMBOLS = @LINUX_SYMBOLS@ @@ -190,6 +189,7 @@ ZFS_CONFIG = @ZFS_CONFIG@ ZFS_META_ALIAS = @ZFS_META_ALIAS@ ZFS_META_AUTHOR = @ZFS_META_AUTHOR@ ZFS_META_DATA = @ZFS_META_DATA@ +ZFS_META_LICENSE = @ZFS_META_LICENSE@ ZFS_META_LT_AGE = @ZFS_META_LT_AGE@ ZFS_META_LT_CURRENT = @ZFS_META_LT_CURRENT@ ZFS_META_LT_REVISION = @ZFS_META_LT_REVISION@ diff --git a/config/Makefile.in b/config/Makefile.in index 21201fcbad..ea08660cef 100644 --- a/config/Makefile.in +++ b/config/Makefile.in @@ -125,7 +125,6 @@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LIBUUID = @LIBUUID@ -LICENSE = @LICENSE@ LINUX = @LINUX@ LINUX_OBJ = @LINUX_OBJ@ LINUX_SYMBOLS = @LINUX_SYMBOLS@ @@ -163,6 +162,7 @@ ZFS_CONFIG = @ZFS_CONFIG@ ZFS_META_ALIAS = @ZFS_META_ALIAS@ ZFS_META_AUTHOR = @ZFS_META_AUTHOR@ ZFS_META_DATA = @ZFS_META_DATA@ +ZFS_META_LICENSE = @ZFS_META_LICENSE@ ZFS_META_LT_AGE = @ZFS_META_LT_AGE@ ZFS_META_LT_CURRENT = @ZFS_META_LT_CURRENT@ ZFS_META_LT_REVISION = @ZFS_META_LT_REVISION@ diff --git a/configure b/configure index 7811c4bc69..876c3c46b7 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 ZFS_META_NAME ZFS_META_VERSION ZFS_META_RELEASE ZFS_META_ALIAS ZFS_META_DATA ZFS_META_AUTHOR ZFS_META_LT_CURRENT ZFS_META_LT_REVISION ZFS_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 CCAS CCASFLAGS LICENSE TOPDIR BUILDDIR LIBDIR CMDDIR MODDIR SCRIPTDIR TARGET_ASM_DIR ZFS_CONFIG LINUX LINUX_OBJ LINUX_VERSION LINUX_SYMBOLS SPL SPL_OBJ SPL_VERSION SPL_SYMBOLS KERNELMAKE_PARAMS KERNELCPPFLAGS ZLIB LIBUUID LIBBLKID CONFIG_USER_TRUE CONFIG_USER_FALSE CONFIG_KERNEL_TRUE CONFIG_KERNEL_FALSE USERDEBUG 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 ZFS_META_NAME ZFS_META_VERSION ZFS_META_RELEASE ZFS_META_LICENSE ZFS_META_ALIAS ZFS_META_DATA ZFS_META_AUTHOR ZFS_META_LT_CURRENT ZFS_META_LT_REVISION ZFS_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 CCAS CCASFLAGS TOPDIR BUILDDIR LIBDIR CMDDIR MODDIR SCRIPTDIR TARGET_ASM_DIR ZFS_CONFIG LINUX LINUX_OBJ LINUX_VERSION LINUX_SYMBOLS SPL SPL_OBJ SPL_VERSION SPL_SYMBOLS KERNELMAKE_PARAMS KERNELCPPFLAGS ZLIB LIBUUID LIBBLKID CONFIG_USER_TRUE CONFIG_USER_FALSE CONFIG_KERNEL_TRUE CONFIG_KERNEL_FALSE USERDEBUG LIBOBJS LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -1587,6 +1587,25 @@ cat >>confdefs.h <<_ACEOF _ACEOF + fi + + ZFS_META_LICENSE=`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; }"\ + 'LICENSE' $META`; + if test -n "$ZFS_META_LICENSE"; then + +cat >>confdefs.h <<_ACEOF +#define ZFS_META_LICENSE "$ZFS_META_LICENSE" +_ACEOF + + fi if test -n "$ZFS_META_NAME" -a -n "$ZFS_META_VERSION"; then @@ -4000,7 +4019,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 4003 "configure"' > conftest.$ac_ext + echo '#line 4022 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -5599,7 +5618,7 @@ fi # Provide some information about the compiler. -echo "$as_me:5602:" \ +echo "$as_me:5621:" \ "checking for Fortran 77 compiler version" >&5 ac_compiler=`set X $ac_compile; echo $2` { (eval echo "$as_me:$LINENO: \"$ac_compiler --version &5\"") >&5 @@ -6662,11 +6681,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:6665: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6684: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:6669: \$? = $ac_status" >&5 + echo "$as_me:6688: \$? = $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. @@ -6930,11 +6949,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:6933: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6952: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:6937: \$? = $ac_status" >&5 + echo "$as_me:6956: \$? = $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. @@ -7034,11 +7053,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:7037: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7056: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:7041: \$? = $ac_status" >&5 + echo "$as_me:7060: \$? = $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 @@ -8503,7 +8522,7 @@ linux*) libsuff= case "$host_cpu" in x86_64*|s390x*|powerpc64*) - echo '#line 8506 "configure"' > conftest.$ac_ext + echo '#line 8525 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -9400,7 +9419,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext <&5) + (eval echo "\"\$as_me:11865: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:11850: \$? = $ac_status" >&5 + echo "$as_me:11869: \$? = $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. @@ -11947,11 +11966,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:11950: $lt_compile\"" >&5) + (eval echo "\"\$as_me:11969: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:11954: \$? = $ac_status" >&5 + echo "$as_me:11973: \$? = $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 @@ -12483,7 +12502,7 @@ linux*) libsuff= case "$host_cpu" in x86_64*|s390x*|powerpc64*) - echo '#line 12486 "configure"' > conftest.$ac_ext + echo '#line 12505 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -13541,11 +13560,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:13544: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13563: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:13548: \$? = $ac_status" >&5 + echo "$as_me:13567: \$? = $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. @@ -13645,11 +13664,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:13648: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13667: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:13652: \$? = $ac_status" >&5 + echo "$as_me:13671: \$? = $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 @@ -15094,7 +15113,7 @@ linux*) libsuff= case "$host_cpu" in x86_64*|s390x*|powerpc64*) - echo '#line 15097 "configure"' > conftest.$ac_ext + echo '#line 15116 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -15872,11 +15891,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:15875: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15894: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:15879: \$? = $ac_status" >&5 + echo "$as_me:15898: \$? = $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. @@ -16140,11 +16159,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:16143: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16162: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:16147: \$? = $ac_status" >&5 + echo "$as_me:16166: \$? = $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. @@ -16244,11 +16263,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:16247: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16266: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:16251: \$? = $ac_status" >&5 + echo "$as_me:16270: \$? = $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 @@ -17713,7 +17732,7 @@ linux*) libsuff= case "$host_cpu" in x86_64*|s390x*|powerpc64*) - echo '#line 17716 "configure"' > conftest.$ac_ext + echo '#line 17735 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -18947,20 +18966,15 @@ test "${CCASFLAGS+set}" = set || CCASFLAGS=$CFLAGS + echo "$as_me:$LINENO: checking zfs author" >&5 +echo $ECHO_N "checking zfs author... $ECHO_C" >&6 + echo "$as_me:$LINENO: result: $ZFS_META_AUTHOR" >&5 +echo "${ECHO_T}$ZFS_META_AUTHOR" >&6 + echo "$as_me:$LINENO: checking zfs license" >&5 echo $ECHO_N "checking zfs license... $ECHO_C" >&6 - LICENSE=`grep MODULE_LICENSE module/zfs/zfs_ioctl.c | cut -f2 -d'"'` - echo "$as_me:$LINENO: result: $LICENSE" >&5 -echo "${ECHO_T}$LICENSE" >&6 - if test "$LICENSE" = GPL; then - -cat >>confdefs.h <<\_ACEOF -#define HAVE_GPL_ONLY_SYMBOLS 1 -_ACEOF - - fi - - + echo "$as_me:$LINENO: result: $ZFS_META_LICENSE" >&5 +echo "${ECHO_T}$ZFS_META_LICENSE" >&6 TOPDIR=`readlink -f ${srcdir}` @@ -19220,6 +19234,92 @@ echo "${ECHO_T}$SPL_SYMBOLS" >&6 + + if test "$ZFS_META_LICENSE" = CDDL; then + echo "$as_me:$LINENO: checking whether Linux was built with CONFIG_DEBUG_LOCK_ALLOC" >&5 +echo $ECHO_N "checking whether Linux was built with CONFIG_DEBUG_LOCK_ALLOC... $ECHO_C" >&6 + + +cat >conftest.c <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + + + #ifndef AUTOCONF_INCLUDED + #include + #endif + +int +main (void) +{ + + #ifndef CONFIG_DEBUG_LOCK_ALLOC + #error CONFIG_DEBUG_LOCK_ALLOC not #defined + #endif + + ; + return 0; +} + +_ACEOF + + + rm -Rf build && mkdir -p build + echo "obj-m := conftest.o" >build/Makefile + if { ac_try='cp conftest.c build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } >/dev/null && { ac_try='test -s build/conftest.o' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 + { { echo "$as_me:$LINENO: error: + *** Kernel built with CONFIG_DEBUG_LOCK_ALLOC which is + *** incompatible with the CDDL license. You must rebuild + *** your kernel without this option." >&5 +echo "$as_me: error: + *** Kernel built with CONFIG_DEBUG_LOCK_ALLOC which is + *** incompatible with the CDDL license. You must rebuild + *** your kernel without this option." >&2;} + { (exit 1); exit 1; }; } + +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 + + + + +fi + + rm -Rf build + + + + fi + + if test "$ZFS_META_LICENSE" = GPL; then + +cat >>confdefs.h <<\_ACEOF +#define HAVE_GPL_ONLY_SYMBOLS 1 +_ACEOF + + fi + + echo "$as_me:$LINENO: checking block device operation prototypes" >&5 echo $ECHO_N "checking block device operation prototypes... $ECHO_C" >&6 @@ -21845,6 +21945,92 @@ echo "${ECHO_T}$SPL_SYMBOLS" >&6 + + if test "$ZFS_META_LICENSE" = CDDL; then + echo "$as_me:$LINENO: checking whether Linux was built with CONFIG_DEBUG_LOCK_ALLOC" >&5 +echo $ECHO_N "checking whether Linux was built with CONFIG_DEBUG_LOCK_ALLOC... $ECHO_C" >&6 + + +cat >conftest.c <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + + + #ifndef AUTOCONF_INCLUDED + #include + #endif + +int +main (void) +{ + + #ifndef CONFIG_DEBUG_LOCK_ALLOC + #error CONFIG_DEBUG_LOCK_ALLOC not #defined + #endif + + ; + return 0; +} + +_ACEOF + + + rm -Rf build && mkdir -p build + echo "obj-m := conftest.o" >build/Makefile + if { ac_try='cp conftest.c build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } >/dev/null && { ac_try='test -s build/conftest.o' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 + { { echo "$as_me:$LINENO: error: + *** Kernel built with CONFIG_DEBUG_LOCK_ALLOC which is + *** incompatible with the CDDL license. You must rebuild + *** your kernel without this option." >&5 +echo "$as_me: error: + *** Kernel built with CONFIG_DEBUG_LOCK_ALLOC which is + *** incompatible with the CDDL license. You must rebuild + *** your kernel without this option." >&2;} + { (exit 1); exit 1; }; } + +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 + + + + +fi + + rm -Rf build + + + + fi + + if test "$ZFS_META_LICENSE" = GPL; then + +cat >>confdefs.h <<\_ACEOF +#define HAVE_GPL_ONLY_SYMBOLS 1 +_ACEOF + + fi + + echo "$as_me:$LINENO: checking block device operation prototypes" >&5 echo $ECHO_N "checking block device operation prototypes... $ECHO_C" >&6 @@ -25095,6 +25281,7 @@ s,@LIBS@,$LIBS,;t t s,@ZFS_META_NAME@,$ZFS_META_NAME,;t t s,@ZFS_META_VERSION@,$ZFS_META_VERSION,;t t s,@ZFS_META_RELEASE@,$ZFS_META_RELEASE,;t t +s,@ZFS_META_LICENSE@,$ZFS_META_LICENSE,;t t s,@ZFS_META_ALIAS@,$ZFS_META_ALIAS,;t t s,@ZFS_META_DATA@,$ZFS_META_DATA,;t t s,@ZFS_META_AUTHOR@,$ZFS_META_AUTHOR,;t t @@ -25176,7 +25363,6 @@ s,@ac_ct_F77@,$ac_ct_F77,;t t s,@LIBTOOL@,$LIBTOOL,;t t s,@CCAS@,$CCAS,;t t s,@CCASFLAGS@,$CCASFLAGS,;t t -s,@LICENSE@,$LICENSE,;t t s,@TOPDIR@,$TOPDIR,;t t s,@BUILDDIR@,$BUILDDIR,;t t s,@LIBDIR@,$LIBDIR,;t t diff --git a/etc/Makefile.in b/etc/Makefile.in index 02e954a9de..198d7fe6e4 100644 --- a/etc/Makefile.in +++ b/etc/Makefile.in @@ -135,7 +135,6 @@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LIBUUID = @LIBUUID@ -LICENSE = @LICENSE@ LINUX = @LINUX@ LINUX_OBJ = @LINUX_OBJ@ LINUX_SYMBOLS = @LINUX_SYMBOLS@ @@ -173,6 +172,7 @@ ZFS_CONFIG = @ZFS_CONFIG@ ZFS_META_ALIAS = @ZFS_META_ALIAS@ ZFS_META_AUTHOR = @ZFS_META_AUTHOR@ ZFS_META_DATA = @ZFS_META_DATA@ +ZFS_META_LICENSE = @ZFS_META_LICENSE@ ZFS_META_LT_AGE = @ZFS_META_LT_AGE@ ZFS_META_LT_CURRENT = @ZFS_META_LT_CURRENT@ ZFS_META_LT_REVISION = @ZFS_META_LT_REVISION@ diff --git a/lib/Makefile.in b/lib/Makefile.in index 41ca71c70a..325b0d6d13 100644 --- a/lib/Makefile.in +++ b/lib/Makefile.in @@ -133,7 +133,6 @@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LIBUUID = @LIBUUID@ -LICENSE = @LICENSE@ LINUX = @LINUX@ LINUX_OBJ = @LINUX_OBJ@ LINUX_SYMBOLS = @LINUX_SYMBOLS@ @@ -171,6 +170,7 @@ ZFS_CONFIG = @ZFS_CONFIG@ ZFS_META_ALIAS = @ZFS_META_ALIAS@ ZFS_META_AUTHOR = @ZFS_META_AUTHOR@ ZFS_META_DATA = @ZFS_META_DATA@ +ZFS_META_LICENSE = @ZFS_META_LICENSE@ ZFS_META_LT_AGE = @ZFS_META_LT_AGE@ ZFS_META_LT_CURRENT = @ZFS_META_LT_CURRENT@ ZFS_META_LT_REVISION = @ZFS_META_LT_REVISION@ diff --git a/lib/libavl/Makefile.in b/lib/libavl/Makefile.in index 3fda0935b0..1d0765f9b5 100644 --- a/lib/libavl/Makefile.in +++ b/lib/libavl/Makefile.in @@ -150,7 +150,6 @@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LIBUUID = @LIBUUID@ -LICENSE = @LICENSE@ LINUX = @LINUX@ LINUX_OBJ = @LINUX_OBJ@ LINUX_SYMBOLS = @LINUX_SYMBOLS@ @@ -188,6 +187,7 @@ ZFS_CONFIG = @ZFS_CONFIG@ ZFS_META_ALIAS = @ZFS_META_ALIAS@ ZFS_META_AUTHOR = @ZFS_META_AUTHOR@ ZFS_META_DATA = @ZFS_META_DATA@ +ZFS_META_LICENSE = @ZFS_META_LICENSE@ ZFS_META_LT_AGE = @ZFS_META_LT_AGE@ ZFS_META_LT_CURRENT = @ZFS_META_LT_CURRENT@ ZFS_META_LT_REVISION = @ZFS_META_LT_REVISION@ diff --git a/lib/libefi/Makefile.in b/lib/libefi/Makefile.in index f7a12944c1..55f09a6d0c 100644 --- a/lib/libefi/Makefile.in +++ b/lib/libefi/Makefile.in @@ -150,7 +150,6 @@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LIBUUID = @LIBUUID@ -LICENSE = @LICENSE@ LINUX = @LINUX@ LINUX_OBJ = @LINUX_OBJ@ LINUX_SYMBOLS = @LINUX_SYMBOLS@ @@ -188,6 +187,7 @@ ZFS_CONFIG = @ZFS_CONFIG@ ZFS_META_ALIAS = @ZFS_META_ALIAS@ ZFS_META_AUTHOR = @ZFS_META_AUTHOR@ ZFS_META_DATA = @ZFS_META_DATA@ +ZFS_META_LICENSE = @ZFS_META_LICENSE@ ZFS_META_LT_AGE = @ZFS_META_LT_AGE@ ZFS_META_LT_CURRENT = @ZFS_META_LT_CURRENT@ ZFS_META_LT_REVISION = @ZFS_META_LT_REVISION@ diff --git a/lib/libnvpair/Makefile.in b/lib/libnvpair/Makefile.in index 54c951568a..0aeb18543c 100644 --- a/lib/libnvpair/Makefile.in +++ b/lib/libnvpair/Makefile.in @@ -151,7 +151,6 @@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LIBUUID = @LIBUUID@ -LICENSE = @LICENSE@ LINUX = @LINUX@ LINUX_OBJ = @LINUX_OBJ@ LINUX_SYMBOLS = @LINUX_SYMBOLS@ @@ -189,6 +188,7 @@ ZFS_CONFIG = @ZFS_CONFIG@ ZFS_META_ALIAS = @ZFS_META_ALIAS@ ZFS_META_AUTHOR = @ZFS_META_AUTHOR@ ZFS_META_DATA = @ZFS_META_DATA@ +ZFS_META_LICENSE = @ZFS_META_LICENSE@ ZFS_META_LT_AGE = @ZFS_META_LT_AGE@ ZFS_META_LT_CURRENT = @ZFS_META_LT_CURRENT@ ZFS_META_LT_REVISION = @ZFS_META_LT_REVISION@ diff --git a/lib/libspl/Makefile.in b/lib/libspl/Makefile.in index d2227be07a..ebb6261f87 100644 --- a/lib/libspl/Makefile.in +++ b/lib/libspl/Makefile.in @@ -161,7 +161,6 @@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LIBUUID = @LIBUUID@ -LICENSE = @LICENSE@ LINUX = @LINUX@ LINUX_OBJ = @LINUX_OBJ@ LINUX_SYMBOLS = @LINUX_SYMBOLS@ @@ -199,6 +198,7 @@ ZFS_CONFIG = @ZFS_CONFIG@ ZFS_META_ALIAS = @ZFS_META_ALIAS@ ZFS_META_AUTHOR = @ZFS_META_AUTHOR@ ZFS_META_DATA = @ZFS_META_DATA@ +ZFS_META_LICENSE = @ZFS_META_LICENSE@ ZFS_META_LT_AGE = @ZFS_META_LT_AGE@ ZFS_META_LT_CURRENT = @ZFS_META_LT_CURRENT@ ZFS_META_LT_REVISION = @ZFS_META_LT_REVISION@ diff --git a/lib/libspl/asm-generic/Makefile.in b/lib/libspl/asm-generic/Makefile.in index b1befdb9e4..a0d17274bb 100644 --- a/lib/libspl/asm-generic/Makefile.in +++ b/lib/libspl/asm-generic/Makefile.in @@ -125,7 +125,6 @@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LIBUUID = @LIBUUID@ -LICENSE = @LICENSE@ LINUX = @LINUX@ LINUX_OBJ = @LINUX_OBJ@ LINUX_SYMBOLS = @LINUX_SYMBOLS@ @@ -163,6 +162,7 @@ ZFS_CONFIG = @ZFS_CONFIG@ ZFS_META_ALIAS = @ZFS_META_ALIAS@ ZFS_META_AUTHOR = @ZFS_META_AUTHOR@ ZFS_META_DATA = @ZFS_META_DATA@ +ZFS_META_LICENSE = @ZFS_META_LICENSE@ ZFS_META_LT_AGE = @ZFS_META_LT_AGE@ ZFS_META_LT_CURRENT = @ZFS_META_LT_CURRENT@ ZFS_META_LT_REVISION = @ZFS_META_LT_REVISION@ diff --git a/lib/libspl/asm-i386/Makefile.in b/lib/libspl/asm-i386/Makefile.in index e4431a3074..eff76818c6 100644 --- a/lib/libspl/asm-i386/Makefile.in +++ b/lib/libspl/asm-i386/Makefile.in @@ -129,7 +129,6 @@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LIBUUID = @LIBUUID@ -LICENSE = @LICENSE@ LINUX = @LINUX@ LINUX_OBJ = @LINUX_OBJ@ LINUX_SYMBOLS = @LINUX_SYMBOLS@ @@ -167,6 +166,7 @@ ZFS_CONFIG = @ZFS_CONFIG@ ZFS_META_ALIAS = @ZFS_META_ALIAS@ ZFS_META_AUTHOR = @ZFS_META_AUTHOR@ ZFS_META_DATA = @ZFS_META_DATA@ +ZFS_META_LICENSE = @ZFS_META_LICENSE@ ZFS_META_LT_AGE = @ZFS_META_LT_AGE@ ZFS_META_LT_CURRENT = @ZFS_META_LT_CURRENT@ ZFS_META_LT_REVISION = @ZFS_META_LT_REVISION@ diff --git a/lib/libspl/asm-x86_64/Makefile.in b/lib/libspl/asm-x86_64/Makefile.in index 3e4c80870d..bea32def97 100644 --- a/lib/libspl/asm-x86_64/Makefile.in +++ b/lib/libspl/asm-x86_64/Makefile.in @@ -129,7 +129,6 @@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LIBUUID = @LIBUUID@ -LICENSE = @LICENSE@ LINUX = @LINUX@ LINUX_OBJ = @LINUX_OBJ@ LINUX_SYMBOLS = @LINUX_SYMBOLS@ @@ -167,6 +166,7 @@ ZFS_CONFIG = @ZFS_CONFIG@ ZFS_META_ALIAS = @ZFS_META_ALIAS@ ZFS_META_AUTHOR = @ZFS_META_AUTHOR@ ZFS_META_DATA = @ZFS_META_DATA@ +ZFS_META_LICENSE = @ZFS_META_LICENSE@ ZFS_META_LT_AGE = @ZFS_META_LT_AGE@ ZFS_META_LT_CURRENT = @ZFS_META_LT_CURRENT@ ZFS_META_LT_REVISION = @ZFS_META_LT_REVISION@ diff --git a/lib/libspl/include/Makefile.in b/lib/libspl/include/Makefile.in index b029ec6abf..59000e8bef 100644 --- a/lib/libspl/include/Makefile.in +++ b/lib/libspl/include/Makefile.in @@ -137,7 +137,6 @@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LIBUUID = @LIBUUID@ -LICENSE = @LICENSE@ LINUX = @LINUX@ LINUX_OBJ = @LINUX_OBJ@ LINUX_SYMBOLS = @LINUX_SYMBOLS@ @@ -175,6 +174,7 @@ ZFS_CONFIG = @ZFS_CONFIG@ ZFS_META_ALIAS = @ZFS_META_ALIAS@ ZFS_META_AUTHOR = @ZFS_META_AUTHOR@ ZFS_META_DATA = @ZFS_META_DATA@ +ZFS_META_LICENSE = @ZFS_META_LICENSE@ ZFS_META_LT_AGE = @ZFS_META_LT_AGE@ ZFS_META_LT_CURRENT = @ZFS_META_LT_CURRENT@ ZFS_META_LT_REVISION = @ZFS_META_LT_REVISION@ diff --git a/lib/libunicode/Makefile.in b/lib/libunicode/Makefile.in index 4736ccdf81..543e469d04 100644 --- a/lib/libunicode/Makefile.in +++ b/lib/libunicode/Makefile.in @@ -150,7 +150,6 @@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LIBUUID = @LIBUUID@ -LICENSE = @LICENSE@ LINUX = @LINUX@ LINUX_OBJ = @LINUX_OBJ@ LINUX_SYMBOLS = @LINUX_SYMBOLS@ @@ -188,6 +187,7 @@ ZFS_CONFIG = @ZFS_CONFIG@ ZFS_META_ALIAS = @ZFS_META_ALIAS@ ZFS_META_AUTHOR = @ZFS_META_AUTHOR@ ZFS_META_DATA = @ZFS_META_DATA@ +ZFS_META_LICENSE = @ZFS_META_LICENSE@ ZFS_META_LT_AGE = @ZFS_META_LT_AGE@ ZFS_META_LT_CURRENT = @ZFS_META_LT_CURRENT@ ZFS_META_LT_REVISION = @ZFS_META_LT_REVISION@ diff --git a/lib/libuutil/Makefile.in b/lib/libuutil/Makefile.in index 3312558b67..4f7fb51be0 100644 --- a/lib/libuutil/Makefile.in +++ b/lib/libuutil/Makefile.in @@ -152,7 +152,6 @@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LIBUUID = @LIBUUID@ -LICENSE = @LICENSE@ LINUX = @LINUX@ LINUX_OBJ = @LINUX_OBJ@ LINUX_SYMBOLS = @LINUX_SYMBOLS@ @@ -190,6 +189,7 @@ ZFS_CONFIG = @ZFS_CONFIG@ ZFS_META_ALIAS = @ZFS_META_ALIAS@ ZFS_META_AUTHOR = @ZFS_META_AUTHOR@ ZFS_META_DATA = @ZFS_META_DATA@ +ZFS_META_LICENSE = @ZFS_META_LICENSE@ ZFS_META_LT_AGE = @ZFS_META_LT_AGE@ ZFS_META_LT_CURRENT = @ZFS_META_LT_CURRENT@ ZFS_META_LT_REVISION = @ZFS_META_LT_REVISION@ diff --git a/lib/libzfs/Makefile.in b/lib/libzfs/Makefile.in index 91afccf628..9df279ad36 100644 --- a/lib/libzfs/Makefile.in +++ b/lib/libzfs/Makefile.in @@ -153,7 +153,6 @@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LIBUUID = @LIBUUID@ -LICENSE = @LICENSE@ LINUX = @LINUX@ LINUX_OBJ = @LINUX_OBJ@ LINUX_SYMBOLS = @LINUX_SYMBOLS@ @@ -191,6 +190,7 @@ ZFS_CONFIG = @ZFS_CONFIG@ ZFS_META_ALIAS = @ZFS_META_ALIAS@ ZFS_META_AUTHOR = @ZFS_META_AUTHOR@ ZFS_META_DATA = @ZFS_META_DATA@ +ZFS_META_LICENSE = @ZFS_META_LICENSE@ ZFS_META_LT_AGE = @ZFS_META_LT_AGE@ ZFS_META_LT_CURRENT = @ZFS_META_LT_CURRENT@ ZFS_META_LT_REVISION = @ZFS_META_LT_REVISION@ diff --git a/lib/libzpool/Makefile.in b/lib/libzpool/Makefile.in index 4f62b1b72a..e0bd39ebbc 100644 --- a/lib/libzpool/Makefile.in +++ b/lib/libzpool/Makefile.in @@ -170,7 +170,6 @@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LIBUUID = @LIBUUID@ -LICENSE = @LICENSE@ LINUX = @LINUX@ LINUX_OBJ = @LINUX_OBJ@ LINUX_SYMBOLS = @LINUX_SYMBOLS@ @@ -208,6 +207,7 @@ ZFS_CONFIG = @ZFS_CONFIG@ ZFS_META_ALIAS = @ZFS_META_ALIAS@ ZFS_META_AUTHOR = @ZFS_META_AUTHOR@ ZFS_META_DATA = @ZFS_META_DATA@ +ZFS_META_LICENSE = @ZFS_META_LICENSE@ ZFS_META_LT_AGE = @ZFS_META_LT_AGE@ ZFS_META_LT_CURRENT = @ZFS_META_LT_CURRENT@ ZFS_META_LT_REVISION = @ZFS_META_LT_REVISION@ diff --git a/lib/libzpool/include/Makefile.in b/lib/libzpool/include/Makefile.in index 3d38d3b0ad..67fa3a2bd7 100644 --- a/lib/libzpool/include/Makefile.in +++ b/lib/libzpool/include/Makefile.in @@ -137,7 +137,6 @@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LIBUUID = @LIBUUID@ -LICENSE = @LICENSE@ LINUX = @LINUX@ LINUX_OBJ = @LINUX_OBJ@ LINUX_SYMBOLS = @LINUX_SYMBOLS@ @@ -175,6 +174,7 @@ ZFS_CONFIG = @ZFS_CONFIG@ ZFS_META_ALIAS = @ZFS_META_ALIAS@ ZFS_META_AUTHOR = @ZFS_META_AUTHOR@ ZFS_META_DATA = @ZFS_META_DATA@ +ZFS_META_LICENSE = @ZFS_META_LICENSE@ ZFS_META_LT_AGE = @ZFS_META_LT_AGE@ ZFS_META_LT_CURRENT = @ZFS_META_LT_CURRENT@ ZFS_META_LT_REVISION = @ZFS_META_LT_REVISION@ diff --git a/man/Makefile.in b/man/Makefile.in index 1bbf7f53b3..6f98509439 100644 --- a/man/Makefile.in +++ b/man/Makefile.in @@ -133,7 +133,6 @@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LIBUUID = @LIBUUID@ -LICENSE = @LICENSE@ LINUX = @LINUX@ LINUX_OBJ = @LINUX_OBJ@ LINUX_SYMBOLS = @LINUX_SYMBOLS@ @@ -171,6 +170,7 @@ ZFS_CONFIG = @ZFS_CONFIG@ ZFS_META_ALIAS = @ZFS_META_ALIAS@ ZFS_META_AUTHOR = @ZFS_META_AUTHOR@ ZFS_META_DATA = @ZFS_META_DATA@ +ZFS_META_LICENSE = @ZFS_META_LICENSE@ ZFS_META_LT_AGE = @ZFS_META_LT_AGE@ ZFS_META_LT_CURRENT = @ZFS_META_LT_CURRENT@ ZFS_META_LT_REVISION = @ZFS_META_LT_REVISION@ diff --git a/man/man8/Makefile.in b/man/man8/Makefile.in index 4fe35a0c5c..5317d22d0b 100644 --- a/man/man8/Makefile.in +++ b/man/man8/Makefile.in @@ -128,7 +128,6 @@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LIBUUID = @LIBUUID@ -LICENSE = @LICENSE@ LINUX = @LINUX@ LINUX_OBJ = @LINUX_OBJ@ LINUX_SYMBOLS = @LINUX_SYMBOLS@ @@ -166,6 +165,7 @@ ZFS_CONFIG = @ZFS_CONFIG@ ZFS_META_ALIAS = @ZFS_META_ALIAS@ ZFS_META_AUTHOR = @ZFS_META_AUTHOR@ ZFS_META_DATA = @ZFS_META_DATA@ +ZFS_META_LICENSE = @ZFS_META_LICENSE@ ZFS_META_LT_AGE = @ZFS_META_LT_AGE@ ZFS_META_LT_CURRENT = @ZFS_META_LT_CURRENT@ ZFS_META_LT_REVISION = @ZFS_META_LT_REVISION@ diff --git a/scripts/Makefile.in b/scripts/Makefile.in index 916d1309bf..d8768ba135 100644 --- a/scripts/Makefile.in +++ b/scripts/Makefile.in @@ -134,7 +134,6 @@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LIBUUID = @LIBUUID@ -LICENSE = @LICENSE@ LINUX = @LINUX@ LINUX_OBJ = @LINUX_OBJ@ LINUX_SYMBOLS = @LINUX_SYMBOLS@ @@ -172,6 +171,7 @@ ZFS_CONFIG = @ZFS_CONFIG@ ZFS_META_ALIAS = @ZFS_META_ALIAS@ ZFS_META_AUTHOR = @ZFS_META_AUTHOR@ ZFS_META_DATA = @ZFS_META_DATA@ +ZFS_META_LICENSE = @ZFS_META_LICENSE@ ZFS_META_LT_AGE = @ZFS_META_LT_AGE@ ZFS_META_LT_CURRENT = @ZFS_META_LT_CURRENT@ ZFS_META_LT_REVISION = @ZFS_META_LT_REVISION@ diff --git a/zfs_config.h.in b/zfs_config.h.in index aa839cdb36..57eb6e0e2d 100644 --- a/zfs_config.h.in +++ b/zfs_config.h.in @@ -54,7 +54,7 @@ /* blk_disk_ro() is available */ #undef HAVE_GET_DISK_RO -/* Define to 1 if module is licensed under the GPL */ +/* Define to 1 if licensed under the GPL */ #undef HAVE_GPL_ONLY_SYMBOLS /* Define to 1 if you have the header file. */ @@ -153,6 +153,9 @@ /* Define the project release date. */ #undef ZFS_META_DATA +/* Define the project license. */ +#undef ZFS_META_LICENSE + /* Define the libtool library 'age' version information. */ #undef ZFS_META_LT_AGE