diff options
| author | Carlos O'Donell <carlos@codesourcery.com> | 2006-06-06 19:01:18 +0000 |
|---|---|---|
| committer | Carlos O'Donell <carlos@gcc.gnu.org> | 2006-06-06 19:01:18 +0000 |
| commit | 32845532e0af2d0aba90b5218feb2fdc47240bc6 (patch) | |
| tree | b7ee0197d3c12dac9d5a85fb2b53a95883ea2c6f /configure.in | |
| parent | 7c78582a317a745aea2eba87463281b80b2edb31 (diff) | |
| download | gcc-32845532e0af2d0aba90b5218feb2fdc47240bc6.zip gcc-32845532e0af2d0aba90b5218feb2fdc47240bc6.tar.gz gcc-32845532e0af2d0aba90b5218feb2fdc47240bc6.tar.bz2 | |
[multiple changes]
2006-06-06 Carlos O'Donell <carlos@codesourcery.com>
Sync from src:
* configure.in: Sync.
* configure: Regenerated.
2006-05-31 Daniel Jacobowitz <dan@codesourcery.com>
* Makefile.def: Added dependencies from sim and gdb on intl, and
added configure dependencies to everything with an all dependency
on intl.
* Makefile.in: Regenerated.
From-SVN: r114444
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/configure.in b/configure.in index 77bbb6b..a148d8f 100644 --- a/configure.in +++ b/configure.in @@ -1068,26 +1068,6 @@ fi ACX_PROG_GNAT ACX_PROG_CMP_IGNORE_INITIAL -# Check for html and install-html -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) - # Check for GMP and MPFR gmplibs= gmpinc= @@ -2433,4 +2413,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) |