[pkg-opensc-commit] [pkcs11-helper] 48/53: Fix build environment (again)
Eric Dorland
eric at moszumanska.debian.org
Fri Jan 6 23:39:55 UTC 2017
This is an automated email from the git hooks/post-receive script.
eric pushed a commit to tag pkcs11-helper-1.03
in repository pkcs11-helper.
commit 034f2eb2f3ab4b7f1f1dae3128eb035afd260db0
Author: alonbl <alonbl at 485eb718-1723-0410-b8a9-88cf21a28c35>
Date: Wed Jun 13 15:41:05 2007 +0000
Fix build environment (again)
---
ChangeLog | 2 +-
acinclude.m4 | 23 +++++++++++++++++++++++
config-w32-vc.h.in | 6 +++---
configure.ac | 28 ++++------------------------
lib/common.h | 2 ++
man/Makefile.am | 13 +++++--------
man/pkcs11-helper-1.8 | 4 ++++
7 files changed, 42 insertions(+), 36 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 9968155..36c2b50 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,7 +3,7 @@ Copyright (c) 2006 Alon Bar-Lev <alon.barlev at gmail.com>
$Id$
-2007-??-?? - Version 1.03
+2007-06-13 - Version 1.03
* Autoconf fixups.
diff --git a/acinclude.m4 b/acinclude.m4
index fb8b4a7..d673b4e 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -41,3 +41,26 @@ AC_DEFUN([AX_CPP_VARARG_MACRO_ISO], [dnl
fi
AS_VAR_POPDEF([VAR])dnl
])
+
+dnl @synopsis AX_SIZE_T_PRINTF
+dnl
+dnl Test if %zx is supported by printf.
+dnl
+dnl @version
+dnl @author <alon.barlev at gmail.com>
+AC_DEFUN([AX_SIZE_T_PRINTF], [dnl
+ AC_TYPE_SIZE_T dnl
+ AC_CHECK_SIZEOF([size_t])dnl
+ AC_MSG_CHECKING([size_t printf format])
+ if test ${ac_cv_sizeof_size_t} = 4; then
+ ax_cv_printf_z_format="%x"
+ else
+ ax_cv_printf_z_format="%lx"
+ fi
+ AC_MSG_RESULT([${ax_cv_printf_z_format}])dnl
+ AC_DEFINE_UNQUOTED(
+ [PRINTF_Z_FORMAT],dnl
+ ["${ax_cv_printf_z_format}"],dnl
+ [Define printf format for size_t]dnl
+ )dnl
+])
diff --git a/config-w32-vc.h.in b/config-w32-vc.h.in
index 3cb5609..dcd84cb 100644
--- a/config-w32-vc.h.in
+++ b/config-w32-vc.h.in
@@ -138,6 +138,9 @@
/* Define if you are on Cygwin */
/* #undef PKCS11H_USE_CYGWIN */
+/* Define printf format for size_t */
+#define PRINTF_Z_FORMAT "%x"
+
/* Define as the return type of signal handlers (`int' or `void'). */
#define RETSIGTYPE void
@@ -162,9 +165,6 @@
/* Version number of package */
#define VERSION "@VERSION@"
-/* size_t printf format */
-#define P_Z "%u"
-
/* Define to empty if `const' does not conform to ANSI C. */
/* #undef const */
diff --git a/configure.ac b/configure.ac
index 4d13c6b..537c473 100644
--- a/configure.ac
+++ b/configure.ac
@@ -50,7 +50,7 @@
#
AC_PREREQ([2.60])
-AC_INIT([pkcs11-helper], [1.03_beta1])
+AC_INIT([pkcs11-helper], [1.03])
AM_INIT_AUTOMAKE([${PACKAGE_NAME}], [${PACKAGE_VERSION}])
AM_CONFIG_HEADER([config.h])
AC_CONFIG_SRCDIR([lib/common.h])
@@ -174,10 +174,6 @@ AC_ARG_WITH([apidocdir],
[apidocdir="\$(htmldir)/api"]
)
-AC_ARG_WITH([mem-check],
- [ --with-mem-check=TYPE Build with debug memory checking, TYPE = valgrind]
-)
-
AC_ARG_WITH([test-provider],
[ --with-test-provider=lib Specify providers for test phase],
[AC_DEFINE_UNQUOTED([TEST_PROVIDER], ["${withval}"], [Test provider])],
@@ -291,7 +287,8 @@ AC_TYPE_PID_T
AC_TYPE_SIZE_T
AC_HEADER_TIME
AC_STRUCT_TM
-AC_CHECK_HEADERS([[ \
+AX_SIZE_T_PRINTF
+AC_CHECK_HEADERS([ \
stdio.h \
stdlib.h \
stdargs.h \
@@ -301,7 +298,7 @@ AC_CHECK_HEADERS([[ \
errno.h \
assert.h \
time.h \
-]])
+])
if test "${WIN32}" != "yes"; then
AC_CHECK_HEADERS([ \
signal.h \
@@ -312,17 +309,6 @@ if test "${WIN32}" != "yes"; then
])
fi
-if test "$with_mem_check" = "valgrind"; then
- AC_CHECKING([for valgrind tool and Header files])
- PKG_CHECK_MODULES([VALGRIND], [valgrind >= 3.0.0], [HAVE_VALGRIND=yes], [HAVE_VALGRIND=no])
- if test "${HAVE_VALGRIND}" != "yes"; then
- AC_MSG_ERROR([valgrind was not found])
- fi
- AC_DEFINE([USE_VALGRIND], [1], [Use valgrind memory debugging library])
- CFLAGS="${CFLAGS} ${VALGRIND_CFLAGS} -g -fno-inline"
-# LIBS="${VALGRIND_LIBS} ${LIBS}"
-fi
-
if echo "${CC}" | grep gcc 2>&1 > /dev/null; then
CFLAGS="$CFLAGS -Wall -Wpointer-arith -Wsign-compare -Wno-unused-parameter -Wno-unused-function"
@@ -378,12 +364,6 @@ if test \
PKCS11H_FEATURES="${PKCS11H_FEATURES} engine_crypto"
fi
-if test "${WIN32}" = "yes"; then
- AC_DEFINE([P_Z], ["%u"], [size_t printf format])
-else
- AC_DEFINE([P_Z], ["%zu"], [size_t printf format])
-fi
-
pkgconfigdir="\$(libdir)/pkgconfig"
AC_SUBST([apidocdir])
AC_SUBST([pkgconfigdir])
diff --git a/lib/common.h b/lib/common.h
index 7a4e94f..13503ed 100644
--- a/lib/common.h
+++ b/lib/common.h
@@ -69,6 +69,8 @@
#include <windows.h>
#endif
+#define P_Z PRINTF_Z_FORMAT
+
#define _PKCS11H_ASSERT assert
#endif
diff --git a/man/Makefile.am b/man/Makefile.am
index 36dc22d..eb89dfb 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -51,18 +51,15 @@
if WIN32
-%.8.html:
- $(MAN2HTML) < $*.8 > $@
+pkcs11-helper-1.8.html:
+ $(MAN2HTML) < pkcs11-helper-1.8 > $@
-nodist_html_DATA=$(shell ls *.[0-9] | sed -r 's/(\.[0-9])/\1.html/g')
+nodist_html_DATA=pkcs11-helper-1.8.html
-endif
+EXTRA_DIST=pkcs11-helper-1.8
-# Must add exist file so automake will add this dependency
-if WIN32
-EXTRA_DIST=$(shell ls *.[0-9]) pkcs11-helper-1.8
else
-dist_man_MANS=$(shell ls *.[0-9]) pkcs11-helper-1.8
+dist_man_MANS=pkcs11-helper-1.8
endif
clean-generic:
diff --git a/man/pkcs11-helper-1.8 b/man/pkcs11-helper-1.8
index 0abd1b5..ef8312b 100644
--- a/man/pkcs11-helper-1.8
+++ b/man/pkcs11-helper-1.8
@@ -57,6 +57,10 @@
.Sh DESCRIPTION
.Nm pkcs11-helper
is a simplified API for accessing PKCS#11 tokens for user applications.
+.Sh SEE ALSO
+.%T "pkcs11-helper Home Page"
+.%O http://www.opensc-project.org/pkcs11-helper
+.Re
.Sh AUTHORS AND COPYRIGHT
Copyright (c) 2006 Alon Bar-Lev <alon.barlev at gmail.com>
.Pp
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-opensc/pkcs11-helper.git
More information about the pkg-opensc-commit
mailing list