X-Git-Url: https://git.camperquake.de/gitweb.cgi?a=blobdiff_plain;f=config%2Fzfs-meta.m4;h=8b3689af7194574c7ab758d64f4a7a1baa542e9b;hb=76659dc110ef2ada13bcb8e4e2ec60d8216c6836;hp=199638096bc40d1dce57a45de3f55cb2a7ccf7e5;hpb=c9a913795679c3f5895de8258f31269530c5eaed;p=zfs.git

diff --git a/config/zfs-meta.m4 b/config/zfs-meta.m4
index 1996380..8b3689a 100644
--- a/config/zfs-meta.m4
+++ b/config/zfs-meta.m4
@@ -6,6 +6,17 @@ dnl # AUTHOR:
 dnl # Chris Dunlap <cdunlap@llnl.gov>
 dnl #
 AC_DEFUN([ZFS_AC_META], [
+
+	AH_BOTTOM([
+#undef PACKAGE
+#undef PACKAGE_BUGREPORT
+#undef PACKAGE_NAME
+#undef PACKAGE_STRING
+#undef PACKAGE_TARNAME
+#undef PACKAGE_VERSION
+#undef STDC_HEADERS
+#undef VERSION])
+
 	AC_MSG_CHECKING([metadata])
 
 	META="$srcdir/META"
@@ -13,84 +24,92 @@ 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
+
+		ZFS_META_LICENSE=_ZFS_AC_META_GETVAL([LICENSE]);
+		if test -n "$ZFS_META_LICENSE"; then
+			AC_DEFINE_UNQUOTED([ZFS_META_LICENSE], ["$ZFS_META_LICENSE"],
+				[Define the project license.]
+			)
+			AC_SUBST([ZFS_META_LICENSE])
 		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"],
+		if test -n "$ZFS_META_NAME" -a -n "$ZFS_META_VERSION"; then
+				ZFS_META_ALIAS="$ZFS_META_NAME-$ZFS_META_VERSION"
+				test -n "$ZFS_META_RELEASE" && 
+				        ZFS_META_ALIAS="$ZFS_META_ALIAS-$ZFS_META_RELEASE"
+				AC_DEFINE_UNQUOTED([ZFS_META_ALIAS],
+					["$ZFS_META_ALIAS"],
 					[Define the project alias string.] 
 				)
-				AC_SUBST([META_ALIAS])
+				AC_SUBST([ZFS_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