diff options
Diffstat (limited to 'make')
| -rw-r--r-- | make/configure.py | 32 | ||||
| -rw-r--r-- | make/include/contrib.defs | 3 | ||||
| -rw-r--r-- | make/include/main.defs | 12 |
3 files changed, 34 insertions, 13 deletions
diff --git a/make/configure.py b/make/configure.py index ed78d026d..b6fe3b60c 100644 --- a/make/configure.py +++ b/make/configure.py @@ -1111,6 +1111,8 @@ def createCLI(): h = IfHost( 'Build and use local yasm', '*-*-*', none=optparse.SUPPRESS_HELP ).value grp.add_option( '--enable-local-yasm', default=False, action='store_true', help=h ) + h = IfHost( 'Build and use local autotools', '*-*-*', none=optparse.SUPPRESS_HELP ).value + grp.add_option( '--enable-local-autotools', default=False, action='store_true', help=h ) cli.add_option_group( grp ) @@ -1269,15 +1271,18 @@ try: else: gmake = ToolProbe( 'GMAKE.exe', 'gmake', 'make' ) - m4 = ToolProbe( 'M4.exe', 'm4' ) - mkdir = ToolProbe( 'MKDIR.exe', 'mkdir' ) - patch = ToolProbe( 'PATCH.exe', 'gpatch', 'patch' ) - rm = ToolProbe( 'RM.exe', 'rm' ) - ranlib = ToolProbe( 'RANLIB.exe', 'ranlib' ) - strip = ToolProbe( 'STRIP.exe', 'strip' ) - tar = ToolProbe( 'TAR.exe', 'gtar', 'tar' ) - wget = ToolProbe( 'WGET.exe', 'wget', abort=False ) - yasm = ToolProbe( 'YASM.exe', 'yasm', abort=False ) + m4 = ToolProbe( 'M4.exe', 'm4' ) + mkdir = ToolProbe( 'MKDIR.exe', 'mkdir' ) + patch = ToolProbe( 'PATCH.exe', 'gpatch', 'patch' ) + rm = ToolProbe( 'RM.exe', 'rm' ) + ranlib = ToolProbe( 'RANLIB.exe', 'ranlib' ) + strip = ToolProbe( 'STRIP.exe', 'strip' ) + tar = ToolProbe( 'TAR.exe', 'gtar', 'tar' ) + wget = ToolProbe( 'WGET.exe', 'wget', abort=False ) + yasm = ToolProbe( 'YASM.exe', 'yasm', abort=False ) + autoconf = ToolProbe( 'AUTOCONF.exe', 'autoconf', abort=False ) + automake = ToolProbe( 'AUTOMAKE.exe', 'automake', abort=False ) + libtool = ToolProbe( 'LIBTOOL.exe', 'libtool', abort=False ) xcodebuild = ToolProbe( 'XCODEBUILD.exe', 'xcodebuild', abort=False ) lipo = ToolProbe( 'LIPO.exe', 'lipo', abort=False ) @@ -1335,9 +1340,13 @@ try: action.run() ## enable local yasm when yasm probe fails - if Tools.yasm.fail and not options.enable_local_yasm: + if not options.enable_local_yasm and Tools.yasm.fail: options.enable_local_yasm = True + ## enable local autotools when any of { autoconf, automake, libtool } probe fails + if not options.enable_local_autotools and (Tools.autoconf.fail or Tools.automake.fail or Tools.libtool.fail): + options.enable_local_autotools = True + if build.system == 'mingw': dlfcn_test = """ #include <dlfcn.h> @@ -1499,7 +1508,8 @@ int main () doc.add( 'PREFIX/', cfg.prefix_final + os.sep ) doc.addBlank() - doc.add( 'FEATURE.local_yasm', int( options.enable_local_yasm ) ) + doc.add( 'FEATURE.local_yasm', int( options.enable_local_yasm )) + doc.add( 'FEATURE.local_autotools', int( options.enable_local_autotools )) doc.add( 'FEATURE.asm', 'disabled' ) doc.add( 'FEATURE.gtk', int( not options.disable_gtk )) doc.add( 'FEATURE.gtk.update.checks', int( not options.disable_gtk_update_checks )) diff --git a/make/include/contrib.defs b/make/include/contrib.defs index 9dfddea6e..963e98226 100644 --- a/make/include/contrib.defs +++ b/make/include/contrib.defs @@ -19,7 +19,8 @@ define import.CONTRIB.defs ## $(1).src/ = $$(SRC/)contrib/$($(1).name)/ $(1).build/ = $$(CONTRIB.build/)$($(1).name)/ - $(1).deps = $$(foreach n,$($(1).prerequisites),$$($$n.INSTALL.target)) + ## add prerequisites and autotool modules for all contribs + $(1).deps = $$(foreach n,$($(1).prerequisites) $(if $(filter $1,$(AUTOTOOL_MODULES)),,$(AUTOTOOL_MODULES)),$$($$n.INSTALL.target)) ## ## target: fetch diff --git a/make/include/main.defs b/make/include/main.defs index df81a0fda..ff6e73f2a 100644 --- a/make/include/main.defs +++ b/make/include/main.defs @@ -8,6 +8,17 @@ include $(SRC/)make/include/tool.defs ############################################################################### +ifeq (1,$(FEATURE.local_autotools)) + MODULES += contrib/autoconf + MODULES += contrib/automake + MODULES += contrib/libtool + MODULES += contrib/m4 + AUTOTOOL_MODULES = AUTOCONF AUTOMAKE LIBTOOL M4 + PATH := $(call fn.ABSOLUTE,$(CONTRIB.build/)bin):$(PATH) +else + AUTOTOOL_MODULES = +endif + MODULES += contrib/a52dec ifneq (,$(filter $(BUILD.system),cygwin mingw)) @@ -20,7 +31,6 @@ ifneq (,$(filter $(BUILD.system),darwin cygwin mingw)) MODULES += contrib/fribidi endif - MODULES += contrib/faac MODULES += contrib/ffmpeg MODULES += contrib/fontconfig |