diff options
| author | Tor Lillqvist <tml@iki.fi> | 2012-02-27 17:02:59 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2012-02-27 17:02:59 +0200 |
| commit | 651dcc29f413b6bb95e01c90d4113ff7a10db3be (patch) | |
| tree | fd6147905c52273cd55859c875571970138ebe22 | |
| parent | c16bc826379b2e70fe517d608055ef167c5a5c9e (diff) | |
Add --disable-extensions switch for future implementation
| -rw-r--r-- | config_host.mk.in | 1 | ||||
| -rw-r--r-- | configure.in | 21 | ||||
| -rw-r--r-- | solenv/gbuild/gbuild.mk | 4 |
3 files changed, 26 insertions, 0 deletions
diff --git a/config_host.mk.in b/config_host.mk.in index 5cc0b8631bd8..d206cb5c88b3 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -79,6 +79,7 @@ export DIRECTXSDK_LIB=@DIRECTXSDK_LIB@ export DISABLE_ACTIVEX=@DISABLE_ACTIVEX@ export DISABLE_ATL=@DISABLE_ATL@ export DISABLE_DBCONNECTIVITY=@DISABLE_DBCONNECTIVITY@ +export DISABLE_EXTENSIONS=@DISABLE_EXTENSIONS@ export DISABLE_SCRIPTING=@DISABLE_SCRIPTING@ export DISABLE_LINKOO=@DISABLE_LINKOO@ export DISABLE_NEON=@DISABLE_NEON@ diff --git a/configure.in b/configure.in index 914e8cf47bd8..86db7689270f 100644 --- a/configure.in +++ b/configure.in @@ -393,6 +393,11 @@ AC_ARG_ENABLE(database-connectivity, [Disable various database connectivity. Work in progress, use only if you are hacking on it.]) ) +AC_ARG_ENABLE(extensions, + AS_HELP_STRING([--disable-extensions], + [Disable all add-on extension functionality. Work in progress, use only if you are hacking on it.]) +) + AC_ARG_ENABLE(scripting, AS_HELP_STRING([--disable-scripting], [Disable BASIC, Java and Python. Work in progress, use only if you are hacking on it.]) @@ -2042,6 +2047,22 @@ else fi AC_SUBST(DISABLE_DBCONNECTIVITY) +if test -z "$enable_extensions"; then + # For iOS disable extensions unless specifically overridden with + # --enable-extensions. + if test $_os != iOS; then + enable_extensions=yes + fi +fi + +DISABLE_EXTENSIONS='' +if test "$enable_extensions" = yes; then + BUILD_TYPE="$BUILD_TYPE EXTENSIONS" +else + DISABLE_EXTENSIONS='TRUE' +fi +AC_SUBST(DISABLE_EXTENSIONS) + if test -z "$enable_scripting"; then # Disable scripting for iOS unless specifically overridden # with --enable-scripting. diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk index e38137e9569c..2aafa6b09d4b 100644 --- a/solenv/gbuild/gbuild.mk +++ b/solenv/gbuild/gbuild.mk @@ -236,6 +236,10 @@ ifeq ($(strip $(DISABLE_DBCONNECTIVITY)),TRUE) gb_GLOBALDEFS += -DDISABLE_DBCONNECTIVITY endif +ifeq ($(strip $(DISABLE_EXTENSIONS)),TRUE) +gb_GLOBALDEFS += -DDISABLE_EXTENSIONS +endif + ifeq ($(strip $(DISABLE_SCRIPTING)),TRUE) gb_GLOBALDEFS += -DDISABLE_SCRIPTING endif |