From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 4652 invoked by alias); 27 Apr 2012 15:16:26 -0000 Received: (qmail 4643 invoked by uid 22791); 27 Apr 2012 15:16:25 -0000 X-SWARE-Spam-Status: No, hits=-3.3 required=5.0 tests=AWL,BAYES_00,FROM_12LTRDOM,KHOP_RCVD_UNTRUST,RCVD_IN_HOSTKARMA_W,RCVD_IN_HOSTKARMA_WL X-Spam-Check-By: sourceware.org Received: from relay1.mentorg.com (HELO relay1.mentorg.com) (192.94.38.131) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Fri, 27 Apr 2012 15:16:01 +0000 Received: from svr-orw-exc-10.mgc.mentorg.com ([147.34.98.58]) by relay1.mentorg.com with esmtp id 1SNmtt-0006X4-1r from Maciej_Rozycki@mentor.com ; Fri, 27 Apr 2012 08:16:01 -0700 Received: from SVR-IES-FEM-01.mgc.mentorg.com ([137.202.0.104]) by SVR-ORW-EXC-10.mgc.mentorg.com with Microsoft SMTPSVC(6.0.3790.4675); Fri, 27 Apr 2012 08:15:58 -0700 Received: from [172.30.0.84] (137.202.0.76) by SVR-IES-FEM-01.mgc.mentorg.com (137.202.0.104) with Microsoft SMTP Server id 14.1.289.1; Fri, 27 Apr 2012 16:15:59 +0100 Date: Fri, 27 Apr 2012 15:23:00 -0000 From: "Maciej W. Rozycki" To: CC: Pedro Alves , Tom Tromey Subject: [PATCH] Unbreak program transformation name `configure' options Message-ID: User-Agent: Alpine 1.10 (DEB 962 2008-03-14) MIME-Version: 1.0 Content-Type: text/plain; charset="US-ASCII" Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org X-SW-Source: 2012-04/txt/msg00993.txt.bz2 Hi, This commit: 2012-04-19 Pedro Alves gdb/ * configure.ac: Remove gl_EARLY, gl_INIT and AM_INIT_AUTOMAKE calls. Configure gnulib using ACX_CONFIGURE_DIR. removed the handling of the program transformation name `configure' options in this subdirectory (that was pulled implicitly with AM_INIT_AUTOMAKE). OK to check in the following fix that reinstates it? 2012-04-26 Maciej W. Rozycki gdb/ * configure.ac: Add AC_ARG_PROGRAM. * configure: Regenerate. Maciej gdb-ac-fix.diff Index: gdb-fsf-trunk-quilt/gdb/configure =================================================================== --- gdb-fsf-trunk-quilt.orig/gdb/configure 2012-04-26 18:06:36.000000000 +0100 +++ gdb-fsf-trunk-quilt/gdb/configure 2012-04-27 06:52:28.075588943 +0100 @@ -1426,6 +1426,11 @@ _ACEOF cat <<\_ACEOF +Program names: + --program-prefix=PREFIX prepend PREFIX to installed program names + --program-suffix=SUFFIX append SUFFIX to installed program names + --program-transform-name=PROGRAM run sed PROGRAM on installed program names + X features: --x-includes=DIR X include files are in DIR --x-libraries=DIR X library files are in DIR @@ -4371,6 +4376,16 @@ ac_configure="$SHELL $ac_aux_dir/configu +test "$program_prefix" != NONE && + program_transform_name="s&^&$program_prefix&;$program_transform_name" +# Use a double $ so make ignores it. +test "$program_suffix" != NONE && + program_transform_name="s&\$&$program_suffix&;$program_transform_name" +# Double any \ or $. +# By default was `s,x,x', remove it if useless. +ac_script='s/[\\$]/&&/g;s/;s,x,x,$//' +program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"` + # Dependency checking. rm -rf .tst 2>/dev/null Index: gdb-fsf-trunk-quilt/gdb/configure.ac =================================================================== --- gdb-fsf-trunk-quilt.orig/gdb/configure.ac 2012-04-26 18:06:36.000000000 +0100 +++ gdb-fsf-trunk-quilt/gdb/configure.ac 2012-04-27 06:51:40.705609266 +0100 @@ -30,6 +30,7 @@ AM_PROG_CC_STDC AC_CONFIG_AUX_DIR(..) AC_CANONICAL_SYSTEM +AC_ARG_PROGRAM # Dependency checking. ZW_CREATE_DEPDIR