[pclasses-cvs] pclasses2 configure.pclasses2,1.5,1.6 configure.toc,1.2,1.3 toc.pclasses2.help,1.1,1.2 toc.pclasses2.make.at,1.2,1.3

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

Update of /cvsroot/pclasses/pclasses2
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21438

Modified Files:
	configure.pclasses2 configure.toc toc.pclasses2.help 
	toc.pclasses2.make.at 
Log Message:
mass commit: toc-related fixes/changes

Index: toc.pclasses2.make.at
===================================================================
RCS file: /cvsroot/pclasses/pclasses2/toc.pclasses2.make.at,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- toc.pclasses2.make.at	24 Dec 2004 10:58:46 -0000	1.2
+++ toc.pclasses2.make.at	24 Dec 2004 12:44:00 -0000	1.3
@@ -5,7 +5,9 @@
 
 # CXXFLAGS += -fPIC
 
+ifneq (,$(wildcard Makefile.am))
 DIST_FILES += Makefile.am
+endif
 
 INSTALL_PACKAGE_HEADERS_DEST = $(prefix)/include/pclasses
 

Index: configure.pclasses2
===================================================================
RCS file: /cvsroot/pclasses/pclasses2/configure.pclasses2,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- configure.pclasses2	23 Dec 2004 21:08:53 -0000	1.5
+++ configure.pclasses2	24 Dec 2004 12:44:00 -0000	1.6
@@ -31,9 +31,18 @@
 
 ############################################################
 # supplemental libs
-toc_test mysql_config
-toc_test pg_config
-# toc_test libexpat # && ldadd="${ldadd} -lexpat"
+if test x0 != "x${configure_with_mysql-1}"; then
+    toc_test mysql_config
+fi
+if test x0 != "x${configure_with_postgres-1}"; then
+    toc_test pg_config
+fi
+if test x0 != "x${configure_with_lyx-1}"; then
+    toc_find lyx "${configure_with_lyx%/*}:$PATH" \
+	&& toc_export LYX_BIN=${TOC_FIND_RESULT} # for (future) lib manual
+fi
+toc_test libs11n; toc_export PCLASSES_HAVE_S11N=${HAVE_LIBS11N}
+toc_test libexpat
 
 ########################################################################
 # pthreads kludge...
@@ -41,7 +50,7 @@
 toc_test gcc_try_compile ${TOC_HOME}/tests/c/check_for_pthread.c && {
     use_pthread=1
     THREADS_LDADD="-lpthread"
-    THREADS_INCLUDES="" # i hope it's in a system default path!
+    THREADS_CFLAGS="" # i hope it's in a system default path!
 }
 
 if test x0 = "x${pclasses2_HAVE_PTHREAD}" ; then
@@ -53,21 +62,7 @@
 
 
 ########################################################################
-{ # huge_kludges:
-cat <<EOF > /dev/null
-the following defs needs to be ported to toc:
-PTHREAD_CREATE_JOINABLE
-STDC_HEADERS
-WITH_STL
-WORDS_BIGENDIAN
-_FILE_OFFSET_BITS
-_LARGE_FILES
-_MINIX
-_POSIX_1_SOURCE
-_POSIX_SOURCE
-EOF
-
-
+# huge_kludges:
 ########################################################################
 # Force default config options until the config tests are all ported:
 # reminder: the following list only works with numeric defines, not
@@ -104,9 +99,9 @@
 HAVE_SYS_STAT_H=1
 HAVE_SYS_TYPES_H=1
 HAVE_UNISTD_H=1
-HAVE_ATALK=0
-HAVE_IPV6=0
-HAVE_IPX=0
+HAVE_ATALK=${configure_with_atalk-0}
+HAVE_IPV6=${configure_with_ipv6-0}
+HAVE_IPX=${configure_with_ipx-0}
 SIZEOF___INT64=64
 WITH_STL=${configure_with_stl-1}
 "
@@ -124,20 +119,28 @@
     done
     rm sizes
 
-} # /huge_kludges
+cat <<EOF > /dev/null
+the following defs needs to be ported to toc:
+PTHREAD_CREATE_JOINABLE
+STDC_HEADERS
+WITH_STL
+WORDS_BIGENDIAN
+_FILE_OFFSET_BITS
+_LARGE_FILES
+_MINIX
+_POSIX_1_SOURCE
+_POSIX_SOURCE
+EOF
+
+# /huge_kludges
 ########################################################################
 
-###### stuff:
-toc_find lyx ${configure_with_lyx%/*}:$PATH \
-    && toc_export LYX_BIN=${TOC_FIND_RESULT} # for (future) lib manual
 toc_export BUILD_USER="$USER"
 toc_export BUILD_HOST=$(hostname)
 toc_export PAC...@li...
 toc_export PACKAGE_URL=http://pclasses.com
 toc_export PACKAGE_LICENSE="GNU LGPL"
 
-CLIENT_LDADD="-L${prefix}/lib -lpclasses_core"
-CLIENT_INCLUDES="-I${prefix}/include"
 
 ########################################################################
 # removeDupes is a helper app to remove duplicate entries from linker/
@@ -152,50 +155,50 @@
 #                  LIBPxxx_NAME
 #   LIBPxxx_CLIENT_LDADD = linker args for clients of LIBPxxx_NAME.
 ########################################################################
+toc_export LIBPCORE_NAME=libpclasses_core
+toc_export LIBPCORE_LDADD="-l${LIBCORE_NAME}"
+toc_export LIBPCORE_CLIENT_LDADD="${ldadd}"
+toc_export LIBPCORE_CFLAGS="${inc}"
+
 toc_export LIBPNET_NAME=libpclasses_net
-toc_export LIBPNET_LDADD="$(${removeDupes} ${ldadd})"
-toc_export LIBPNET_CLIENT_LDADD="$(${removeDupes} ${ldadd})"
-toc_export LIBPNET_INCLUDES="$(${removeDupes} ${inc})"
+toc_export LIBPNET_LDADD="-l${LIBPNET_NAME}"
+toc_export LIBPNET_CLIENT_LDADD="${ldadd}"
+toc_export LIBPNET_CFLAGS="${inc}"
 
 toc_export LIBPIO_NAME=libpclasses_io
-toc_export LIBPIO_LDADD="$(${removeDupes} ${ldadd})"
-toc_export LIBPIO_CLIENT_LDADD="$(${removeDupes} ${ldadd})"
-toc_export LIBPIO_INCLUDES="$(${removeDupes} ${inc})"
+toc_export LIBPIO_LDADD="-l${LIBPIO_NAME}"
+toc_export LIBPIO_CLIENT_LDADD="${ldadd}"
+toc_export LIBPIO_CFLAGS="${inc}"
 
 toc_export LIBPUNICODE_NAME=libpclasses_unicode
-toc_export LIBPUNICODE_LDADD="$(${removeDupes} ${ldadd})"
-toc_export LIBPUNICODE_CLIENT_LDADD="$(${removeDupes} ${ldadd})"
-toc_export LIBPUNICODE_INCLUDES="$(${removeDupes} ${inc})"
-
-toc_export LIBPCORE_NAME=libpclasses_core
-toc_export LIBPCORE_LDADD="$(${removeDupes} ${ldadd})"
-toc_export LIBPCORE_CLIENT_LDADD="$(${removeDupes} ${ldadd})"
-toc_export LIBPCORE_INCLUDES="$(${removeDupes} ${inc})"
+toc_export LIBPUNICODE_LDADD="-l${LIBPUNICODE_NAME}"
+toc_export LIBPUNICODE_CLIENT_LDADD="${ldadd}"
+toc_export LIBPUNICODE_CFLAGS="${inc}"
 
 toc_export LIBPSYSTEM_NAME=libpclasses_system
-toc_export LIBPSYSTEM_LDADD="$(${removeDupes} ${THREADS_INCLUDES})"
-toc_export LIBPSYSTEM_CLIENT_LDADD="$(${removeDupes} ${THREADS_INCLUDES})"
-toc_export LIBPSYSTEM_INCLUDES="$(${removeDupes} ${THREADS_INCLUDES})"
+toc_export LIBPSYSTEM_LDADD="-l${LIBPSYSTEM_NAME}"
+toc_export LIBPSYSTEM_CLIENT_LDADD="${THREADS_CFLAGS}"
+toc_export LIBPSYSTEM_CFLAGS="${THREADS_CFLAGS}"
 
 toc_export LIBPUTIL_NAME=libpclasses_util
-toc_export LIBPUTIL_LDADD="$(${removeDupes} ${THREADS_LDADD})"
-toc_export LIBPUTIL_CLIENT_LDADD="$(${removeDupes} ${THREADS_LDADD})"
-toc_export LIBPUTIL_INCLUDES="$(${removeDupes} ${THREADS_INCLUDES})"
+toc_export LIBPUTIL_LDADD="-l${LIBPUTIL_NAME_LDADD}"
+toc_export LIBPUTIL_CLIENT_LDADD="${THREADS_LDADD}"
+toc_export LIBPUTIL_CFLAGS="${THREADS_CFLAGS}"
 
 ########################################################################
 # Enable mysql driver...
 if test -x "${MYSQL_CONFIG_BIN}"; then
     toc_export LIBPSQL_HAVE_MYSQL=1
-    toc_export LIBPSQL_MYSQL_LDADD="$(${removeDupes} ${ldadd} ${MYSQL_LIBS})"
-    toc_export LIBPSQL_MYSQL_INCLUDES="$(${removeDupes} ${inc} ${MYSQL_INCLUDES})"
+    toc_export LIBPSQL_MYSQL_LDADD="${ldadd} ${MYSQL_LIBS}"
+    toc_export LIBPSQL_MYSQL_CFLAGS="${inc} ${MYSQL_INCLUDES}"
 fi
 
 ########################################################################
-# Enable postgress driver...
+# Enable postgres driver...
 if test -x "${POSTGRES_CONFIG_BIN}"; then
     toc_export LIBPSQL_HAVE_POSTGRES=1
-    toc_export LIBPSQL_POSTSQL_LDADD="$(${removeDupes} ${ldadd} ${POSTGRES_LIBS})"
-    toc_export LIBPSQL_POSTSQL_INCLUDES="$(${removeDupes} ${inc} ${POSTGRES_INCLUDES})"
+    toc_export LIBPSQL_POSTSQL_LDADD="${ldadd} ${POSTGRES_LIBS}"
+    toc_export LIBPSQL_POSTSQL_CFLAGS="${inc} ${POSTGRES_INCLUDES}"
 fi
 
 
@@ -206,6 +209,10 @@
 # now exporting our files...
 ########################################################################
 
+toc_test_require atfilter_file \
+    include/pclasses/pclasses-config.h.at \
+    include/pclasses/pclasses-config.h
+
 ########################################################################
 toc_boldecho "======================= Creating Makefiles..."
 make_out=${PWD}/.toc.Makefile
@@ -220,11 +227,10 @@
 	DIST_FILES := \$(filter-out Makefile,\$(DIST_FILES))
 	# ^^^^ toc automatically adds Makefile to DIST_FILES.
 	DISTCLEAN_FILES += Makefile
-	# ^^^^ todo
 EOF
 } > $make_out
-
-#### Make Makefiles
+########################################################################
+# Make Makefiles
 for m in $(find . -type f -name Makefile.toc | sort); do
     nm=${m%%.toc}
     echo -en "\t\t$nm ... "
@@ -239,11 +245,10 @@
 toc_boldecho "======================= ${TOC_EMOTICON_OKAY} Created Makefiles."
 ########################################################################
 
-toc_test_require atfilter_file \
-    include/pclasses/pclasses-config.h.at \
-    include/pclasses/pclasses-config.h
-
-##### close the config-filtered files:
+##### Create toc.make and end config process... this must come last.
 toc_test_require toc_project_makefile
-# ^^^^ this must come last.
-return 0
+########################################################################
+# The end. Nothing past here, please. If you do that then this text,
+# by definition, would not longer be The End, and would therefor the
+# statement "The End" would be technically inaccurate ;).
+########################################################################

Index: configure.toc
===================================================================
RCS file: /cvsroot/pclasses/pclasses2/configure.toc,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- configure.toc	22 Dec 2004 22:19:15 -0000	1.2
+++ configure.toc	24 Dec 2004 12:44:00 -0000	1.3
@@ -4,7 +4,7 @@
 . ./find_toc.sh || exit
 
 export PACKAGE_NAME=pclasses2
-export PACKAGE_VERSION=2004.12.x
+export PACKAGE_VERSION=2.0.dev
 
 # Kludge to allow toc and autotools to coexist...
 TOC_CONFIGURE_SCRIPT=${PWD}/configure.toc

Index: toc.pclasses2.help
===================================================================
RCS file: /cvsroot/pclasses/pclasses2/toc.pclasses2.help,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- toc.pclasses2.help	24 Dec 2004 10:57:11 -0000	1.1
+++ toc.pclasses2.help	24 Dec 2004 12:44:00 -0000	1.2
@@ -1,10 +1,39 @@
-(Reminder: not all of the following options actually work yet!)
+************************************************************************
+ACHTUNG: Options below marked with a * do not completely work yet.
+************************************************************************
 
---without-stl : disable STL support. Might or might not result in a buildable tree.
+Compatibility options:
 
---with-atalk  : enable AppleTalk protocol support.
+*	--without-stl
+		Disable STL support. Might or might not result in a
+		buildable tree.
 
---with-ipx    : enable IPX protocol.
+	--without-s11n
+		Disable the check for libs11n (1.0.x).
 
---with-ipv6   : enable IPV6.
+Networking options:
+*	--with-atalk
+		Enable AppleTalk protocol support.
+
+*	--with-ipx
+		Enable IPX protocol.
+
+*	--with-ipv6
+		Enable IPV6.
+
+	--without-mysql
+		Disables test for MySQL.
+
+	--without-postgres
+		Disables test for Postgres.
+
+*	--without-oci8
+		Enables test for Oracle OCI.
+
+Docs options:
+	--with-lyx=/path/to/lyx 
+		Set path to lyx binary.
+
+	--without-lyx
+		Explicitely disable lyx support.