[pclasses-cvs] pclasses2 configure.pclasses2,1.20,1.21

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

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

Modified Files:
	configure.pclasses2 
Log Message:
You guessed it... more tinkering with link flags...

Index: configure.pclasses2
===================================================================
RCS file: /cvsroot/pclasses/pclasses2/configure.pclasses2,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- configure.pclasses2	29 Dec 2004 20:55:37 -0000	1.20
+++ configure.pclasses2	30 Dec 2004 15:38:58 -0000	1.21
@@ -9,8 +9,8 @@
 
 toc_export PACKAGE_DESCRIPTION="C++ generic application framework library"
 
-toc_source_test user_is_stephan_beal
-# ^^^ don't ask. Must come before gnu_cpp_tools test.
+# toc_source_test user_is_stephan_beal
+# ^^^ i always compile with -Werror and -Wall. Must come before gnu_cpp_tools test.
 
 ####### compilers:
 toc_test_require gnu_cpp_tools
@@ -48,13 +48,12 @@
     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
-toc_export PCLASSES_HAVE_LIBEXPAT="${HAVE_LIBEXPAT-0}"
-if test x1 = "x${HAVE_LIBEXPAT}"; then
+toc_test ${TOC_HOME}/tests/doxygen.sh
+
+toc_test libexpat && {
     toc_export LIBEXPAT_CLIENT_LDADD="-lexpat"
-    expat_ldadd="-lexpat"
-fi
+}
+toc_export PCLASSES_HAVE_LIBEXPAT="${HAVE_LIBEXPAT-0}"
 
 ########################################################################
 # pthreads kludge...
@@ -233,7 +232,7 @@
 fi
 
 
-toc_test ${TOC_HOME}/tests/doxygen.sh
+toc_export INCLUDES="${INCLUDES}"
 
 ########################################################################
 # Anything below this line should not modify the config: we are
@@ -277,7 +276,6 @@
     include/pclasses/pclasses-config.h.at \
     include/pclasses/pclasses-config.h
 
-
 ##### Create toc.make and end config process... this must come last.
 toc_test_require toc_project_makefile
 ########################################################################