This is an automated email from the git hooks/post-receive script.
eric pushed a commit to tag pkcs11-helper-1.02
in repository pkcs11-helper.
commit bdb93d69d6eedf4a567441b5ed69322d191ebc1e
Author: alonbl <alonbl at 485eb718-1723-0410-b8a9-88cf21a28c35>
Date: Wed Jan 3 21:37:38 2007 +0000
More build environment cleanups
---
configure.ac | 2 +-
include/pkcs11-helper-1.0/Makefile.am | 6 ++
include/pkcs11-helper-1.0/pkcs11h-core.h | 4 +-
include/pkcs11-helper-1.0/pkcs11h-version.h.in | 80 ++++++++++++++++++++++++++
lib/Makefile.am | 3 +-
5 files changed, 89 insertions(+), 6 deletions(-)
diff --git a/configure.ac b/configure.ac
index 9b8ffba..6fd0dba 100644
--- a/configure.ac
+++ b/configure.ac
@@ -360,7 +360,6 @@ fi
docdir="${docdir}-${PACKAGE_VERSION}"
pkgconfigdir="${libdir}/pkgconfig"
AC_SUBST([pkgconfigdir])
-AC_SUBST([LIBS])
AC_SUBST([PKCS11H_FEATURES])
AM_CONDITIONAL(ENABLE_DOC, test "${ENABLE_DOC}" = "yes")
AM_CONDITIONAL(WIN32, test "${WIN32}" = "yes")
@@ -376,6 +375,7 @@ AC_CONFIG_FILES([
pkcs11-helper.spec
include/Makefile
include/pkcs11-helper-1.0/Makefile
+ include/pkcs11-helper-1.0/pkcs11h-version.h
man/Makefile
doc/Makefile
doc/api/Makefile
diff --git a/include/pkcs11-helper-1.0/Makefile.am b/include/pkcs11-helper-1.0/Makefile.am
index 439f9a6..5041207 100644
--- a/include/pkcs11-helper-1.0/Makefile.am
+++ b/include/pkcs11-helper-1.0/Makefile.am
@@ -58,6 +58,12 @@ myinc_HEADERS= \
pkcs11h-core.h
noinst_HEADERS=
+#
+# For win32 vc, add this into
+# dist as well
+#
+myinc_HEADERS+=pkcs11h-version.h
+
if ENABLE_PKCS11H_CERTIFICATE
myinc_HEADERS+=pkcs11h-certificate.h
else
diff --git a/include/pkcs11-helper-1.0/pkcs11h-core.h b/include/pkcs11-helper-1.0/pkcs11h-core.h
index 2faba83..9dae10e 100644
--- a/include/pkcs11-helper-1.0/pkcs11h-core.h
+++ b/include/pkcs11-helper-1.0/pkcs11h-core.h
@@ -125,6 +125,7 @@
#include <stdarg.h>
#include <time.h>
+#include <pkcs11-helper-1.0/pkcs11h-version.h>
#include <pkcs11-helper-1.0/pkcs11h-def.h>
#include <pkcs11-helper-1.0/pkcs11h-engines.h>
@@ -132,9 +133,6 @@
extern "C" {
#endif
-/** Static pkcs11-helper library version */
-#define PKCS11H_VERSION 0x00010000
-
/**
* @brief pkcs11-helper features mask.
* @addtogroup PKCS11H_FEATURE_MASK
diff --git a/include/pkcs11-helper-1.0/pkcs11h-version.h.in b/include/pkcs11-helper-1.0/pkcs11h-version.h.in
new file mode 100644
index 0000000..bd55b9c
--- /dev/null
+++ b/include/pkcs11-helper-1.0/pkcs11h-version.h.in
@@ -0,0 +1,80 @@
+/*
+ * Copyright (c) 2005-2006 Alon Bar-Lev <alon.barlev at gmail.com>
+ * All rights reserved.
+ *
+ * This software is available to you under a choice of one of two
+ * licenses. You may choose to be licensed under the terms of the GNU
+ * General Public License (GPL) Version 2, or the BSD license.
+ *
+ * GNU General Public License (GPL) Version 2
+ * ===========================================
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program (see the file COPYING.GPL included with this
+ * distribution); if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * BSD License
+ * ============
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * o Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * o Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * o Neither the name of the <ORGANIZATION> nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+#ifndef __PKCS11H_VERSION_H
+#define __PKCS11H_VERSION_H
+
+/**
+ * @file pkcs11h-core.h
+ * @brief pkcs11-helper core.
+ * @author Alon Bar-Lev <alon.barlev at gmail.com>
+ * @see pkcs11h_core.
+ */
+
+/**
+ * @addtogroup pkcs11h_core pkcs11-helper core interface
+ *
+ * Core functionality.
+ *
+ * @{
+ */
+
+/**
+ * @brief Library version.
+ */
+#define PKCS11H_VERSION ( \
+ (@LIBPKCS11_HELPER_LT_CURRENT@<<16) | \
+ (@LIBPKCS11_HELPER_LT_REVISION@<<8) | \
+ (@LIBPKCS11_HELPER_LT_AGE@<<0) \
+)
+
+/** @} */
+
+#endif /* __PKCS11H_VERSION_H */
diff --git a/lib/Makefile.am b/lib/Makefile.am
index db57c90..8253778 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -85,8 +85,7 @@ libpkcs11_helper_la_SOURCES= \
libpkcs11_helper_la_LDFLAGS= \
-version-info @LIBPKCS11_HELPER_LT_CURRENT@:@LIBPKCS11_HELPER_LT_REVISION@:@LIBPKCS11_HELPER_LT_AGE@ \
-export-symbols pkcs11-helper.exports \
- -no-undefined \
- $(no_undefined) $(export_symbols)
+ -no-undefined
pkcs11-helper.exports: \
../config.h \
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-opensc/pkcs11-helper.git