Merged autopoint_test branch to head

Author: cleishm

ABOUT-NLS

@@ -9,9 +9,31 @@
 # build directory.  This is probably a bug in my version of automake (1.6.1).
 
 auxdir			= @ac_aux_dir@
-EXTRA_DIST		= bootstrap BUGS CREDITS
+EXTRA_DIST		= ABOUT-NLS bootstrap BUGS CREDITS
 AUTOMAKE_OPTIONS 	= 1.6 dist-bzip2
 ACLOCAL_AMFLAGS		= -I config
-SUBDIRS 		= config contrib intl po src docs
-MAINTAINERCLEANFILES 	= Makefile.in aclocal.m4 configure \
-			  config.h.in config.status config.log 
+SUBDIRS 		= config intl contrib src docs po
+
+## remove gettext macros here, as aclocal.m4 depends on them
+MAINTAINERCLEANFILES 	= ABOUT-NLS Makefile.in aclocal.m4 configure \
+			  config.h.in config.status config.log \
+                          config/codeset.m4 config/gettext.m4 \
+                          config/glibc21.m4 config/iconv.m4 config/intdiv0.m4 \
+                          config/intmax.m4 config/inttypes-pri.m4 \
+                          config/inttypes.m4 config/inttypes_h.m4 \
+                          config/isc-posix.m4 config/lcmessage.m4 \
+                          config/lib-ld.m4 config/lib-link.m4 \
+                          config/lib-prefix.m4 config/longdouble.m4 \
+                          config/longlong.m4 config/nls.m4 config/po.m4 \
+                          config/printf-posix.m4 config/progtest.m4 \
+                          config/signed.m4 config/size_max.m4 \
+                          config/stdint_h.m4 config/uintmax_t.m4 \
+                          config/ulonglong.m4 config/wchar_t.m4 \
+                          config/wint_t.m4 config/xsize.m4 \
+                          po/Makefile.in.in po/Makevars.template \
+                          po/Rules-quot po/boldquot.sed po/[email protected] \
+                          po/[email protected] po/insert-header.sin po/quot.sed \
+                          po/remove-potcdate.sin po/nc6.pot
+
+maintainer-clean-local:
+	rm -rf intl

Makefile.am

@@ -6,6 +6,7 @@
 #! /bin/sh
 
 set -x
+autopoint
 aclocal -I config $@
 autoheader
 automake --add-missing --copy

bootstrap

@@ -1,14 +1,16 @@
+EXTRA_DIST = ai_constants.m4 in6_guess_stack.m4 member_sin6_scope_id.m4 \
+             paths.m4 proto_bluez.m4 proto_inet6.m4 somaxconn_constant.m4 \
+             type_socklen_t.m4 type_struct_sockaddr_in6.m4 \
+             type_struct_sockaddr_l2.m4 type_struct_sockaddr_storage.m4 \
+	     wait_any_constant.m4 \
+             codeset.m4 gettext.m4 glibc21.m4 iconv.m4 intdiv0.m4 intmax.m4 \
+             inttypes-pri.m4 inttypes.m4 inttypes_h.m4 isc-posix.m4 \
+             lcmessage.m4 lib-ld.m4 lib-link.m4 lib-prefix.m4 longdouble.m4 \
+             longlong.m4 nls.m4 po.m4 printf-posix.m4 progtest.m4 \
+             signed.m4 size_max.m4 stdint_h.m4 uintmax_t.m4 ulonglong.m4 \
+             wchar_t.m4 wint_t.m4 xsize.m4
 
-EXTRA_DIST = codeset.m4 glibc21.m4 iconv.m4 intdiv0.m4 intmax.m4 inttypes.m4 \
-	     inttypes_h.m4 inttypes-pri.m4 isc-posix.m4 lcmessage.m4 lib-ld.m4 \
-	     lib-link.m4 lib-prefix.m4 longdouble.m4 longlong.m4 nls.m4 po.m4 \
-	     printf-posix.m4 progtest.m4 signed.m4 size_max.m4 stdint_h.m4 \
-	     uintmax_t.m4 ulonglong.m4 wchar_t.m4 wint_t.m4 xsize.m4 \
-	     config.rpath ai_constants.m4 in6_guess_stack.m4 \
-	     member_sin6_scope_id.m4 paths.m4 proto_inet6.m4 \
-	     type_struct_sockaddr_storage.m4 type_struct_sockaddr_in6.m4 \
-	     type_socklen_t.m4 somaxconn_constant.m4 wait_any_constant.m4 \
-	     proto_bluez.m4 type_struct_sockaddr_l2.m4 gettext.m4
 
-MAINTAINERCLEANFILES = Makefile.in depcomp install-sh missing mkinstalldirs
 
+MAINTAINERCLEANFILES = Makefile.in depcomp install-sh missing mkinstalldirs \
+                config.guess config.rpath config.sub