Add thread library for Solaris, use dashes in library_combo

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@2584 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Adam Fedor 1997-10-29 16:27:45 +00:00
parent 66c5a81e16
commit 56d3ae478d
5 changed files with 16 additions and 8 deletions

View file

@ -1,3 +1,11 @@
Wed Oct 29 10:02:37 1997 Adam Fedor <fedor@doc.com>
* GNUstep.sh.in: Use -f to find user's GNUstep.sh.
* configure.in (ac_cv_library_combo): Use dashes instead of
underlines.
* target.make (TARGET_SYSTEM_LIBS): Add -lthread for Solaris.
Tue Oct 28 09:32:23 1997 Ovidiu Predescu <ovidiu@net-community.com>
* common.make: Define the system, local and user headers variables.

View file

@ -58,7 +58,7 @@ PATH=$GNUSTEP_USER_ROOT/Tools/$GNUSTEP_HOST_CPU/$GNUSTEP_HOST_OS/$LIBRARY_COMBO:
#
# Perform any user initialization
#
if [ -e ~/.GNUstep/GNUstep.sh ]
if [ -f ~/.GNUstep/GNUstep.sh ]
then
. ~/.GNUstep/GNUstep.sh
fi

6
configure vendored
View file

@ -26,7 +26,7 @@ ac_help="$ac_help
'make'. You can still change the library combination at runtime by
specifying the 'library_combo' make variable. For example:
$ make library_combo=nx_pdo_nx_nil
$ make library_combo=nx-pdo-nx-nil
"
# Initialize some variables set by options.
@ -1466,9 +1466,9 @@ fi
if test "$ac_cv_library_combo" = ""; then
if test $host_os = nextstep4; then
ac_cv_library_combo=nx_nx_nx_nil
ac_cv_library_combo=nx-nx-nx-nil
else
ac_cv_library_combo=gnu_gnu_gnu_xdp
ac_cv_library_combo=gnu-gnu-gnu-xdp
fi
fi

View file

@ -91,7 +91,7 @@ AC_ARG_WITH(library-combo,[
'make'. You can still change the library combination at runtime by
specifying the 'library_combo' make variable. For example:
$ make library_combo=nx_pdo_nx_nil
$ make library_combo=nx-pdo-nx-nil
],
ac_cv_library_combo=$withval,
ac_cv_library_combo=$withval
@ -99,9 +99,9 @@ ac_cv_library_combo=$withval
if test "$ac_cv_library_combo" = ""; then
if test $host_os = nextstep4; then
ac_cv_library_combo=nx_nx_nx_nil
ac_cv_library_combo=nx-nx-nx-nil
else
ac_cv_library_combo=gnu_gnu_gnu_xdp
ac_cv_library_combo=gnu-gnu-gnu-xdp
fi
fi
AC_SUBST(ac_cv_library_combo)

View file

@ -44,7 +44,7 @@ TARGET_SYSTEM_LIBS := -ldl -lm
endif
endif
ifeq ($(findstring solaris, $(GNUSTEP_TARGET_OS)), solaris)
TARGET_SYSTEM_LIBS := -lsocket -lnsl -ldl -lm
TARGET_SYSTEM_LIBS := -lthread -lsocket -lnsl -ldl -lm
endif
#