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

diff --git a/libobjc/ChangeLog b/libobjc/ChangeLog
index ef8f0734ded3bb95bff83b84bb2344e819929d59..a201145b15be0c4386d29e9a0799f20c050ccd13 100644 (file)
--- 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 2efba0c5e08c68d11396c28799a488ede139a3f0..4de20137d93915e693a85ddd1a5ed4e0f41c95aa 100755 (executable)
--- 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 73bdd0d49be9dcf21c9d9199dbf5f53f9f86e715..061501b642cfbb1e474408f84483bf647a847ca0 100644 (file)
--- 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])