Re: Support --with-pkgversion and --with-bugurl

[Roland McGrath <roland at hack dot frob dot com>]

> This patch is relative to a tree with 
> <http://sourceware.org/ml/libc-alpha/2012-11/msg00270.html> applied 
> (though one possibility is that it makes sense to get in the pkgversion / 
> bugurl changes for everything outside the timezone/ directory separately 
> from sorting out how versions / bug-reporting URLs are handled for that 
> directory).

I think this should go in without touching timezone/ and then we can
work on cleaning up the tzcode integration.

> +INSTALL: manual/install.texi manual/macros.texi \
> +	$(common-objpfx)manual/pkgvers.texi; $(format-me)

When the whole rule is no longer one line, don't use ; syntax.
Put the command line on the next line with a tab.

> diff --git a/configure.in b/configure.in
> index 5e35b98..a3a8464 100644
> --- a/configure.in
> +++ b/configure.in
> @@ -218,6 +218,13 @@ AC_ARG_ENABLE([all-warnings],
>  	      [])
>  AC_SUBST(all_warnings)
>  
> +ACX_PKGVERSION([GNU libc])
> +ACX_BUGURL([http://www.gnu.org/software/libc/bugs.html])
> +AC_DEFINE_UNQUOTED([PKGVERSION], ["$PKGVERSION"],
> +		   [Package description])
> +AC_DEFINE_UNQUOTED([REPORT_BUGS_TO], ["$REPORT_BUGS_TO"],
> +		   [Bug reporting address])

I don't know how you chose the placement of these.  
I think they belong at the top, right after AC_CONFIG_AUX_DIR.

> @@ -34,11 +34,11 @@ if test $# -eq 0; then
>        echo '  --help      print this help, then exit'
>        echo '  --version   print version number, then exit'
>        echo "For bug reporting instructions, please see:"

Might as well change this to '' while you're here.
There was never any reason for it to be "".

> -      echo "<http://www.gnu.org/software/libc/bugs.html>."
> +      echo "@REPORT_BUGS_TO@."

Do this as:

cat <<\EOF
@REPORT_BUGS_TO@.
EOF

That doesn't constrain the text from containing $ or ` or ' or "
(just constrains it from being "EOF").

> --- a/debug/xtrace.sh
> +++ b/debug/xtrace.sh
> @@ -54,14 +54,14 @@ Mandatory arguments to long options are also mandatory for any corresponding
>  short options.
>  
>  "
> -  echo $"For bug reporting instructions, please see:
> -<http://www.gnu.org/software/libc/bugs.html>.
> -"
> +  printf $"For bug reporting instructions, please see:
> +%s.
> +" "@REPORT_BUGS_TO@"

Since this is now printf, I'd be inclined to use "...\\n%s.\\n"
rather than embedded newlines.

> --- a/elf/ldd.bash.in
> +++ b/elf/ldd.bash.in

Same here.

> --- a/elf/sotruss.ksh
> +++ b/elf/sotruss.ksh

Same here.

> --- a/malloc/memusage.sh
> +++ b/malloc/memusage.sh

Same here.

> diff --git a/sunrpc/proto.h b/sunrpc/proto.h
> index 0ba9cd6..ea28565 100644
> --- a/sunrpc/proto.h
> +++ b/sunrpc/proto.h
> @@ -62,7 +62,4 @@ void add_type(int len, const char *type);
>  #define _(X) (X)
>  #define textdomain(X) ((void) 0)
>  
> -/* This is used in the definition of PACKAGE for --version output.  */
> -#define _libc_intl_domainname "libc"
> -
>  #endif

These seems unrelated.  If it doesn't break either the build or the rpcgen
built to be installed, it's a fine change.  But it shouldn't be part of
this commit.

The whole change is fine with those amendments/omissions.


Thanks,
Roland