gnustep/tools-make
0
0
Fork 0
mirror of https://github.com/gnustep/tools-make.git synced 2025-04-23 22:33:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Make --enable-absolute-install-paths the default on Darwin with gnu-gnu-gnu library-combo

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@32649 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Nicola Pero 2011-03-18 21:28:24 +00:00
parent 31fb09205d
commit b1bf46c277
3 changed files with 48 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
2011-03-18 Nicola Pero <nicola.pero@meta-innovation.com>
* configure.ac: By default, use --enable-absolute-install-paths on
Darwin with gnu-gnu-gnu (Suggestion from Wolfgang Lux
<wolfgang.lux@gmail.com>).
* configure: Regenerated.
2011-03-16 Nicola Pero <nicola.pero@meta-innovation.com>
* config.make.in (CXX): If CXX is specified on the environment or

35
configure vendored
View file

@ -863,7 +863,8 @@ Optional Features:
to set DYLD_LIBRARY_PATH and DYLD_FRAMEWORK_PATH in the shell
and ~/.MacOSX/environment.plist, but libraries built with an
absolute install_name are not relocatable. By default, this
setting is disabled.
setting is disabled unless the gnu-gnu-gnu library combo is
used, in which case it is enabled.
--enable-importing-config-file
@ -3890,7 +3891,7 @@ if test "${enable_absolute_install_paths+set}" = set; then
enableval="$enable_absolute_install_paths"
ac_cv_absolute_install_paths=$enableval
else
ac_cv_absolute_install_paths="no"
ac_cv_absolute_install_paths="undefined"
fi;
if test "$ac_cv_absolute_install_paths" = "yes"; then
@ -3898,19 +3899,25 @@ fi;
echo "${ECHO_T}yes" >&6
GNUSTEP_ABSOLUTE_INSTALL_PATHS=yes;
else
echo "$as_me:$LINENO: result: no" >&5
if test "$ac_cv_absolute_install_paths" = "undefined"; then
# gnu-gnu-gnu on darwin is difficult because of the risk of
# conflicts between the GNU Objective-C runtime and the Apple
# one. absolute-install-paths makes this slightly easier
# by hardcoding the absolute path of dynamic libraries into the
# programs that link them so that it's less likely that the
# wrong dynamic libraries will be pulled in. So we enable it
# by default in that case.
if test "$ac_cv_library_combo" = "gnu-gnu-gnu"; then
GNUSTEP_ABSOLUTE_INSTALL_PATHS=yes;
echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6
else
echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}no" >&6
fi
else
echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}no" >&6
if test ! x"$GNUSTEP_FILESYSTEM_LAYOUT_FILE" = x"apple"; then
echo ""
echo "*******************************************************"
echo "WARNING: To use a layout other than 'apple' on Mac OS X"
echo "without enabling absolute install paths you must set"
echo "DYLD_LIBRARY_PATH and DYLD_FRAMEWORK_PATH in your shell"
echo "start-up script (typically by sourcing GNUstep.sh) and"
echo "also in ~/.MacOSX/environment.plist."
echo "*******************************************************"
echo ""
fi
fi

35
configure.ac
View file

@ -361,27 +361,32 @@ case "$target_os" in
to set DYLD_LIBRARY_PATH and DYLD_FRAMEWORK_PATH in the shell
and ~/.MacOSX/environment.plist, but libraries built with an
absolute install_name are not relocatable. By default, this
setting is disabled.
],
setting is disabled unless the gnu-gnu-gnu library combo is
used, in which case it is enabled.
],
ac_cv_absolute_install_paths=$enableval,
ac_cv_absolute_install_paths="no")
ac_cv_absolute_install_paths="undefined")
if test "$ac_cv_absolute_install_paths" = "yes"; then
AC_MSG_RESULT(yes)
GNUSTEP_ABSOLUTE_INSTALL_PATHS=yes;
else
AC_MSG_RESULT(no)
if test ! x"$GNUSTEP_FILESYSTEM_LAYOUT_FILE" = x"apple"; then
echo ""
echo "*******************************************************"
echo "WARNING: To use a layout other than 'apple' on Mac OS X"
echo "without enabling absolute install paths you must set"
echo "DYLD_LIBRARY_PATH and DYLD_FRAMEWORK_PATH in your shell"
echo "start-up script (typically by sourcing GNUstep.sh) and"
echo "also in ~/.MacOSX/environment.plist."
echo "*******************************************************"
echo ""
if test "$ac_cv_absolute_install_paths" = "undefined"; then
# gnu-gnu-gnu on darwin is difficult because of the risk of
# conflicts between the GNU Objective-C runtime and the Apple
# one. absolute-install-paths makes this slightly easier
# by hardcoding the absolute path of dynamic libraries into the
# programs that link them so that it's less likely that the
# wrong dynamic libraries will be pulled in. So we enable it
# by default in that case.
if test "$ac_cv_library_combo" = "gnu-gnu-gnu"; then
GNUSTEP_ABSOLUTE_INSTALL_PATHS=yes;
AC_MSG_RESULT(yes)
else
AC_MSG_RESULT(no)
fi
else
AC_MSG_RESULT(no)
fi
fi