Added m4 directory

4 files changed, 353 insertions, 40 deletions

diff --git a/m4/ChangeLog b/m4/ChangeLog
index ef3e43c89..c14dde666 100644
--- a/m4/ChangeLog
+++ b/m4/ChangeLog
@@ -1,41 +1,32 @@
-2004-07-27  gettextize  <[email protected]>
+2004-08-09  gettextize  <[email protected]>
 
-	* gettext.m4: Upgrade to gettext-0.14.1.
+	* codeset.m4: New file, from gettext-0.14.1.
+	* gettext.m4: New file, from gettext-0.14.1.
+	* glibc21.m4: New file, from gettext-0.14.1.
+	* iconv.m4: New file, from gettext-0.14.1.
+	* intdiv0.m4: New file, from gettext-0.14.1.
 	* intmax.m4: New file, from gettext-0.14.1.
-	* lib-ld.m4: Upgrade to gettext-0.14.1.
-	* lib-prefix.m4: Upgrade to gettext-0.14.1.
+	* inttypes.m4: New file, from gettext-0.14.1.
+	* inttypes_h.m4: New file, from gettext-0.14.1.
+	* inttypes-pri.m4: New file, from gettext-0.14.1.
+	* isc-posix.m4: New file, from gettext-0.14.1.
+	* lcmessage.m4: New file, from gettext-0.14.1.
+	* lib-ld.m4: New file, from gettext-0.14.1.
+	* lib-link.m4: New file, from gettext-0.14.1.
+	* lib-prefix.m4: New file, from gettext-0.14.1.
 	* longdouble.m4: New file, from gettext-0.14.1.
 	* longlong.m4: New file, from gettext-0.14.1.
-	* po.m4: Upgrade to gettext-0.14.1.
+	* nls.m4: New file, from gettext-0.14.1.
+	* po.m4: New file, from gettext-0.14.1.
 	* printf-posix.m4: New file, from gettext-0.14.1.
+	* progtest.m4: New file, from gettext-0.14.1.
 	* signed.m4: New file, from gettext-0.14.1.
 	* size_max.m4: New file, from gettext-0.14.1.
-	* ulonglong.m4: Upgrade to gettext-0.14.1.
+	* stdint_h.m4: New file, from gettext-0.14.1.
+	* uintmax_t.m4: New file, from gettext-0.14.1.
+	* ulonglong.m4: New file, from gettext-0.14.1.
 	* wchar_t.m4: New file, from gettext-0.14.1.
 	* wint_t.m4: New file, from gettext-0.14.1.
 	* xsize.m4: New file, from gettext-0.14.1.
-	* Makefile.am (EXTRA_DIST): Add the new files.
-
-2003-10-25  gettextize  <[email protected]>
-
-	* codeset.m4: New file, from gettext-0.12.1.
-	* gettext.m4: New file, from gettext-0.12.1.
-	* glibc21.m4: New file, from gettext-0.12.1.
-	* iconv.m4: New file, from gettext-0.12.1.
-	* intdiv0.m4: New file, from gettext-0.12.1.
-	* inttypes.m4: New file, from gettext-0.12.1.
-	* inttypes_h.m4: New file, from gettext-0.12.1.
-	* inttypes-pri.m4: New file, from gettext-0.12.1.
-	* isc-posix.m4: New file, from gettext-0.12.1.
-	* lcmessage.m4: New file, from gettext-0.12.1.
-	* lib-ld.m4: New file, from gettext-0.12.1.
-	* lib-link.m4: New file, from gettext-0.12.1.
-	* lib-prefix.m4: New file, from gettext-0.12.1.
-	* nls.m4: New file, from gettext-0.12.1.
-	* po.m4: New file, from gettext-0.12.1.
-	* progtest.m4: New file, from gettext-0.12.1.
-	* stdint_h.m4: New file, from gettext-0.12.1.
-	* uintmax_t.m4: New file, from gettext-0.12.1.
-	* ulonglong.m4: New file, from gettext-0.12.1.
 	* Makefile.am: New file.
 
diff --git a/m4/Makefile b/m4/Makefile
new file mode 100644
index 000000000..15a26a854
--- /dev/null
+++ b/m4/Makefile
@@ -0,0 +1,329 @@
+# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# m4/Makefile.  Generated from Makefile.in by configure.
+
+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
+# Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+
+
+srcdir = .
+top_srcdir = ..
+
+pkgdatadir = $(datadir)/gnupg
+pkglibdir = $(libdir)/gnupg
+pkgincludedir = $(includedir)/gnupg
+top_builddir = ..
+
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = /usr/bin/install -c
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+host_triplet = i686-pc-linux-gnu
+ACLOCAL = ${SHELL} /home/wk/proj/gnupg12/scripts/missing --run aclocal-1.7
+ALLOCA = 
+AMDEP_FALSE = #
+AMDEP_TRUE = 
+AMTAR = ${SHELL} /home/wk/proj/gnupg12/scripts/missing --run tar
+AR = ar
+AUTOCONF = ${SHELL} /home/wk/proj/gnupg12/scripts/missing --run autoconf
+AUTOHEADER = ${SHELL} /home/wk/proj/gnupg12/scripts/missing --run autoheader
+AUTOMAKE = ${SHELL} /home/wk/proj/gnupg12/scripts/missing --run automake-1.7
+AWK = gawk
+BUILD_INCLUDED_LIBINTL = no
+CAPLIBS = 
+CATOBJEXT = .gmo
+CC = gcc
+CCDEPMODE = depmode=gcc3
+CFLAGS = -g -O2 -Wall -Wcast-align -Wshadow -Wstrict-prototypes -Wformat-nonliteral
+CPP = gcc -E
+CPPFLAGS = 
+CROSS_COMPILING_FALSE = 
+CROSS_COMPILING_TRUE = #
+CYGPATH_W = echo
+DATADIRNAME = share
+DEFS = -DHAVE_CONFIG_H
+DEPDIR = .deps
+DLLIBS = -ldl 
+DOCBOOK_TO_MAN = yes
+DOCBOOK_TO_TEXI = yes
+ECHO_C = 
+ECHO_N = -n
+ECHO_T = 
+EGDLIBS = 
+EGREP = grep -E
+ENABLE_BZIP2_SUPPORT_FALSE = #
+ENABLE_BZIP2_SUPPORT_TRUE = 
+ENABLE_LOCAL_ZLIB_FALSE = 
+ENABLE_LOCAL_ZLIB_TRUE = #
+EXEEXT = 
+FAQPROG = faqprog.pl
+GENCAT = gencat
+GETOPT = 
+GLIBC21 = yes
+GMSGFMT = /usr/bin/msgfmt
+GPGKEYS_HKP = 
+GPGKEYS_LDAP = gpgkeys_ldap
+GPGKEYS_MAILTO = gpgkeys_mailto
+HAVE_ASPRINTF = 1
+HAVE_DOCBOOK_TO_MAN_FALSE = #
+HAVE_DOCBOOK_TO_MAN_TRUE = 
+HAVE_DOCBOOK_TO_TEXI_FALSE = #
+HAVE_DOCBOOK_TO_TEXI_TRUE = 
+HAVE_DOSISH_SYSTEM_FALSE = 
+HAVE_DOSISH_SYSTEM_TRUE = #
+HAVE_POSIX_PRINTF = 1
+HAVE_SNPRINTF = 1
+HAVE_WPRINTF = 0
+IDEA_O = idea-stub.o
+INSTALL_DATA = ${INSTALL} -m 644
+INSTALL_PROGRAM = ${INSTALL}
+INSTALL_SCRIPT = ${INSTALL}
+INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s
+INSTOBJEXT = .mo
+INTLBISON = bison
+INTLLIBS = 
+INTLOBJS = 
+INTL_LIBTOOL_SUFFIX_PREFIX = 
+LDAPLIBS = -lldap
+LDFLAGS = 
+LIBICONV = 
+LIBINTL = 
+LIBOBJS = 
+LIBS = 
+LTLIBICONV = 
+LTLIBINTL = 
+LTLIBOBJS = 
+MAINT = 
+MAINTAINER_MODE_FALSE = #
+MAINTAINER_MODE_TRUE = 
+MAKEINFO = ${SHELL} /home/wk/proj/gnupg12/scripts/missing --run makeinfo
+MKINSTALLDIRS = $(top_builddir)/scripts/mkinstalldirs
+MPI_EXTRA_ASM_OBJS = 
+MPI_OPT_FLAGS = 
+MPI_SFLAGS = 
+MSGFMT = /usr/bin/msgfmt
+MSGMERGE = /usr/bin/msgmerge
+NETLIBS = 
+NM = /usr/bin/nm -B
+OBJEXT = o
+PACKAGE = gnupg
+PACKAGE_BUGREPORT = [email protected]
+PACKAGE_NAME = gnupg
+PACKAGE_STRING = gnupg 1.2.6-cvs
+PACKAGE_TARNAME = gnupg
+PACKAGE_VERSION = 1.2.6-cvs
+PATH_SEPARATOR = :
+PERL = /usr/bin/perl
+POSUB = po
+RANLIB = ranlib
+SENDMAIL = /usr/sbin/sendmail
+SET_MAKE = 
+SHA512_O = 
+SHELL = /bin/sh
+STRIP = 
+TIGER_O = 
+USE_INCLUDED_LIBINTL = no
+USE_NLS = yes
+VERSION = 1.2.6-cvs
+W32LIBS = 
+WORKING_FAQPROG_FALSE = #
+WORKING_FAQPROG_TRUE = 
+XGETTEXT = /usr/bin/xgettext
+ZLIBS = -lz -lbz2
+ac_ct_AR = ar
+ac_ct_CC = gcc
+ac_ct_RANLIB = ranlib
+ac_ct_STRIP = 
+am__fastdepCC_FALSE = #
+am__fastdepCC_TRUE = 
+am__include = include
+am__leading_dot = .
+am__quote = 
+bindir = ${exec_prefix}/bin
+build = i686-pc-linux-gnu
+build_alias = 
+build_cpu = i686
+build_os = linux-gnu
+build_vendor = pc
+datadir = ${prefix}/share
+exec_prefix = ${prefix}
+host = i686-pc-linux-gnu
+host_alias = 
+host_cpu = i686
+host_os = linux-gnu
+host_vendor = pc
+includedir = ${prefix}/include
+infodir = ${prefix}/info
+install_sh = /home/wk/proj/gnupg12/scripts/install-sh
+libdir = ${exec_prefix}/lib
+libexecdir = ${exec_prefix}/libexec
+localstatedir = ${prefix}/var
+mandir = ${prefix}/man
+oldincludedir = /usr/include
+prefix = /usr/local
+program_transform_name = s,x,x,
+sbindir = ${exec_prefix}/sbin
+sharedstatedir = ${prefix}/com
+sysconfdir = ${prefix}/etc
+target = i686-pc-linux-gnu
+target_alias = 
+target_cpu = i686
+target_os = linux-gnu
+target_vendor = pc
+EXTRA_DIST = codeset.m4 gettext.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
+subdir = m4
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+DIST_SOURCES =
+DIST_COMMON = $(srcdir)/Makefile.in ChangeLog Makefile.am
+all: all-am
+
+.SUFFIXES:
+$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.ac $(ACLOCAL_M4)
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu  m4/Makefile
+Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+uninstall-info-am:
+tags: TAGS
+TAGS:
+
+ctags: CTAGS
+CTAGS:
+
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+
+top_distdir = ..
+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+	list='$(DISTFILES)'; for file in $$list; do \
+	  case $$file in \
+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+	  esac; \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    dir="/$$dir"; \
+	    $(mkinstalldirs) "$(distdir)$$dir"; \
+	  else \
+	    dir=''; \
+	  fi; \
+	  if test -d $$d/$$file; then \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile
+
+installdirs:
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-rm -f $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic mostlyclean-am
+
+distclean: distclean-am
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic
+
+dvi: dvi-am
+
+dvi-am:
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-exec-am:
+
+install-info: install-info-am
+
+install-man:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-info-am
+
+.PHONY: all all-am check check-am clean clean-generic distclean \
+	distclean-generic distdir dvi dvi-am info info-am install \
+	install-am install-data install-data-am install-exec \
+	install-exec-am install-info install-info-am install-man \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am \
+	uninstall-info-am
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/m4/Makefile.am b/m4/Makefile.am
index dd5706d43..f971283a3 100644
--- a/m4/Makefile.am
+++ b/m4/Makefile.am
@@ -1 +1 @@
-EXTRA_DIST = intmax.m4 longdouble.m4 longlong.m4 printf-posix.m4 signed.m4 size_max.m4 wchar_t.m4 wint_t.m4 xsize.m4  codeset.m4 gettext.m4 glibc21.m4 iconv.m4 intdiv0.m4 inttypes.m4 inttypes_h.m4 inttypes-pri.m4 isc-posix.m4 lcmessage.m4 lib-ld.m4 lib-link.m4 lib-prefix.m4 nls.m4 po.m4 progtest.m4 stdint_h.m4 uintmax_t.m4 ulonglong.m4
+EXTRA_DIST = codeset.m4 gettext.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
diff --git a/m4/Makefile.in b/m4/Makefile.in
index de92c33f1..e14d9fb61 100644
--- a/m4/Makefile.in
+++ b/m4/Makefile.in
@@ -66,11 +66,10 @@ DOCBOOK_TO_TEXI = @DOCBOOK_TO_TEXI@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
+EGDLIBS = @EGDLIBS@
 EGREP = @EGREP@
 ENABLE_BZIP2_SUPPORT_FALSE = @ENABLE_BZIP2_SUPPORT_FALSE@
 ENABLE_BZIP2_SUPPORT_TRUE = @ENABLE_BZIP2_SUPPORT_TRUE@
-ENABLE_CARD_SUPPORT_FALSE = @ENABLE_CARD_SUPPORT_FALSE@
-ENABLE_CARD_SUPPORT_TRUE = @ENABLE_CARD_SUPPORT_TRUE@
 ENABLE_LOCAL_ZLIB_FALSE = @ENABLE_LOCAL_ZLIB_FALSE@
 ENABLE_LOCAL_ZLIB_TRUE = @ENABLE_LOCAL_ZLIB_TRUE@
 EXEEXT = @EXEEXT@
@@ -80,10 +79,7 @@ GETOPT = @GETOPT@
 GLIBC21 = @GLIBC21@
 GMSGFMT = @GMSGFMT@
 GPGKEYS_HKP = @GPGKEYS_HKP@
-GPGKEYS_HTTP = @GPGKEYS_HTTP@
 GPGKEYS_LDAP = @GPGKEYS_LDAP@
-GPGKEYS_LDAP_FALSE = @GPGKEYS_LDAP_FALSE@
-GPGKEYS_LDAP_TRUE = @GPGKEYS_LDAP_TRUE@
 GPGKEYS_MAILTO = @GPGKEYS_MAILTO@
 HAVE_ASPRINTF = @HAVE_ASPRINTF@
 HAVE_DOCBOOK_TO_MAN_FALSE = @HAVE_DOCBOOK_TO_MAN_FALSE@
@@ -111,8 +107,6 @@ LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
-LIBUSB_LIBS = @LIBUSB_LIBS@
-LN_S = @LN_S@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
@@ -139,13 +133,12 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PERL = @PERL@
 POSUB = @POSUB@
 RANLIB = @RANLIB@
-REGEX_O = @REGEX_O@
 SENDMAIL = @SENDMAIL@
 SET_MAKE = @SET_MAKE@
 SHA512_O = @SHA512_O@
 SHELL = @SHELL@
-SRVLIBS = @SRVLIBS@
 STRIP = @STRIP@
+TIGER_O = @TIGER_O@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
@@ -194,7 +187,7 @@ target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-EXTRA_DIST = intmax.m4 longdouble.m4 longlong.m4 printf-posix.m4 signed.m4 size_max.m4 wchar_t.m4 wint_t.m4 xsize.m4  codeset.m4 gettext.m4 glibc21.m4 iconv.m4 intdiv0.m4 inttypes.m4 inttypes_h.m4 inttypes-pri.m4 isc-posix.m4 lcmessage.m4 lib-ld.m4 lib-link.m4 lib-prefix.m4 nls.m4 po.m4 progtest.m4 stdint_h.m4 uintmax_t.m4 ulonglong.m4
+EXTRA_DIST = codeset.m4 gettext.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
 subdir = m4
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs