You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@santuario.apache.org by bl...@apache.org on 2006/04/23 13:26:44 UTC
svn commit: r396255 - in /xml/security/trunk/c/src: configure configure.ac
xenc/impl/XENCCipherImpl.cpp
Author: blautenb
Date: Sun Apr 23 04:26:41 2006
New Revision: 396255
URL: http://svn.apache.org/viewcvs?rev=396255&view=rev
Log:
Update for NetBSD build
Modified:
xml/security/trunk/c/src/configure
xml/security/trunk/c/src/configure.ac
xml/security/trunk/c/src/xenc/impl/XENCCipherImpl.cpp
Modified: xml/security/trunk/c/src/configure
URL: http://svn.apache.org/viewcvs/xml/security/trunk/c/src/configure?rev=396255&r1=396254&r2=396255&view=diff
==============================================================================
--- xml/security/trunk/c/src/configure (original)
+++ xml/security/trunk/c/src/configure Sun Apr 23 04:26:41 2006
@@ -980,7 +980,7 @@
else
echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
fi
- cd $ac_popdir
+ cd "$ac_popdir"
done
fi
@@ -1998,8 +1998,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -2057,8 +2056,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -2174,8 +2172,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -2229,8 +2226,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -2275,8 +2271,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -2320,8 +2315,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -2505,8 +2499,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_cxx_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -2564,8 +2557,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_cxx_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -2636,8 +2628,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_cxx_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -2681,8 +2672,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_cxx_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -3533,8 +3523,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -3620,8 +3609,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -3791,8 +3779,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -3860,8 +3847,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -4070,26 +4056,19 @@
LINK_OPTIONS="-DSOLARIS"
;;
- *-*-netbsd*) platform=NETBSD
- shlibsuffix=.so
- lib_name="lib${PACKAGE_TARNAME}.so.${package_lib_version}"
- lib_major_name="lib${PACKAGE_TARNAME}.so.${package_lib_major}"
- lib_short_name="lib${PACKAGE_TARNAME}.so"
- PLATFORM_OPTIONS="-Wall"
- PIC="-fPIC"
-
- # Should use -D_REENTRANT - but not yet OK
- PLATFORM_OPTIONS="${PLATFORM_OPTIONS} ${PIC} -DNETBSD"
- CC1="${CXX} ${CXXFLAGS} ${PLATFORM_OPTIONS}"
- CC4="${CC} ${CXXFLAGS} ${PLATFORM_OPTIONS}"
- MAKE_SHARED="${CXX} ${CXXFLAGS} -DNETBSD -shared ${PIC}"
- LINK="${CXX} ${CXXFLAGS} -DNETBSD ${PIC}"
- LINK_COMMAND_1="(cd \$(LIB_DIR) ; rm -f \$(LIBMAJORNAME) ; \$(LN_S) \$(LIBNAME) \$(LIBMAJORNAME))"
- LINK_COMMAND_2="(cd \$(LIB_DIR) ; rm -f \$(LIBSHORTNAME) ; \$(LN_S) \$(LIBNAME) \$(LIBSHORTNAME))"
- INSTALL_COMMAND_1="\$(INSTALL) \${THISLIB} \$(DESTDIR)\${libdir}"
- INSTALL_COMMAND_2="\$(RM) \$(DESTDIR)\${libdir}/\${LIBMAJORNAME} && \$(LN_S) \${LIBNAME} \$(DESTDIR)\${libdir}/\${LIBMAJORNAME}"
- INSTALL_COMMAND_3="\$(RM) \$(DESTDIR)\${libdir}/\${LIBSHORTNAME} && \$(LN_S) \${LIBNAME} \$(DESTDIR)\${libdir}/\${LIBSHORTNAME}"
+ *-*-netbsd*) platform=NETBSD
+ shlibsuffix=.so
+ lib_name="lib${PACKAGE_TARNAME}.so.${package_lib_version}"
+ lib_major_name="lib${PACKAGE_TARNAME}.so.${package_lib_major}"
+ lib_short_name="lib${PACKAGE_TARNAME}.so"
+ PLATFORM_OPTIONS="${PLATFORM_OPTIONS} ${PIC} -DFREEBSD"
+ SHARED_OPTIONS="-DNETBSD -shared"
+ LINK_OPTIONS="-DNETBSD"
+
+ # NetBSD puts packages in /usr/pkg
+ CPPFLAGS="${CPPFLAGS} -I/usr/pkg/include"
+ LIBS="${LIBS} -L/usr/pkg/lib"
;;
*-*-freebsd*) platform=FREEBSD
@@ -4198,7 +4177,10 @@
if test "x${ac_cv_cxx_compiler_gnu}" = "xyes" ; then
PLATFORM_OPTIONS="${PLATFORM_OPTIONS} -Wall"
- PIC="-fPIC"
+ if test "${PLATFORM}" != "CYGWIN" ; then
+ PIC="-fPIC"
+ PLATFORM_OPTIONS="${PLATFORM_OPTIONS} ${PIC}"
+ fi
if test "$enable_debug" = "yes" ; then
CXXFLAGS="${CXXFLAGS} -g"
@@ -4264,10 +4246,10 @@
if test $XERCESCROOT; then
OLDCPPFLAGS=$CPPFLAGS
- CPPFLAGS="${CPPFLAGS} -I${XERCESCROOT}/src"
+ CPPFLAGS="${CPPFLAGS} -I${XERCESCROOT}/include"
- echo "$as_me:$LINENO: checking for Xerces 2.x headers in XERCESCROOT/src" >&5
-echo $ECHO_N "checking for Xerces 2.x headers in XERCESCROOT/src... $ECHO_C" >&6
+ echo "$as_me:$LINENO: checking for Xerces 2.x headers in XERCESCROOT/include" >&5
+echo $ECHO_N "checking for Xerces 2.x headers in XERCESCROOT/include... $ECHO_C" >&6
if test "$cross_compiling" = yes; then
{ { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
See \`config.log' for more details." >&5
@@ -4300,7 +4282,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
- LIBS="${LIBS} -L${XERCESCROOT}/lib -lxerces-c"
+ LIBS="-L${XERCESCROOT}/lib -lxerces-c ${LIBS}"
xerces_found=yes
echo "$as_me:$LINENO: result: found" >&5
echo "${ECHO_T}found" >&6
@@ -4416,8 +4398,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_cxx_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -4478,8 +4459,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_cxx_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -4536,8 +4516,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_cxx_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -4577,7 +4556,7 @@
# Updated to include nls/include as this is generally needed for
# compilation against non-installed xalan.
# Also now include XALANCROOT/include to cater for installed xalan
- CPPFLAGS="${CPPFLAGS} -I${XALANCROOT}/src -I${XALANCROOT}/include -I${XALANCROOT}/nls/include"
+ CPPFLAGS="-I${XALANCROOT}/src -I${XALANCROOT}/include -I${XALANCROOT}/nls/include ${CPPFLAGS}"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
@@ -4606,7 +4585,7 @@
fi
if test -z "$ac_cpp_err"; then
xalan_found=yes
- LIBS="${LIBS} -L${XALANCROOT}/lib -lxalan-c -lxalanMsg"
+ LIBS="-L${XALANCROOT}/lib -lxalan-c ${LIBS}"
echo "$as_me:$LINENO: result: found" >&5
echo "${ECHO_T}found" >&6
else
@@ -4652,7 +4631,7 @@
fi
if test -z "$ac_cpp_err"; then
xalan_found=yes
- LIBS="${LIBS} -lxalan-c -lxalanMsg"
+ LIBS="${LIBS} -lxalan-c"
echo "$as_me:$LINENO: result: found" >&5
echo "${ECHO_T}found" >&6
else
@@ -4683,6 +4662,63 @@
fi
+if test "${xalan_found}" = "yes" ; then
+ # Do we need xalanMsg.so?
+ echo "$as_me:$LINENO: checking if libxalanMsg is required" >&5
+echo $ECHO_N "checking if libxalanMsg is required... $ECHO_C" >&6
+ old_libs=$LIBS
+ LIBS="${LIBS} -lxalanMsg"
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+
+int
+main ()
+{
+
+ int test=1;
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+ (eval $ac_link) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+ LIBS=${old_libs}
+fi
+rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext;
+fi
# Check for handling of XSLException types
if test "$xalan_found" = "yes" ; then
@@ -4720,8 +4756,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_cxx_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -4780,8 +4815,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_cxx_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -4847,8 +4881,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_cxx_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -4976,8 +5009,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_cxx_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -5107,8 +5139,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_cxx_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -5181,8 +5212,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_cxx_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -5318,8 +5348,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_cxx_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -5381,8 +5410,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_cxx_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -5443,8 +5471,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_cxx_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -5508,8 +5535,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_cxx_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -5568,8 +5594,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_cxx_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -5630,8 +5655,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_cxx_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -5695,8 +5719,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_cxx_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -5760,8 +5783,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_cxx_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -6086,10 +6108,9 @@
# 1. Remove the extension, and $U if already installed.
ac_i=`echo "$ac_i" |
sed 's/\$U\././;s/\.o$//;s/\.obj$//'`
- # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR
- # will be set to the directory where LIBOBJS objects are built.
- ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"
- ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo'
+ # 2. Add them.
+ ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext"
+ ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo'
done
LIBOBJS=$ac_libobjs
@@ -6906,11 +6927,6 @@
*) ac_INSTALL=$ac_top_builddir$INSTALL ;;
esac
- if test x"$ac_file" != x-; then
- { echo "$as_me:$LINENO: creating $ac_file" >&5
-echo "$as_me: creating $ac_file" >&6;}
- rm -f "$ac_file"
- fi
# Let's still pretend it is `configure' which instantiates (i.e., don't
# use $as_me), people would be surprised to read:
# /* config.h. Generated by config.status. */
@@ -6949,6 +6965,12 @@
fi;;
esac
done` || { (exit 1); exit 1; }
+
+ if test x"$ac_file" != x-; then
+ { echo "$as_me:$LINENO: creating $ac_file" >&5
+echo "$as_me: creating $ac_file" >&6;}
+ rm -f "$ac_file"
+ fi
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
sed "$ac_vpsub
Modified: xml/security/trunk/c/src/configure.ac
URL: http://svn.apache.org/viewcvs/xml/security/trunk/c/src/configure.ac?rev=396255&r1=396254&r2=396255&view=diff
==============================================================================
--- xml/security/trunk/c/src/configure.ac (original)
+++ xml/security/trunk/c/src/configure.ac Sun Apr 23 04:26:41 2006
@@ -219,26 +219,19 @@
LINK_OPTIONS="-DSOLARIS"
;;
- *-*-netbsd*) platform=NETBSD
- shlibsuffix=.so
- lib_name="lib${PACKAGE_TARNAME}.so.${package_lib_version}"
- lib_major_name="lib${PACKAGE_TARNAME}.so.${package_lib_major}"
- lib_short_name="lib${PACKAGE_TARNAME}.so"
- PLATFORM_OPTIONS=["-Wall"]
- PIC=["-fPIC"]
-
- # Should use -D_REENTRANT - but not yet OK
- PLATFORM_OPTIONS=["${PLATFORM_OPTIONS} ${PIC} -DNETBSD"]
- CC1=["${CXX} ${CXXFLAGS} ${PLATFORM_OPTIONS}"]
- CC4=["${CC} ${CXXFLAGS} ${PLATFORM_OPTIONS}"]
- MAKE_SHARED=["${CXX} ${CXXFLAGS} -DNETBSD -shared ${PIC}"]
- LINK=["${CXX} ${CXXFLAGS} -DNETBSD ${PIC}"]
- LINK_COMMAND_1=["(cd \$(LIB_DIR) ; rm -f \$(LIBMAJORNAME) ; \$(LN_S) \$(LIBNAME) \$(LIBMAJORNAME))"]
- LINK_COMMAND_2=["(cd \$(LIB_DIR) ; rm -f \$(LIBSHORTNAME) ; \$(LN_S) \$(LIBNAME) \$(LIBSHORTNAME))"]
- INSTALL_COMMAND_1=["\$(INSTALL) \${THISLIB} \$(DESTDIR)\${libdir}"]
- INSTALL_COMMAND_2=["\$(RM) \$(DESTDIR)\${libdir}/\${LIBMAJORNAME} && \$(LN_S) \${LIBNAME} \$(DESTDIR)\${libdir}/\${LIBMAJORNAME}"]
- INSTALL_COMMAND_3=["\$(RM) \$(DESTDIR)\${libdir}/\${LIBSHORTNAME} && \$(LN_S) \${LIBNAME} \$(DESTDIR)\${libdir}/\${LIBSHORTNAME}"]
+ *-*-netbsd*) platform=NETBSD
+ shlibsuffix=.so
+ lib_name="lib${PACKAGE_TARNAME}.so.${package_lib_version}"
+ lib_major_name="lib${PACKAGE_TARNAME}.so.${package_lib_major}"
+ lib_short_name="lib${PACKAGE_TARNAME}.so"
+ PLATFORM_OPTIONS=["${PLATFORM_OPTIONS} ${PIC} -DFREEBSD"]
+ SHARED_OPTIONS=["-DNETBSD -shared"]
+ LINK_OPTIONS=["-DNETBSD"]
+
+ # NetBSD puts packages in /usr/pkg
+ CPPFLAGS="${CPPFLAGS} -I/usr/pkg/include"
+ LIBS="${LIBS} -L/usr/pkg/lib"
;;
*-*-freebsd*) platform=FREEBSD
@@ -345,7 +338,10 @@
if test "x${ac_cv_cxx_compiler_gnu}" = "xyes" ; then
PLATFORM_OPTIONS=["${PLATFORM_OPTIONS} -Wall"]
- PIC=["-fPIC"]
+ if test "${PLATFORM}" != "CYGWIN" ; then
+ PIC=["-fPIC"]
+ PLATFORM_OPTIONS=["${PLATFORM_OPTIONS} ${PIC}"]
+ fi
if test "$enable_debug" = "yes" ; then
CXXFLAGS="${CXXFLAGS} -g"
@@ -404,9 +400,9 @@
if test $XERCESCROOT; then
OLDCPPFLAGS=$CPPFLAGS
- CPPFLAGS=["${CPPFLAGS} -I${XERCESCROOT}/src"]
+ CPPFLAGS=["${CPPFLAGS} -I${XERCESCROOT}/include"]
- AC_MSG_CHECKING([for Xerces 2.x headers in XERCESCROOT/src])
+ AC_MSG_CHECKING([for Xerces 2.x headers in XERCESCROOT/include])
AC_TRY_RUN([#include <xercesc/util/XercesVersion.hpp>
int main(int argc, char **argv) {
if (XERCES_VERSION_MAJOR < 2)
@@ -414,7 +410,7 @@
else
return 0;
}],
- LIBS="${LIBS} -L${XERCESCROOT}/lib -lxerces-c"
+ LIBS="-L${XERCESCROOT}/lib -lxerces-c ${LIBS}"
xerces_found=yes
[AC_MSG_RESULT([found])],
CPPFLAGS=$OLD_CPPFLAGS
@@ -497,11 +493,11 @@
# Updated to include nls/include as this is generally needed for
# compilation against non-installed xalan.
# Also now include XALANCROOT/include to cater for installed xalan
- CPPFLAGS=["${CPPFLAGS} -I${XALANCROOT}/src -I${XALANCROOT}/include -I${XALANCROOT}/nls/include"]
+ CPPFLAGS=["-I${XALANCROOT}/src -I${XALANCROOT}/include -I${XALANCROOT}/nls/include ${CPPFLAGS}"]
AC_TRY_CPP([#include <xalanc/Include/XalanVersion.hpp>],
xalan_found=yes
- LIBS="${LIBS} -L${XALANCROOT}/lib -lxalan-c -lxalanMsg"
+ LIBS="-L${XALANCROOT}/lib -lxalan-c ${LIBS}"
[AC_MSG_RESULT([found])],
CPPFLAGS=$OLD_CPPFLAGS
[AC_MSG_RESULT([no])]);
@@ -513,7 +509,7 @@
AC_MSG_CHECKING([for Xalan in system includes])
AC_TRY_CPP([#include <xalanc/Include/XalanVersion.hpp>],
xalan_found=yes
- LIBS="${LIBS} -lxalan-c -lxalanMsg"
+ LIBS="${LIBS} -lxalan-c"
[AC_MSG_RESULT([found])],
[AC_DEFINE(XSEC_NO_XALAN)]
[AC_MSG_RESULT([no - WARNING - configuring for no Xalan])]);
@@ -529,6 +525,18 @@
fi
+if test "${xalan_found}" = "yes" ; then
+ # Do we need xalanMsg.so?
+ AC_MSG_CHECKING([if libxalanMsg is required])
+ old_libs=$LIBS
+ LIBS="${LIBS} -lxalanMsg"
+ AC_TRY_LINK([],[
+ int test=1;
+ ],
+ AC_MSG_RESULT([yes]),
+ AC_MSG_RESULT([no])
+ LIBS=${old_libs});
+fi
# Check for handling of XSLException types
if test "$xalan_found" = "yes" ; then
Modified: xml/security/trunk/c/src/xenc/impl/XENCCipherImpl.cpp
URL: http://svn.apache.org/viewcvs/xml/security/trunk/c/src/xenc/impl/XENCCipherImpl.cpp?rev=396255&r1=396254&r2=396255&view=diff
==============================================================================
--- xml/security/trunk/c/src/xenc/impl/XENCCipherImpl.cpp (original)
+++ xml/security/trunk/c/src/xenc/impl/XENCCipherImpl.cpp Sun Apr 23 04:26:41 2006
@@ -338,8 +338,7 @@
parser->parse(*memIS);
errorCount = parser->getErrorCount();
if (errorCount > 0)
-
- throw XSECException(XSECException::CipherError, (const char *) sbt.rawBuffer());
+ throw XSECException(XSECException::CipherError, "Errors occured during de-serialisation of decrypted element content");
DOMDocument * doc = parser->getDocument();