diff options
| author | Jeffrey A Law <law@cygnus.com> | 1999-01-05 00:40:22 +0000 |
|---|---|---|
| committer | Jeff Law <law@gcc.gnu.org> | 1999-01-04 17:40:22 -0700 |
| commit | 79014e6f0b4a4cfaa275189172fe8c02cd2e9906 (patch) | |
| tree | 5bbac729dd9eebacf9be5667828794c2cae844ec | |
| parent | 031071bf6b8dbc3ce0878f997b9c7593dc26081c (diff) | |
| download | gcc-79014e6f0b4a4cfaa275189172fe8c02cd2e9906.zip gcc-79014e6f0b4a4cfaa275189172fe8c02cd2e9906.tar.gz gcc-79014e6f0b4a4cfaa275189172fe8c02cd2e9906.tar.bz2 | |
configure.in (thread_file): Correct and simplify code to find the thread file.
* configure.in (thread_file): Correct and simplify code to find
the thread file.
* configure: Rebuilt.
From-SVN: r24494
| -rw-r--r-- | libobjc/ChangeLog | 6 | ||||
| -rwxr-xr-x | libobjc/configure | 13 | ||||
| -rw-r--r-- | libobjc/configure.in | 11 |
3 files changed, 11 insertions, 19 deletions
diff --git a/libobjc/ChangeLog b/libobjc/ChangeLog index ef8f073..a201145 100644 --- a/libobjc/ChangeLog +++ b/libobjc/ChangeLog @@ -1,3 +1,9 @@ +Tue Jan 5 01:38:53 1999 Jeffrey A Law (law@cygnus.com) + + * configure.in (thread_file): Correct and simplify code to find + the thread file. + * configure: Rebuilt. + 1998-11-26 Manfred Hollstein <manfred@s-direktnet.de> * configure.in (compiler_name): Add check to detect if this diff --git a/libobjc/configure b/libobjc/configure index 2efba0c..4de2013 100755 --- a/libobjc/configure +++ b/libobjc/configure @@ -1063,21 +1063,14 @@ fi # Determine the name of the GCC thread file. -dir=`pwd` -if test x"${with_multisubdir}" = "x" ; then - gccobjdir=`echo $dir/../../gcc` -else - gccobjdir=`echo $dir | sed -e s:${with_multisubdir}::`/../../gcc -fi - echo $ac_n "checking for thread file""... $ac_c" 1>&6 -echo "configure:1075: checking for thread file" >&5 +echo "configure:1068: checking for thread file" >&5 if eval "test \"`echo '$''{'objc_cv_thread_file'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else - if test -f $gccobjdir/Makefile + if test -f "$r"/gcc/Makefile then - objc_cv_thread_file=`grep \^GCC_THREAD_FILE $gccobjdir/Makefile | awk -F= '{ print $2 }'` + objc_cv_thread_file=`grep \^GCC_THREAD_FILE "$r"/gcc/Makefile | awk -F= '{ print $2 }'` else { echo "configure: error: not found" 1>&2; exit 1; } fi diff --git a/libobjc/configure.in b/libobjc/configure.in index 73bdd0d..061501b 100644 --- a/libobjc/configure.in +++ b/libobjc/configure.in @@ -90,17 +90,10 @@ AC_HEADER_STDC # Determine the name of the GCC thread file. -dir=`pwd` -if test x"${with_multisubdir}" = "x" ; then - gccobjdir=`echo $dir/../../gcc` -else - gccobjdir=`echo $dir | sed -e s:${with_multisubdir}::`/../../gcc -fi - AC_CACHE_CHECK([for thread file],objc_cv_thread_file, -[if test -f $gccobjdir/Makefile +[if test -f "$r"/gcc/Makefile then - objc_cv_thread_file=`grep \^GCC_THREAD_FILE $gccobjdir/Makefile | awk -F= '{ print $2 }'` + objc_cv_thread_file=`grep \^GCC_THREAD_FILE "$r"/gcc/Makefile | awk -F= '{ print $2 }'` else AC_MSG_ERROR([not found]) fi]) |