mirror of
https://github.com/gnustep/tools-make.git
synced 2025-04-23 22:33:28 +00:00
honour the library combo of an existing installation
This commit is contained in:
Niels Grewe
parent
29dbe2bc76
commit
02f47ebb01
3 changed files with 81 additions and 9 deletions
69
configure
vendored
69
configure
vendored
|
|
@ -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;}
|
||||
|
|
|
|||
|
|
@ -45,7 +45,7 @@ targetArgument=${target}
|
|||
AC_CANONICAL_TARGET([])
|
||||
|
||||
AC_PATH_PROG(GNUSTEP_HAS_PKGCONFIG, pkgconfig, yes, no)
|
||||
|
||||
AC_CHECK_PROG([HAVE_GNUSTEP_CONFIG], [gnustep-config], yes, no)
|
||||
#--------------------------------------------------------------------
|
||||
# Setup the library combination
|
||||
#--------------------------------------------------------------------
|
||||
|
|
@ -1089,7 +1089,7 @@ if test "$OBJC_RUNTIME_LIB" = "gnu" -a x"$gs_cv_cc_is_clang" = x"yes" -a x"$gs_
|
|||
if test x"$ac_cv_func_objc_test_capability" = x"yes"; then
|
||||
GS_LIBRARY_COMBO([ng-gnu-gnu],[yes])
|
||||
LIBRARY_COMBO=ng-gnu-gnu
|
||||
AC_MSG_NOTICE([library combo has been upgraded to `ng-gnu-gnu' because compiler/runtime support is available. To prevent this, pass --with-library-combo explicitly])
|
||||
AC_MSG_NOTICE([library combo has been upgraded to `ng-gnu-gnu' because compiler/runtime support is available. To prevent this, pass --with-library-combo explicitly.])
|
||||
fi
|
||||
m4_foreach([saved_var], [rt_save_variables], [dnl
|
||||
AS_VAR_SET([m4_strip(saved_var)], m4_join([], [$gs_cv_ng_rt_saved_], m4_strip(saved_var)))
|
||||
|
|
|
|||
|
|
@ -12,13 +12,21 @@
|
|||
AC_DEFUN([GS_LIBRARY_COMBO],dnl
|
||||
[AC_REQUIRE([AC_CANONICAL_TARGET])
|
||||
AC_REQUIRE([AC_PROG_AWK])
|
||||
gs_cv_library_combo_from_existing_install=no
|
||||
m4_ifblank([$1], [
|
||||
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
|
||||
], [
|
||||
default_library_combo="$1"
|
||||
])
|
||||
|
|
@ -53,7 +61,12 @@ AC_DEFUN([GS_LIBRARY_COMBO],dnl
|
|||
gs_cv_library_combo_implicit=no
|
||||
],[dnl
|
||||
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
|
||||
AC_MSG_NOTICE([Using library combo $default_library_combo from your existing installation of gnustep-make. To prevent this, pass --with-library-combo explicitly.])
|
||||
else
|
||||
gs_cv_library_combo_implicit=yes
|
||||
fi
|
||||
])
|
||||
AC_CACHE_CHECK([for library combo],[_gs_cv_libray_combo], [
|
||||
case "$with_library_combo" in
|
||||
|
|
|
|||
Loading…
Reference in a new issue