# HG changeset patch
# User Richard Strand <richard.strand@icomera.com>
# Date 1263332834 0
# Node ID 60b7ebc4709a514df74d1a3db46b75a1979751b0
# Parent  5f222264bb54d2c75f1efb09937dcdb5328bdd85
companion_tools/m4: Add m4 tool

Add version 1.4.13 of m4 as a companion tool

Signed-off-by: Richard Strand <richard.strand@icomera.com>

diff -r 5f222264bb54 -r 60b7ebc4709a config/companion_tools.in
--- a/config/companion_tools.in	Tue Jan 12 21:09:30 2010 +0100
+++ b/config/companion_tools.in	Tue Jan 12 21:47:14 2010 +0000
@@ -10,6 +10,7 @@
     prompt "Build some companion tools"
     help
       Crosstool-NG relies on some external tools to be recent enough, namely:
+        m4 >= 1.4.12
         autoconf >= 2.63
       
       If your system has older versions, we can build them for you,
@@ -17,6 +18,10 @@
 
 if COMP_TOOLS
 
+config COMP_TOOLS_m4
+    bool
+    prompt "m4"
+
 config COMP_TOOLS_autoconf
     bool
     prompt "autoconf"
diff -r 5f222264bb54 -r 60b7ebc4709a scripts/build/companion_tools/100-m4.sh
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/scripts/build/companion_tools/100-m4.sh	Tue Jan 12 21:47:14 2010 +0000
@@ -0,0 +1,27 @@
+# Build script for m4
+
+CT_M4_VERSION=1.4.13
+
+do_companion_tools_m4_get() {
+    CT_GetFile "m4-${CT_M4_VERSION}" \
+               {ftp,http}://ftp.gnu.org/gnu/m4
+}
+
+do_companion_tools_m4_extract() {
+    CT_Extract "m4-${CT_M4_VERSION}"
+    CT_Patch "m4-${CT_M4_VERSION}"
+}
+
+do_companion_tools_m4_build() {
+    CT_DoStep EXTRA "Installing m4"
+    mkdir -p "${CT_BUILD_DIR}/build-m4"
+    CT_Pushd "${CT_BUILD_DIR}/build-m4"
+    
+    CT_DoExecLog ALL \
+    "${CT_SRC_DIR}/m4-${CT_M4_VERSION}/configure" \
+        --prefix="${CT_TOOLS_OVERIDE_DIR}"
+    CT_DoExecLog ALL make
+    CT_DoExecLog ALL make install
+    CT_Popd
+    CT_EndStep
+}