[fU-cvs] libfunutil configure.libfunutil,1.21,1.22 configure.s11n,1.2,1.3 toc.s11n.make.at,1.1,1.2 toc_shared.make.at,1.24,1.25

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

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

Modified Files:
	configure.libfunutil configure.s11n toc.s11n.make.at 
	toc_shared.make.at 
Log Message:
adjusted to accomodate s11n-related refactoring.

Index: configure.libfunutil
===================================================================
RCS file: /cvsroot/libfunutil/libfunutil/configure.libfunutil,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- configure.libfunutil	14 Oct 2003 03:43:25 -0000	1.21
+++ configure.libfunutil	17 Nov 2003 20:27:18 -0000	1.22
@@ -1,5 +1,10 @@
+#!/do/not/bash
+# ^^^^ to help out emacs
+
 # package-specific configure script for libfunutil
 
+toc_run_failok check_dist_md5s
+
 # 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...)."
@@ -13,6 +18,7 @@
 toc_run_fail gnu_cpp_tools
 toc_run_failok readline
 toc_run_failok zlib
+toc_run_failok bzlib
 toc_add_config_h PACKAGE_EMAIL_ADDRESS=lib...@li...
 
 PACKAGE_URL=http://libfunutil.sourceforge.net/
@@ -26,6 +32,7 @@
 toc_add_make configure_enable_cppdeps=1
 
 toc_run_failok doxygen
+toc_run_failok lyxport
 
 
 configure_with_qt=${configure_with_qt-1}
@@ -51,7 +58,7 @@
 toc_add_make FUN_API_QSTRING="$FUN_API_QSTRING"
 toc_add_make FUN_API_STD_STRING="$FUN_API_STD_STRING"
 
-configure_developer_script=configure.$USER
+configure_developer_script=configure.user.$USER
 test -f ${configure_developer_script} && {
     toc_boldecho "Running $USER's tests..."
     source ${configure_developer_script} || toc_die $? "${configure_developer_script} failed"
@@ -67,6 +74,8 @@
 echo ==============================================================
 echo "${PACKAGE_NAME} configuration checks completed."
 echo ==============================================================
-# toc_run_fail toc_project_makefile
+
+toc_run_fail toc_project_makefile
+
 
 return 0

Index: configure.s11n
===================================================================
RCS file: /cvsroot/libfunutil/libfunutil/configure.s11n,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- configure.s11n	14 Oct 2003 03:19:32 -0000	1.2
+++ configure.s11n	17 Nov 2003 20:27:18 -0000	1.3
@@ -1,11 +1,21 @@
-
+#!/do/not/bash
 echo "==================== s11n-specific checks:"
-toc_run_fail gcc_try_compile toc/tests/cpp/check_stl_newstyle.cpp
-toc_run_fail gcc_try_compile toc/tests/cpp/gcc_2_95_typename_problem.cpp
-toc_run_fail gcc_build_and_run toc/tests/c/check_for_dlopen_and_friends.c -export-dynamic -ldl
 
-toc_run_fail flex
 toc_run_failok bzlib
 toc_run_failok lyxport
 
-toc_atfilter_as_makefile toc.s11n.make.at toc.s11n.make
+
+toc_run_fail gcc_try_compile toc/tests/cpp/check_stl_newstyle.cpp
+toc_run_fail gcc_try_compile toc/tests/cpp/gcc_2_95_typename_problem.cpp
+toc_run_fail libltdl
+toc_run_fail flex
+
+
+
+toc_add_config CL_NAMESPACE=fun
+toc_add_config TOOLBOX_NAMESPACE=fun
+toc_add_config S11N_NAMESPACE=fun
+xtramakes="s11n"
+for M in ${xtramakes}; do
+    toc_run_fail toc_project_makefile toc.$M.make
+done

Index: toc.s11n.make.at
===================================================================
RCS file: /cvsroot/libfunutil/libfunutil/toc.s11n.make.at,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- toc.s11n.make.at	14 Oct 2003 03:11:54 -0000	1.1
+++ toc.s11n.make.at	17 Nov 2003 20:27:18 -0000	1.2
@@ -1,14 +1,22 @@
 #!/do/not/make
-#^^^ only to help emacs out
-
-CLEAN_FILES += $(wildcard *.o *~)
-
+#^^^ only to help emacs out.
 
-FLEX = @FLEX@
-configure_enable_zlib = @HAVE_ZLIB@
-configure_enable_bzlib = @HAVE_BZLIB@
+################# from libltdl test:
+HAVE_LIBLTDL = @HAVE_LIBLTDL@
+HAVE_LIBDL = @HAVE_LIBDL@
+LDADD_LIBDL = @LDADD_LIBDL@
+LDADD_LIBLTDL = @LDADD_LIBLTDL@
+ifeq (1,$(HAVE_LIBLTDL))
+  L_DL = -lltdl
+else
+  L_DL = -ldl
+endif
+################
 
-S11N_LIBDIR = $(top_srcdir)/lib/s11n
+################ s11n:
+S11N_NAMESPACE = @S11N_NAMESPACE@
+TOOLBOX_NAMESPACE = @TOOLBOX_NAMESPACE@
+S11N_LIBDIR = $(top_srcdir)/lib
 S11N_LIB_A = $(S11N_LIBDIR)/libs11n.a
 $(S11N_LIB_A):
 	${MAKE} -C $(S11N_LIBDIR)
@@ -16,7 +24,7 @@
 $(S11N_LIB_SO):
 	${MAKE} -C $(S11N_LIBDIR)
 L_S11N =  -L$(S11N_LIBDIR) -ls11n
-S11N_CLIENT_LDADD = -export-dynamic $(L_S11N) -ldl
+S11N_CLIENT_LDADD = $(L_S11N) $(LIBCL_CLIENT_LDADD)
 ifeq (1,$(configure_enable_zlib))
     S11N_CLIENT_LDADD += -lz
 endif
@@ -25,12 +33,15 @@
 endif
 
 
-configure_with_lyxport = @configure_with_lyxport@
-ifeq (1,$(configure_with_lyxport))
-    # these flags are used by toc/make/lyxport.make
-    LYXPORT_L2HARGS = -nonavigation -show_section_numbers -split 0 -noimages
-    LYXPORT_ARGS = -c -tt
-    LYXPORT_ARGS += --html --opts_l2h '$(LYXPORT_L2HARGS)'
-    LYXPORT_ARGS += --ps --pdf
-    LYXPORT_BIN = @LYXPORT_BIN@
-endif
+############################# libclass_loader:
+CL_NAMESPACE = @CL_NAMESPACE@
+LIBCL_LIBNAME = $(CL_NAMESPACE)_class_loader
+LIBCL_LIBDIR = $(top_srcdir)/lib/cl
+LIBCL_LIB_A = $(LIBCL_LIBDIR)/lib$(LIBCL_LIBNAME).a
+$(LIBCL_LIB_A):
+	${MAKE} -C $(LIBCL_LIBDIR)
+LIBCL_LIB_SO = $(LIBCL_LIBDIR)/lib$(LIBCL_LIBNAME).so
+$(LIBCL_LIB_SO):
+	${MAKE} -C $(LIBCL_LIBDIR)
+L_CL =  -L$(LIBCL_LIBDIR) -l$(LIBCL_LIBNAME)
+LIBCL_CLIENT_LDADD = -export-dynamic $(L_DL) $(L_CL)

Index: toc_shared.make.at
===================================================================
RCS file: /cvsroot/libfunutil/libfunutil/toc_shared.make.at,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- toc_shared.make.at	14 Oct 2003 03:11:17 -0000	1.24
+++ toc_shared.make.at	17 Nov 2003 20:27:18 -0000	1.25
@@ -118,16 +118,6 @@
 DIST_FILES += Makefile
 
 
-configure_enable_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)
-  LIBREADLINE_LDADD = @LIBREADLINE_LDADD@
-endif
-
-include $(top_srcdir)/toc.s11n.make
 
 include $(toc_makesdir)/toc_mainincludes.make
 include $(toc_makesdir)/tests.make