mirror of
				https://git.proxmox.com/git/mirror_zfs.git
				synced 2025-10-26 18:05:04 +03:00 
			
		
		
		
	Fix warning about AM_INIT_AUTOMAKE arguments
As of automake 1.14.2, currently shipped with Ubuntu 14.04, automake warns about AM_INIT_AUTOMAKE having more than one argument: configure.ac:41: warning: AM_INIT_AUTOMAKE: two- and three-arguments forms are deprecated. For more info, see: configure.ac:41: http://www.gnu.org/software/automake/manual/automake.html#Modernize-AM_005fINIT_005fAUTOMAKE-invocation This commit fixes the warnings by following above link's advice, so AM_INIT gets called with the package's name and version. As both are defined in the META file we're parsing it with `grep`, `cut` and `tr`. NOTE: autoconf < 1.14 not supporting m4_esyscmd_s so m4_esyscmd was used and modified `tr` to truncate newlines, too. Signed-off-by: Hajo M<C3><B6>ller <dasjoe@gmail.com> Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov> Closes #3174
This commit is contained in:
		
							parent
							
								
									e023409500
								
							
						
					
					
						commit
						a1d3450e94
					
				| @ -30,7 +30,8 @@ | ||||
|  * CDDL HEADER END | ||||
|  */ | ||||
| 
 | ||||
| AC_INIT | ||||
| AC_INIT(m4_esyscmd(grep Name META | cut -d ':' -f 2 | tr -d ' \n'), | ||||
| 	m4_esyscmd(grep Version META | cut -d ':' -f 2 | tr -d ' \n')) | ||||
| AC_LANG(C) | ||||
| ZFS_AC_META | ||||
| AC_CONFIG_AUX_DIR([config]) | ||||
| @ -38,7 +39,7 @@ AC_CONFIG_MACRO_DIR([config]) | ||||
| AC_CANONICAL_SYSTEM | ||||
| AM_MAINTAINER_MODE | ||||
| m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) | ||||
| AM_INIT_AUTOMAKE([$ZFS_META_NAME], [$ZFS_META_VERSION]) | ||||
| AM_INIT_AUTOMAKE | ||||
| AC_CONFIG_HEADERS([zfs_config.h], [ | ||||
| 	(mv zfs_config.h zfs_config.h.tmp && | ||||
| 	awk -f ${ac_srcdir}/config/config.awk zfs_config.h.tmp >zfs_config.h && | ||||
|  | ||||
		Loading…
	
		Reference in New Issue
	
	Block a user
	 Hajo Möller
						Hajo Möller