summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>1999-03-29 22:24:23 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>1999-03-29 22:24:23 +0000
commite5f4e5aaff76424f6977d9938cb6ffa10e24f354 (patch)
tree6f3114b43124b7546e748831dbfde12eba801ee2
parentPatch from Ralf Corsepius <corsepiu@faw.uni-ulm.de> to fix a typo. (diff)
downloadrtems-e5f4e5aaff76424f6977d9938cb6ffa10e24f354.tar.bz2
Patch from Ralf Corsepius <corsepiu@faw.uni-ulm.de>:
rtems-rc-19990326-2.diff: Enhancements to autoconf support for librdbg * autoconf-checks for AWK and RPCGEN * disable librdbg if either AWK, RPCGEN or librdbg/$target_cpu cannot be found
-rw-r--r--c/src/lib/librdbg/Makefile.in4
-rw-r--r--c/src/librdbg/src/Makefile.in4
-rw-r--r--configure127
-rw-r--r--configure.in18
4 files changed, 127 insertions, 26 deletions
diff --git a/c/src/lib/librdbg/Makefile.in b/c/src/lib/librdbg/Makefile.in
index af9e8090c6..50a2e2d3d4 100644
--- a/c/src/lib/librdbg/Makefile.in
+++ b/c/src/lib/librdbg/Makefile.in
@@ -47,8 +47,8 @@ X_FILES=$(X_FILE1) $(X_FILE2)
SRCS=$(C_FILES) $(ASM_FILES) $(C_GEN_FILES) $(H_FILES)
OBJS=$(C_GEN_O_FILES) $(C_O_FILES) $(ASM_O_FILES)
-RPCGEN=rpcgen
-AWK=awk
+RPCGEN=@RPCGEN@
+AWK=@AWK@
include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
include $(RTEMS_ROOT)/make/lib.cfg
diff --git a/c/src/librdbg/src/Makefile.in b/c/src/librdbg/src/Makefile.in
index af9e8090c6..50a2e2d3d4 100644
--- a/c/src/librdbg/src/Makefile.in
+++ b/c/src/librdbg/src/Makefile.in
@@ -47,8 +47,8 @@ X_FILES=$(X_FILE1) $(X_FILE2)
SRCS=$(C_FILES) $(ASM_FILES) $(C_GEN_FILES) $(H_FILES)
OBJS=$(C_GEN_O_FILES) $(C_O_FILES) $(ASM_O_FILES)
-RPCGEN=rpcgen
-AWK=awk
+RPCGEN=@RPCGEN@
+AWK=@AWK@
include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
include $(RTEMS_ROOT)/make/lib.cfg
diff --git a/configure b/configure
index ebdd1c3c10..20d7ab13a7 100644
--- a/configure
+++ b/configure
@@ -3544,9 +3544,89 @@ fi
if test "$RTEMS_HAS_RDBG" = "yes"; then
-
+ echo $ac_n "checking whether cpu supports rdbg? ""... $ac_c" 1>&6
+echo "configure:3549: checking whether cpu supports rdbg? " >&5
+ test ! -d "$srcdir/c/src/lib/librdbg/$target_cpu" && RTEMS_HAS_RDBG="no" ;
+ echo "$ac_t""$RTEMS_HAS_RDBG" 1>&6
+ if test "$RTEMS_HAS_RDBG" = "yes"; then
+ # 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:3556: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_path_RPCGEN'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ case "$RPCGEN" in
+ /*)
+ ac_cv_path_RPCGEN="$RPCGEN" # Let the user override the test with a path.
+ ;;
+ ?:/*)
+ ac_cv_path_RPCGEN="$RPCGEN" # Let the user override the test with a dos path.
+ ;;
+ *)
+ 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_path_RPCGEN="$ac_dir/$ac_word"
+ break
+ fi
+ done
+ IFS="$ac_save_ifs"
+ ;;
+esac
+fi
+RPCGEN="$ac_cv_path_RPCGEN"
+if test -n "$RPCGEN"; then
+ echo "$ac_t""$RPCGEN" 1>&6
+else
+ echo "$ac_t""no" 1>&6
+fi
+
+ test -z "$RPCGEN" && RTEMS_HAS_RDBG="no"
+ fi
+ if test "$RTEMS_HAS_RDBG" = "yes"; then
+ for ac_prog in mawk gawk nawk awk
+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:3596: 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
+ if test -n "$AWK"; then
+ ac_cv_prog_AWK="$AWK" # 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_AWK="$ac_prog"
+ break
+ fi
+ done
+ IFS="$ac_save_ifs"
+fi
+fi
+AWK="$ac_cv_prog_AWK"
+if test -n "$AWK"; then
+ echo "$ac_t""$AWK" 1>&6
+else
+ echo "$ac_t""no" 1>&6
+fi
+
+test -n "$AWK" && break
+done
+
+ test -z "$AWK" && RTEMS_HAS_RDBG="no"
+ fi
+ if test "$RTEMS_HAS_RDBG" = "yes"; then
+
echo $ac_n "checking for Makefile.in in c/src/lib/librdbg""... $ac_c" 1>&6
-echo "configure:3550: checking for Makefile.in in c/src/lib/librdbg" >&5
+echo "configure:3630: checking for Makefile.in in c/src/lib/librdbg" >&5
if test -d $srcdir/c/src/lib/librdbg; then
rtems_av_save_dir=`pwd`;
cd $srcdir;
@@ -3559,6 +3639,9 @@ else
fi
+ else
+ echo "configure: warning: *** warning disabling --enable-rdbg" 1>&2
+ fi
fi
fi
@@ -3570,7 +3653,7 @@ fi
# If the tests are enabled, then find all the test suite Makefiles
echo $ac_n "checking if the test suites are enabled? ""... $ac_c" 1>&6
-echo "configure:3574: checking if the test suites are enabled? " >&5
+echo "configure:3657: checking if the test suites are enabled? " >&5
tests_enabled=yes
# Check whether --enable-tests or --disable-tests was given.
if test "${enable_tests+set}" = set; then
@@ -3588,7 +3671,7 @@ fi
echo $ac_n "checking for Makefile.in in c/src/tests/tools/$target_cpu""... $ac_c" 1>&6
-echo "configure:3592: checking for Makefile.in in c/src/tests/tools/$target_cpu" >&5
+echo "configure:3675: checking for Makefile.in in c/src/tests/tools/$target_cpu" >&5
if test -d $srcdir/c/src/tests/tools/$target_cpu; then
rtems_av_save_dir=`pwd`;
cd $srcdir;
@@ -3605,7 +3688,7 @@ fi
if test "$tests_enabled" = "yes"; then
echo $ac_n "checking for Makefile.in in c/src/tests/libtests""... $ac_c" 1>&6
-echo "configure:3609: checking for Makefile.in in c/src/tests/libtests" >&5
+echo "configure:3692: checking for Makefile.in in c/src/tests/libtests" >&5
if test -d $srcdir/c/src/tests/libtests; then
rtems_av_save_dir=`pwd`;
cd $srcdir;
@@ -3620,7 +3703,7 @@ fi
echo $ac_n "checking for Makefile.in in c/src/tests/sptests""... $ac_c" 1>&6
-echo "configure:3624: checking for Makefile.in in c/src/tests/sptests" >&5
+echo "configure:3707: checking for Makefile.in in c/src/tests/sptests" >&5
if test -d $srcdir/c/src/tests/sptests; then
rtems_av_save_dir=`pwd`;
cd $srcdir;
@@ -3635,7 +3718,7 @@ fi
echo $ac_n "checking for Makefile.in in c/src/tests/tmtests""... $ac_c" 1>&6
-echo "configure:3639: checking for Makefile.in in c/src/tests/tmtests" >&5
+echo "configure:3722: checking for Makefile.in in c/src/tests/tmtests" >&5
if test -d $srcdir/c/src/tests/tmtests; then
rtems_av_save_dir=`pwd`;
cd $srcdir;
@@ -3651,7 +3734,7 @@ fi
if test "$RTEMS_HAS_MULTIPROCESSING" = "yes"; then
echo $ac_n "checking for Makefile.in in c/src/tests/mptests""... $ac_c" 1>&6
-echo "configure:3655: checking for Makefile.in in c/src/tests/mptests" >&5
+echo "configure:3738: checking for Makefile.in in c/src/tests/mptests" >&5
if test -d $srcdir/c/src/tests/mptests; then
rtems_av_save_dir=`pwd`;
cd $srcdir;
@@ -3668,7 +3751,7 @@ fi
if test "$RTEMS_HAS_POSIX_API" = "yes"; then
echo $ac_n "checking for Makefile.in in c/src/tests/psxtests""... $ac_c" 1>&6
-echo "configure:3672: checking for Makefile.in in c/src/tests/psxtests" >&5
+echo "configure:3755: checking for Makefile.in in c/src/tests/psxtests" >&5
if test -d $srcdir/c/src/tests/psxtests; then
rtems_av_save_dir=`pwd`;
cd $srcdir;
@@ -3702,13 +3785,13 @@ fi
if test "$RTEMS_HAS_HWAPI" = "yes"; then
echo $ac_n "checking whether libwapi is present""... $ac_c" 1>&6
-echo "configure:3706: checking whether libwapi is present" >&5
+echo "configure:3789: checking whether libwapi is present" >&5
if test -f ${srcdir}/c/src/lib/libhwapi/Makefile.in ; then
echo "$ac_t""yes" 1>&6
makefiles="$makefiles c/src/lib/libhwapi/Makefile"
echo $ac_n "checking for Makefile.in in c/src/lib/libhwapi/analog""... $ac_c" 1>&6
-echo "configure:3712: checking for Makefile.in in c/src/lib/libhwapi/analog" >&5
+echo "configure:3795: checking for Makefile.in in c/src/lib/libhwapi/analog" >&5
if test -d $srcdir/c/src/lib/libhwapi/analog; then
rtems_av_save_dir=`pwd`;
cd $srcdir;
@@ -3723,7 +3806,7 @@ fi
echo $ac_n "checking for Makefile.in in c/src/lib/libhwapi/discrete""... $ac_c" 1>&6
-echo "configure:3727: checking for Makefile.in in c/src/lib/libhwapi/discrete" >&5
+echo "configure:3810: checking for Makefile.in in c/src/lib/libhwapi/discrete" >&5
if test -d $srcdir/c/src/lib/libhwapi/discrete; then
rtems_av_save_dir=`pwd`;
cd $srcdir;
@@ -3738,7 +3821,7 @@ fi
echo $ac_n "checking for Makefile.in in c/src/lib/libhwapi/drivers""... $ac_c" 1>&6
-echo "configure:3742: checking for Makefile.in in c/src/lib/libhwapi/drivers" >&5
+echo "configure:3825: checking for Makefile.in in c/src/lib/libhwapi/drivers" >&5
if test -d $srcdir/c/src/lib/libhwapi/drivers; then
rtems_av_save_dir=`pwd`;
cd $srcdir;
@@ -3753,7 +3836,7 @@ fi
echo $ac_n "checking for Makefile.in in c/src/lib/libhwapi/non_volatile_memory""... $ac_c" 1>&6
-echo "configure:3757: checking for Makefile.in in c/src/lib/libhwapi/non_volatile_memory" >&5
+echo "configure:3840: checking for Makefile.in in c/src/lib/libhwapi/non_volatile_memory" >&5
if test -d $srcdir/c/src/lib/libhwapi/non_volatile_memory; then
rtems_av_save_dir=`pwd`;
cd $srcdir;
@@ -3768,7 +3851,7 @@ fi
echo $ac_n "checking for Makefile.in in c/src/lib/libhwapi/serial""... $ac_c" 1>&6
-echo "configure:3772: checking for Makefile.in in c/src/lib/libhwapi/serial" >&5
+echo "configure:3855: checking for Makefile.in in c/src/lib/libhwapi/serial" >&5
if test -d $srcdir/c/src/lib/libhwapi/serial; then
rtems_av_save_dir=`pwd`;
cd $srcdir;
@@ -3783,7 +3866,7 @@ fi
echo $ac_n "checking for Makefile.in in c/src/lib/libhwapi/support""... $ac_c" 1>&6
-echo "configure:3787: checking for Makefile.in in c/src/lib/libhwapi/support" >&5
+echo "configure:3870: checking for Makefile.in in c/src/lib/libhwapi/support" >&5
if test -d $srcdir/c/src/lib/libhwapi/support; then
rtems_av_save_dir=`pwd`;
cd $srcdir;
@@ -3798,7 +3881,7 @@ fi
echo $ac_n "checking for Makefile.in in c/src/lib/libhwapi/wrapup""... $ac_c" 1>&6
-echo "configure:3802: checking for Makefile.in in c/src/lib/libhwapi/wrapup" >&5
+echo "configure:3885: checking for Makefile.in in c/src/lib/libhwapi/wrapup" >&5
if test -d $srcdir/c/src/lib/libhwapi/wrapup; then
rtems_av_save_dir=`pwd`;
cd $srcdir;
@@ -3842,7 +3925,7 @@ fi
# pick up all the Makefiles in required parts of the tree
echo $ac_n "checking for Makefile.in in make""... $ac_c" 1>&6
-echo "configure:3846: checking for Makefile.in in make" >&5
+echo "configure:3929: checking for Makefile.in in make" >&5
if test -d $srcdir/make; then
rtems_av_save_dir=`pwd`;
cd $srcdir;
@@ -3857,7 +3940,7 @@ fi
echo $ac_n "checking for Makefile.in in c/src/lib/libchip""... $ac_c" 1>&6
-echo "configure:3861: checking for Makefile.in in c/src/lib/libchip" >&5
+echo "configure:3944: checking for Makefile.in in c/src/lib/libchip" >&5
if test -d $srcdir/c/src/lib/libchip; then
rtems_av_save_dir=`pwd`;
cd $srcdir;
@@ -3872,7 +3955,7 @@ fi
echo $ac_n "checking for Makefile.in in c/src/lib/libmisc""... $ac_c" 1>&6
-echo "configure:3876: checking for Makefile.in in c/src/lib/libmisc" >&5
+echo "configure:3959: checking for Makefile.in in c/src/lib/libmisc" >&5
if test -d $srcdir/c/src/lib/libmisc; then
rtems_av_save_dir=`pwd`;
cd $srcdir;
@@ -3887,7 +3970,7 @@ fi
echo $ac_n "checking for Makefile.in in c/src/tests/samples""... $ac_c" 1>&6
-echo "configure:3891: checking for Makefile.in in c/src/tests/samples" >&5
+echo "configure:3974: checking for Makefile.in in c/src/tests/samples" >&5
if test -d $srcdir/c/src/tests/samples; then
rtems_av_save_dir=`pwd`;
cd $srcdir;
@@ -4151,6 +4234,8 @@ s%@RTEMS_GAS_CODE16@%$RTEMS_GAS_CODE16%g
s%@CC@%$CC%g
s%@EXEEXT@%$EXEEXT%g
s%@GCCSED@%$GCCSED%g
+s%@RPCGEN@%$RPCGEN%g
+s%@AWK@%$AWK%g
s%@subdirs@%$subdirs%g
s%@RTEMS_HAS_HWAPI@%$RTEMS_HAS_HWAPI%g
s%@rtems_cv_prog_cc_cross@%$rtems_cv_prog_cc_cross%g
diff --git a/configure.in b/configure.in
index 481540061c..bbae5d09c4 100644
--- a/configure.in
+++ b/configure.in
@@ -1,3 +1,4 @@
+
dnl Process this file with autoconf to produce a configure script.
dnl
dnl $Id$
@@ -310,7 +311,22 @@ if test "$RTEMS_HAS_NETWORKING" = "yes"; then
RTEMS_CHECK_MAKEFILE(c/src/lib/libnetworking)
RTEMS_CHECK_MAKEFILE(c/src/lib/librpc)
if test "$RTEMS_HAS_RDBG" = "yes"; then
- RTEMS_CHECK_MAKEFILE(c/src/lib/librdbg)
+ AC_MSG_CHECKING([whether cpu supports rdbg? ])
+ test ! -d "$srcdir/c/src/lib/librdbg/$target_cpu" && RTEMS_HAS_RDBG="no" ;
+ AC_MSG_RESULT($RTEMS_HAS_RDBG)
+ if test "$RTEMS_HAS_RDBG" = "yes"; then
+ AC_PATH_PROG(RPCGEN,rpcgen)
+ test -z "$RPCGEN" && RTEMS_HAS_RDBG="no"
+ fi
+ if test "$RTEMS_HAS_RDBG" = "yes"; then
+ AC_PROG_AWK
+ test -z "$AWK" && RTEMS_HAS_RDBG="no"
+ fi
+ if test "$RTEMS_HAS_RDBG" = "yes"; then
+ RTEMS_CHECK_MAKEFILE(c/src/lib/librdbg)
+ else
+ AC_MSG_WARN([*** warning disabling --enable-rdbg])
+ fi
fi
fi