diff options
| author | cvs2svn <> | 2006-04-12 22:41:46 +0400 |
|---|---|---|
| committer | cvs2svn <> | 2006-04-12 22:41:46 +0400 |
| commit | 3e58882d0d67546b5652f410197fd1160e250254 (patch) | |
| tree | 5134d327cb64a57d81bdbbd45d04b27eb7bb837f /configure.in | |
| parent | 47fe9f993c5ca9464f023b749c933368e74ac4e8 (diff) | |
This commit was manufactured by cvs2svn to create branch 'binutils-binutils-2_17-branchpoint
2_17-branch'.
Sprout from msnyder-reverse-20060331-branch 2006-03-28 07:19:17 UTC cvs2svn 'This commit was manufactured by cvs2svn to create branch 'msnyder-'
Cherrypick from master 2006-04-12 18:41:45 UTC DJ Delorie <dj@redhat.com> 'merge from gcc':
ChangeLog
Makefile.def
Makefile.in
Makefile.tpl
configure
configure.in
etc/ChangeLog
etc/Makefile.in
etc/configure
etc/configure.in
etc/configure.texi
include/ChangeLog
include/bfdlink.h
include/libiberty.h
include/opcode/ChangeLog
include/opcode/avr.h
Delete:
djunpack.bat
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 24 |
1 files changed, 22 insertions, 2 deletions
diff --git a/configure.in b/configure.in index da7c63f4f..b6ef515e0 100644 --- a/configure.in +++ b/configure.in @@ -2203,10 +2203,10 @@ case " $build_configdirs " in *" texinfo "*) MAKEINFO='$$r/$(BUILD_SUBDIR)/texinfo/makeinfo/makeinfo' ;; *) changequote(,) - # For an installed makeinfo, we require it to be from texinfo 4.2 or + # For an installed makeinfo, we require it to be from texinfo 4.4 or # higher, else we use the "missing" dummy. if ${MAKEINFO} --version \ - | egrep 'texinfo[^0-9]*([1-3][0-9]|4\.[2-9]|[5-9])' >/dev/null 2>&1; then + | egrep 'texinfo[^0-9]*([1-3][0-9]|4\.[4-9]|[5-9])' >/dev/null 2>&1; then : else MAKEINFO="$MISSING makeinfo" @@ -2384,4 +2384,24 @@ case ${enable_werror} in esac AC_SUBST(stage2_werror_flag) +# Flags needed to enable html installing and building +AC_ARG_WITH(datarootdir, +[ --with-datarootdir Use datarootdir as the data root directory.], +[datarootdir="\${prefix}/${withval}"], +[datarootdir="\${prefix}/share"]) + +AC_ARG_WITH(docdir, +[ --with-docdir Install documentation in this directory.], +[docdir="\${prefix}/${withval}"], +[docdir="\${datarootdir}/doc"]) + +AC_ARG_WITH(htmldir, +[ --with-htmldir Install html in this directory.], +[htmldir="\${prefix}/${withval}"], +[htmldir="\${docdir}"]) + +AC_SUBST(datarootdir) +AC_SUBST(docdir) +AC_SUBST(htmldir) + AC_OUTPUT(Makefile) |