[fU-cvs] libfunutil configure.libfunutil,1.18,1.19 toc_shared.make.at,1.22,1.23

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

Update of /cvsroot/libfunutil/libfunutil
In directory sc8-pr-cvs1:/tmp/cvs-serv8685

Modified Files:
	configure.libfunutil toc_shared.make.at 
Log Message:
toc modernization and s11n-related changes.

Index: configure.libfunutil
===================================================================
RCS file: /cvsroot/libfunutil/libfunutil/configure.libfunutil,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- configure.libfunutil	31 Aug 2003 00:50:26 -0000	1.18
+++ configure.libfunutil	27 Sep 2003 22:40:40 -0000	1.19
@@ -1,7 +1,6 @@
 # package-specific configure script for libfunutil
 
-toc_run_fail toc_tests_help
-toc_run_failok buildtool
+# toc_run_failok buildtool
 
 toc_add_config PACKAGE_COPYRIGHT="GNU General Public License, version 2. Copyright (c) 2000-2003 Rusty Ballinger (bo...@so...) and stephan beal (sg...@us...)."
 
@@ -11,9 +10,9 @@
 LDFLAGS="$LDFLAGS -L\$(top_srcdir)/lib/fun"
 
 
-toc_run_fail gnu_cpp_tools "C/C++ compilers and linkers"
-toc_run_failok readline "got readline library?"
-
+toc_run_fail gnu_cpp_tools
+toc_run_failok readline
+toc_run_failok zlib
 toc_add_config_h PACKAGE_EMAIL_ADDRESS=lib...@li...
 
 PACKAGE_URL=http://libfunutil.sourceforge.net/
@@ -26,13 +25,11 @@
 
 toc_add_make configure_enable_cppdeps=1
 
-toc_run_failok doxygen "Enable API doc generation?"
+toc_run_failok doxygen
 
 
 configure_with_qt=${configure_with_qt-1}
-qt_required_version='3.x'
-qt_required_version_glob='3.*'
-toc_run_fail qt_if_enabled
+toc_run_fail qt_if_enabled '3.x' '3.*'
 
 #  If we're building with Qt, see whether we're also building std::string API's
 if test "${configure_with_qt}" = "1"; then
@@ -60,6 +57,9 @@
     source ${configure_developer_script} || toc_die $? "${configure_developer_script} failed"
 }
 
+test x1 = "x${configure_enable_s11n}" && {
+    toc_run_fail flex
+}
 
 echo ==============================================================
 echo "${PACKAGE_NAME} configuration checks completed."

Index: toc_shared.make.at
===================================================================
RCS file: /cvsroot/libfunutil/libfunutil/toc_shared.make.at,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- toc_shared.make.at	31 Aug 2003 20:33:30 -0000	1.22
+++ toc_shared.make.at	27 Sep 2003 22:40:40 -0000	1.23
@@ -119,8 +119,9 @@
 
 
 
-
-
+configure_have_zlib = @HAVE_ZLIB@
+configure_enable_s11n = @configure_enable_s11n@
+configure_build_quietly = @configure_build_quietly@
 
 configure_with_libreadline = @configure_with_libreadline@
 ifeq ($(configure_with_libreadline),1)