gnustep/tools-make
0
0
Fork 0
mirror of https://github.com/gnustep/tools-make.git synced 2025-06-03 18:50:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Set lib_combo correctly

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@3329 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Adam Fedor 1998-11-25 21:06:09 +00:00
parent a185a0933b
commit 24fab0b16b
3 changed files with 14 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
Wed Nov 25 16:25:09 1998 Adam Fedor <fedor@doc.com>
* configure.in (ac_cv_library_combo): Take old value if not set.
Mon Nov 23 14:00:00 1998 Richard Frith-Macdonald <richard@brainstrom.co.uk> Mon Nov 23 14:00:00 1998 Richard Frith-Macdonald <richard@brainstrom.co.uk>
GNUmakefile.in: mod for services GNUmakefile.in: mod for services

18
configure vendored
View file

@ -1538,7 +1538,7 @@ if test "${with_library_combo+set}" = set; then
withval="$with_library_combo" withval="$with_library_combo"
ac_cv_library_combo=$withval ac_cv_library_combo=$withval
else else
ac_cv_library_combo=$withval ac_cv_library_combo=$ac_cv_library_combo
fi fi
@ -1562,7 +1562,7 @@ objc_thread_lib=""
if test $host_os = linux-gnu; then if test $host_os = linux-gnu; then
LIBS="-lobjc -lpthread" LIBS="-lobjc -lpthread"
if test "$cross_compiling" = yes; then if test "$cross_compiling" = yes; then
objc_threaded=-lpthread objc_threaded="-lpthread"
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 1569 "configure" #line 1569 "configure"
@ -1571,7 +1571,7 @@ else
EOF EOF
if { (eval echo configure:1573: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null if { (eval echo configure:1573: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
then then
objc_threaded=-lpthread objc_threaded="-lpthread"
else else
echo "configure: failed program was:" >&5 echo "configure: failed program was:" >&5
cat conftest.$ac_ext >&5 cat conftest.$ac_ext >&5
@ -1581,10 +1581,10 @@ fi
rm -fr conftest* rm -fr conftest*
fi fi
if test "$objc_threaded" = ""; then if test x"$objc_threaded" = x""; then
LIBS="-lobjc -lpcthread" LIBS="-lobjc -lpcthread"
if test "$cross_compiling" = yes; then if test "$cross_compiling" = yes; then
objc_threaded=-lpcthread objc_threaded="-lpcthread"
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 1591 "configure" #line 1591 "configure"
@ -1593,7 +1593,7 @@ else
EOF EOF
if { (eval echo configure:1595: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null if { (eval echo configure:1595: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
then then
objc_threaded=-lpcthread objc_threaded="-lpcthread"
else else
echo "configure: failed program was:" >&5 echo "configure: failed program was:" >&5
cat conftest.$ac_ext >&5 cat conftest.$ac_ext >&5
@ -1607,7 +1607,7 @@ fi
else else
LIBS="-lobjc $LIBS" LIBS="-lobjc $LIBS"
if test "$cross_compiling" = yes; then if test "$cross_compiling" = yes; then
objc_threaded=-lthread objc_threaded="-lthread"
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 1614 "configure" #line 1614 "configure"
@ -1616,7 +1616,7 @@ else
EOF EOF
if { (eval echo configure:1618: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null if { (eval echo configure:1618: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
then then
objc_threaded=-lthread objc_threaded="-lthread"
else else
echo "configure: failed program was:" >&5 echo "configure: failed program was:" >&5
cat conftest.$ac_ext >&5 cat conftest.$ac_ext >&5
@ -1628,7 +1628,7 @@ fi
fi fi
LIBS="$saved_LIBS" LIBS="$saved_LIBS"
if test "$objc_threaded" = ""; then if test x"$objc_threaded" = x""; then
echo "$ac_t""no" 1>&6 echo "$ac_t""no" 1>&6
else else
echo "$ac_t""yes" 1>&6 echo "$ac_t""yes" 1>&6

2
configure.in
View file

@ -134,7 +134,7 @@ 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,
ac_cv_library_combo=$withval ac_cv_library_combo=$ac_cv_library_combo
) )
if test "$ac_cv_library_combo" = ""; then if test "$ac_cv_library_combo" = ""; then