diff options
| author | Ronald Oussoren <ronaldoussoren@mac.com> | 2008-05-02 19:45:11 (GMT) |
|---|---|---|
| committer | Ronald Oussoren <ronaldoussoren@mac.com> | 2008-05-02 19:45:11 (GMT) |
| commit | 580c7fec67eb233bb3b31db0f656174be032e6ed (patch) | |
| tree | 7784e56c7de5f4a793f18e5aac3aa3571a43dff6 /configure.in | |
| parent | ee340e501d2a59d70a91748ebd948787bfac8044 (diff) | |
| download | cpython-580c7fec67eb233bb3b31db0f656174be032e6ed.zip cpython-580c7fec67eb233bb3b31db0f656174be032e6ed.tar.gz cpython-580c7fec67eb233bb3b31db0f656174be032e6ed.tar.bz2 | |
Fix for issue #2573: Can't change the framework name on OS X builds
This introduces a new configure option: --with-framework-name=NAME
(defaulting to 'Python'). This allows you to install several copies
of the Python framework with different names (such as a normal build
and a debug build).
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/configure.in b/configure.in index a4793aa..bc9a02e 100644 --- a/configure.in +++ b/configure.in @@ -83,6 +83,18 @@ AC_ARG_ENABLE(universalsdk, ]) AC_SUBST(UNIVERSALSDK) +AC_ARG_WITH(framework-name, + AC_HELP_STRING(--with-framework-name=FRAMEWORK, + specify an alternate name of the framework built with --enable-framework), +[ + PYTHONFRAMEWORK=${withval} + PYTHONFRAMEWORKDIR=${withval}.framework + PYTHONFRAMEWORKIDENTIFIER=org.python.`echo $withval | tr '[A-Z]' '[a-z]'` + ],[ + PYTHONFRAMEWORK=Python + PYTHONFRAMEWORKDIR=Python.framework + PYTHONFRAMEWORKIDENTIFIER=org.python.python +]) dnl quadrigraphs "@<:@" and "@:>@" produce "[" and "]" in the output AC_ARG_ENABLE(framework, AC_HELP_STRING(--enable-framework@<:@=INSTALLDIR@:>@, Build (MacOSX|Darwin) framework), @@ -109,8 +121,6 @@ AC_ARG_ENABLE(framework, enable_framework= ;; *) - PYTHONFRAMEWORK=Python - PYTHONFRAMEWORKDIR=Python.framework PYTHONFRAMEWORKPREFIX=$enableval PYTHONFRAMEWORKINSTALLDIR=$PYTHONFRAMEWORKPREFIX/$PYTHONFRAMEWORKDIR FRAMEWORKINSTALLFIRST="frameworkinstallstructure" @@ -124,11 +134,13 @@ AC_ARG_ENABLE(framework, fi prefix=$PYTHONFRAMEWORKINSTALLDIR/Versions/$VERSION - # Add makefiles for Mac specific code to the list of output + # Add files for Mac specific code to the list of output # files: AC_CONFIG_FILES(Mac/Makefile) AC_CONFIG_FILES(Mac/PythonLauncher/Makefile) AC_CONFIG_FILES(Mac/IDLE/Makefile) + AC_CONFIG_FILES(Mac/Resources/framework/Info.plist) + AC_CONFIG_FILES(Mac/Resources/app/Info.plist) esac ],[ PYTHONFRAMEWORK= @@ -147,6 +159,7 @@ AC_ARG_ENABLE(framework, enable_framework= ]) AC_SUBST(PYTHONFRAMEWORK) +AC_SUBST(PYTHONFRAMEWORKIDENTIFIER) AC_SUBST(PYTHONFRAMEWORKDIR) AC_SUBST(PYTHONFRAMEWORKPREFIX) AC_SUBST(PYTHONFRAMEWORKINSTALLDIR) |