From ea562ee977d4b48500a9b117e543e9c4ae0eb05e Mon Sep 17 00:00:00 2001
From: Joel Sherrill <joel.sherrill@OARcorp.com>
Date: Thu, 12 Aug 1999 18:22:17 +0000
Subject: Patch from Ralf Corsepius <corsepiu@faw.uni-ulm.de>:

    After upgrading my linux box to the brand new SuSE 6.2 release, which is
    glibc-2.1 based, I came across a bug in RTEMS - IIRC, I even warned you
    about it about 1/2 a year ago, but nothing has been done since then :-.

    The *.m4 macros to check for SYSV/IPC are broken for linux/glibc2.1,
    because they assume that linux always defines union semun, which isn't
    true anymore for glibc2.1 (the manpage for semctl states _X_OPEN
    specifies it this way). Therefore I have tried to implement a more
    general approach for handling SYSV for unix/posix which checks for
    presence of struct semun, instead of trying  to evaluate OS specific
    preprocessor symbols.

    This approach is a bit adventureous, because I only tested it with
    linux/glibc2.1 and linux/libc5, but not under other Unix variants RTEMS
    supports. I am quite confident it will work on other hosts, too, but who
    knows :-.

    [FYI: I think this might also is the cause of some problems with RedHat
    6.X / Mandrake linux recently reported on the rtems list -- rtems-4.0.0
    can not be build for posix on any glibc2.1 based host]

    Furthermore the patch below contains a couple of minor fixes and
    configuration cleanups, which IMO should be applied before releasing a
    new snapshot.

    To apply this patch:

        cd <source-tree>
        patch -p1 < rtems-rc-19990709-8.diff
        ./autogen
---
 c/src/lib/configure | 432 +++-------------------------------------------------
 1 file changed, 25 insertions(+), 407 deletions(-)

(limited to 'c/src/lib/configure')

diff --git a/c/src/lib/configure b/c/src/lib/configure
index fed56fb847..e759b423e1 100644
--- a/c/src/lib/configure
+++ b/c/src/lib/configure
@@ -2190,387 +2190,6 @@ else
   RTEMS_GAS_CODE16_FALSE=
 fi;
 
-# Extract the first word of "gcc", so it can be a program name with args.
-set dummy gcc; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2197: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_CC="gcc"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-CC="$ac_cv_prog_CC"
-if test -n "$CC"; then
-  echo "$ac_t""$CC" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-if test -z "$CC"; then
-  # Extract the first word of "cc", so it can be a program name with args.
-set dummy cc; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2227: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_prog_rejected=no
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
-        ac_prog_rejected=yes
-	continue
-      fi
-      ac_cv_prog_CC="cc"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-if test $ac_prog_rejected = yes; then
-  # We found a bogon in the path, so make sure we never use it.
-  set dummy $ac_cv_prog_CC
-  shift
-  if test $# -gt 0; then
-    # We chose a different compiler from the bogus one.
-    # However, it has the same basename, so the bogon will be chosen
-    # first if we set CC to just the basename; use the full file name.
-    shift
-    set dummy "$ac_dir/$ac_word" "$@"
-    shift
-    ac_cv_prog_CC="$@"
-  fi
-fi
-fi
-fi
-CC="$ac_cv_prog_CC"
-if test -n "$CC"; then
-  echo "$ac_t""$CC" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-  if test -z "$CC"; then
-    case "`uname -s`" in
-    *win32* | *WIN32*)
-      # Extract the first word of "cl", so it can be a program name with args.
-set dummy cl; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2278: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_CC="cl"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-CC="$ac_cv_prog_CC"
-if test -n "$CC"; then
-  echo "$ac_t""$CC" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
- ;;
-    esac
-  fi
-  test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
-fi
-
-echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:2310: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
-
-ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
-
-cat > conftest.$ac_ext << EOF
-
-#line 2321 "configure"
-#include "confdefs.h"
-
-main(){return(0);}
-EOF
-if { (eval echo configure:2326: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  ac_cv_prog_cc_works=yes
-  # If we can't run a trivial program, we are probably using a cross compiler.
-  if (./conftest; exit) 2>/dev/null; then
-    ac_cv_prog_cc_cross=no
-  else
-    ac_cv_prog_cc_cross=yes
-  fi
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  ac_cv_prog_cc_works=no
-fi
-rm -fr conftest*
-ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
-
-echo "$ac_t""$ac_cv_prog_cc_works" 1>&6
-if test $ac_cv_prog_cc_works = no; then
-  { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
-fi
-echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:2352: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
-echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
-cross_compiling=$ac_cv_prog_cc_cross
-
-echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:2357: checking whether we are using GNU C" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.c <<EOF
-#ifdef __GNUC__
-  yes;
-#endif
-EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:2366: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
-  ac_cv_prog_gcc=yes
-else
-  ac_cv_prog_gcc=no
-fi
-fi
-
-echo "$ac_t""$ac_cv_prog_gcc" 1>&6
-
-if test $ac_cv_prog_gcc = yes; then
-  GCC=yes
-else
-  GCC=
-fi
-
-ac_test_CFLAGS="${CFLAGS+set}"
-ac_save_CFLAGS="$CFLAGS"
-CFLAGS=
-echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:2385: checking whether ${CC-cc} accepts -g" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  echo 'void f(){}' > conftest.c
-if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
-  ac_cv_prog_cc_g=yes
-else
-  ac_cv_prog_cc_g=no
-fi
-rm -f conftest*
-
-fi
-
-echo "$ac_t""$ac_cv_prog_cc_g" 1>&6
-if test "$ac_test_CFLAGS" = set; then
-  CFLAGS="$ac_save_CFLAGS"
-elif test $ac_cv_prog_cc_g = yes; then
-  if test "$GCC" = yes; then
-    CFLAGS="-g -O2"
-  else
-    CFLAGS="-g"
-  fi
-else
-  if test "$GCC" = yes; then
-    CFLAGS="-O2"
-  else
-    CFLAGS=
-  fi
-fi
-
-
-if test "$RTEMS_CPU" = "unix" ; then
-   
-
-echo $ac_n "checking whether $RTEMS_HOST supports System V semaphores""... $ac_c" 1>&6
-echo "configure:2421: checking whether $RTEMS_HOST supports System V semaphores" >&5
-if eval "test \"`echo '$''{'rtems_cv_sysv_sem'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-if test "$cross_compiling" = yes; then
-  :
-else
-  cat > conftest.$ac_ext <<EOF
-#line 2430 "configure"
-#include "confdefs.h"
-
-#include <sys/types.h>
-#include <sys/ipc.h>
-#include <sys/sem.h>
-int main () {
-#if !defined(sun) 
-  union semun arg ;
-#else
-  union semun {
-    int val;
-    struct semid_ds *buf;
-    ushort *array;
-  } arg;
-#endif
-  int id=semget(IPC_PRIVATE,1,IPC_CREAT|0400);
-  if (id == -1)
-    exit(1);
-  arg.val = 0; /* avoid implicit type cast to union */
-  if (semctl(id, 0, IPC_RMID, arg) == -1)
-    exit(1);
-  exit(0);
-}
-
-EOF
-if { (eval echo configure:2456: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-then
-  rtems_cv_sysv_sem="yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -fr conftest*
-  rtems_cv_sysv_sem="no"
-fi
-rm -fr conftest*
-fi
-
-
-fi
-
-echo "$ac_t""$rtems_cv_sysv_sem" 1>&6
-
-  if test "$rtems_cv_sysv_sem" != "yes" ; then
-    { echo "configure: error: System V semaphores don't work, required by simulator" 1>&2; exit 1; }
-  fi
-   
-
-echo $ac_n "checking whether $RTEMS_HOST supports System V shared memory""... $ac_c" 1>&6
-echo "configure:2479: checking whether $RTEMS_HOST supports System V shared memory" >&5
-if eval "test \"`echo '$''{'rtems_cv_sysv_shm'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-if test "$cross_compiling" = yes; then
-  :
-else
-  cat > conftest.$ac_ext <<EOF
-#line 2488 "configure"
-#include "confdefs.h"
-
-#include <sys/types.h>
-#include <sys/ipc.h>
-#include <sys/shm.h>
-int main () {
-  int id=shmget(IPC_PRIVATE,1,IPC_CREAT|0400);
-  if (id == -1)
-    exit(1);
-  if (shmctl(id, IPC_RMID, 0) == -1)
-    exit(1);
-  exit(0);
-}
-
-EOF
-if { (eval echo configure:2504: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-then
-  rtems_cv_sysv_shm="yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -fr conftest*
-  rtems_cv_sysv_shm="no"
-fi
-rm -fr conftest*
-fi
-
-
-fi
-
-echo "$ac_t""$rtems_cv_sysv_shm" 1>&6
-
-  if test "$rtems_cv_sysv_shm" != "yes" ; then
-    { echo "configure: error: System V shared memory doesn't work, required by simulator" 1>&2; exit 1; }
-  fi
-   
-
-echo $ac_n "checking whether $RTEMS_HOST supports System V messages""... $ac_c" 1>&6
-echo "configure:2527: checking whether $RTEMS_HOST supports System V messages" >&5
-if eval "test \"`echo '$''{'rtems_cv_sysv_msg'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-if test "$cross_compiling" = yes; then
-  :
-else
-  cat > conftest.$ac_ext <<EOF
-#line 2536 "configure"
-#include "confdefs.h"
-
-#include <sys/types.h>
-#include <sys/ipc.h>
-#include <sys/msg.h>
-int main () {
-  int id=msgget(IPC_PRIVATE,IPC_CREAT|0400);
-  if (id == -1)
-    exit(1);
-  if (msgctl(id, IPC_RMID, 0) == -1)
-    exit(1);
-  exit(0);
-}
-
-EOF
-if { (eval echo configure:2552: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-then
-  rtems_cv_sysv_msg="yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -fr conftest*
-  rtems_cv_sysv_msg="no"
-fi
-rm -fr conftest*
-fi
-
-
-fi
-
-echo "$ac_t""$rtems_cv_sysv_msg" 1>&6
-
-  if test "$rtems_cv_sysv_msg" != "yes" ; then
-    { echo "configure: error: System V messages don't work, required by simulator" 1>&2; exit 1; }
-  fi
-fi
-
-
 # find all the Makefiles for the BSPs
 makefiles="$makefiles libbsp/$RTEMS_CPU/Makefile"
 
@@ -2579,7 +2198,7 @@ makefiles="$makefiles libbsp/bare/Makefile"
 fi
 
 echo $ac_n "checking for make/custom/$RTEMS_BSP.cfg""... $ac_c" 1>&6
-echo "configure:2583: checking for make/custom/$RTEMS_BSP.cfg" >&5
+echo "configure:2202: checking for make/custom/$RTEMS_BSP.cfg" >&5
 if test -r "$srcdir/$RTEMS_TOPdir/make/custom/$RTEMS_BSP.cfg"; then
   echo "$ac_t""yes" 1>&6
 else
@@ -2587,7 +2206,7 @@ else
 fi
 
 echo $ac_n "checking whether BSP supports multiprocessing""... $ac_c" 1>&6
-echo "configure:2591: checking whether BSP supports multiprocessing" >&5
+echo "configure:2210: checking whether BSP supports multiprocessing" >&5
 if eval "test \"`echo '$''{'rtems_cv_HAS_MP'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2611,7 +2230,7 @@ fi
 
 
 echo $ac_n "checking whether to build rtems++""... $ac_c" 1>&6
-echo "configure:2615: checking whether to build rtems++" >&5
+echo "configure:2234: checking whether to build rtems++" >&5
 if eval "test \"`echo '$''{'rtems_cv_HAS_CPLUSPLUS'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2630,7 +2249,7 @@ echo "$ac_t""$rtems_cv_HAS_CPLUSPLUS" 1>&6
 HAS_CPLUSPLUS="$rtems_cv_HAS_CPLUSPLUS";
 
 echo $ac_n "checking whether BSP supports networking""... $ac_c" 1>&6
-echo "configure:2634: checking whether BSP supports networking" >&5
+echo "configure:2253: checking whether BSP supports networking" >&5
 if eval "test \"`echo '$''{'rtems_cv_HAS_NETWORKING'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2695,7 +2314,7 @@ fi
 if test -d "$srcdir/libbsp/$bspcpudir$bspdir"; then
   
 echo $ac_n "checking for Makefile.in in libbsp/${bspcpudir}$bspdir""... $ac_c" 1>&6
-echo "configure:2699: checking for Makefile.in in libbsp/${bspcpudir}$bspdir" >&5
+echo "configure:2318: checking for Makefile.in in libbsp/${bspcpudir}$bspdir" >&5
 if test -d $srcdir/libbsp/${bspcpudir}$bspdir; then
   rtems_av_save_dir=`pwd`;
   cd $srcdir;
@@ -2710,7 +2329,7 @@ fi
 
   
 echo $ac_n "checking for Makefile.in in libbsp/${bspcpudir}shared""... $ac_c" 1>&6
-echo "configure:2714: checking for Makefile.in in libbsp/${bspcpudir}shared" >&5
+echo "configure:2333: checking for Makefile.in in libbsp/${bspcpudir}shared" >&5
 if test -d $srcdir/libbsp/${bspcpudir}shared; then
   rtems_av_save_dir=`pwd`;
   cd $srcdir;
@@ -2754,7 +2373,7 @@ fi
 # find all the CPU dependent library Makefiles
 
 echo $ac_n "checking for Makefile.in in libcpu/$RTEMS_CPU""... $ac_c" 1>&6
-echo "configure:2758: checking for Makefile.in in libcpu/$RTEMS_CPU" >&5
+echo "configure:2377: checking for Makefile.in in libcpu/$RTEMS_CPU" >&5
 if test -d $srcdir/libcpu/$RTEMS_CPU; then
   rtems_av_save_dir=`pwd`;
   cd $srcdir;
@@ -2774,7 +2393,7 @@ case "${target}" in
   *)
     
 echo $ac_n "checking for Makefile.in in start/$RTEMS_CPU""... $ac_c" 1>&6
-echo "configure:2778: checking for Makefile.in in start/$RTEMS_CPU" >&5
+echo "configure:2397: checking for Makefile.in in start/$RTEMS_CPU" >&5
 if test -d $srcdir/start/$RTEMS_CPU; then
   rtems_av_save_dir=`pwd`;
   cd $srcdir;
@@ -2794,7 +2413,7 @@ esac
 if test "$HAS_NETWORKING" = "yes"; then
   
 echo $ac_n "checking for Makefile.in in libnetworking""... $ac_c" 1>&6
-echo "configure:2798: checking for Makefile.in in libnetworking" >&5
+echo "configure:2417: checking for Makefile.in in libnetworking" >&5
 if test -d $srcdir/libnetworking; then
   rtems_av_save_dir=`pwd`;
   cd $srcdir;
@@ -2809,7 +2428,7 @@ fi
 
   
 echo $ac_n "checking for Makefile.in in librpc""... $ac_c" 1>&6
-echo "configure:2813: checking for Makefile.in in librpc" >&5
+echo "configure:2432: checking for Makefile.in in librpc" >&5
 if test -d $srcdir/librpc; then
   rtems_av_save_dir=`pwd`;
   cd $srcdir;
@@ -2825,7 +2444,7 @@ fi
 
   if test "$HAS_RDBG" = "yes"; then
     echo $ac_n "checking whether BSP supports librdbg""... $ac_c" 1>&6
-echo "configure:2829: checking whether BSP supports librdbg" >&5
+echo "configure:2448: checking whether BSP supports librdbg" >&5
 if eval "test \"`echo '$''{'rtems_cv_HAS_RDBG'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2847,7 +2466,7 @@ HAS_RDBG="$rtems_cv_HAS_RDBG"
       # Extract the first word of "rpcgen", so it can be a program name with args.
 set dummy rpcgen; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2851: checking for $ac_word" >&5
+echo "configure:2470: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RPCGEN'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2878,7 +2497,7 @@ do
 # 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 "configure:2882: checking for $ac_word" >&5
+echo "configure:2501: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AWK'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2917,7 +2536,7 @@ done
     if test "$HAS_RDBG" = "yes"; then
       
 echo $ac_n "checking for Makefile.in in librdbg""... $ac_c" 1>&6
-echo "configure:2921: checking for Makefile.in in librdbg" >&5
+echo "configure:2540: checking for Makefile.in in librdbg" >&5
 if test -d $srcdir/librdbg; then
   rtems_av_save_dir=`pwd`;
   cd $srcdir;
@@ -2938,7 +2557,7 @@ fi
 if test "$HAS_CPLUSPLUS" = "yes"; then
   
 echo $ac_n "checking for Makefile.in in librtems++""... $ac_c" 1>&6
-echo "configure:2942: checking for Makefile.in in librtems++" >&5
+echo "configure:2561: checking for Makefile.in in librtems++" >&5
 if test -d $srcdir/librtems++; then
   rtems_av_save_dir=`pwd`;
   cd $srcdir;
@@ -2969,13 +2588,13 @@ fi
 
 if test "$RTEMS_HAS_HWAPI" = "yes"; then
   echo $ac_n "checking whether libwapi is present""... $ac_c" 1>&6
-echo "configure:2973: checking whether libwapi is present" >&5
+echo "configure:2592: checking whether libwapi is present" >&5
   if test -f ${srcdir}/libhwapi/Makefile.in ; then
     echo "$ac_t""yes" 1>&6
     makefiles="$makefiles libhwapi/Makefile"
     
 echo $ac_n "checking for Makefile.in in libhwapi/analog""... $ac_c" 1>&6
-echo "configure:2979: checking for Makefile.in in libhwapi/analog" >&5
+echo "configure:2598: checking for Makefile.in in libhwapi/analog" >&5
 if test -d $srcdir/libhwapi/analog; then
   rtems_av_save_dir=`pwd`;
   cd $srcdir;
@@ -2990,7 +2609,7 @@ fi
 
     
 echo $ac_n "checking for Makefile.in in libhwapi/discrete""... $ac_c" 1>&6
-echo "configure:2994: checking for Makefile.in in libhwapi/discrete" >&5
+echo "configure:2613: checking for Makefile.in in libhwapi/discrete" >&5
 if test -d $srcdir/libhwapi/discrete; then
   rtems_av_save_dir=`pwd`;
   cd $srcdir;
@@ -3005,7 +2624,7 @@ fi
 
     
 echo $ac_n "checking for Makefile.in in libhwapi/drivers""... $ac_c" 1>&6
-echo "configure:3009: checking for Makefile.in in libhwapi/drivers" >&5
+echo "configure:2628: checking for Makefile.in in libhwapi/drivers" >&5
 if test -d $srcdir/libhwapi/drivers; then
   rtems_av_save_dir=`pwd`;
   cd $srcdir;
@@ -3020,7 +2639,7 @@ fi
 
     
 echo $ac_n "checking for Makefile.in in libhwapi/non_volatile_memory""... $ac_c" 1>&6
-echo "configure:3024: checking for Makefile.in in libhwapi/non_volatile_memory" >&5
+echo "configure:2643: checking for Makefile.in in libhwapi/non_volatile_memory" >&5
 if test -d $srcdir/libhwapi/non_volatile_memory; then
   rtems_av_save_dir=`pwd`;
   cd $srcdir;
@@ -3035,7 +2654,7 @@ fi
 
     
 echo $ac_n "checking for Makefile.in in libhwapi/serial""... $ac_c" 1>&6
-echo "configure:3039: checking for Makefile.in in libhwapi/serial" >&5
+echo "configure:2658: checking for Makefile.in in libhwapi/serial" >&5
 if test -d $srcdir/libhwapi/serial; then
   rtems_av_save_dir=`pwd`;
   cd $srcdir;
@@ -3050,7 +2669,7 @@ fi
 
     
 echo $ac_n "checking for Makefile.in in libhwapi/support""... $ac_c" 1>&6
-echo "configure:3054: checking for Makefile.in in libhwapi/support" >&5
+echo "configure:2673: checking for Makefile.in in libhwapi/support" >&5
 if test -d $srcdir/libhwapi/support; then
   rtems_av_save_dir=`pwd`;
   cd $srcdir;
@@ -3065,7 +2684,7 @@ fi
 
     
 echo $ac_n "checking for Makefile.in in libhwapi/wrapup""... $ac_c" 1>&6
-echo "configure:3069: checking for Makefile.in in libhwapi/wrapup" >&5
+echo "configure:2688: checking for Makefile.in in libhwapi/wrapup" >&5
 if test -d $srcdir/libhwapi/wrapup; then
   rtems_av_save_dir=`pwd`;
   cd $srcdir;
@@ -3095,7 +2714,7 @@ if test "$RTEMS_CPU" != "unix"; then
 ## HACK: Suppress libchip for unix
 
 echo $ac_n "checking for Makefile.in in libchip""... $ac_c" 1>&6
-echo "configure:3099: checking for Makefile.in in libchip" >&5
+echo "configure:2718: checking for Makefile.in in libchip" >&5
 if test -d $srcdir/libchip; then
   rtems_av_save_dir=`pwd`;
   cd $srcdir;
@@ -3112,7 +2731,7 @@ fi
 
 
 echo $ac_n "checking for Makefile.in in libmisc""... $ac_c" 1>&6
-echo "configure:3116: checking for Makefile.in in libmisc" >&5
+echo "configure:2735: checking for Makefile.in in libmisc" >&5
 if test -d $srcdir/libmisc; then
   rtems_av_save_dir=`pwd`;
   cd $srcdir;
@@ -3334,7 +2953,6 @@ s%@STRIP_FOR_TARGET@%$STRIP_FOR_TARGET%g
 s%@RTEMS_GAS_CODE16@%$RTEMS_GAS_CODE16%g
 s%@RTEMS_GAS_CODE16_TRUE@%$RTEMS_GAS_CODE16_TRUE%g
 s%@RTEMS_GAS_CODE16_FALSE@%$RTEMS_GAS_CODE16_FALSE%g
-s%@CC@%$CC%g
 s%@HAS_MP@%$HAS_MP%g
 s%@HAS_CPLUSPLUS@%$HAS_CPLUSPLUS%g
 s%@HAS_NETWORKING@%$HAS_NETWORKING%g
-- 
cgit v1.2.3