gnustep/tools-make
0
0
Fork 0
mirror of https://github.com/gnustep/tools-make.git synced 2025-05-31 09:21:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

honour the library combo of an existing installation

Browse source
This commit is contained in:
Niels Grewe 2019-12-22 23:59:07 +01:00
parent 29dbe2bc76
commit 02f47ebb01
No known key found for this signature in database
GPG key ID: 003E2A780EE52172
3 changed files with 81 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

69
configure vendored
View file

@ -715,6 +715,7 @@ CFLAGS
CC
ac_cv_library_combo
AWK
HAVE_GNUSTEP_CONFIG
GNUSTEP_HAS_PKGCONFIG
target_os
target_vendor
@ -2597,6 +2598,43 @@ $as_echo "no" >&6; }
fi
# Extract the first word of "gnustep-config", so it can be a program name with args.
set dummy gnustep-config; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
if ${ac_cv_prog_HAVE_GNUSTEP_CONFIG+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$HAVE_GNUSTEP_CONFIG"; then
ac_cv_prog_HAVE_GNUSTEP_CONFIG="$HAVE_GNUSTEP_CONFIG" # Let the user override the test.
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_HAVE_GNUSTEP_CONFIG="yes"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
IFS=$as_save_IFS
test -z "$ac_cv_prog_HAVE_GNUSTEP_CONFIG" && ac_cv_prog_HAVE_GNUSTEP_CONFIG="no"
fi
fi
HAVE_GNUSTEP_CONFIG=$ac_cv_prog_HAVE_GNUSTEP_CONFIG
if test -n "$HAVE_GNUSTEP_CONFIG"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $HAVE_GNUSTEP_CONFIG" >&5
$as_echo "$HAVE_GNUSTEP_CONFIG" >&6; }
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
#--------------------------------------------------------------------
# Setup the library combination
@ -2645,13 +2683,21 @@ done
gs_cv_library_combo_from_existing_install=no
case "$host_os" in
darwin*) default_library_combo=apple-apple-apple ;;
nextstep4) default_library_combo=nx-nx-nx ;;
openstep4) default_library_combo=nx-nx-nx ;;
*) default_library_combo=gnu-gnu-gnu ;;
esac
esac
if test x"$HAVE_GNUSTEP_CONFIG" = x"yes"; then
maybe_library_combo=$(gnustep-config --variable=LIBRARY_COMBO||echo "")
if test ! x"$maybe_library_combo" = x""; then
default_library_combo=$maybe_library_combo
gs_cv_library_combo_from_existing_install=yes
fi
fi
@ -2664,7 +2710,13 @@ if test "${with_library_combo+set}" = set; then :
else
with_library_combo=${default_library_combo}
gs_cv_library_combo_implicit=yes
if test x"$gs_cv_library_combo_from_existing_install" = x"yes"; then
gs_cv_library_combo_implicit=no
{ $as_echo "$as_me:${as_lineno-$LINENO}: Using library combo $default_library_combo from your existing installation of gnustep-make. To prevent this, pass --with-library-combo explicitly." >&5
$as_echo "$as_me: Using library combo $default_library_combo from your existing installation of gnustep-make. To prevent this, pass --with-library-combo explicitly." >&6;}
else
gs_cv_library_combo_implicit=yes
fi
fi
@ -6655,6 +6707,7 @@ fi
if test x"$ac_cv_func_objc_test_capability" = x"yes"; then
gs_cv_library_combo_from_existing_install=no
default_library_combo="ng-gnu-gnu"
@ -6672,7 +6725,13 @@ if test "${with_library_combo+set}" = set; then :
else
with_library_combo=${default_library_combo}
gs_cv_library_combo_implicit=yes
if test x"$gs_cv_library_combo_from_existing_install" = x"yes"; then
gs_cv_library_combo_implicit=no
{ $as_echo "$as_me:${as_lineno-$LINENO}: Using library combo $default_library_combo from your existing installation of gnustep-make. To prevent this, pass --with-library-combo explicitly." >&5
$as_echo "$as_me: Using library combo $default_library_combo from your existing installation of gnustep-make. To prevent this, pass --with-library-combo explicitly." >&6;}
else
gs_cv_library_combo_implicit=yes
fi
fi
@ -6699,8 +6758,8 @@ $as_echo "$_gs_cv_libray_combo" >&6; }
LIBRARY_COMBO=ng-gnu-gnu
{ $as_echo "$as_me:${as_lineno-$LINENO}: library combo has been upgraded to \`ng-gnu-gnu' because compiler/runtime support is available. To prevent this, pass --with-library-combo explicitly" >&5
$as_echo "$as_me: library combo has been upgraded to \`ng-gnu-gnu' because compiler/runtime support is available. To prevent this, pass --with-library-combo explicitly" >&6;}
{ $as_echo "$as_me:${as_lineno-$LINENO}: library combo has been upgraded to \`ng-gnu-gnu' because compiler/runtime support is available. To prevent this, pass --with-library-combo explicitly." >&5
$as_echo "$as_me: library combo has been upgraded to \`ng-gnu-gnu' because compiler/runtime support is available. To prevent this, pass --with-library-combo explicitly." >&6;}
fi
OBJC_CPPFLAGS=$gs_cv_ng_rt_saved_OBJC_CPPFLAGS
{ gs_cv_ng_rt_saved_OBJC_CPPFLAGS=; unset gs_cv_ng_rt_saved_OBJC_CPPFLAGS;}