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

Configure update.

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@9500 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Jonathan Gapen 2001-03-26 23:20:17 +00:00
parent b9d100c5a6
commit 8fd79d79b1
3 changed files with 42 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2001-03-23 Jonathan Gapen <jagapen@home.com>
* configure.in: Also look for 'gnutar' tar program.
* configure: Re-generate.
Mon Mar 19 14:30:01 2001 Nicola Pero <nicola@brainstorm.co.uk> Mon Mar 19 14:30:01 2001 Nicola Pero <nicola@brainstorm.co.uk>
* rules.make (install): Depend on internal-after-install after all * rules.make (install): Depend on internal-after-install after all

70
configure vendored
View file

@ -1596,11 +1596,12 @@ else
fi fi
TAR= for ac_prog in gnutar gtar
# Extract the first word of "gtar", so it can be a program name with args. do
set dummy gtar; ac_word=$2 # Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
echo "configure:1604: checking for $ac_word" >&5 echo "configure:1605: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_TAR'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_prog_TAR'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
@ -1612,7 +1613,7 @@ else
for ac_dir in $ac_dummy; do for ac_dir in $ac_dummy; do
test -z "$ac_dir" && ac_dir=. test -z "$ac_dir" && ac_dir=.
if test -f $ac_dir/$ac_word; then if test -f $ac_dir/$ac_word; then
ac_cv_prog_TAR="gtar" ac_cv_prog_TAR="$ac_prog"
break break
fi fi
done done
@ -1626,9 +1627,10 @@ else
echo "$ac_t""no" 1>&6 echo "$ac_t""no" 1>&6
fi fi
if test "$TAR" = ""; then test -n "$TAR" && break
TAR=tar done
fi test -n "$TAR" || TAR="tar"
#-------------------------------------------------------------------- #--------------------------------------------------------------------
# Miscellaneous flags and setup # Miscellaneous flags and setup
@ -1659,7 +1661,7 @@ fi
# If so, there are probably other libraries that we want there also, so # If so, there are probably other libraries that we want there also, so
# leave the proper includes in CPPFLAGS and LDFLAGS # leave the proper includes in CPPFLAGS and LDFLAGS
echo $ac_n "checking for alternate objc library""... $ac_c" 1>&6 echo $ac_n "checking for alternate objc library""... $ac_c" 1>&6
echo "configure:1663: checking for alternate objc library" >&5 echo "configure:1665: checking for alternate objc library" >&5
if eval "test \"`echo '$''{'gs_cv_objc_libdir'+set}'`\" = set"; then if eval "test \"`echo '$''{'gs_cv_objc_libdir'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
@ -1701,12 +1703,12 @@ for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h
do do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr that defines DIR""... $ac_c" 1>&6 echo $ac_n "checking for $ac_hdr that defines DIR""... $ac_c" 1>&6
echo "configure:1705: checking for $ac_hdr that defines DIR" >&5 echo "configure:1707: checking for $ac_hdr that defines DIR" >&5
if eval "test \"`echo '$''{'ac_cv_header_dirent_$ac_safe'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_header_dirent_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 1710 "configure" #line 1712 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <sys/types.h> #include <sys/types.h>
#include <$ac_hdr> #include <$ac_hdr>
@ -1714,7 +1716,7 @@ int main() {
DIR *dirp = 0; DIR *dirp = 0;
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:1718: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then if { (eval echo configure:1720: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest* rm -rf conftest*
eval "ac_cv_header_dirent_$ac_safe=yes" eval "ac_cv_header_dirent_$ac_safe=yes"
else else
@ -1739,7 +1741,7 @@ done
# Two versions of opendir et al. are in -ldir and -lx on SCO Xenix. # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
if test $ac_header_dirent = dirent.h; then if test $ac_header_dirent = dirent.h; then
echo $ac_n "checking for opendir in -ldir""... $ac_c" 1>&6 echo $ac_n "checking for opendir in -ldir""... $ac_c" 1>&6
echo "configure:1743: checking for opendir in -ldir" >&5 echo "configure:1745: checking for opendir in -ldir" >&5
ac_lib_var=`echo dir'_'opendir | sed 'y%./+-%__p_%'` ac_lib_var=`echo dir'_'opendir | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
@ -1747,7 +1749,7 @@ else
ac_save_LIBS="$LIBS" ac_save_LIBS="$LIBS"
LIBS="-ldir $LIBS" LIBS="-ldir $LIBS"
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 1751 "configure" #line 1753 "configure"
#include "confdefs.h" #include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */ /* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2 /* We use char because int might match the return type of a gcc2
@ -1758,7 +1760,7 @@ int main() {
opendir() opendir()
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:1762: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then if { (eval echo configure:1764: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest* rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes" eval "ac_cv_lib_$ac_lib_var=yes"
else else
@ -1780,7 +1782,7 @@ fi
else else
echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6 echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6
echo "configure:1784: checking for opendir in -lx" >&5 echo "configure:1786: checking for opendir in -lx" >&5
ac_lib_var=`echo x'_'opendir | sed 'y%./+-%__p_%'` ac_lib_var=`echo x'_'opendir | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
@ -1788,7 +1790,7 @@ else
ac_save_LIBS="$LIBS" ac_save_LIBS="$LIBS"
LIBS="-lx $LIBS" LIBS="-lx $LIBS"
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 1792 "configure" #line 1794 "configure"
#include "confdefs.h" #include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */ /* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2 /* We use char because int might match the return type of a gcc2
@ -1799,7 +1801,7 @@ int main() {
opendir() opendir()
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:1803: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then if { (eval echo configure:1805: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest* rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes" eval "ac_cv_lib_$ac_lib_var=yes"
else else
@ -1825,17 +1827,17 @@ for ac_hdr in sys/param.h sys/file.h dir.h string.h stdlib.h sys/types.h sys/s
do do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
echo "configure:1829: checking for $ac_hdr" >&5 echo "configure:1831: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 1834 "configure" #line 1836 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <$ac_hdr> #include <$ac_hdr>
EOF EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:1839: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } { (eval echo configure:1841: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then if test -z "$ac_err"; then
rm -rf conftest* rm -rf conftest*
@ -1866,7 +1868,7 @@ done
# Check if libobjc was compiled with thread support. # Check if libobjc was compiled with thread support.
#-------------------------------------------------------------------- #--------------------------------------------------------------------
echo $ac_n "checking whether objc has thread support""... $ac_c" 1>&6 echo $ac_n "checking whether objc has thread support""... $ac_c" 1>&6
echo "configure:1870: checking whether objc has thread support" >&5 echo "configure:1872: checking whether objc has thread support" >&5
extra_LIBS="" extra_LIBS=""
case "${target_os}" in case "${target_os}" in
solaris*) solaris*)
@ -1882,11 +1884,11 @@ if test $host_os = linux-gnu; then
objc_threaded="-lpthread" objc_threaded="-lpthread"
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 1886 "configure" #line 1888 "configure"
#include "confdefs.h" #include "confdefs.h"
#include "config_thread.m" #include "config_thread.m"
EOF EOF
if { (eval echo configure:1890: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null if { (eval echo configure:1892: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then then
objc_threaded="-lpthread" objc_threaded="-lpthread"
else else
@ -1904,11 +1906,11 @@ elif test "`echo $host_os|sed 's/[0-9].*//'|sed s/elf//`" = freebsd; then
objc_threaded="-pthread" objc_threaded="-pthread"
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 1908 "configure" #line 1910 "configure"
#include "confdefs.h" #include "confdefs.h"
#include "config_thread.m" #include "config_thread.m"
EOF EOF
if { (eval echo configure:1912: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null if { (eval echo configure:1914: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then then
objc_threaded="-pthread" objc_threaded="-pthread"
else else
@ -1926,11 +1928,11 @@ fi
objc_threaded="-lpthread" objc_threaded="-lpthread"
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 1930 "configure" #line 1932 "configure"
#include "confdefs.h" #include "confdefs.h"
#include "config_thread.m" #include "config_thread.m"
EOF EOF
if { (eval echo configure:1934: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null if { (eval echo configure:1936: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then then
objc_threaded="-lpthread" objc_threaded="-lpthread"
else else
@ -1949,11 +1951,11 @@ fi
objc_threaded="-lpcthread" objc_threaded="-lpcthread"
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 1953 "configure" #line 1955 "configure"
#include "confdefs.h" #include "confdefs.h"
#include "config_thread.m" #include "config_thread.m"
EOF EOF
if { (eval echo configure:1957: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null if { (eval echo configure:1959: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then then
objc_threaded="-lpcthread" objc_threaded="-lpcthread"
else else
@ -1973,11 +1975,11 @@ elif test "$MINGW32" = yes; then
objc_threaded="works" objc_threaded="works"
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 1977 "configure" #line 1979 "configure"
#include "confdefs.h" #include "confdefs.h"
#include "config_thread.m" #include "config_thread.m"
EOF EOF
if { (eval echo configure:1981: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null if { (eval echo configure:1983: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then then
objc_threaded="works" objc_threaded="works"
else else
@ -1995,11 +1997,11 @@ else
objc_threaded="" objc_threaded=""
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 1999 "configure" #line 2001 "configure"
#include "confdefs.h" #include "confdefs.h"
#include "config_thread.m" #include "config_thread.m"
EOF EOF
if { (eval echo configure:2003: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null if { (eval echo configure:2005: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then then
objc_threaded="-lthread $extra_LIBS" objc_threaded="-lthread $extra_LIBS"
else else

6
configure.in
View file

@ -203,11 +203,7 @@ fi
AC_LN_S AC_LN_S
TAR= AC_CHECK_PROGS(TAR, gnutar gtar, tar)
AC_CHECK_PROG(TAR, gtar, gtar)
if test "$TAR" = ""; then
TAR=tar
fi
#-------------------------------------------------------------------- #--------------------------------------------------------------------
# Miscellaneous flags and setup # Miscellaneous flags and setup