PATCH: [toplevel] Gas install name problem from autoconf 2.5x

[H. J. Lu]

On Wed, Sep 03, 2003 at 12:10:31AM -0400, Daniel Jacobowitz wrote:
> I've gotten a report that gas now installs after a native build as
> $(target_alias)-as.  This is presumably the one consequence of autoconf
> 2.5x's "specify absolutely nothing on the command line unless absolutely
> necessary" policy.
> 
> I see two basic choices:
>   - Override AC_CANONICAL_TARGET.
>   - Always pass down --program-transform-name from the top level.
> 
> I think the latter is the way to go.  Any other opinions?
> 

How about this? We undo the change in gas/configure.in?


H.J.
-------------- next part --------------
2003-09-03  H.J. Lu  <hongjiu.lu@intel.com>

	* configure.in: Don't set program_prefix automatically for
	native build.
	* configure: Regenerated.

--- gas/configure.in.name	2003-09-03 11:05:43.000000000 -0700
+++ gas/configure.in	2003-09-03 13:26:01.000000000 -0700
@@ -8,6 +8,15 @@ dnl v2.5 needed for --bindir et al
 AC_PREREQ(2.57)
 AC_INIT(as.h)
 
+dnl Check if program_prefix is set at the command line.
+seen_program_prefix=no
+case "$*" in
+  *" -program-prefix "* | *" --program-prefix "* \
+  | *" --program-prefi "* | *" --program-pref "*  \
+  | *" --program-pre "* | *" --program-pr "* | *" --program-p "*)
+  seen_program_prefix=yes
+esac
+
 dnl Autoconf 2.57 will find the aux dir without this.  However, unless
 dnl we specify this explicitly, automake-1.7 will assume that ylwrap is in
 dnl gas/ instead of gas/../.
@@ -15,6 +24,13 @@ AC_CONFIG_AUX_DIR(..)
 AC_CANONICAL_SYSTEM
 AC_ISC_POSIX
 
+dnl Undo the damange made by Autoconf 2.57.
+if test "$host_alias" = "$target_alias" &&
+  test "$seen_program_prefix" = "no" &&
+  test "$program_prefix" = "${target_alias}-"; then
+  program_prefix=NONE
+fi
+
 changequote(,)dnl
 BFD_VERSION=`sed -n -e 's/^.._INIT_AUTOMAKE.*,[ 	]*\([^ 	]*\)[ 	]*).*/\1/p' < ${srcdir}/../bfd/configure.in`
 changequote([,])dnl