X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=ld%2Fconfigure.in;h=01b802eeaeea7b63850795067480a8a91239ed7a;hb=feb129926a8d12656f1ca4b7a8bb10268d3af4fb;hp=6d5d8960778ea0aea1b61bf0a87871d77d17a6d1;hpb=49c009b56f4633058ff247ec765b3fff85dacec1;p=deliverable%2Fbinutils-gdb.git diff --git a/ld/configure.in b/ld/configure.in index 6d5d896077..01b802eeae 100644 --- a/ld/configure.in +++ b/ld/configure.in @@ -1,11 +1,11 @@ dnl Process this file with autoconf to produce a configure script dnl -AC_PREREG(2.5) +AC_PREREG(2.13) AC_INIT(ldmain.c) AC_CANONICAL_SYSTEM -AM_INIT_AUTOMAKE(ld, 2.8.2) +AM_INIT_AUTOMAKE(ld, 2.9.5) AM_PROG_LIBTOOL @@ -37,13 +37,15 @@ fi # host-specific stuff: AC_PROG_CC -AM_PROG_INSTALL -AM_CYGWIN32 -AM_EXEEXT +AC_PROG_INSTALL + +ALL_LINGUAS= +CY_GNU_GETTEXT + +AC_EXEEXT AC_PROG_YACC -AC_PROG_LEX -AC_DECL_YYTEXT +AM_PROG_LEX AM_MAINTAINER_MODE @@ -64,13 +66,21 @@ BFD_NEED_DECLARATION(strstr) BFD_NEED_DECLARATION(free) BFD_NEED_DECLARATION(sbrk) BFD_NEED_DECLARATION(getenv) +BFD_NEED_DECLARATION(environ) # target-specific stuff: all_targets= EMUL= all_emuls= -TDIRS= +all_emul_extras= +all_libpath= + +dnl We need to get an arbitrary number of tdir definitions into +dnl Makefile. We can't do it using AC_SUBST, because autoconf does +dnl not permit literal newlines in an AC_SUBST variables. So we use a +dnl file. +rm -f tdirs for targ_alias in `echo $target_alias $enable_targets | sed 's/,/ /g'` do @@ -91,15 +101,36 @@ do EMUL=$targ_emul fi - for i in $targ_emul $targ_extra_emuls; do + for i in $targ_emul $targ_extra_emuls $targ_extra_libpath; do case " $all_emuls " in *" e${i}.o "*) ;; *) all_emuls="$all_emuls e${i}.o" eval result=\$tdir_$i test -z "$result" && result=$targ_alias - TDIRS="$TDIRS\\ -tdir_$i=$result" + echo tdir_$i=$result >> tdirs + ;; + esac + done + + for i in $targ_emul $targ_extra_libpath; do + case " $all_libpath " in + *" ${i} "*) ;; + *) + if test -z "$all_libpath"; then + all_libpath=${i} + else + all_libpath="$all_libpath ${i}" + fi + ;; + esac + done + + for i in $targ_extra_ofiles; do + case " $all_emul_extras " in + *" ${i} "*) ;; + *) + all_emul_extras="$all_emul_extras ${i}" ;; esac done @@ -107,7 +138,9 @@ tdir_$i=$result" done AC_SUBST(EMUL) -AC_SUBST(TDIRS) + +TDIRS=tdirs +AC_SUBST_FILE(TDIRS) dnl FIXME: We will build a 64 bit BFD for a 64 bit host or a 64 bit dnl target, and in those cases we should also build the 64 bit @@ -118,9 +151,23 @@ if test x${all_targets} = xtrue; then else EMULATION_OFILES='$(ALL_EMULATIONS)' fi + EMUL_EXTRA_OFILES='$(ALL_EMUL_EXTRA_OFILES)' else EMULATION_OFILES=$all_emuls + EMUL_EXTRA_OFILES=$all_emul_extras fi AC_SUBST(EMULATION_OFILES) +AC_SUBST(EMUL_EXTRA_OFILES) + +EMULATION_LIBPATH=$all_libpath +AC_SUBST(EMULATION_LIBPATH) + +if test x${enable_static} = xno; then + TESTBFDLIB="--rpath ../bfd/.libs ../bfd/.libs/libbfd.so" +else + TESTBFDLIB="../bfd/.libs/libbfd.a" +fi +AC_SUBST(TESTBFDLIB) -AC_OUTPUT(Makefile) +AC_OUTPUT(Makefile po/Makefile.in:po/Make-in, +[sed -e '/POTFILES =/r po/POTFILES' po/Makefile.in > po/Makefile])