[fU-cvs] libfunutil toc_shared.make.at,1.23,1.24 configure.libfunutil,1.19,1.20 Makefile,1.13,1.14

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

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

Modified Files:
	toc_shared.make.at configure.libfunutil Makefile 
Log Message:
s11n-related changes

Index: toc_shared.make.at
===================================================================
RCS file: /cvsroot/libfunutil/libfunutil/toc_shared.make.at,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- toc_shared.make.at	27 Sep 2003 22:40:40 -0000	1.23
+++ toc_shared.make.at	14 Oct 2003 03:11:17 -0000	1.24
@@ -118,8 +118,7 @@
 DIST_FILES += Makefile
 
 
-
-configure_have_zlib = @HAVE_ZLIB@
+configure_enable_zlib = @HAVE_ZLIB@
 configure_enable_s11n = @configure_enable_s11n@
 configure_build_quietly = @configure_build_quietly@
 
@@ -128,6 +127,7 @@
   LIBREADLINE_LDADD = @LIBREADLINE_LDADD@
 endif
 
+include $(top_srcdir)/toc.s11n.make
 
 include $(toc_makesdir)/toc_mainincludes.make
 include $(toc_makesdir)/tests.make

Index: configure.libfunutil
===================================================================
RCS file: /cvsroot/libfunutil/libfunutil/configure.libfunutil,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- configure.libfunutil	27 Sep 2003 22:40:40 -0000	1.19
+++ configure.libfunutil	14 Oct 2003 03:11:17 -0000	1.20
@@ -57,12 +57,15 @@
     source ${configure_developer_script} || toc_die $? "${configure_developer_script} failed"
 }
 
+configure_enable_s11n=${configure_enable_s11n-1}
 test x1 = "x${configure_enable_s11n}" && {
-    toc_run_fail flex
+        source configure.s11n
 }
 
+
 echo ==============================================================
 echo "${PACKAGE_NAME} configuration checks completed."
 echo ==============================================================
 # toc_run_fail toc_project_makefile
+
 return 0

Index: Makefile
===================================================================
RCS file: /cvsroot/libfunutil/libfunutil/Makefile,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- Makefile	5 Sep 2003 09:27:50 -0000	1.13
+++ Makefile	14 Oct 2003 03:11:17 -0000	1.14
@@ -2,8 +2,11 @@
 
 default: all
 
-SUBDIRS = build lib util tests include doc
-SUBDIRS += toc
+SUBDIRS = build lib util client tests include doc
+ifneq (,$(strip $(filter dist testdist,$(MAKECMDGOALS))))
+    SUBDIRS += toc
+endif
+
 
 include toc.make