2011-01-14 Tobias Burnus <burnus@net-b.de>

        PR fortran/47182
        * configure.ac: Use ACX_BUGURL.
        * libquadmath.texi: Include libquadmath-vers.texi for BUGURL.
        * Makefile.am: Create libquadmath-vers.texi.
        * configure.in: Regenerate.
        * Makefile.in: Regenerate.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@168776 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/libquadmath/ChangeLog b/libquadmath/ChangeLog
index 146e02e..5158dba 100644 (file)
--- a/libquadmath/ChangeLog
+++ b/libquadmath/ChangeLog
@@ -1,3 +1,12 @@
+2011-01-14  Tobias Burnus  <burnus@net-b.de>
+
+       PR fortran/47182
+       * configure.ac: Use ACX_BUGURL.
+       * libquadmath.texi: Include libquadmath-vers.texi for BUGURL.
+       * Makefile.am: Create libquadmath-vers.texi.
+       * configure.in: Regenerate.
+       * Makefile.in: Regenerate.
+
 2011-01-06  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
        PR fortran/47174

diff --git a/libquadmath/Makefile.am b/libquadmath/Makefile.am
index 83eb749..87ebf20 100644 (file)
--- a/libquadmath/Makefile.am
+++ b/libquadmath/Makefile.am
@@ -126,7 +126,7 @@ stamp-geninsrc: libquadmath.info
        cp -p $(top_builddir)/libquadmath.info $(srcdir)/libquadmath.info
        @touch $@
 
-stamp-build-info: libquadmath.texi
+stamp-build-info: libquadmath.texi $(libquadmath_TEXINFOS)
        $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) -o libquadmath.info $(srcdir)/libquadmath.texi
        @touch $@
 
@@ -150,3 +150,7 @@ TEXINFO_TEX   = ../gcc/doc/include/texinfo.tex
 # Defines info, dvi, pdf and html targets
 MAKEINFOFLAGS = -I $(srcdir)/../gcc/doc/include
 info_TEXINFOS = libquadmath.texi
+libquadmath_TEXINFOS = libquadmath-vers.texi
+
+libquadmath-vers.texi:
+       echo "@set BUGURL $(REPORT_BUGS_TEXI)" > $@

diff --git a/libquadmath/Makefile.in b/libquadmath/Makefile.in
index b2b64ad..49e6498 100644 (file)
--- a/libquadmath/Makefile.in
+++ b/libquadmath/Makefile.in
@@ -41,7 +41,7 @@ subdir = .
 DIST_COMMON = ChangeLog $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
        $(top_srcdir)/configure $(am__configure_deps) \
        $(srcdir)/config.h.in $(srcdir)/../mkinstalldirs \
-       $(srcdir)/../depcomp
+       $(srcdir)/../depcomp $(libquadmath_TEXINFOS)
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../config/acx.m4 \
        $(top_srcdir)/../config/depstand.m4 \
@@ -220,6 +220,8 @@ PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 RANLIB = @RANLIB@
+REPORT_BUGS_TEXI = @REPORT_BUGS_TEXI@
+REPORT_BUGS_TO = @REPORT_BUGS_TO@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
@@ -388,6 +390,7 @@ TEXINFO_TEX = ../gcc/doc/include/texinfo.tex
 # Defines info, dvi, pdf and html targets
 MAKEINFOFLAGS = -I $(srcdir)/../gcc/doc/include
 info_TEXINFOS = libquadmath.texi
+libquadmath_TEXINFOS = libquadmath-vers.texi
 all: config.h
        $(MAKE) $(AM_MAKEFLAGS) all-am
 
@@ -843,17 +846,17 @@ distclean-multi:
 maintainer-clean-multi:
        $(MULTICLEAN) $(AM_MAKEFLAGS) DO=maintainer-clean multi-clean # $(MAKE)
 
-libquadmath.dvi: libquadmath.texi  
+libquadmath.dvi: libquadmath.texi $(libquadmath_TEXINFOS) 
        TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
        MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir)' \
        $(TEXI2DVI) -o $@ `test -f 'libquadmath.texi' || echo '$(srcdir)/'`libquadmath.texi
 
-libquadmath.pdf: libquadmath.texi  
+libquadmath.pdf: libquadmath.texi $(libquadmath_TEXINFOS) 
        TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
        MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir)' \
        $(TEXI2PDF) -o $@ `test -f 'libquadmath.texi' || echo '$(srcdir)/'`libquadmath.texi
 
-libquadmath.html: libquadmath.texi  
+libquadmath.html: libquadmath.texi $(libquadmath_TEXINFOS) 
        rm -rf $(@:.html=.htp)
        if $(MAKEINFOHTML) $(AM_MAKEINFOHTMLFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) \
         -o $(@:.html=.htp) `test -f 'libquadmath.texi' || echo '$(srcdir)/'`libquadmath.texi; \
@@ -1270,7 +1273,7 @@ uninstall-am: uninstall-dvi-am uninstall-html-am uninstall-info-am \
 @BUILD_LIBQUADMATH_TRUE@       cp -p $(top_builddir)/libquadmath.info $(srcdir)/libquadmath.info
 @BUILD_LIBQUADMATH_TRUE@       @touch $@
 
-@BUILD_LIBQUADMATH_TRUE@stamp-build-info: libquadmath.texi
+@BUILD_LIBQUADMATH_TRUE@stamp-build-info: libquadmath.texi $(libquadmath_TEXINFOS)
 @BUILD_LIBQUADMATH_TRUE@       $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) -o libquadmath.info $(srcdir)/libquadmath.texi
 @BUILD_LIBQUADMATH_TRUE@       @touch $@
 
@@ -1278,6 +1281,9 @@ uninstall-am: uninstall-dvi-am uninstall-html-am uninstall-info-am \
 # does not wrongly interfere.
 libquadmath.info: $(STAMP_BUILD_INFO)
 
+libquadmath-vers.texi:
+       echo "@set BUGURL $(REPORT_BUGS_TEXI)" > $@
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:

diff --git a/libquadmath/configure b/libquadmath/configure
index 078b410..baed921 100755 (executable)
--- a/libquadmath/configure
+++ b/libquadmath/configure
@@ -655,6 +655,8 @@ LDFLAGS
 CFLAGS
 CC
 LIBTOOL
+REPORT_BUGS_TEXI
+REPORT_BUGS_TO
 BUILD_INFO_FALSE
 BUILD_INFO_TRUE
 am__untar
@@ -735,6 +737,7 @@ ac_subst_files=''
 ac_user_opts='
 enable_option_checking
 enable_version_specific_runtime_libs
+with_bugurl
 enable_shared
 enable_static
 with_pic
@@ -1396,6 +1399,7 @@ Optional Features:
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
+  --with-bugurl=URL       Direct users to URL to report a bug
   --with-pic              try to use only PIC/non-PIC objects [default=use
                           both]
   --with-gnu-ld           assume the C compiler uses GNU ld [default=no]
@@ -2853,6 +2857,35 @@ fi
 
 
 
+
+# Check whether --with-bugurl was given.
+if test "${with_bugurl+set}" = set; then :
+  withval=$with_bugurl; case "$withval" in
+      yes) as_fn_error "bug URL not specified" "$LINENO" 5 ;;
+      no)  BUGURL=
+          ;;
+      *)   BUGURL="$withval"
+          ;;
+     esac
+else
+  BUGURL="http://gcc.gnu.org/bugs.html"
+
+fi
+
+  case ${BUGURL} in
+  "")
+    REPORT_BUGS_TO=
+    REPORT_BUGS_TEXI=
+    ;;
+  *)
+    REPORT_BUGS_TO="<$BUGURL>"
+    REPORT_BUGS_TEXI=@uref{`echo "$BUGURL" | sed 's/@/@@/g'`}
+    ;;
+  esac;
+
+
+
+
 # Configure libtool
 case `pwd` in
   *\ * | *\    *)
@@ -10337,7 +10370,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10340 "configure"
+#line 10373 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -10443,7 +10476,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10446 "configure"
+#line 10479 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H

diff --git a/libquadmath/configure.ac b/libquadmath/configure.ac
index 568b36a..cae6abb 100644 (file)
--- a/libquadmath/configure.ac
+++ b/libquadmath/configure.ac
@@ -49,6 +49,7 @@ ACX_CHECK_PROG_VER([MAKEINFO], [makeinfo], [--version],
                    [4.[4-9]*|4.[1-9][0-9]*|[5-9]*|[1-9][0-9]*])
 AM_CONDITIONAL(BUILD_INFO, test $gcc_cv_prog_makeinfo_modern = "yes")
 
+ACX_BUGURL([http://gcc.gnu.org/bugs.html])
 
 # Configure libtool
 AM_PROG_LIBTOOL

diff --git a/libquadmath/libquadmath.texi b/libquadmath/libquadmath.texi
index ab8ed01..8818a37 100644 (file)
--- a/libquadmath/libquadmath.texi
+++ b/libquadmath/libquadmath.texi
@@ -272,6 +272,9 @@ int main ()
 @c Reporting Bugs
 @c ---------------------------------------------------------------------
 
+@c For BUGURL
+@include libquadmath-vers.texi
+
 @node Reporting Bugs
 @chapter Reporting Bugs