Clean test and build
git-svn-id: https://svn.apache.org/repos/asf/santuario/xml-security-cpp/trunk@1739418 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/configure.ac b/configure.ac
index 32a2ccb..57cbee1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -399,6 +399,8 @@
else
AC_MSG_WARN([OpenSSL not supported by pkg-config, try --with-openssl=PATH instead])
fi
+ else
+ SSLLIBS="-lcrypto -lssl"
fi
else
if test x_$use_openssl != x_/usr; then
diff --git a/xsec/Makefile.am b/xsec/Makefile.am
index c4f41a6..a723976 100644
--- a/xsec/Makefile.am
+++ b/xsec/Makefile.am
@@ -14,7 +14,7 @@
# limitations under the License.
#
-AUTOMAKE_OPTIONS = foreign
+AUTOMAKE_OPTIONS = foreign subdir-objects
AM_CPPFLAGS = -I..
diff --git a/xsec/basicTests.pl b/xsec/basicTests.pl
index 53e080b..90cca3d 100755
--- a/xsec/basicTests.pl
+++ b/xsec/basicTests.pl
@@ -74,12 +74,12 @@
$cipher = "../Build/Win32/VC6/Debug/cipher.exe";
}
else {
- $checksig = "../bin/checksig";
- $cipher = "../bin/cipher";
+ $checksig = ".libs/checksig";
+ $cipher = ".libs/cipher";
}
# Directory setup
-my $data_dir = "../../data";
+my $data_dir = "../../xml-security-java/src/test/resources";
# Digital Signature Tests
@@ -181,7 +181,7 @@
# Extra unit tests provided for bug reports
-"org/apache/xml/security/testcases/SAML2ArtifactResponse.xml,,n,n",
+"org/apache/xml/security/testcases/SAML2ArtifactResponse.xml,--id ID,n,n",
);
