Merge pull request #963 from kebby/master

[mono.git] / autogen.sh

diff --git a/autogen.sh b/autogen.sh
index 5d578c0605df5a5de5a51e3b4dc3ef9d4881261e..a576ed6672afab5a9697e610ce8b6a9e0265b208 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 # Run this to generate all the initial makefiles, etc.
 # Ripped off from GNOME macros version
 
@@ -102,8 +102,33 @@ if grep "^AM_PROG_LIBTOOL" configure.in >/dev/null; then
   fi
 fi
 
+
+#
+# Plug in the extension module
+#
+has_ext_mod=false
+ext_mod_args=''
+for PARAM; do
+    if [[ $PARAM =~ "--enable-extension-module" ]] ; then
+        has_ext_mod=true
+        if [[ $PARAM =~ "=" ]] ; then
+            ext_mod_args=`echo $PARAM | cut -d= -f2`
+        fi
+    fi
+done
+
+if test x$has_ext_mod = xtrue; then
+       pushd ../mono-extensions/scripts
+       sh ./prepare-repo.sh $ext_mod_args || exit 1
+       popd
+else
+       cat mono/mini/Makefile.am.in > mono/mini/Makefile.am
+       cat mono/metadata/Makefile.am.in > mono/metadata/Makefile.am
+fi
+
+
 echo "Running aclocal -I m4 -I . $ACLOCAL_FLAGS ..."
-aclocal -I m4 -I . $ACLOCAL_FLAGS || {
+aclocal -Wnone -I m4 -I . $ACLOCAL_FLAGS || {
   echo
   echo "**Error**: aclocal failed. This may mean that you have not"
   echo "installed all of the packages you need, or you may need to"
@@ -113,13 +138,13 @@ aclocal -I m4 -I . $ACLOCAL_FLAGS || {
   exit 1
 }
 
-if grep "^AM_CONFIG_HEADER" configure.in >/dev/null; then
+if grep "^AC_CONFIG_HEADERS" configure.in >/dev/null; then
   echo "Running autoheader..."
   autoheader || { echo "**Error**: autoheader failed."; exit 1; }
 fi
 
 echo "Running automake --gnu $am_opt ..."
-automake --add-missing --gnu -Wno-portability $am_opt ||
+automake --add-missing --gnu -Wno-portability -Wno-obsolete $am_opt ||
   { echo "**Error**: automake failed."; exit 1; }
 echo "Running autoconf ..."
 autoconf || { echo "**Error**: autoconf failed."; exit 1; }