pclasses-cvs

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

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

Modified Files:
	configure.pclasses2 
Log Message:
re-added libltdl support

Index: configure.pclasses2
===================================================================
RCS file: /cvsroot/pclasses/pclasses2/configure.pclasses2,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- configure.pclasses2	23 Dec 2004 06:28:03 -0000	1.4
+++ configure.pclasses2	23 Dec 2004 21:08:53 -0000	1.5
@@ -24,8 +24,9 @@
 
 
 # reminder: need to add SharedLib.ltdl.cpp
-# toc_test libltdl || toc_test_require libdl # prefer ltdl, else allow dl.
-toc_test_require libdl
+toc_test libltdl || toc_test_require libdl # prefer ltdl, else allow dl.
+# toc_test_require libdl
+ldadd="${ldadd} ${LDADD_DL}"
 
 
 ############################################################
@@ -50,6 +51,7 @@
 # /pthread
 ########################################################################
 
+
 ########################################################################
 { # huge_kludges:
 cat <<EOF > /dev/null
@@ -65,11 +67,16 @@
 _POSIX_SOURCE
 EOF
 
+
+########################################################################
+# Force default config options until the config tests are all ported:
+# reminder: the following list only works with numeric defines, not
+# strings:
 force="
 HAVE_LARGEFILE=1
-HAVE_DLFCN_H=1
-HAVE_DLOPEN=1
-HAVE_DYLD=1
+HAVE_DLFCN_H=${HAVE_DLFCN_H-0}
+HAVE_DLOPEN=${HAVE_DLOPEN-0}
+HAVE_DYLD=0
 HAVE_FUNC_GETSERVBYNAME_R_4=0
 HAVE_FUNC_GETSERVBYNAME_R_5=0
 HAVE_FUNC_GETSERVBYNAME_R_6=0
@@ -97,14 +104,18 @@
 HAVE_SYS_STAT_H=1
 HAVE_SYS_TYPES_H=1
 HAVE_UNISTD_H=1
+HAVE_ATALK=0
+HAVE_IPV6=0
+HAVE_IPX=0
 SIZEOF___INT64=64
 WITH_STL=${configure_with_stl-1}
 "
-
     for i in ${force}; do
         toc_export PCLASSES_${i%%=*}=${i##*=}
     done
 
+    ################################
+    # get SIZEOF defines:
     ${CC} -o sizes toc/tests/cpp/type_sizes.cpp -lstdc++ &>/dev/null || {
         toc_die $? "Error getting system's type sizes!"
     }
@@ -125,24 +136,70 @@
 toc_export PACKAGE_URL=http://pclasses.com
 toc_export PACKAGE_LICENSE="GNU LGPL"
 
-
-CLIENT_LDADD="-L${prefix}/lib -lpcore"
+CLIENT_LDADD="-L${prefix}/lib -lpclasses_core"
 CLIENT_INCLUDES="-I${prefix}/include"
+
+########################################################################
+# removeDupes is a helper app to remove duplicate entries from linker/
+# includes arguments.
 removeDupes=${TOC_HOME}/bin/removeDupeArgs
-# These are the libs the core lib The libs
+
+########################################################################
+# For each module, define:
+#
+#   LIBPxxx_NAME = the DLL file's name
+#   LIBPxxx_LDADD/INCLUDES = the linker/includes flags needed to build
+#                  LIBPxxx_NAME
+#   LIBPxxx_CLIENT_LDADD = linker args for clients of LIBPxxx_NAME.
+########################################################################
+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 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 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 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 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 LIBPSQL_MYSQL_LDADD="$(${removeDupes} ${ldadd} ${MYSQL_LDADD})"
-toc_export LIBPSQL_MYSQL_INCLUDES="$(${removeDupes} ${inc} ${MYSQL_INCLUDES})"
-toc_export LIBPSQL_POSTSQL_LDADD="$(${removeDupes} ${ldadd} ${POSTGRES_LDADD})"
-toc_export LIBPSQL_POSTSQL_INCLUDES="$(${removeDupes} ${inc} ${POSTGRES_INCLUDES})"
+########################################################################
+# 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})"
+fi
+
+########################################################################
+# Enable postgress 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})"
+fi
+
+
+
 
 ########################################################################
 # Anything below this line should not modify the config: we are