[build]Enable passing arguments to the extension module.

The build argument --enable-extension-module now takes a comma separated list
of arguments that are passed down. Passing no arguments triggers the old behavior.

diff --git a/autogen.sh b/autogen.sh
index 8fc51d24df070776c14a3ba73fd310cba639610a..a576ed6672afab5a9697e610ce8b6a9e0265b208 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -107,15 +107,19 @@ fi
 # Plug in the extension module
 #
 has_ext_mod=false
+ext_mod_args=''
 for PARAM; do
-    if test "$PARAM" = "--enable-extension-module" ; then
-               has_ext_mod=true
-       fi
+    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 || exit 1
+       sh ./prepare-repo.sh $ext_mod_args || exit 1
        popd
 else
        cat mono/mini/Makefile.am.in > mono/mini/Makefile.am

diff --git a/configure.in b/configure.in
index 9f49d86cc905cd388418af646d7f2feb313d6fcb..0dbc8107509b5c097abd479ec421ecd196421867 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -931,7 +931,19 @@ fi
 AC_ARG_ENABLE(executables, [  --disable-executables disable the build of the runtime executables], enable_executables=$enableval, enable_executables=yes)
 AM_CONDITIONAL(DISABLE_EXECUTABLES, test x$enable_executables = xno)
 
-AC_ARG_ENABLE(extension-module, [  --enable-extension-module enables usage of the extension module], has_extension_module=$enableval, has_extension_module=no)
+has_extension_module=no
+AC_ARG_ENABLE(extension-module, [  --enable-extension-module=LIST enable the core-extensions from LIST],
+[
+       for extension in `echo "$enable_extension_module" | sed -e "s/,/ /g"`; do
+               if test x$extension = xdefault ; then
+                       has_extension_module=yes;
+               fi
+       done
+       if test x$enable_extension_module = xyes; then
+               has_extension_module=yes;
+       fi
+], [])
+
 AM_CONDITIONAL([HAS_EXTENSION_MODULE], [test x$has_extension_module != xno])
 
 if test x$has_extension_module != xno ; then