[fU-cvs] libfunutil/toc/tests Makefile,1.2,1.3 check_dist_md5s.sh,1.1,1.2 doxygen.sh,1.4,1.5 gcc_build_and_run.sh,1.1,1.2 gcc_try_compile.sh,1.1,1.2 gnu_cpp_tools.sh,1.12,1.13 libltdl.sh,1.1,1.2 lyxport.sh,1.4,1.5 qt.sh,1.6,1.7 toc_core_tests.sh,1.10,1.11

[<sg...@us...>]

Update of /cvsroot/libfunutil/libfunutil/toc/tests
In directory sc8-pr-cvs1:/tmp/cvs-serv14493/toc/tests

Modified Files:
	Makefile check_dist_md5s.sh doxygen.sh gcc_build_and_run.sh 
	gcc_try_compile.sh gnu_cpp_tools.sh libltdl.sh lyxport.sh 
	qt.sh toc_core_tests.sh 
Log Message:
mass commit: fixes/changes from toc/s11n/cl trees.

Index: Makefile
===================================================================
RCS file: /cvsroot/libfunutil/libfunutil/toc/tests/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Makefile	27 Sep 2003 22:34:03 -0000	1.2
+++ Makefile	10 Dec 2003 19:45:20 -0000	1.3
@@ -1,6 +1,6 @@
 
+SUBDIRS = cpp c
 include toc.make
-SUBDIRS = cpp
 DIST_FILES += $(wildcard *.sh)
 
 all: subdirs

Index: check_dist_md5s.sh
===================================================================
RCS file: /cvsroot/libfunutil/libfunutil/toc/tests/check_dist_md5s.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- check_dist_md5s.sh	31 Aug 2003 21:38:57 -0000	1.1
+++ check_dist_md5s.sh	10 Dec 2003 19:45:20 -0000	1.2
@@ -15,7 +15,7 @@
 md5=${TOC_FIND_RESULT}
 tmp=.toc.checkmd5.foo
 ret=0
-$md5 --check $fn > $tmp || {
+$md5 -c $fn > $tmp || {
     grep FAILED $tmp
     echo "md5 check failed! Your distribution does not seem to be an unmodified copy of ${PACKAGE_NAME}!"
     ret=1

Index: doxygen.sh
===================================================================
RCS file: /cvsroot/libfunutil/libfunutil/toc/tests/doxygen.sh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- doxygen.sh	29 Aug 2003 05:30:58 -0000	1.4
+++ doxygen.sh	10 Dec 2003 19:45:20 -0000	1.5
@@ -11,19 +11,18 @@
 fi
 
 if test "x${configure_with_doxygen}" = x || test "x${configure_with_doxygen}" = x1; then
-	toc_find_in_path doxygen $PATH > /dev/null
-	DOXYGEN_BIN=$TOC_FIND_RESULT
+    toc_find_in_path doxygen "$PATH" && DOXYGEN_BIN=${TOC_FIND_RESULT}
 elif test "x${configure_with_doxygen}" = x0; then
-	DOXYGEN_BIN=
+    DOXYGEN_BIN=
 else
-	if test -x ${configure_with_doxygen}; then
-		DOXYGEN_BIN="${configure_with_doxygen}"
+    if test -x ${configure_with_doxygen}; then
+        DOXYGEN_BIN="${configure_with_doxygen}"
     else
-		#  I hate shell scripts!!
-		echo '--with-doxygen "'"${configure_with_doxygen}"'" isn'"'t executable!"
-		toc_add_make DOXYGEN_BIN=
-		return 1
-	fi
+    #  I hate shell scripts!!
+        echo '--with-doxygen "'"${configure_with_doxygen}"'" isn'"'t executable!"
+        toc_add_make DOXYGEN_BIN=
+        return 1
+    fi
 fi
 toc_add_make DOXYGEN_BIN="$DOXYGEN_BIN"
 return 0

Index: gcc_build_and_run.sh
===================================================================
RCS file: /cvsroot/libfunutil/libfunutil/toc/tests/gcc_build_and_run.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- gcc_build_and_run.sh	14 Oct 2003 03:13:48 -0000	1.1
+++ gcc_build_and_run.sh	10 Dec 2003 19:45:20 -0000	1.2
@@ -1,4 +1,4 @@
-# toc_run_description = trying to build $@
+# toc_run_description = $@
 #
 # toc_begin_help = 
 #

Index: gcc_try_compile.sh
===================================================================
RCS file: /cvsroot/libfunutil/libfunutil/toc/tests/gcc_try_compile.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- gcc_try_compile.sh	27 Sep 2003 22:34:39 -0000	1.1
+++ gcc_try_compile.sh	10 Dec 2003 19:45:20 -0000	1.2
@@ -1,4 +1,4 @@
-# toc_run_description = trying to compile $@
+# toc_run_description = $@
 #
 # toc_begin_help = 
 #

Index: gnu_cpp_tools.sh
===================================================================
RCS file: /cvsroot/libfunutil/libfunutil/toc/tests/gnu_cpp_tools.sh,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- gnu_cpp_tools.sh	9 Oct 2003 22:20:54 -0000	1.12
+++ gnu_cpp_tools.sh	10 Dec 2003 19:45:20 -0000	1.13
@@ -18,6 +18,7 @@
 #  - INCLUDES   probably empty
 #  - CPPFLAGS   probably empty
 #  - OPT        -g or -O2 (or some other value specified by --enable-debug)
+#    CFLAGS_OPT - same as OPT (prefered for naming's sake)
 #  - WARN       -Wall (or some other value specified by --enable-warn or --enable-werror)
 #  - CFLAGS     probably empty (or maybe -pipe)
 #  - CXXFLAGS   probably empty (or maybe -pipe)
@@ -60,7 +61,9 @@
     #  They specified some flags.
     OPT="$configure_enable_debug"
 fi
+
 toc_add_make OPT="$OPT"
+toc_add_make CFLAGS_OPT="$OPT"
 
 if test "$configure_enable_warn" = 1; then
     WARN="-Wall $WARN"

Index: libltdl.sh
===================================================================
RCS file: /cvsroot/libfunutil/libfunutil/toc/tests/libltdl.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- libltdl.sh	17 Nov 2003 18:23:28 -0000	1.1
+++ libltdl.sh	10 Dec 2003 19:45:20 -0000	1.2
@@ -17,13 +17,13 @@
 toc_add_config LDADD_LIBLTDL=
 
 err=1
-toc_run_failok gcc_build_and_run toc/tests/c/check_for_ltdlopen_and_friends.c -export-dynamic -lltdl && {
+toc_run_failok gcc_build_and_run ${TOC_HOME}/tests/c/check_for_ltdlopen_and_friends.c -export-dynamic -lltdl && {
     err=0
     toc_add_config HAVE_LIBLTDL=1
     toc_add_config LDADD_LIBLTDL=-lltdl
 }
 
-toc_run_failok gcc_build_and_run toc/tests/c/check_for_dlopen_and_friends.c -export-dynamic -ldl && {
+toc_run_failok gcc_build_and_run ${TOC_HOME}/tests/c/check_for_dlopen_and_friends.c -export-dynamic -ldl && {
     err=0
     toc_add_config HAVE_LIBDL=1
     toc_add_config LDADD_LIBDL=-ldl

Index: lyxport.sh
===================================================================
RCS file: /cvsroot/libfunutil/libfunutil/toc/tests/lyxport.sh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- lyxport.sh	30 Aug 2003 19:20:31 -0000	1.4
+++ lyxport.sh	10 Dec 2003 19:45:20 -0000	1.5
@@ -18,14 +18,14 @@
     return 1
 }
 configure_with_lyxport=${configure_with_lyxport-0}
-path=${PATH}:${TOC_TOCDIR}/bin
+path=${PATH}:${TOC_HOME}/bin
 toc_find_failok lyxport $path || {
     echo "lyxport not found. You can possibly find lyxport at http://www-hep.colorado.edu/~fperez/lyxport"
     return 1
 }
 lyxport=${TOC_FIND_RESULT}
 
-lyxport_makefile=${TOC_TOCDIR}/make/lyxport.make
+lyxport_makefile=${TOC_HOME}/make/lyxport.make
 toc_find_failok $lyxport_makefile || {
     echo "lyxport requires $lyxport_makefile"
     return 1

Index: qt.sh
===================================================================
RCS file: /cvsroot/libfunutil/libfunutil/toc/tests/qt.sh,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- qt.sh	30 Aug 2003 19:19:35 -0000	1.6
+++ qt.sh	10 Dec 2003 19:45:20 -0000	1.7
@@ -1,4 +1,4 @@
-# toc_run_description = looking for Qt libraries and headers
+# toc_run_description = looking for Qt $1
 # toc_begin_help =
 #  Calls toc_add_make for the following:
 #  - QTINCDIR   directory containing Qt headers

Index: toc_core_tests.sh
===================================================================
RCS file: /cvsroot/libfunutil/libfunutil/toc/tests/toc_core_tests.sh,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- toc_core_tests.sh	27 Sep 2003 22:34:03 -0000	1.10
+++ toc_core_tests.sh	10 Dec 2003 19:45:20 -0000	1.11
@@ -1,3 +1,4 @@
+#!/do/not/bash
 # toc_run_description = Looking for required build components...
 # toc_begin_help =
 # To be sourced from toc_core.sh. This is the core sanity checker for
@@ -31,11 +32,12 @@
     return 1
 }
 
-toc_find_fail install-sh ${TOC_TOCDIR}/bin
-toc_add_make INSTALLER_BIN="\$(top_srcdir)/${TOC_FIND_RESULT##${PWD}/}"
+toc_find_fail install-sh ${TOC_HOME}/bin
+# toc_add_make INSTALLER_BIN="\$(top_srcdir)/${TOC_FIND_RESULT##${PWD}/}"
+toc_add_make INSTALLER_BIN="${TOC_FIND_RESULT}"
 
-toc_find_fail makedist ${TOC_TOCDIR}/bin
-toc_add_make TOC_MAKEDIST_BIN="\$(top_srcdir)/${TOC_FIND_RESULT##${PWD}/}"
+toc_find_fail makedist ${TOC_HOME}/bin
+toc_add_make TOC_MAKEDIST_BIN="${TOC_FIND_RESULT}"
 # it's very arguable to make makedist a required component :/
 
 for x in \