facho-signer: correciones para primera compilacion de wasm
FossilOrigin-Name: 7e2792a899cccff417c583b419ff7081d9630e405f39dc67aa96ed479b4b5164
This commit is contained in:
parent
dc9e0d9ad7
commit
7054e2da22
@ -1,3 +1,3 @@
|
||||
#!/bin/sh
|
||||
libtoolize -c
|
||||
autoreconf --install
|
||||
libtoolize -c --force
|
||||
autoreconf --install --force
|
||||
|
@ -13,8 +13,18 @@ AC_PROG_CC
|
||||
|
||||
# Checks for libraries.
|
||||
PKG_CHECK_MODULES([OPENSSL], [openssl])
|
||||
PKG_CHECK_MODULES([XMLSEC1], [xmlsec1-openssl])
|
||||
PKG_CHECK_MODULES([XMLSEC1], [xmlsec1-openssl], [
|
||||
AC_DEFINE([XMLSEC_CRYPTO_OPENSSL], [1], [enable crypto openssl])
|
||||
])
|
||||
PKG_CHECK_MODULES([LZMA], [liblzma])
|
||||
|
||||
AC_ARG_ENABLE([xmlsec-crypto-dynamic-loading],
|
||||
AS_HELP_STRING([--enable-xmlsec-crypto-dynamic-loading],
|
||||
[enable crypto xmlsec dynamic loading])
|
||||
)
|
||||
|
||||
if test "x$enable_xmlsec_crypto_dynamic_loading" == xyes; then
|
||||
AC_DEFINE([XMLSEC_CRYPTO_DYNAMIC_LOADING], [1], [enable xmlsec crypto dynamic loading])
|
||||
AC_CHECK_HEADER([ltdl.h], [
|
||||
AC_CHECK_LIB(
|
||||
[ltdl],
|
||||
@ -24,13 +34,6 @@ AC_CHECK_HEADER([ltdl.h], [
|
||||
)
|
||||
], [ LIBLTDL= ])
|
||||
|
||||
AC_ARG_ENABLE([xmlsec-crypto-dynamic-loading],
|
||||
AS_HELP_STRING([--enable-xmlsec-crypto-dynamic-loading],
|
||||
[enable crypto xmlsec dynamic loading])
|
||||
)
|
||||
|
||||
if test "x$enable_xmlsec_crypto_dynamic_loading" == xyes; then
|
||||
AC_DEFINE([XMLSEC_CRYPTO_DYNAMIC_LOADING], [1], [enable xmlsec crypto dynamic loading])
|
||||
else
|
||||
AC_DEFINE([XMLSEC_NO_CRYPTO_DYNAMIC_LOADING], [1], [disable xmlsec crypto dynamic loading])
|
||||
fi
|
||||
@ -47,7 +50,7 @@ AC_CHECK_FUNCS([clock_gettime gethrtime gettimeofday memset strdup])
|
||||
|
||||
# libtool
|
||||
|
||||
LT_INIT([dlopen])
|
||||
LT_INIT
|
||||
|
||||
AC_CONFIG_FILES([Makefile src/Makefile])
|
||||
AC_OUTPUT
|
||||
|
@ -1,7 +1,7 @@
|
||||
SOURCES = xades/xmlsec1/xmltree.c xades/xmlsec1/errors.c xades/templates.c xades/xades.c facho_signer.c
|
||||
|
||||
lib_LTLIBRARIES = libfachosigner.la
|
||||
libfachosigner_la_SOURCES = $(SOURCES)
|
||||
libfachosigner_la_SOURCES = $(LTDL_SOURCE_FILES) $(SOURCES)
|
||||
libfachosigner_la_CFLAGS = $(OPENSSL_CFLAGS) $(XMLSEC1_CFLAGS) -DXMLSEC_NOT_CRYPTO_DYNAMIC_LOADING
|
||||
libfachosigner_la_LDFLAGS = $(OPENSSL_LIBS) $(LIBLTDL) $(XMLSEC1_LIBS)
|
||||
|
||||
|
@ -1,4 +1,5 @@
|
||||
#include "config.h"
|
||||
|
||||
#include "xades.h"
|
||||
|
||||
#include <libxml/xpath.h>
|
||||
@ -14,7 +15,8 @@
|
||||
#include <xmlsec/transforms.h>
|
||||
#include <xmlsec/keysdata.h>
|
||||
|
||||
#ifndef XMLSEC_CRYPTO_DYNAMIC_LOADING
|
||||
#ifdef XMLSEC_NO_CRYPTO_DYNAMIC_LOADING
|
||||
#include <xmlsec/openssl/x509.h>
|
||||
#include <xmlsec/openssl/crypto.h>
|
||||
#include <xmlsec/openssl/symbols.h>
|
||||
#endif
|
||||
|
@ -1,12 +1,15 @@
|
||||
#ifndef XADES_H
|
||||
#define XADES_H
|
||||
|
||||
|
||||
|
||||
#include <libxml/tree.h>
|
||||
|
||||
#define XMLSEC_NO_XSLT 1
|
||||
|
||||
#include <xmlsec/xmltree.h>
|
||||
#include <xmlsec/transforms.h>
|
||||
#include <xmlsec/xmldsig.h>
|
||||
#include <xmlsec/openssl/x509.h>
|
||||
#include <xmlsec/base64.h>
|
||||
|
||||
#include "xmlsec1/errors_helpers.h"
|
||||
|
@ -15,6 +15,7 @@
|
||||
*/
|
||||
|
||||
#define XMLSEC_PRIVATE 1
|
||||
#define XMLSEC_NO_XSLT 1
|
||||
|
||||
#include <stdlib.h>
|
||||
#include <stdio.h>
|
||||
|
@ -23,6 +23,8 @@
|
||||
#include <libxml/xpath.h>
|
||||
#include <libxml/xpathInternals.h>
|
||||
|
||||
#define XMLSEC_NO_XSLT 1
|
||||
|
||||
#include <xmlsec/xmlsec.h>
|
||||
#include <xmlsec/xmltree.h>
|
||||
#include <xmlsec/parser.h>
|
||||
|
Loading…
Reference in New Issue
Block a user