Update of /cvsroot/libfunutil/libfunutil/toc/tests
In directory sc8-pr-cvs1:/tmp/cvs-serv29062
Modified Files:
toc_core_tests.sh
Log Message:
modernized a bit. Removed 'install' in favor of install-sh.
Index: toc_core_tests.sh
===================================================================
RCS file: /cvsroot/libfunutil/libfunutil/toc/tests/toc_core_tests.sh,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- toc_core_tests.sh 28 Aug 2003 09:29:43 -0000 1.5
+++ toc_core_tests.sh 29 Aug 2003 08:47:26 -0000 1.6
@@ -3,35 +3,41 @@
# pass for a tree to be considered toc-capable may be placed
# in here.
+toc_quietly "Required components:"
for x in \
- awk-AWK \
- bash-SHELL \
- cat-CAT \
- cut-CUT \
- gzip-GZIP \
- install-INSTALLER_BIN \
- ls-LS \
- more-XtocX \
- perl-PERL \
- sed-SED \
+ awk=AWK \
+ bash=SHELL \
+ cat=CAT \
+ cut=CUT \
+ gzip=GZIP \
+ ls=LS \
+ more=XtocX \
+ perl=PERL \
+ sed=SED \
+ xargs=XARGS \
; do
- f=${x%%-*}
- v=${x##*-}
+ f=${x%%=*}
+ v=${x##*=}
toc_find_failok $f || {
- echo "configure couldn't find required app: $core_app"
+ echo "configure couldn't find required app: $f"
return 1
}
test "x$v" = "xXtocX" && continue
toc_add_make $v=${TOC_FIND_RESULT}
done
+toc_find_fail install-sh ${TOC_TOCDIR}/bin
+toc_add_make INSTALLER_BIN="\$(top_srcdir)/${TOC_FIND_RESULT##${PWD}/}"
+toc_find_fail makedist ${TOC_TOCDIR}/bin
+toc_add_make TOC_MAKEDIST_BIN="\$(top_srcdir)/${TOC_FIND_RESULT##${PWD}/}"
+
for x in \
gnu_make \
gnu_find \
gnu_tar \
; do
toc_run_failok $x || {
- echo "configure's core build-tree sanity check failed."
+ echo "required test $x failed."
return 1
}
done
@@ -39,6 +45,17 @@
#toc_run_failok gnu_install || {
# boldecho "Didn't find GNU install. You won't be able to do a 'make install'."
#}
+
+toc_quietly "Optional components:"
+for x in \
+ bzip2=BZIP \
+ zip=ZIP \
+ ; do
+ f=${x%%=*}
+ v=${x##*=}
+ toc_find_failok $f
+ toc_add_make $v=${TOC_FIND_RESULT}
+done
toc_boldecho -n "Core configure checks completed. "
echo ${TOC_EMOTICON_OKAY}
|
