[pkg-opensc-commit] [pkcs11-helper] 169/253: Prepare for libtool-2
Eric Dorland
eric at moszumanska.debian.org
Fri Jan 6 23:39:16 UTC 2017
This is an automated email from the git hooks/post-receive script.
eric pushed a commit to branch master
in repository pkcs11-helper.
commit 54ab9678d078accbe824f51f06a45ab3b67eb13d
Author: Alon Bar-Lev <alon.barlev at gmail.com>
Date: Thu Jun 5 20:33:10 2008 +0000
Prepare for libtool-2
---
Makefile.am | 5 ++++-
configure.ac | 50 ++++++++++++++++++++++++++------------------------
m4/Makefile.am | 54 ------------------------------------------------------
3 files changed, 30 insertions(+), 79 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index d31aebf..6be8a8e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -59,9 +59,12 @@ MAINTAINERCLEANFILES= \
$(srcdir)/install-sh $(srcdir)/ltmain.sh $(srcdir)/missing \
$(srcdir)/depcomp $(srcdir)/aclocal.m4 \
$(srcdir)/config.guess $(srcdir)/config.sub \
+ $(srcdir)/aclocal/ltsugar.m4 $(srcdir)/aclocal/libtool.m4 \
+ $(srcdir)/aclocal/ltversion.m4 $(srcdir)/aclocal/lt~obsolete.m4 \
+ $(srcdir)/aclocal/ltoptions.m4 \
$(srcdir)/pkcs11-helper.spec $(srcdir)/config-w32-vc.h
-SUBDIRS=aclocal man include lib m4dir doc distro tests
+SUBDIRS=man include lib m4dir doc distro tests
dist_doc_DATA=README COPYING.GPL COPYING.BSD COPYING
noinst_HEADERS=config-w32-vc.h
diff --git a/configure.ac b/configure.ac
index c26463d..cfab6e5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -49,15 +49,16 @@
# POSSIBILITY OF SUCH DAMAGE.
#
-AC_PREREQ([2.60])
+AC_PREREQ(2.60)
define([PACKAGE_VERSION_MAJOR], [1])
define([PACKAGE_VERSION_MINOR], [06])
define([PACKAGE_VERSION_FIX], [0])
-AC_INIT([pkcs11-helper], [PACKAGE_VERSION_MAJOR.PACKAGE_VERSION_MINOR-beta1])
+AC_INIT([pkcs11-helper],[PACKAGE_VERSION_MAJOR.PACKAGE_VERSION_MINOR-beta1])
AC_CONFIG_AUX_DIR([.])
-AM_CONFIG_HEADER([config.h])
+AC_CONFIG_HEADERS([config.h])
+AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_SRCDIR([lib/common.h])
AM_INIT_AUTOMAKE([${PACKAGE_NAME}], [${PACKAGE_VERSION}])
@@ -78,7 +79,7 @@ AC_CANONICAL_HOST
AC_ARG_WITH(
[cygwin-native],
- [AC_HELP_STRING([--with-cygwin-native], [compile native win32])],
+ [AS_HELP_STRING([--with-cygwin-native],[compile native win32])],
,
[with_cygwin_native="no"]
)
@@ -109,136 +110,138 @@ esac
AC_ARG_ENABLE(
[doc],
- [AC_HELP_STRING([--enable-doc], [enable documantation])],
+ [AS_HELP_STRING([--enable-doc],[enable documantation])],
,
[enable_doc="no"]
)
AC_ARG_ENABLE(
[debug],
- [AC_HELP_STRING([--disable-debug], [disable debug support])],
+ [AS_HELP_STRING([--disable-debug],[disable debug support])],
,
[enable_debug="yes"]
)
AC_ARG_ENABLE(
[threading],
- [AC_HELP_STRING([--disable-threading], [disable threading])],
+ [AS_HELP_STRING([--disable-threading],[disable threading])],
,
[enable_threading="yes"]
)
AC_ARG_ENABLE(
[token],
- [AC_HELP_STRING([--disable-token], [disable token support])],
+ [AS_HELP_STRING([--disable-token],[disable token support])],
,
[enable_token="yes"]
)
AC_ARG_ENABLE(
[data],
- [AC_HELP_STRING([--disable-data], [disable data objects support])],
+ [AS_HELP_STRING([--disable-data],[disable data objects support])],
,
[enable_data="yes"]
)
AC_ARG_ENABLE(
[certificate],
- [AC_HELP_STRING([--disable-certificate], [disable certificate support])],
+ [AS_HELP_STRING([--disable-certificate],[disable certificate support])],
,
[enable_certificate="yes"]
)
AC_ARG_ENABLE(
[slotevent],
- [AC_HELP_STRING([--disable-slotevent], [disable slotevent support])],
+ [AS_HELP_STRING([--disable-slotevent],[disable slotevent support])],
,
[enable_slotevent="yes"]
)
AC_ARG_ENABLE(
[openssl],
- [AC_HELP_STRING([--disable-openssl], [disable openssl interface])],
+ [AS_HELP_STRING([--disable-openssl],[disable openssl interface])],
,
[enable_openssl="yes"]
)
AC_ARG_ENABLE(
[strict],
- [AC_HELP_STRING([--enable-strict], [enable strict compiler warnings])],
+ [AS_HELP_STRING([--enable-strict],[enable strict compiler warnings])],
,
[enable_strict="no"]
)
AC_ARG_ENABLE(
[pedantic],
- [AC_HELP_STRING([--enable-pedantic], [enable pedantic compiler warnings])],
+ [AS_HELP_STRING([--enable-pedantic],[enable pedantic compiler warnings])],
,
[enable_pedantic="no"]
)
AC_ARG_ENABLE(
[crypto-engine-openssl],
- [AC_HELP_STRING([--disable-crypto-engine-openssl], [disable OpenSSL crypto engine)])],
+ [AS_HELP_STRING([--disable-crypto-engine-openssl],[disable OpenSSL crypto engine)])],
,
[enable_crypto_engine_openssl="yes"]
)
AC_ARG_ENABLE(
[crypto-engine-gnutls],
- [AC_HELP_STRING([--disable-crypto-engine-gnutls], [disable GnuTLS crypto engine])],
+ [AS_HELP_STRING([--disable-crypto-engine-gnutls],[disable GnuTLS crypto engine])],
,
[enable_crypto_engine_gnutls="yes"]
)
AC_ARG_ENABLE(
[crypto-engine-nss],
- [AC_HELP_STRING([--disable-crypto-engine-nss], [disable NSS crypto engine])],
+ [AS_HELP_STRING([--disable-crypto-engine-nss],[disable NSS crypto engine])],
,
[enable_crypto_engine_nss="yes"]
)
AC_ARG_ENABLE(
[crypto-engine-win32],
- [AC_HELP_STRING([--disable-crypto-engine-win32], [disable win32 native crypto engine on win32 systems])],
+ [AS_HELP_STRING([--disable-crypto-engine-win32],[disable win32 native crypto engine on win32 systems])],
,
[enable_crypto_engine_win32="yes"]
)
AC_ARG_ENABLE(
[tests],
- [AC_HELP_STRING([--enable-tests], [enable tests])],
+ [AS_HELP_STRING([--enable-tests],[enable tests])],
,
[enable_tests="no"]
)
AC_ARG_WITH(
[apidocdir],
- [AC_HELP_STRING([--with-apidocdir], [put API documents at this directory, default HTMLDIR/api])],
+ [AS_HELP_STRING([--with-apidocdir],[put API documents at this directory, default HTMLDIR/api])],
[apidocdir="${with_apidocdir}"],
[apidocdir="\$(htmldir)/api"]
)
AC_ARG_WITH(
[test-provider],
- [AC_HELP_STRING([--with-test-provider=lib], [specify providers for test phase])],
+ [AS_HELP_STRING([--with-test-provider=lib],[specify providers for test phase])],
[AC_DEFINE_UNQUOTED([TEST_PROVIDER], ["${withval}"], [Test provider])],
[AC_DEFINE_UNQUOTED([TEST_PROVIDER], ["/usr/lib/pkcs11/provider.so"], [Test provider])]
)
AC_ARG_WITH(
[test-log-level],
- [AC_HELP_STRING([--with-test-log-level=level], [specify log level for test phase])],
+ [AS_HELP_STRING([--with-test-log-level=level],[specify log level for test phase])],
[AC_DEFINE_UNQUOTED([TEST_LOG_LEVEL], [${withval}], [Test log level])],
[AC_DEFINE_UNQUOTED([TEST_LOG_LEVEL], [3], [Test log level])]
)
AC_PROG_CC
AC_PROG_INSTALL
+PKG_PROG_PKG_CONFIG
AC_LIBTOOL_WIN32_DLL
AC_LIBTOOL_RC
AC_PROG_LIBTOOL
-PKG_PROG_PKG_CONFIG
+#LT_INIT([win32-dll])
+#LT_LANG([Windows Resource])
AC_ARG_VAR([M4], [m4 utility])
AC_CHECK_PROGS([M4], [m4])
@@ -457,7 +460,6 @@ AC_CONFIG_FILES([
include/Makefile
include/pkcs11-helper-1.0/Makefile
include/pkcs11-helper-1.0/pkcs11h-version.h
- m4/Makefile
man/Makefile
doc/Makefile
doc/api/Makefile
diff --git a/m4/Makefile.am b/m4/Makefile.am
deleted file mode 100644
index 444b398..0000000
--- a/m4/Makefile.am
+++ /dev/null
@@ -1,54 +0,0 @@
-#
-# Copyright (c) 2005-2008 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.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 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.
-#
-
-MAINTAINERCLEANFILES=$(srcdir)/Makefile.in
-
-dist_noinst_DATA=vararg.m4 size_t.m4
--
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