[osx/ios] add m4 to depends

4 files changed, 43 insertions, 3 deletions

diff --git a/tools/darwin/depends/Makefile.in b/tools/darwin/depends/Makefile.in
index 7835edd66a..cb2d6db14a 100644
--- a/tools/darwin/depends/Makefile.in
+++ b/tools/darwin/depends/Makefile.in
@@ -1,6 +1,6 @@
 include Makefile.include
 
-BUILDTOOLS = gas-preprocessor help2man autoconf automake libtool pkg-config yasm cmake tar dpkg
+BUILDTOOLS = gas-preprocessor help2man m4 autoconf automake libtool pkg-config yasm cmake tar dpkg
 
 SUBDIRS := \
 	Backrow pcre expat gettext readline sqlite3 \
diff --git a/tools/darwin/depends/config.site_ios.in b/tools/darwin/depends/config.site_ios.in
index 67941691c6..0ae0df4711 100755
--- a/tools/darwin/depends/config.site_ios.in
+++ b/tools/darwin/depends/config.site_ios.in
@@ -21,10 +21,11 @@ export CXX=${platform_path}/usr/bin/g++-${platform_gcc_version}
 export CXXFLAGS="-m${platform_min_version} -isysroot ${platform_sdk_path} ${platform_os_cflags}"
 export AR=${platform_path}/usr/bin/ar
 export AS="@use_toolchain@/bin/gas-preprocessor.pl ${CC}"
+export M4=@use_toolchain@/bin/m4
 export CCAS="--tag CC @use_toolchain@/bin/gas-preprocessor.pl ${CC}"
 export STRIP=${platform_path}/usr/bin/strip
 export RANLIB=${platform_path}/usr/bin/ranlib
-export ACLOCAL="aclocal -I ${prefix}/share/aclocal -I @use_toolchain@/share/aclocal -I /Developer/usr/share/aclocal"
+export ACLOCAL="@use_toolchain@/bin/aclocal -I ${prefix}/share/aclocal -I @use_toolchain@/share/aclocal -I /Developer/usr/share/aclocal"
 export LIBTOOL=@use_toolchain@/bin/glibtool
 export LIBTOOLIZE=@use_toolchain@/bin/glibtoolize
 export PKG_CONFIG_PATH=${prefix}/lib/pkgconfig:${platform_sdk_path}/usr/lib/pkgconfig
diff --git a/tools/darwin/depends/config.site_osx.in b/tools/darwin/depends/config.site_osx.in
index b25a31c02f..2390dbdd40 100644
--- a/tools/darwin/depends/config.site_osx.in
+++ b/tools/darwin/depends/config.site_osx.in
@@ -31,9 +31,10 @@ export CXX=/usr/bin/g++-${platform_gcc_version}
 export CXXFLAGS="-m${platform_min_version} -isysroot ${platform_sdk_path} ${platform_os_cflags}"
 export AR=${platform_path}/usr/bin/ar
 export AS=${platform_path}/usr/bin/as
+export M4=@use_toolchain@/bin/m4
 export STRIP=${platform_path}/usr/bin/strip
 export RANLIB=${platform_path}/usr/bin/ranlib
-export ACLOCAL="aclocal -I ${prefix}/share/aclocal -I @use_toolchain@/share/aclocal -I /Developer/usr/share/aclocal"
+export ACLOCAL="@use_toolchain@/aclocal -I ${prefix}/share/aclocal -I @use_toolchain@/share/aclocal -I /Developer/usr/share/aclocal"
 export LIBTOOL=@use_toolchain@/bin/glibtool
 export LIBTOOLIZE=@use_toolchain@/bin/glibtoolize
 export PKG_CONFIG_PATH=${prefix}/lib/pkgconfig:${platform_sdk_path}/usr/lib/pkgconfig
diff --git a/tools/darwin/depends/m4/Makefile b/tools/darwin/depends/m4/Makefile
new file mode 100644
index 0000000000..c8ecf1a1bc
--- /dev/null
+++ b/tools/darwin/depends/m4/Makefile
@@ -0,0 +1,38 @@
+include ../Makefile.include
+
+# lib name, version
+APPNAME=m4
+VERSION=1.4.9
+SOURCE=$(APPNAME)-$(VERSION)
+ARCHIVE=$(SOURCE).tar.gz
+
+# configuration settings
+export PATH:=$(TOOLCHAIN)/bin:$(PATH)
+CONFIGURE=./configure --prefix=$(TOOLCHAIN)
+
+APP=$(SOURCE)/bin/$(APPNAME)
+APPBIN=$(TOOLCHAIN)/bin/$(APPNAME)
+
+all: $(APPBIN)
+
+$(TARBALLS_LOCATION)/$(ARCHIVE):
+	$(RETRIEVE_TOOL) $(RETRIEVE_TOOL_FLAGS) $(BASE_URL)/$(ARCHIVE)
+
+$(SOURCE): $(TARBALLS_LOCATION)/$(ARCHIVE)
+	rm -rf $(SOURCE)
+	$(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE)
+	echo $(SOURCE) > .gitignore
+	cd $(SOURCE); $(CONFIGURE)
+
+$(APP): $(SOURCE)
+	make -j $(MAKE_JOBS) -C $(SOURCE)
+
+$(APPBIN):
+	make $(APP)
+	make -C $(SOURCE) install
+
+clean:
+	make -C $(SOURCE) clean
+
+distclean::
+	rm -rf $(SOURCE)