FYI: move-xstrtol-to-src

The 2007-08-11 left most of the getopt-in-src configury untouched,
which resulted in multiply defined getopt symbols on darwin.  Removing
the stale copy of getopt from src/ caused configure to fail in m4-getopt.m4,
so I undid the bootstrap change and moved xstrtol out of libm4 into src:

Applied the following to HEAD.

  Index: ChangeLog
  from  Gary V. Vaughan  <[email protected]>
  
  	As gnulib xstrtol is only used by main, and unconditionally pulls
  	in a copy of getopt, undo bootstrap change from 2007-08-11 below,
  	and copy the xstrtol code into src/ so that main() can use it
  	without pushing the extra code into libm4:
  
  	* bootstrap (src_modules): Add getopt and xstrtol modules.
  	* Makefile.am (src_m4_SOURCES): Add xstrtol sources.
  	* po/POTFILES.in: Move gnu/xstrtol-error.c to src/xstrtol-error.c.
  
  Index: Makefile.am
  ===================================================================
  RCS file: /sources/m4/m4/Makefile.am,v
  retrieving revision 1.57
  diff -u -u -r1.57 Makefile.am
  --- Makefile.am 7 Aug 2007 03:15:24 -0000 1.57
  +++ Makefile.am 30 Aug 2007 00:49:58 -0000
  @@ -63,6 +63,10 @@
   
   bin_PROGRAMS	= src/m4
   src_m4_SOURCES	= \
  +		  src/xstrtoul.c \
  +		  src/xstrtol-error.c \
  +		  src/xstrtol.c \
  +		  src/xstrtol.h \
   		  src/version-etc-fsf.c \
   		  src/version-etc.c \
   		  src/version-etc.h \
  Index: bootstrap
  ===================================================================
  RCS file: /sources/m4/m4/bootstrap,v
  retrieving revision 1.50
  diff -u -u -r1.50 bootstrap
  --- bootstrap 11 Aug 2007 15:50:58 -0000 1.50
  +++ bootstrap 30 Aug 2007 00:49:58 -0000
  @@ -1,6 +1,6 @@
   #! /bin/sh
   
  -# bootstrap (GNU M4) version 2007-08-11
  +# bootstrap (GNU M4) version 2007-08-29
   # Written by Gary V. Vaughan  <[email protected]>
   
   # Copyright (C) 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
  @@ -70,7 +70,7 @@
   
   # List dependencies here too; we don't extract them, otherwise dependent
   # modules could end up being imported to src/ *and* gnu/!
  -src_modules='version-etc-fsf version-etc'
  +src_modules='getopt version-etc-fsf version-etc xstrtol'
   
   dirname="s,/[^/]*$,,"
   basename="s,^.*/,,g"
  @@ -340,7 +340,6 @@
   .cvsignore
   argz.m4
   codeset.m4
  -getopt.m4
   gettext.m4
   glibc2.m4
   glibc21.m4
  Index: ltdl/m4/gnulib-cache.m4
  ===================================================================
  RCS file: /sources/m4/m4/ltdl/m4/gnulib-cache.m4,v
  retrieving revision 1.32
  diff -u -u -r1.32 gnulib-cache.m4
  --- ltdl/m4/gnulib-cache.m4 21 Jul 2007 03:41:13 -0000 1.32
  +++ ltdl/m4/gnulib-cache.m4 30 Aug 2007 00:49:58 -0000
  @@ -15,11 +15,11 @@
   
   
   # Specification in the form of a command-line invocation:
  -#   gnulib-tool --import --dir=. --local-dir=local --lib=libgnu --source-base=gnu --m4-base=ltdl/m4 --doc-base=doc --aux-dir=ltdl/config --with-tests --libtool --macro-prefix=M4 assert autobuild avltree-oset binary-io clean-temp cloexec close-stream closein config-h configmake dirname error exit fdl fflush filenamecat fopen-safer fprintf-posix free fseeko gendocs gettext gnupload gpl-3.0 mkstemp obstack progname regex regexprops-generic sprintf-posix stdbool stdlib-safer strnlen strtol tempname unlocked-io vasprintf-posix verror xalloc xalloc-die xstrndup xstrtol xvasprintf
  +#   gnulib-tool --import --dir=. --local-dir=local --lib=libgnu --source-base=gnu --m4-base=ltdl/m4 --doc-base=doc --aux-dir=ltdl/config --with-tests --libtool --macro-prefix=M4 assert autobuild avltree-oset binary-io clean-temp cloexec close-stream closein config-h configmake dirname error exit fdl fflush filenamecat fopen-safer fprintf-posix free fseeko gendocs gettext gnupload gpl-3.0 mkstemp obstack progname regex regexprops-generic sprintf-posix stdbool stdlib-safer strnlen strtol tempname unlocked-io vasprintf-posix verror xalloc xalloc-die xstrndup xvasprintf
   
   # Specification in the form of a few gnulib-tool.m4 macro invocations:
   gl_LOCAL_DIR([local])
  -gl_MODULES([assert autobuild avltree-oset binary-io clean-temp cloexec close-stream closein config-h configmake dirname error exit fdl fflush filenamecat fopen-safer fprintf-posix free fseeko gendocs gettext gnupload gpl-3.0 mkstemp obstack progname regex regexprops-generic sprintf-posix stdbool stdlib-safer strnlen strtol tempname unlocked-io vasprintf-posix verror xalloc xalloc-die xstrndup xstrtol xvasprintf])
  +gl_MODULES([assert autobuild avltree-oset binary-io clean-temp cloexec close-stream closein config-h configmake dirname error exit fdl fflush filenamecat fopen-safer fprintf-posix free fseeko gendocs gettext gnupload gpl-3.0 mkstemp obstack progname regex regexprops-generic sprintf-posix stdbool stdlib-safer strnlen strtol tempname unlocked-io vasprintf-posix verror xalloc xalloc-die xstrndup xvasprintf])
   gl_AVOID([])
   gl_SOURCE_BASE([gnu])
   gl_M4_BASE([ltdl/m4])
  Index: po/POTFILES.in
  ===================================================================
  RCS file: /sources/m4/m4/po/POTFILES.in,v
  retrieving revision 1.17
  diff -u -u -r1.17 POTFILES.in
  --- po/POTFILES.in 11 Aug 2007 15:50:58 -0000 1.17
  +++ po/POTFILES.in 30 Aug 2007 00:49:58 -0000
  @@ -7,7 +7,6 @@
   gnu/regcomp.c
   gnu/verror.c
   gnu/xalloc-die.c
  -gnu/xstrtol-error.c
   m4/builtin.c
   m4/debug.c
   m4/input.c
  @@ -30,3 +29,4 @@
   src/main.c
   src/stackovf.c
   src/version-etc.c
  +src/xstrtol-error.c
-- 
  ())_.              Email me: [email protected]
  ( '/           Read my blog: http://blog.azazil.net
  / )=         ...and my book: http://sources.redhat.com/autobook
`(_~)_ Join my AGLOCO Network: http://www.agloco.com/r/BBBS7912 
_________________________________________________________
This patch notification generated by vcsapply version 1.0
http://savannah.gnu.org/projects/cvs-utils

_______________________________________________
M4-patches mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/m4-patches

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.7 (Darwin)

iD8DBQFG1hU2FRMICSmD1gYRAgmLAKCfZgKvyXD0UMdBfZAvTL2KQaW8AQCfZzn+
zsmgSrcznl4nzIwyr/vBLu8=
=Czvc
-----END PGP SIGNATURE-----