OSDN Git Service

bfd/
authorH.J. Lu <hjl@lucon.org>
Thu, 15 Mar 2007 14:17:16 +0000 (14:17 +0000)
committerH.J. Lu <hjl@lucon.org>
Thu, 15 Mar 2007 14:17:16 +0000 (14:17 +0000)
2007-03-15  H.J. Lu  <hongjiu.lu@intel.com>

* Makefile.am (bfdver.h): Substitute report_bugs_to.  Also
create doc/bfdver.texi.
* Makefile.in: Regenerated.

* configure.in (--with-bugurl): New option.
* configure: Regenerated.

* version.h (REPORT_BUGS_TO): New.

binutils/

2007-03-15  H.J. Lu  <hongjiu.lu@intel.com>

* Makefile.am (REPORT_BUGS_TO): Removed.
(INCLUDES): Remove -DREPORT_BUGS_TO.
* Makefile.in: Regenerated.

* bucomm.c: Don't include bfdver.h.
* objdump.c: Likewise.
* version.c: Likewise.

* bucomm.h: Include bfdver.h.

* configure.in (--with-bugurl): Removed.
* configure: Regenerated.

* doc/Makefile.am (binutils_TEXINFOS): Removed.
(AM_MAKEINFOFLAGS): Add -I ../../bfd/doc.
(TEXI2DVI): Likewise.
(config.texi): Removed.
(MOSTLYCLEANFILES): Remove config.texi.
* doc/Makefile.in: Regenerated.

* doc/binutils.texi: Include bfdver.texi instead of
config.texi.

gas/

2007-03-15  H.J. Lu  <hongjiu.lu@intel.com>

* Makefile.am (REPORT_BUGS_TO): Removed.
(INCLUDES): Remove -DREPORT_BUGS_TO.
* Makefile.in: Regenerated.

* configure.in (--with-bugurl): Removed.
* configure: Regenerated.

* doc/Makefile.am (as_TEXINFOS): Remove gasver.texi.
(AM_MAKEINFOFLAGS): Add -I ../../bfd/doc.
(TEXI2DVI): Likewise.
(gasver.texi): Removed.
(MOSTLYCLEANFILES): Remove gasver.texi.
(as.1): Don't depend on gasver.texi.
* doc/Makefile.in: Regenerated.

* doc/as.texi: Include bfdver.texi instead of gasver.texi.

gprof/

2007-03-15  H.J. Lu  <hongjiu.lu@intel.com>

* Makefile.am (REPORT_BUGS_TO): Removed.
(INCLUDES): Remove -DREPORT_BUGS_TO.
* Makefile.in: Regenerated.

* configure.in (--with-bugurl): Removed.
* configure: Regenerated.

ld/

2007-03-15  H.J. Lu  <hongjiu.lu@intel.com>

* Makefile.am (ld_TEXINFOS): Remove ldver.texi.
(AM_MAKEINFOFLAGS): Add -I ../../bfd/doc.
(TEXI2DVI): Likewise.
(REPORT_BUGS_TO): Removed.
(INCLUDES): Remove -DREPORT_BUGS_TO.
(ldver.texi): Likewise.
(ld.1): Don't depend on ldver.texi.
(MOSTLYCLEANFILES): Remove ldver.texi.
* Makefile.in: Regenerated.

* configure.in (--with-bugurl): Removed.
* configure: Regenerated.

* lexsup.c: Include bfdver.h.

* ld.texinfo: Include bfdver.texi instead of ldver.texi.

bfd/ChangeLog
bfd/Makefile.am
bfd/Makefile.in
bfd/configure
bfd/configure.in
bfd/version.h

index 6813f17..1276a6a 100644 (file)
@@ -1,3 +1,14 @@
+2007-03-15  H.J. Lu  <hongjiu.lu@intel.com>
+
+       * Makefile.am (bfdver.h): Substitute report_bugs_to.  Also
+       create doc/bfdver.texi.
+       * Makefile.in: Regenerated.
+
+       * configure.in (--with-bugurl): New option.
+       * configure: Regenerated.
+
+       * version.h (REPORT_BUGS_TO): New.
+
 2007-03-13  H.J. Lu  <hongjiu.lu@intel.com>
 
        PR binutils/3826
index 409de71..5d2afb0 100644 (file)
@@ -964,15 +964,27 @@ CLEANFILES = bfd.h dep.sed stmp-bfd-h DEP DEPA DEP1 DEP2 libbfd.a stamp-lib \
 DISTCLEANFILES = $(BUILD_CFILES) $(BUILD_HFILES)
 
 bfdver.h: $(srcdir)/version.h $(srcdir)/Makefile.in
-       @echo "creating $@"
+       @-test -d doc || mkdir doc
+       @echo "creating $@ and doc/bfdver.texi"
        @bfd_version=`echo "$(VERSION)" | sed -e 's/\([^\.]*\)\.*\([^\.]*\)\.*\([^\.]*\)\.*\([^\.]*\)\.*\([^\.]*\).*/\1.00\2.00\3.00\4.00\5/' -e 's/\([^\.]*\)\..*\(..\)\..*\(..\)\..*\(..\)\..*\(..\)$$/\1\2\3\4\5/'` ;\
        bfd_version_string="\"$(VERSION)\"" ;\
        bfd_version_package="\"$(PKGVERSION)\"" ;\
+       report_bugs_to="\"$(REPORT_BUGS_TO)\"" ;\
        if test "x$(RELEASE)" = x ; then \
          bfd_version_date=`sed -n -e 's/.*DATE //p' < $(srcdir)/version.h` ;\
          bfd_version_string="\"$(VERSION).$${bfd_version_date}\"" ;\
        fi ;\
-       sed -e "s/@bfd_version@/$$bfd_version/" -e "s/@bfd_version_string@/$$bfd_version_string/" -e "s/@bfd_version_package@/$$bfd_version_package/" < $(srcdir)/version.h > $@
+       sed -e "s,@bfd_version@,$$bfd_version," \
+           -e "s,@bfd_version_string@,$$bfd_version_string," \
+           -e "s,@bfd_version_package@,$$bfd_version_package," \
+           -e "s,@report_bugs_to@,$$report_bugs_to," \
+           < $(srcdir)/version.h > $@; \
+        echo "@set VERSION $(VERSION)" > doc/bfdver.texi; \
+        echo "@set VERSION_PACKAGE $(PKGVERSION)" >> doc/bfdver.texi; \
+        echo "@set UPDATED `date '+%B %Y'`" >> doc/bfdver.texi; \
+        if [ -n "$(REPORT_BUGS_TEXI)" ]; then \
+          echo "@set BUGURL $(REPORT_BUGS_TEXI)" >> doc/bfdver.texi; \
+        fi
 
 # What appears below is generated by a hacked mkdep using gcc -MM.
 
index f7106b2..8929b14 100644 (file)
@@ -178,6 +178,8 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKGVERSION = @PKGVERSION@
 POSUB = @POSUB@
 RANLIB = @RANLIB@
+REPORT_BUGS_TEXI = @REPORT_BUGS_TEXI@
+REPORT_BUGS_TO = @REPORT_BUGS_TO@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
@@ -956,15 +958,15 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
        @for dep in $?; do \
          case '$(am__configure_deps)' in \
            *$$dep*) \
-             echo ' cd $(srcdir) && $(AUTOMAKE) --foreign '; \
-             cd $(srcdir) && $(AUTOMAKE) --foreign  \
+             echo ' cd $(srcdir) && $(AUTOMAKE) --cygnus '; \
+             cd $(srcdir) && $(AUTOMAKE) --cygnus  \
                && exit 0; \
              exit 1;; \
          esac; \
        done; \
-       echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  Makefile'; \
+       echo ' cd $(top_srcdir) && $(AUTOMAKE) --cygnus  Makefile'; \
        cd $(top_srcdir) && \
-         $(AUTOMAKE) --foreign  Makefile
+         $(AUTOMAKE) --cygnus  Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
        @case '$?' in \
@@ -1528,15 +1530,27 @@ stmp-lcoff-h: $(LIBCOFF_H_FILES)
        touch stmp-lcoff-h
 
 bfdver.h: $(srcdir)/version.h $(srcdir)/Makefile.in
-       @echo "creating $@"
+       @-test -d doc || mkdir doc
+       @echo "creating $@ and doc/bfdver.texi"
        @bfd_version=`echo "$(VERSION)" | sed -e 's/\([^\.]*\)\.*\([^\.]*\)\.*\([^\.]*\)\.*\([^\.]*\)\.*\([^\.]*\).*/\1.00\2.00\3.00\4.00\5/' -e 's/\([^\.]*\)\..*\(..\)\..*\(..\)\..*\(..\)\..*\(..\)$$/\1\2\3\4\5/'` ;\
        bfd_version_string="\"$(VERSION)\"" ;\
        bfd_version_package="\"$(PKGVERSION)\"" ;\
+       report_bugs_to="\"$(REPORT_BUGS_TO)\"" ;\
        if test "x$(RELEASE)" = x ; then \
          bfd_version_date=`sed -n -e 's/.*DATE //p' < $(srcdir)/version.h` ;\
          bfd_version_string="\"$(VERSION).$${bfd_version_date}\"" ;\
        fi ;\
-       sed -e "s/@bfd_version@/$$bfd_version/" -e "s/@bfd_version_string@/$$bfd_version_string/" -e "s/@bfd_version_package@/$$bfd_version_package/" < $(srcdir)/version.h > $@
+       sed -e "s,@bfd_version@,$$bfd_version," \
+           -e "s,@bfd_version_string@,$$bfd_version_string," \
+           -e "s,@bfd_version_package@,$$bfd_version_package," \
+           -e "s,@report_bugs_to@,$$report_bugs_to," \
+           < $(srcdir)/version.h > $@; \
+        echo "@set VERSION $(VERSION)" > doc/bfdver.texi; \
+        echo "@set VERSION_PACKAGE $(PKGVERSION)" >> doc/bfdver.texi; \
+        echo "@set UPDATED `date '+%B %Y'`" >> doc/bfdver.texi; \
+        if [ -n "$(REPORT_BUGS_TEXI)" ]; then \
+          echo "@set BUGURL $(REPORT_BUGS_TEXI)" >> doc/bfdver.texi; \
+        fi
 
 # What appears below is generated by a hacked mkdep using gcc -MM.
 
index 31aee53..efedc4b 100755 (executable)
@@ -309,7 +309,7 @@ ac_includes_default="\
 # include <unistd.h>
 #endif"
 
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE AR ac_ct_AR RANLIB ac_ct_RANLIB LN_S LIBTOOL PKGVERSION WARN_CFLAGS NO_WERROR MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT GENINSRC_NEVER_TRUE GENINSRC_NEVER_FALSE INSTALL_LIBBFD_TRUE INSTALL_LIBBFD_FALSE host_noncanonical target_noncanonical bfdlibdir bfdincludedir USE_NLS LIBINTL LIBINTL_DEP INCINTL XGETTEXT GMSGFMT POSUB CATALOGS DATADIRNAME INSTOBJEXT GENCAT CATOBJEXT MKINSTALLDIRS MSGFMT MSGMERGE HDEFINES CPP EGREP BFD_HOST_64BIT_LONG BFD_HOST_LONG_LONG BFD_HOST_64_BIT_DEFINED BFD_HOST_64_BIT BFD_HOST_U_64_BIT CC_FOR_BUILD EXEEXT_FOR_BUILD COREFILE COREFLAG WIN32LDFLAGS WIN32LIBADD TDEFINES wordsize bfd64_libs all_backends bfd_backends bfd_machines bfd_default_target_size bfd_file_ptr bfd_ufile_ptr tdefaults datarootdir docdir htmldir LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE AR ac_ct_AR RANLIB ac_ct_RANLIB LN_S LIBTOOL PKGVERSION REPORT_BUGS_TO REPORT_BUGS_TEXI WARN_CFLAGS NO_WERROR MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT GENINSRC_NEVER_TRUE GENINSRC_NEVER_FALSE INSTALL_LIBBFD_TRUE INSTALL_LIBBFD_FALSE host_noncanonical target_noncanonical bfdlibdir bfdincludedir USE_NLS LIBINTL LIBINTL_DEP INCINTL XGETTEXT GMSGFMT POSUB CATALOGS DATADIRNAME INSTOBJEXT GENCAT CATOBJEXT MKINSTALLDIRS MSGFMT MSGMERGE HDEFINES CPP EGREP BFD_HOST_64BIT_LONG BFD_HOST_LONG_LONG BFD_HOST_64_BIT_DEFINED BFD_HOST_64_BIT BFD_HOST_U_64_BIT CC_FOR_BUILD EXEEXT_FOR_BUILD COREFILE COREFLAG WIN32LDFLAGS WIN32LIBADD TDEFINES wordsize bfd64_libs all_backends bfd_backends bfd_machines bfd_default_target_size bfd_file_ptr bfd_ufile_ptr tdefaults datarootdir docdir htmldir LIBOBJS LTLIBOBJS'
 ac_subst_files=''
 
 # Initialize some variables set by options.
@@ -874,6 +874,7 @@ Optional Packages:
   --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-bugurl=URL       Direct users to URL to report a bug
 
 Some influential environment variables:
   CC          C compiler command
@@ -4032,7 +4033,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 4035 "configure"' > conftest.$ac_ext
+  echo '#line 4036 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -4404,6 +4405,30 @@ else
 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
+echo "$as_me: error: bug URL not specified" >&2;}
+   { (exit 1); exit 1; }; } ;;
+    no)  REPORT_BUGS_TO="";
+        REPORT_BUGS_TEXI=""
+        ;;
+    *)   REPORT_BUGS_TO="<URL:$withval>"
+        REPORT_BUGS_TEXI="@uref{`echo $withval | sed 's/@/@@/g'`}"
+        ;;
+   esac
+else
+  REPORT_BUGS_TO="<URL:http://www.sourceware.org/bugzilla/>"
+   REPORT_BUGS_TEXI="@uref{http://www.sourceware.org/bugzilla/}"
+
+fi;
+
+
+
 
 GCC_WARN_CFLAGS="-W -Wall -Wstrict-prototypes -Wmissing-prototypes"
 
@@ -13033,6 +13058,8 @@ s,@ac_ct_RANLIB@,$ac_ct_RANLIB,;t t
 s,@LN_S@,$LN_S,;t t
 s,@LIBTOOL@,$LIBTOOL,;t t
 s,@PKGVERSION@,$PKGVERSION,;t t
+s,@REPORT_BUGS_TO@,$REPORT_BUGS_TO,;t t
+s,@REPORT_BUGS_TEXI@,$REPORT_BUGS_TEXI,;t t
 s,@WARN_CFLAGS@,$WARN_CFLAGS,;t t
 s,@NO_WERROR@,$NO_WERROR,;t t
 s,@MAINTAINER_MODE_TRUE@,$MAINTAINER_MODE_TRUE,;t t
index ad203f4..1cd339b 100644 (file)
@@ -76,6 +76,25 @@ AC_ARG_WITH(pkgversion,
 )
 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="<URL:$withval>"
+        REPORT_BUGS_TEXI="@uref{`echo $withval | sed 's/@/@@/g'`}"
+        ;;
+   esac],
+   REPORT_BUGS_TO="<URL:http://www.sourceware.org/bugzilla/>"
+   REPORT_BUGS_TEXI="@uref{http://www.sourceware.org/bugzilla/}"
+)
+AC_SUBST(REPORT_BUGS_TO)
+AC_SUBST(REPORT_BUGS_TEXI)
+
 AM_BINUTILS_WARNINGS
 
 AM_CONFIG_HEADER(config.h:config.in)
index 4808312..829a978 100644 (file)
@@ -1,3 +1,4 @@
 #define BFD_VERSION_DATE 20070315
 #define BFD_VERSION @bfd_version@
 #define BFD_VERSION_STRING  @bfd_version_package@ @bfd_version_string@
+#define REPORT_BUGS_TO @report_bugs_to@