From 13ff1518ee3e35bacb4543b227c0bfd5de9bdaf8 Mon Sep 17 00:00:00 2001 From: Keith Marshall Date: Fri, 3 Oct 2008 22:48:22 +0000 Subject: [PATCH] Improve package identification in configure script. --- winsup/mingw/ChangeLog | 17 +++++++++++++++++ winsup/mingw/aclocal.m4 | 5 ++--- winsup/mingw/configure | 30 ++++++++++++++++-------------- winsup/mingw/configure.in | 4 ++-- 4 files changed, 37 insertions(+), 19 deletions(-) diff --git a/winsup/mingw/ChangeLog b/winsup/mingw/ChangeLog index fa8376e8e..99b563ebe 100644 --- a/winsup/mingw/ChangeLog +++ b/winsup/mingw/ChangeLog @@ -1,3 +1,20 @@ +2008-10-03 Keith Marshall + + Improve package identification in configure script. + + * configure.ac (AC_INIT): Redefine parameters... + (PACKAGE_NAME): Set to `MinGW Runtime'. + (PACKAGE_BUGREPORT): Set to `http://mingw.org/reporting_bugs' + (PACKAGE_TARNAME): Set to `mingwrt'. + (PACKAGE_VERSION): Set generically to `v3.x'; reassigned by... + (MINGW_AC_CONFIG_SRCDIR): ...this macro, which extracts... + (__MINGW32_VERSION): ...this, from file `include/_mingw.h'. + + * aclocal.m4 (MINGW_AC_CONFIG_SRCDIR): Do not redefine... + (PACKAGE_TARNAME): ...this. + + * configure: Regenerated. + 2008-09-25 Keith Marshall Fix MinGW-Bug [2125708]. diff --git a/winsup/mingw/aclocal.m4 b/winsup/mingw/aclocal.m4 index 4d530d651..77786d631 100644 --- a/winsup/mingw/aclocal.m4 +++ b/winsup/mingw/aclocal.m4 @@ -8,13 +8,12 @@ # Wrapper for AC_CONFIG_SRCDIR; in addition to checking for a # unique file reference within the source tree, it resolves the # definition for PACKAGE_VERSION, based on a tagged definition -# within that file, and adjusts PACKAGE_TARNAME to match. +# within that file. # AC_DEFUN([MINGW_AC_CONFIG_SRCDIR], [AC_CONFIG_SRCDIR([$2]) AC_MSG_CHECKING([package version]) PACKAGE_VERSION=`awk '$[2] == "'"$1"'" { print $[3] }' ${srcdir}/$2` - PACKAGE_TARNAME=${PACKAGE_NAME}-${PACKAGE_VERSION} AC_MSG_RESULT([$PACKAGE_VERSION])dnl ]) #MINGW_AC_CONFIG_SRCDIR @@ -33,7 +32,7 @@ AC_DEFUN([MINGW_AC_CONFIG_SRCDIR], # PARTICULAR PURPOSE. # GCC_NO_EXECUTABLES -# ----------------- +# ------------------ # FIXME: The GCC team has specific needs which the current Autoconf # framework cannot solve elegantly. This macro implements a dirty # hack until Autoconf is able to provide the services its users diff --git a/winsup/mingw/configure b/winsup/mingw/configure index 7d15f8707..913e17983 100755 --- a/winsup/mingw/configure +++ b/winsup/mingw/configure @@ -1,6 +1,8 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.59 for mingw-runtime __MINGW32_VERSION. +# Generated by GNU Autoconf 2.59 for MinGW Runtime v3.x. +# +# Report bugs to . # # Copyright (C) 2003 Free Software Foundation, Inc. # This configure script is free software; the Free Software Foundation @@ -265,11 +267,11 @@ SHELL=${CONFIG_SHELL-/bin/sh} : ${ac_max_here_lines=38} # Identity of this package. -PACKAGE_NAME='mingw-runtime' -PACKAGE_TARNAME='mingw-runtime' -PACKAGE_VERSION='__MINGW32_VERSION' -PACKAGE_STRING='mingw-runtime __MINGW32_VERSION' -PACKAGE_BUGREPORT='' +PACKAGE_NAME='MinGW Runtime' +PACKAGE_TARNAME='mingwrt' +PACKAGE_VERSION='v3.x' +PACKAGE_STRING='MinGW Runtime v3.x' +PACKAGE_BUGREPORT='http://mingw.org/reporting_bugs' ac_unique_file="include/_mingw.h" ac_subdirs_all="$ac_subdirs_all profile mingwex" @@ -738,7 +740,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures mingw-runtime __MINGW32_VERSION to adapt to many kinds of systems. +\`configure' configures MinGW Runtime v3.x to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -800,7 +802,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of mingw-runtime __MINGW32_VERSION:";; + short | recursive ) echo "Configuration of MinGW Runtime v3.x:";; esac cat <<\_ACEOF @@ -825,6 +827,7 @@ Some influential environment variables: Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. +Report bugs to . _ACEOF fi @@ -920,7 +923,7 @@ fi test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF -mingw-runtime configure __MINGW32_VERSION +MinGW Runtime configure v3.x generated by GNU Autoconf 2.59 Copyright (C) 2003 Free Software Foundation, Inc. @@ -934,7 +937,7 @@ cat >&5 <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by mingw-runtime $as_me __MINGW32_VERSION, which was +It was created by MinGW Runtime $as_me v3.x, which was generated by GNU Autoconf 2.59. Invocation command line was $ $0 $@ @@ -1273,8 +1276,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu echo "$as_me:$LINENO: checking package version" >&5 echo $ECHO_N "checking package version... $ECHO_C" >&6 - PACKAGE_VERSION=`awk '$2 == "'"$PACKAGE_VERSION"'" { print $3 }' ${srcdir}/include/_mingw.h` - PACKAGE_TARNAME=${PACKAGE_NAME}-${PACKAGE_VERSION} + PACKAGE_VERSION=`awk '$2 == "'"__MINGW32_VERSION"'" { print $3 }' ${srcdir}/include/_mingw.h` echo "$as_me:$LINENO: result: $PACKAGE_VERSION" >&5 echo "${ECHO_T}$PACKAGE_VERSION" >&6 @@ -3606,7 +3608,7 @@ _ASBOX } >&5 cat >&5 <<_CSEOF -This file was extended by mingw-runtime $as_me __MINGW32_VERSION, which was +This file was extended by MinGW Runtime $as_me v3.x, which was generated by GNU Autoconf 2.59. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3661,7 +3663,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -mingw-runtime config.status __MINGW32_VERSION +MinGW Runtime config.status v3.x configured by $0, generated by GNU Autoconf 2.59, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" diff --git a/winsup/mingw/configure.in b/winsup/mingw/configure.in index 775149b7e..b869038a8 100644 --- a/winsup/mingw/configure.in +++ b/winsup/mingw/configure.in @@ -17,8 +17,8 @@ dnl along with this program; if not, write to the Free Software dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. AC_PREREQ([2.59]) -AC_INIT([mingw-runtime], [__MINGW32_VERSION]) -MINGW_AC_CONFIG_SRCDIR([$PACKAGE_VERSION], [include/_mingw.h]) +AC_INIT([MinGW Runtime], [v3.x], [http://mingw.org/reporting_bugs], [mingwrt]) +MINGW_AC_CONFIG_SRCDIR([__MINGW32_VERSION], [include/_mingw.h]) AC_CANONICAL_SYSTEM GCC_NO_EXECUTABLES