1.1 --- a/config/companion_tools.in	Tue Jan 12 21:09:30 2010 +0100
     1.2 +++ b/config/companion_tools.in	Tue Jan 12 21:47:14 2010 +0000
     1.3 @@ -10,6 +10,7 @@
     1.4      prompt "Build some companion tools"
     1.5      help
     1.6        Crosstool-NG relies on some external tools to be recent enough, namely:
     1.7 +        m4 >= 1.4.12
     1.8          autoconf >= 2.63
     1.9        
    1.10        If your system has older versions, we can build them for you,
    1.11 @@ -17,6 +18,10 @@
    1.12  
    1.13  if COMP_TOOLS
    1.14  
    1.15 +config COMP_TOOLS_m4
    1.16 +    bool
    1.17 +    prompt "m4"
    1.18 +
    1.19  config COMP_TOOLS_autoconf
    1.20      bool
    1.21      prompt "autoconf"

     2.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.2 +++ b/scripts/build/companion_tools/100-m4.sh	Tue Jan 12 21:47:14 2010 +0000
     2.3 @@ -0,0 +1,27 @@
     2.4 +# Build script for m4
     2.5 +
     2.6 +CT_M4_VERSION=1.4.13
     2.7 +
     2.8 +do_companion_tools_m4_get() {
     2.9 +    CT_GetFile "m4-${CT_M4_VERSION}" \
    2.10 +               {ftp,http}://ftp.gnu.org/gnu/m4
    2.11 +}
    2.12 +
    2.13 +do_companion_tools_m4_extract() {
    2.14 +    CT_Extract "m4-${CT_M4_VERSION}"
    2.15 +    CT_Patch "m4-${CT_M4_VERSION}"
    2.16 +}
    2.17 +
    2.18 +do_companion_tools_m4_build() {
    2.19 +    CT_DoStep EXTRA "Installing m4"
    2.20 +    mkdir -p "${CT_BUILD_DIR}/build-m4"
    2.21 +    CT_Pushd "${CT_BUILD_DIR}/build-m4"
    2.22 +    
    2.23 +    CT_DoExecLog ALL \
    2.24 +    "${CT_SRC_DIR}/m4-${CT_M4_VERSION}/configure" \
    2.25 +        --prefix="${CT_TOOLS_OVERIDE_DIR}"
    2.26 +    CT_DoExecLog ALL make
    2.27 +    CT_DoExecLog ALL make install
    2.28 +    CT_Popd
    2.29 +    CT_EndStep
    2.30 +}