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).
diff --git a/configure b/configure
index 6009d88..6c19b2c 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
#! /bin/sh
-# From configure.in Revision: 62451 .
+# From configure.in Revision: 62499 .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.61 for python 2.6.
#
@@ -658,6 +658,7 @@
CONFIG_ARGS
UNIVERSALSDK
PYTHONFRAMEWORK
+PYTHONFRAMEWORKIDENTIFIER
PYTHONFRAMEWORKDIR
PYTHONFRAMEWORKPREFIX
PYTHONFRAMEWORKINSTALLDIR
@@ -1327,6 +1328,9 @@
Optional Packages:
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
--without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
+ --with-framework-name=FRAMEWORK
+ specify an alternate name of the framework built
+ with --enable-framework
--without-gcc never use gcc
--with-cxx-main=<compiler>
compile main() and link python executable with C++
@@ -1879,6 +1883,22 @@
+
+# Check whether --with-framework-name was given.
+if test "${with_framework_name+set}" = set; then
+ withval=$with_framework_name;
+ PYTHONFRAMEWORK=${withval}
+ PYTHONFRAMEWORKDIR=${withval}.framework
+ PYTHONFRAMEWORKIDENTIFIER=org.python.`echo $withval | tr 'A-Z' 'a-z'`
+
+else
+
+ PYTHONFRAMEWORK=Python
+ PYTHONFRAMEWORKDIR=Python.framework
+ PYTHONFRAMEWORKIDENTIFIER=org.python.python
+
+fi
+
# Check whether --enable-framework was given.
if test "${enable_framework+set}" = set; then
enableval=$enable_framework;
@@ -1904,8 +1924,6 @@
enable_framework=
;;
*)
- PYTHONFRAMEWORK=Python
- PYTHONFRAMEWORKDIR=Python.framework
PYTHONFRAMEWORKPREFIX=$enableval
PYTHONFRAMEWORKINSTALLDIR=$PYTHONFRAMEWORKPREFIX/$PYTHONFRAMEWORKDIR
FRAMEWORKINSTALLFIRST="frameworkinstallstructure"
@@ -1919,7 +1937,7 @@
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="$ac_config_files Mac/Makefile"
@@ -1927,6 +1945,10 @@
ac_config_files="$ac_config_files Mac/IDLE/Makefile"
+ ac_config_files="$ac_config_files Mac/Resources/framework/Info.plist"
+
+ ac_config_files="$ac_config_files Mac/Resources/app/Info.plist"
+
esac
else
@@ -1958,6 +1980,7 @@
+
##AC_ARG_WITH(dyld,
## AC_HELP_STRING(--with-dyld,
## Use (OpenStep|Rhapsody) dynamic linker))
@@ -24579,6 +24602,8 @@
"Mac/Makefile") CONFIG_FILES="$CONFIG_FILES Mac/Makefile" ;;
"Mac/PythonLauncher/Makefile") CONFIG_FILES="$CONFIG_FILES Mac/PythonLauncher/Makefile" ;;
"Mac/IDLE/Makefile") CONFIG_FILES="$CONFIG_FILES Mac/IDLE/Makefile" ;;
+ "Mac/Resources/framework/Info.plist") CONFIG_FILES="$CONFIG_FILES Mac/Resources/framework/Info.plist" ;;
+ "Mac/Resources/app/Info.plist") CONFIG_FILES="$CONFIG_FILES Mac/Resources/app/Info.plist" ;;
"Makefile.pre") CONFIG_FILES="$CONFIG_FILES Makefile.pre" ;;
"Modules/Setup.config") CONFIG_FILES="$CONFIG_FILES Modules/Setup.config" ;;
@@ -24684,6 +24709,7 @@
CONFIG_ARGS!$CONFIG_ARGS$ac_delim
UNIVERSALSDK!$UNIVERSALSDK$ac_delim
PYTHONFRAMEWORK!$PYTHONFRAMEWORK$ac_delim
+PYTHONFRAMEWORKIDENTIFIER!$PYTHONFRAMEWORKIDENTIFIER$ac_delim
PYTHONFRAMEWORKDIR!$PYTHONFRAMEWORKDIR$ac_delim
PYTHONFRAMEWORKPREFIX!$PYTHONFRAMEWORKPREFIX$ac_delim
PYTHONFRAMEWORKINSTALLDIR!$PYTHONFRAMEWORKINSTALLDIR$ac_delim
@@ -24738,7 +24764,6 @@
CFLAGSFORSHARED!$CFLAGSFORSHARED$ac_delim
SHLIBS!$SHLIBS$ac_delim
USE_SIGNAL_MODULE!$USE_SIGNAL_MODULE$ac_delim
-SIGNAL_OBJS!$SIGNAL_OBJS$ac_delim
_ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -24780,6 +24805,7 @@
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
cat >conf$$subs.sed <<_ACEOF
+SIGNAL_OBJS!$SIGNAL_OBJS$ac_delim
USE_THREAD_MODULE!$USE_THREAD_MODULE$ac_delim
LDLAST!$LDLAST$ac_delim
THREADOBJ!$THREADOBJ$ac_delim
@@ -24801,7 +24827,7 @@
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 19; then
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 20; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5