kopia lustrzana https://gitlab.com/sane-project/backends
				
				
				
			align autoconf/automake output to common version.
Signed-off-by: Chris Bagwell <chris@cnpbagwell.com>merge-requests/1/head
							rodzic
							
								
									5d080dc17c
								
							
						
					
					
						commit
						1903d646b2
					
				| 
						 | 
				
			
			@ -1,3 +1,7 @@
 | 
			
		|||
2010-02-27 Chris Bagwell <chris at cnpbagwell dot com>
 | 
			
		||||
	* Rerun autoconf/automake to align files to single version
 | 
			
		||||
	of tools.
 | 
			
		||||
 | 
			
		||||
2010-02-27 m. allan noah <kitno455 at gmail dot com>
 | 
			
		||||
	* */Makefile.in: update with (unfortunately) slightly older automake
 | 
			
		||||
	* po/*: standard gettext layout by Adi Roiban <adi at roiban dot ro>
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
							
								
								
									
										17
									
								
								Makefile.in
								
								
								
								
							
							
						
						
									
										17
									
								
								Makefile.in
								
								
								
								
							| 
						 | 
				
			
			@ -1,4 +1,4 @@
 | 
			
		|||
# Makefile.in generated by automake 1.11 from Makefile.am.
 | 
			
		||||
# Makefile.in generated by automake 1.11.1 from Makefile.am.
 | 
			
		||||
# @configure_input@
 | 
			
		||||
 | 
			
		||||
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
 | 
			
		||||
| 
						 | 
				
			
			@ -401,7 +401,7 @@ uninstall-dist_docDATA:
 | 
			
		|||
#     (which will cause the Makefiles to be regenerated when you run `make');
 | 
			
		||||
# (2) otherwise, pass the desired values on the `make' command line.
 | 
			
		||||
$(RECURSIVE_TARGETS):
 | 
			
		||||
	@failcom='exit 1'; \
 | 
			
		||||
	@fail= failcom='exit 1'; \
 | 
			
		||||
	for f in x $$MAKEFLAGS; do \
 | 
			
		||||
	  case $$f in \
 | 
			
		||||
	    *=* | --[!k]*);; \
 | 
			
		||||
| 
						 | 
				
			
			@ -426,7 +426,7 @@ $(RECURSIVE_TARGETS):
 | 
			
		|||
	fi; test -z "$$fail"
 | 
			
		||||
 | 
			
		||||
$(RECURSIVE_CLEAN_TARGETS):
 | 
			
		||||
	@failcom='exit 1'; \
 | 
			
		||||
	@fail= failcom='exit 1'; \
 | 
			
		||||
	for f in x $$MAKEFLAGS; do \
 | 
			
		||||
	  case $$f in \
 | 
			
		||||
	    *=* | --[!k]*);; \
 | 
			
		||||
| 
						 | 
				
			
			@ -590,7 +590,8 @@ distdir: $(DISTFILES)
 | 
			
		|||
	  fi; \
 | 
			
		||||
	done
 | 
			
		||||
	-test -n "$(am__skip_mode_fix)" \
 | 
			
		||||
	|| find "$(distdir)" -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
 | 
			
		||||
	|| find "$(distdir)" -type d ! -perm -755 \
 | 
			
		||||
		-exec chmod u+rwx,go+rx {} \; -o \
 | 
			
		||||
	  ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
 | 
			
		||||
	  ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
 | 
			
		||||
	  ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
 | 
			
		||||
| 
						 | 
				
			
			@ -634,17 +635,17 @@ dist dist-all: distdir
 | 
			
		|||
distcheck: dist
 | 
			
		||||
	case '$(DIST_ARCHIVES)' in \
 | 
			
		||||
	*.tar.gz*) \
 | 
			
		||||
	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
 | 
			
		||||
	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
 | 
			
		||||
	*.tar.bz2*) \
 | 
			
		||||
	  bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
 | 
			
		||||
	  bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
 | 
			
		||||
	*.tar.lzma*) \
 | 
			
		||||
	  unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
 | 
			
		||||
	  lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
 | 
			
		||||
	*.tar.xz*) \
 | 
			
		||||
	  xz -dc $(distdir).tar.xz | $(am__untar) ;;\
 | 
			
		||||
	*.tar.Z*) \
 | 
			
		||||
	  uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
 | 
			
		||||
	*.shar.gz*) \
 | 
			
		||||
	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
 | 
			
		||||
	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
 | 
			
		||||
	*.zip*) \
 | 
			
		||||
	  unzip $(distdir).zip ;;\
 | 
			
		||||
	esac
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1,4 +1,4 @@
 | 
			
		|||
# generated automatically by aclocal 1.11 -*- Autoconf -*-
 | 
			
		||||
# generated automatically by aclocal 1.11.1 -*- Autoconf -*-
 | 
			
		||||
 | 
			
		||||
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
 | 
			
		||||
# 2005, 2006, 2007, 2008, 2009  Free Software Foundation, Inc.
 | 
			
		||||
| 
						 | 
				
			
			@ -190,7 +190,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
 | 
			
		|||
[am__api_version='1.11'
 | 
			
		||||
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
 | 
			
		||||
dnl require some minimum version.  Point them to the right macro.
 | 
			
		||||
m4_if([$1], [1.11], [],
 | 
			
		||||
m4_if([$1], [1.11.1], [],
 | 
			
		||||
      [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
 | 
			
		||||
])
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			@ -206,7 +206,7 @@ m4_define([_AM_AUTOCONF_VERSION], [])
 | 
			
		|||
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
 | 
			
		||||
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
 | 
			
		||||
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
 | 
			
		||||
[AM_AUTOMAKE_VERSION([1.11])dnl
 | 
			
		||||
[AM_AUTOMAKE_VERSION([1.11.1])dnl
 | 
			
		||||
m4_ifndef([AC_AUTOCONF_VERSION],
 | 
			
		||||
  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
 | 
			
		||||
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1,4 +1,4 @@
 | 
			
		|||
# Makefile.in generated by automake 1.11 from Makefile.am.
 | 
			
		||||
# Makefile.in generated by automake 1.11.1 from Makefile.am.
 | 
			
		||||
# @configure_input@
 | 
			
		||||
 | 
			
		||||
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
										
											
												Plik diff jest za duży
												Load Diff
											
										
									
								
							| 
						 | 
				
			
			@ -1,4 +1,4 @@
 | 
			
		|||
# Makefile.in generated by automake 1.11 from Makefile.am.
 | 
			
		||||
# Makefile.in generated by automake 1.11.1 from Makefile.am.
 | 
			
		||||
# @configure_input@
 | 
			
		||||
 | 
			
		||||
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1,4 +1,4 @@
 | 
			
		|||
# Makefile.in generated by automake 1.11 from Makefile.am.
 | 
			
		||||
# Makefile.in generated by automake 1.11.1 from Makefile.am.
 | 
			
		||||
# @configure_input@
 | 
			
		||||
 | 
			
		||||
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1,4 +1,4 @@
 | 
			
		|||
# Makefile.in generated by automake 1.11 from Makefile.am.
 | 
			
		||||
# Makefile.in generated by automake 1.11.1 from Makefile.am.
 | 
			
		||||
# @configure_input@
 | 
			
		||||
 | 
			
		||||
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -321,9 +321,6 @@
 | 
			
		|||
/* Define to 1 if you have the <sys/ipc.h> header file. */
 | 
			
		||||
#undef HAVE_SYS_IPC_H
 | 
			
		||||
 | 
			
		||||
/* Define to 1 if you have the <sys/param.h> header file. */
 | 
			
		||||
#undef HAVE_SYS_PARAM_H
 | 
			
		||||
 | 
			
		||||
/* Define to 1 if you have the <sys/passthrudef.h> header file. */
 | 
			
		||||
#undef HAVE_SYS_PASSTHRUDEF_H
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			@ -432,9 +429,6 @@
 | 
			
		|||
/* Define to the one symbol short name of this package. */
 | 
			
		||||
#undef PACKAGE_TARNAME
 | 
			
		||||
 | 
			
		||||
/* Define to the home page for this package. */
 | 
			
		||||
#undef PACKAGE_URL
 | 
			
		||||
 | 
			
		||||
/* Define to the version of this package. */
 | 
			
		||||
#undef PACKAGE_VERSION
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1,4 +1,4 @@
 | 
			
		|||
# Makefile.in generated by automake 1.11 from Makefile.am.
 | 
			
		||||
# Makefile.in generated by automake 1.11.1 from Makefile.am.
 | 
			
		||||
# @configure_input@
 | 
			
		||||
 | 
			
		||||
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1,4 +1,4 @@
 | 
			
		|||
# Makefile.in generated by automake 1.11 from Makefile.am.
 | 
			
		||||
# Makefile.in generated by automake 1.11.1 from Makefile.am.
 | 
			
		||||
# @configure_input@
 | 
			
		||||
 | 
			
		||||
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1,4 +1,4 @@
 | 
			
		|||
# Makefile.in generated by automake 1.11 from Makefile.am.
 | 
			
		||||
# Makefile.in generated by automake 1.11.1 from Makefile.am.
 | 
			
		||||
# @configure_input@
 | 
			
		||||
 | 
			
		||||
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
							
								
								
									
										4740
									
								
								po/sane-backends.pot
								
								
								
								
							
							
						
						
									
										4740
									
								
								po/sane-backends.pot
								
								
								
								
							
										
											
												Plik diff jest za duży
												Load Diff
											
										
									
								
							| 
						 | 
				
			
			@ -1,4 +1,4 @@
 | 
			
		|||
# Makefile.in generated by automake 1.11 from Makefile.am.
 | 
			
		||||
# Makefile.in generated by automake 1.11.1 from Makefile.am.
 | 
			
		||||
# @configure_input@
 | 
			
		||||
 | 
			
		||||
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1,4 +1,4 @@
 | 
			
		|||
# Makefile.in generated by automake 1.11 from Makefile.am.
 | 
			
		||||
# Makefile.in generated by automake 1.11.1 from Makefile.am.
 | 
			
		||||
# @configure_input@
 | 
			
		||||
 | 
			
		||||
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1,4 +1,4 @@
 | 
			
		|||
# Makefile.in generated by automake 1.11 from Makefile.am.
 | 
			
		||||
# Makefile.in generated by automake 1.11.1 from Makefile.am.
 | 
			
		||||
# @configure_input@
 | 
			
		||||
 | 
			
		||||
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Ładowanie…
	
		Reference in New Issue