mirror of
https://github.com/gnustep/tools-make.git
synced 2025-04-22 22:00:49 +00:00
Use library-combo = apple-apple-apple on darwin; print out message saying
which library combo we are using; recognize the abbreviations gnu, apple and nx for library-combos git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@15382 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
parent
6e7344af02
commit
0b04514855
1 changed files with 17 additions and 5 deletions
22
configure.ac
22
configure.ac
|
@ -30,6 +30,7 @@ AC_PROG_CC
|
|||
AC_PROG_CPP
|
||||
AC_CANONICAL_TARGET([])
|
||||
|
||||
AC_MSG_CHECKING(for library combo)
|
||||
AC_ARG_WITH(library-combo,[
|
||||
--with-library-combo Define the default library combination
|
||||
],
|
||||
|
@ -38,13 +39,21 @@ ac_cv_library_combo=$ac_cv_library_combo
|
|||
)
|
||||
|
||||
if test "$ac_cv_library_combo" = ""; then
|
||||
if test $host_os = nextstep4; then
|
||||
ac_cv_library_combo=nx-nx-nx
|
||||
else
|
||||
ac_cv_library_combo=gnu-gnu-gnu
|
||||
fi
|
||||
case "$host_os" in
|
||||
darwin*) ac_cv_library_combo=apple-apple-apple ;;
|
||||
nextstep4) ac_cv_library_combo=nx-nx-nx ;;
|
||||
*) ac_cv_library_combo=gnu-gnu-gnu ;;
|
||||
esac
|
||||
fi
|
||||
|
||||
case "$ac_cv_library_combo" in
|
||||
apple) ac_cv_library_combo=apple-apple-apple ;;
|
||||
gnu) ac_cv_library_combo=gnu-gnu-gnu ;;
|
||||
nx) ac_cv_library_combo=nx-nx-nx ;;
|
||||
esac
|
||||
|
||||
AC_SUBST(ac_cv_library_combo)
|
||||
AC_MSG_RESULT($ac_cv_library_combo)
|
||||
|
||||
OBJC_RUNTIME_LIB=`echo $ac_cv_library_combo | awk -F- '{print $1}'`
|
||||
|
||||
|
@ -329,6 +338,9 @@ CFLAGS="$CFLAGS -x objective-c -I$srcdir $OBJC_CPPFLAGS $OBJC_LDFLAGS"
|
|||
if test "$OBJC_RUNTIME_LIB" = "nx"; then
|
||||
CFLAGS="$CFLAGS -DNeXT_RUNTIME"
|
||||
fi
|
||||
if test "$OBJC_RUNTIME_LIB" = "apple"; then
|
||||
CFLAGS="$CFLAGS -DNeXT_RUNTIME"
|
||||
fi
|
||||
if test "$OBJC_THREAD" != ""; then
|
||||
LIBS="-lobjc $LIBS $OBJC_THREAD $extra_LIBS"
|
||||
AC_TRY_RUN([#include "config_thread.m"],
|
||||
|
|
Loading…
Reference in a new issue