diff options
| -rw-r--r-- | bfd/ChangeLog | 5 | ||||
| -rwxr-xr-x | bfd/configure | 36 | ||||
| -rw-r--r-- | bfd/configure.in | 33 | ||||
| -rw-r--r-- | config/ChangeLog | 4 | ||||
| -rw-r--r-- | config/acx.m4 | 38 |
5 files changed, 68 insertions, 48 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 3d7d87c..a598833 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,8 @@ +2007-03-23 Joseph Myers <joseph@codesourcery.com> + + * configure.in: Use ACX_PKGVERSION and ACX_BUGURL. + * configure: Regenerate. + 2007-03-23 Alan Modra <amodra@bigpond.net.au> * elf32-spu.c (spu_stub_name): Don't put input section in stub name. diff --git a/bfd/configure b/bfd/configure index bb651a5..fe5e9ce 100755 --- a/bfd/configure +++ b/bfd/configure @@ -873,7 +873,8 @@ Optional Packages: --with-gnu-ld assume the C compiler uses GNU ld default=no --with-pic try to use only PIC/non-PIC objects default=use both --with-mmap try using mmap for BFD input files if available - --with-pkgversion=PKG Add PKG to the version string + --with-pkgversion=PKG Use PKG in the version string in place of "GNU + Binutils" --with-bugurl=URL Direct users to URL to report a bug Some influential environment variables: @@ -4033,7 +4034,7 @@ test x"$pic_mode" = xno && libtool_flags="$libtool_flags --prefer-non-pic" case $host in *-*-irix6*) # Find out which ABI we are using. - echo '#line 4036 "configure"' > conftest.$ac_ext + echo '#line 4037 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -4387,49 +4388,50 @@ _ACEOF fi -# Package version. For an official FSF release, it is empty. + # Check whether --with-pkgversion or --without-pkgversion was given. if test "${with_pkgversion+set}" = set; then withval="$with_pkgversion" case "$withval" in - yes) { { echo "$as_me:$LINENO: error: package version not specified" >&5 + yes) { { echo "$as_me:$LINENO: error: package version not specified" >&5 echo "$as_me: error: package version not specified" >&2;} { (exit 1); exit 1; }; } ;; - no) PKGVERSION= ;; - *) PKGVERSION="($withval) " ;; - esac + no) PKGVERSION= ;; + *) PKGVERSION="($withval) " ;; + esac else PKGVERSION="(GNU Binutils) " fi; -# The location to which bugs should be reported. + # Check whether --with-bugurl or --without-bugurl was given. if test "${with_bugurl+set}" = set; then withval="$with_bugurl" case "$withval" in - yes) { { echo "$as_me:$LINENO: error: bug URL not specified" >&5 + yes) { { echo "$as_me:$LINENO: error: bug URL not specified" >&5 echo "$as_me: error: bug URL not specified" >&2;} { (exit 1); exit 1; }; } ;; - no) REPORT_BUGS_TO=""; - REPORT_BUGS_TEXI="" - ;; - *) REPORT_BUGS_TO="<$withval>" - REPORT_BUGS_TEXI="@uref{`echo $withval | sed 's/@/@@/g'`}" - ;; - esac + no) REPORT_BUGS_TO=""; + REPORT_BUGS_TEXI="" + ;; + *) REPORT_BUGS_TO="<$withval>" + REPORT_BUGS_TEXI="@uref{`echo $withval | sed 's/@/@@/g'`}" + ;; + esac else REPORT_BUGS_TO="<http://www.sourceware.org/bugzilla/>" - REPORT_BUGS_TEXI="@uref{http://www.sourceware.org/bugzilla/}" + REPORT_BUGS_TEXI="@uref{http://www.sourceware.org/bugzilla/}" fi; + GCC_WARN_CFLAGS="-W -Wall -Wstrict-prototypes -Wmissing-prototypes" # Check whether --enable-werror or --disable-werror was given. diff --git a/bfd/configure.in b/bfd/configure.in index bb7065b..4524c62 100644 --- a/bfd/configure.in +++ b/bfd/configure.in @@ -63,37 +63,8 @@ if test $use_secureplt = true; then [Define if we should default to creating read-only plt entries]) fi -# Package version. For an official FSF release, it is empty. -AC_ARG_WITH(pkgversion, - AS_HELP_STRING([--with-pkgversion=PKG], - [Add PKG to the version string]), - [case "$withval" in - yes) AC_MSG_ERROR([package version not specified]) ;; - no) PKGVERSION= ;; - *) PKGVERSION="($withval) " ;; - esac], - PKGVERSION="(GNU Binutils) " -) -AC_SUBST(PKGVERSION) - -# The location to which bugs should be reported. -AC_ARG_WITH(bugurl, - AS_HELP_STRING([--with-bugurl=URL], - [Direct users to URL to report a bug]), - [case "$withval" in - yes) AC_MSG_ERROR([bug URL not specified]) ;; - no) REPORT_BUGS_TO=""; - REPORT_BUGS_TEXI="" - ;; - *) REPORT_BUGS_TO="<$withval>" - REPORT_BUGS_TEXI="@uref{`echo $withval | sed 's/@/@@/g'`}" - ;; - esac], - REPORT_BUGS_TO="<http://www.sourceware.org/bugzilla/>" - REPORT_BUGS_TEXI="@uref{http://www.sourceware.org/bugzilla/}" -) -AC_SUBST(REPORT_BUGS_TO) -AC_SUBST(REPORT_BUGS_TEXI) +ACX_PKGVERSION([GNU Binutils]) +ACX_BUGURL([http://www.sourceware.org/bugzilla/]) AM_BINUTILS_WARNINGS diff --git a/config/ChangeLog b/config/ChangeLog index f0cda7a..250c3ff 100644 --- a/config/ChangeLog +++ b/config/ChangeLog @@ -1,3 +1,7 @@ +2007-03-23 Joseph Myers <joseph@codesourcery.com> + + * acx.m4 (ACX_PKGVERSION, ACX_BUGURL): Define. + 2007-03-07 Andreas Schwab <schwab@suse.de> * acx.m4 (GCC_TARGET_TOOL): Expand backquotes outside diff --git a/config/acx.m4 b/config/acx.m4 index a897075..73afe8d 100644 --- a/config/acx.m4 +++ b/config/acx.m4 @@ -552,3 +552,41 @@ AC_DEFUN([ACX_CHECK_PROG_VER],[ $1="${CONFIG_SHELL-/bin/sh} $ac_aux_dir/missing $2" fi ]) + +dnl Support the --with-pkgversion configure option. +dnl ACX_PKGVERSION(default-pkgversion) +AC_DEFUN([ACX_PKGVERSION],[ + AC_ARG_WITH(pkgversion, + AS_HELP_STRING([--with-pkgversion=PKG], + [Use PKG in the version string in place of "$1"]), + [case "$withval" in + yes) AC_MSG_ERROR([package version not specified]) ;; + no) PKGVERSION= ;; + *) PKGVERSION="($withval) " ;; + esac], + PKGVERSION="($1) " + ) + AC_SUBST(PKGVERSION) +]) + +dnl Support the --with-bugurl configure option. +dnl ACX_BUGURL(default-bugurl) +AC_DEFUN([ACX_BUGURL],[ + AC_ARG_WITH(bugurl, + AS_HELP_STRING([--with-bugurl=URL], + [Direct users to URL to report a bug]), + [case "$withval" in + yes) AC_MSG_ERROR([bug URL not specified]) ;; + no) REPORT_BUGS_TO=""; + REPORT_BUGS_TEXI="" + ;; + *) REPORT_BUGS_TO="<$withval>" + REPORT_BUGS_TEXI="@uref{`echo $withval | sed 's/@/@@/g'`}" + ;; + esac], + REPORT_BUGS_TO="<$1>" + REPORT_BUGS_TEXI="@uref{$1}" + ) + AC_SUBST(REPORT_BUGS_TO) + AC_SUBST(REPORT_BUGS_TEXI) +]) |