X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=configure.ac;h=da88113f0684296c2ab6801e11c6de178510eaac;hb=694dd537b964f0a5869c9519f3968a6eddea827a;hp=b0df6e7a156bee4036c8901ab7562475a9745582;hpb=1c710c3ca66e758aa6570ecbd58de4dc92cf7329;p=gcc.git diff --git a/configure.ac b/configure.ac index b0df6e7a156..da88113f068 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, +# 2001, 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc. # # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -85,14 +85,25 @@ progname=$0 # if PWD already has a value, it is probably wrong. if test -n "$PWD" ; then PWD=`${PWDCMD-pwd}`; fi -# Export original configure arguments for use by sub-configures. These -# will be expanded by make, so quote '$'. -tmp="$progname $@" -sed -e 's,\$,$$,g' < conftestsed.out -$tmp -EOF_SED -TOPLEVEL_CONFIGURE_ARGUMENTS=`cat conftestsed.out` -rm -f conftestsed.out +# Export original configure arguments for use by sub-configures. +# Quote arguments with shell meta charatcers. +TOPLEVEL_CONFIGURE_ARGUMENTS= +set -- "$progname" "$@" +for ac_arg +do + case "$ac_arg" in + *" "*|*" "*|*[[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\']]*) + ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` + # if the argument is of the form -foo=baz, quote the baz part only + ac_arg=`echo "'$ac_arg'" | sed "s/^'\([[-a-zA-Z0-9]]*=\)/\\1'/"` ;; + *) ;; + esac + # Add the quoted argument to the list. + TOPLEVEL_CONFIGURE_ARGUMENTS="$TOPLEVEL_CONFIGURE_ARGUMENTS $ac_arg" +done +# Remove the initial space we just introduced and, as these will be +# expanded by make, quote '$'. +TOPLEVEL_CONFIGURE_ARGUMENTS=`echo "x$TOPLEVEL_CONFIGURE_ARGUMENTS" | sed -e 's/^x *//' -e 's,\\$,$$,g'` AC_SUBST(TOPLEVEL_CONFIGURE_ARGUMENTS) moveifchange=${srcdir}/move-if-change @@ -158,8 +169,8 @@ libgcj="target-libffi \ # these libraries are built for the target environment, and are built after # the host libraries and the host tools (which may be a cross compiler) # -target_libraries="target-libiberty \ - target-libgcc \ +target_libraries="target-libgcc \ + target-libiberty \ target-libgloss \ target-newlib \ target-libstdc++-v3 \ @@ -321,7 +332,7 @@ esac AC_ARG_ENABLE(libada, -[ --enable-libada Builds libada directory], +[ --enable-libada build libada directory], ENABLE_LIBADA=$enableval, ENABLE_LIBADA=yes) if test "${ENABLE_LIBADA}" != "yes" ; then @@ -329,7 +340,7 @@ if test "${ENABLE_LIBADA}" != "yes" ; then fi AC_ARG_ENABLE(libssp, -[ --enable-libssp Builds libssp directory], +[ --enable-libssp build libssp directory], ENABLE_LIBSSP=$enableval, ENABLE_LIBSSP=yes) @@ -353,7 +364,7 @@ esac # Disable libmudflap on some systems. if test x$enable_libmudflap = x ; then case "${target}" in - *-*-linux* | *-*-gnu* | *-*-k*bsd*-gnu) + *-*-linux* | *-*-gnu* | *-*-k*bsd*-gnu | bfin*-*-uclinux*) # Enable libmudflap by default in GNU and friends. ;; *-*-freebsd*) @@ -505,6 +516,9 @@ case "${target}" in arm*-*-linux-gnueabi) noconfigdirs="$noconfigdirs target-libffi target-qthreads" noconfigdirs="$noconfigdirs target-libjava target-libobjc" + case ${with_newlib} in + no) noconfigdirs="$noconfigdirs target-newlib target-libgloss" + esac ;; arm*-*-symbianelf*) noconfigdirs="$noconfigdirs ${libgcj} target-libiberty" @@ -1030,49 +1044,31 @@ if test -z "${CC}" && test "${build}" = "${host}" ; then fi if test "${build}" != "${host}" ; then - # If we are doing a Canadian Cross, in which the host and build systems - # are not the same, we set reasonable default values for the tools. - - CC=${CC-${host_noncanonical}-gcc} - CFLAGS=${CFLAGS-"-g -O2"} - CXX=${CXX-${host_noncanonical}-c++} - CXXFLAGS=${CXXFLAGS-"-g -O2"} CC_FOR_BUILD=${CC_FOR_BUILD-gcc} - else - # Set reasonable default values for some tools even if not Canadian. - # Of course, these are different reasonable default values, originally - # specified directly in the Makefile. - # We don't export, so that autoconf can do its job. - # Note that all these settings are above the fragment inclusion point - # in Makefile.in, so can still be overridden by fragments. - # This is all going to change when we autoconfiscate... - CC_FOR_BUILD="\$(CC)" - AC_PROG_CC - - # We must set the default linker to the linker used by gcc for the correct - # operation of libtool. If LD is not defined and we are using gcc, try to - # set the LD default to the ld used by gcc. - if test -z "$LD"; then - if test "$GCC" = yes; then - case $build in - *-*-mingw*) - gcc_prog_ld=`$CC -print-prog-name=ld 2>&1 | tr -d '\015'` ;; - *) - gcc_prog_ld=`$CC -print-prog-name=ld 2>&1` ;; - esac - case $gcc_prog_ld in - # Accept absolute paths. - [[\\/]* | [A-Za-z]:[\\/]*)] - LD="$gcc_prog_ld" ;; - esac - fi - fi +fi - CXX=${CXX-"c++"} - CFLAGS=${CFLAGS-"-g"} - CXXFLAGS=${CXXFLAGS-"-g -O2"} +AC_PROG_CC +AC_PROG_CXX + +# We must set the default linker to the linker used by gcc for the correct +# operation of libtool. If LD is not defined and we are using gcc, try to +# set the LD default to the ld used by gcc. +if test -z "$LD"; then + if test "$GCC" = yes; then + case $build in + *-*-mingw*) + gcc_prog_ld=`$CC -print-prog-name=ld 2>&1 | tr -d '\015'` ;; + *) + gcc_prog_ld=`$CC -print-prog-name=ld 2>&1` ;; + esac + case $gcc_prog_ld in + # Accept absolute paths. + [[\\/]* | [A-Za-z]:[\\/]*)] + LD="$gcc_prog_ld" ;; + esac + fi fi ACX_PROG_GNAT @@ -1085,16 +1081,16 @@ have_gmp=no # Specify a location for mpfr # check for this first so it ends up on the link line before gmp. -AC_ARG_WITH(mpfr-dir, [ --with-mpfr-dir=PATH This option has been REMOVED], +AC_ARG_WITH(mpfr-dir, [ --with-mpfr-dir=PATH this option has been REMOVED], AC_MSG_ERROR([The --with-mpfr-dir=PATH option has been removed. Use --with-mpfr=PATH or --with-mpfr-include=PATH plus --with-mpfr-lib=PATH])) -AC_ARG_WITH(mpfr, [ --with-mpfr=PATH Specify prefix directory for installed MPFR package +AC_ARG_WITH(mpfr, [ --with-mpfr=PATH specify prefix directory for installed MPFR package. Equivalent to --with-mpfr-include=PATH/include plus --with-mpfr-lib=PATH/lib]) AC_ARG_WITH(mpfr_include, [ --with-mpfr-include=PATH - Specify directory for installed MPFR include files]) -AC_ARG_WITH(mpfr_lib, [ --with-mpfr-lib=PATH Specify the directory for the installed MPFR library]) + specify directory for installed MPFR include files]) +AC_ARG_WITH(mpfr_lib, [ --with-mpfr-lib=PATH specify directory for the installed MPFR library]) if test "x$with_mpfr" != x; then gmplibs="-L$with_mpfr/lib $gmplibs" @@ -1117,15 +1113,15 @@ if test "x$with_mpfr$with_mpfr_include$with_mpfr_lib" = x && test -d ${srcdir}/m fi # Specify a location for gmp -AC_ARG_WITH(gmp-dir, [ --with-gmp-dir=PATH This option has been REMOVED], +AC_ARG_WITH(gmp-dir, [ --with-gmp-dir=PATH this option has been REMOVED], AC_MSG_ERROR([The --with-gmp-dir=PATH option has been removed. Use --with-gmp=PATH or --with-gmp-include=PATH plus --with-gmp-lib=PATH])) -AC_ARG_WITH(gmp, [ --with-gmp=PATH Specify prefix directory for the installed GMP package +AC_ARG_WITH(gmp, [ --with-gmp=PATH specify prefix directory for the installed GMP package. Equivalent to --with-gmp-include=PATH/include plus --with-gmp-lib=PATH/lib]) -AC_ARG_WITH(gmp_include, [ --with-gmp-include=PATH Specify directory for installed GMP include files]) -AC_ARG_WITH(gmp_lib, [ --with-gmp-lib=PATH Specify the directory for the installed GMP library]) +AC_ARG_WITH(gmp_include, [ --with-gmp-include=PATH specify directory for installed GMP include files]) +AC_ARG_WITH(gmp_lib, [ --with-gmp-lib=PATH specify directory for the installed GMP library]) if test "x$with_gmp" != x; then @@ -1170,9 +1166,11 @@ if test -d ${srcdir}/gcc && test "x$have_gmp" = xno; then #if MPFR_VERSION < MPFR_VERSION_NUM(2,2,0) choke me #endif - mpfr_t n; mpfr_init(n); - mpfr_t x; mpfr_init(x); + mpfr_t n; + mpfr_t x; int t; + mpfr_init (n); + mpfr_init (x); mpfr_atan2 (n, n, x, GMP_RNDN); mpfr_erfc (n, x, GMP_RNDN); mpfr_subnormalize (x, t, GMP_RNDN); @@ -1367,7 +1365,7 @@ if test -d ${srcdir}/gcc; then done AC_ARG_ENABLE(stage1-languages, -[ --enable-stage1-languages[=all] choose additional languages to build during +[ --enable-stage1-languages@<:@=all@:>@ choose additional languages to build during stage1. Mostly useful for compiler development.], [case ,${enable_stage1_languages}, in ,no,|,,) @@ -1415,7 +1413,7 @@ Supported languages are: ${potential_languages}]) fi AC_SUBST(stage1_languages) - ac_configure_args=`echo " $ac_configure_args" | sed -e 's/ --enable-languages=[[^ ]]*//' -e 's/$/ --enable-languages='"$enable_languages"/ ` + ac_configure_args=`echo " $ac_configure_args" | sed -e "s/ '--enable-languages=[[^ ]]*'//g" -e "s/$/ '--enable-languages="$enable_languages"'/" ` fi # Handle --disable- generically. @@ -1428,8 +1426,8 @@ done # Check for Boehm's garbage collector AC_ARG_ENABLE(objc-gc, -[ --enable-objc-gc enable the use of Boehm's garbage collector with - the GNU Objective-C runtime.], +[ --enable-objc-gc enable use of Boehm's garbage collector with the + GNU Objective-C runtime], [case ,${enable_languages},:${enable_objc_gc}:${noconfigdirs} in *,objc,*:*:yes:*target-boehm-gc*) AC_MSG_ERROR([Boehm's garbage collector was requested yet not supported in this configuration]) @@ -1578,10 +1576,13 @@ case "$host" in enable_gdbtk=no ;; esac +# To find our prefix, in gcc_cv_tool_prefix. +ACX_TOOL_DIRS + copy_dirs= AC_ARG_WITH([build-sysroot], - [ --with-build-sysroot=sysroot + [ --with-build-sysroot=SYSROOT use sysroot as the system root during the build], [if test x"$withval" != x ; then SYSROOT_CFLAGS_FOR_TARGET="--sysroot=$withval" @@ -1597,10 +1598,7 @@ if test x"${with_headers}" != x && test x"${with_headers}" != xno ; then exit 1 fi if test x"${with_headers}" != xyes ; then - case "${exec_prefixoption}" in - "") x=${prefix} ;; - *) x=${exec_prefix} ;; - esac + x=${gcc_cv_tool_prefix} copy_dirs="${copy_dirs} ${with_headers} $x/${target_noncanonical}/sys-include" fi fi @@ -1616,10 +1614,7 @@ if test x"${with_libs}" != x && test x"${with_libs}" != xno ; then if test x"${with_libs}" != xyes ; then # Copy the libraries in reverse order, so that files in the first named # library override files in subsequent libraries. - case "${exec_prefixoption}" in - "") x=${prefix} ;; - *) x=${exec_prefix} ;; - esac + x=${gcc_cv_tool_prefix} for l in ${with_libs}; do copy_dirs="$l $x/${target_noncanonical}/lib ${copy_dirs}" done @@ -1698,10 +1693,10 @@ case "${target}" in alpha*-*-*vms*) md_exec_prefix=/gnu/lib/gcc-lib ;; - i[34567]86-pc-msdosdjgpp*) + i[[34567]]86-pc-msdosdjgpp*) md_exec_prefix=/dev/env/DJDIR/bin ;; - i[34567]86-*-sco3.2v5*) + i[[34567]]86-*-sco3.2v5*) if test $with_gnu_as = yes; then md_exec_prefix=/usr/gnu/bin else @@ -1732,7 +1727,7 @@ case "${target}" in *-*-nto-qnx* | \ *-*-rtems* | \ *-*-solaris2* | \ - *-*-sysv[45]* | \ + *-*-sysv[[45]]* | \ *-*-vxworks* | \ *-wrs-windiss) md_exec_prefix=/usr/ccs/bin @@ -1744,6 +1739,9 @@ extra_nmflags_for_target= extra_ranlibflags_for_target= target_makefile_frag=/dev/null case "${target}" in + mep*-*-*) + target_makefile_frag="config/mt-mep" + ;; spu-*-*) target_makefile_frag="config/mt-spu" ;; @@ -1943,7 +1941,7 @@ INSTALL_GDB_TK=`echo ${GDB_TK} | sed s/-all-/-install-/g` # not to nest @if/@endif pairs, because configure will not warn you at all. AC_ARG_ENABLE([bootstrap], -[ --enable-bootstrap Enable bootstrapping [yes if native build]],, +[ --enable-bootstrap enable bootstrapping @<:@yes if native build@:>@],, enable_bootstrap=default) # Issue errors and warnings for invalid/strange bootstrap combinations. @@ -2037,10 +2035,10 @@ extrasub="$extrasub # Create the serialization dependencies. This uses a temporary file. AC_ARG_ENABLE([serial-configure], -[ --enable-serial-[{host,target,build}-]configure - Force sequential configuration of +[ --enable-serial-@<:@{host,target,build}-@:>@configure + force sequential configuration of sub-packages for the host, target or build - machine, or all sub-packages]) + machine, or all sub-packages]) case ${enable_serial_configure} in yes) @@ -2093,7 +2091,8 @@ baseargs= keep_next=no skip_next=no eval "set -- $ac_configure_args" -for ac_arg; do +for ac_arg +do if test X"$skip_next" = X"yes"; then skip_next=no continue @@ -2322,6 +2321,9 @@ case "${target}" in FLAGS_FOR_TARGET=$FLAGS_FOR_TARGET' -L$$r/$(TARGET_SUBDIR)/libgloss/libnosys' fi ;; + mep*) + FLAGS_FOR_TARGET="$FLAGS_FOR_TARGET -mlibrary" + ;; esac # Makefile fragments. @@ -2437,6 +2439,7 @@ NCN_STRICT_CHECK_TOOLS(NM, nm) NCN_STRICT_CHECK_TOOLS(RANLIB, ranlib, :) NCN_STRICT_CHECK_TOOLS(STRIP, strip, :) NCN_STRICT_CHECK_TOOLS(WINDRES, windres) +NCN_STRICT_CHECK_TOOLS(WINDMC, windmc) NCN_STRICT_CHECK_TOOLS(OBJCOPY, objcopy) NCN_STRICT_CHECK_TOOLS(OBJDUMP, objdump) AC_SUBST(CC) @@ -2447,7 +2450,7 @@ AC_SUBST(CXXFLAGS) # Target tools. AC_ARG_WITH([build-time-tools], - [ --with-build-time-tools=path + [ --with-build-time-tools=PATH use given path to find target tools during the build], [case x"$withval" in x/*) ;; @@ -2474,6 +2477,7 @@ ACX_CHECK_INSTALLED_TARGET_TOOL(OBJDUMP_FOR_TARGET, objdump) ACX_CHECK_INSTALLED_TARGET_TOOL(RANLIB_FOR_TARGET, ranlib, :) ACX_CHECK_INSTALLED_TARGET_TOOL(STRIP_FOR_TARGET, strip) ACX_CHECK_INSTALLED_TARGET_TOOL(WINDRES_FOR_TARGET, windres) +ACX_CHECK_INSTALLED_TARGET_TOOL(WINDMC_FOR_TARGET, windmc) RAW_CXX_FOR_TARGET="$CXX_FOR_TARGET" @@ -2499,6 +2503,7 @@ GCC_TARGET_TOOL(objdump, OBJDUMP_FOR_TARGET, OBJDUMP, [binutils/objdump]) GCC_TARGET_TOOL(ranlib, RANLIB_FOR_TARGET, RANLIB, [binutils/ranlib]) GCC_TARGET_TOOL(strip, STRIP_FOR_TARGET, STRIP, [binutils/strip]) GCC_TARGET_TOOL(windres, WINDRES_FOR_TARGET, WINDRES, [binutils/windres]) +GCC_TARGET_TOOL(windmc, WINDMC_FOR_TARGET, WINDMC, [binutils/windmc]) AC_SUBST(FLAGS_FOR_TARGET) AC_SUBST(RAW_CXX_FOR_TARGET) @@ -2567,7 +2572,13 @@ if test "$GCC" = yes; then # Pass -fkeep-inline-functions for stage 1 if the GCC version supports it. CFLAGS="$CFLAGS -fkeep-inline-functions" AC_MSG_CHECKING([whether -fkeep-inline-functions is supported]) - AC_TRY_COMPILE(,, + AC_TRY_COMPILE([ +#if (__GNUC__ < 3) \ + || (__GNUC__ == 3 && (__GNUC_MINOR__ < 3 \ + || (__GNUC_MINOR__ == 3 && __GNUC_PATCHLEVEL__ < 1))) +#error http://gcc.gnu.org/PR29382 +#endif + ],, [AC_MSG_RESULT([yes]); stage1_cflags="$stage1_cflags -fkeep-inline-functions"], [AC_MSG_RESULT([no])]) @@ -2578,8 +2589,8 @@ AC_SUBST(stage1_cflags) # Enable --enable-checking in stage1 of the compiler. AC_ARG_ENABLE(stage1-checking, -[ --enable-stage1-checking[=all] choose additional checking for stage1 - of the compiler.], +[ --enable-stage1-checking@<:@=all@:>@ choose additional checking for stage1 + of the compiler], [stage1_checking=--enable-checking=${enable_stage1_checking}], [if test "x$enable_checking" = xno; then stage1_checking=--enable-checking @@ -2604,22 +2615,28 @@ 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.], +[ --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.], +[ --with-docdir install documentation in this directory.], [docdir="\${prefix}/${withval}"], [docdir="\${datarootdir}/doc"]) +AC_ARG_WITH(pdfdir, +[ --with-pdfdir install pdf in this directory.], +[pdfdir="\${prefix}/${withval}"], +[pdfdir="\${docdir}"]) + AC_ARG_WITH(htmldir, -[ --with-htmldir Install html in this directory.], +[ --with-htmldir install html in this directory.], [htmldir="\${prefix}/${withval}"], [htmldir="\${docdir}"]) AC_SUBST(datarootdir) AC_SUBST(docdir) +AC_SUBST(pdfdir) AC_SUBST(htmldir) AC_OUTPUT(Makefile)