diff --git a/doc/tools/Makefile.am b/doc/tools/Makefile.am
index aa0862ee..f4e64c79 100644
--- a/doc/tools/Makefile.am
+++ b/doc/tools/Makefile.am
@@ -25,8 +25,8 @@ tools.html: $(srcdir)/tools.xml $(wildcard $(srcdir)/*.1.xml) $(wildcard $(srcdi
| $(XSLTPROC) --nonet --path "$(srcdir)/..:$(xslstylesheetsdir)/manpages" --xinclude -o $@ man.xsl $<
%: $(srcdir)/%.1.xml
- echo $< $@
- cat completion-template \
+ @echo $< $@
+ @cat completion-template \
| sed "s,ALLOPTS,\
$(shell sed -n 's,\s\s\s*.*,\1,pg' $< \
| sort -u | grep -- '^\-' | tr '\n' ' ')," \
diff --git a/etc/Makefile.am b/etc/Makefile.am
index 59f2d29f..3816fbc3 100644
--- a/etc/Makefile.am
+++ b/etc/Makefile.am
@@ -15,7 +15,7 @@ force:
opensc.conf: opensc.conf.in force
.in:
- sed \
+ @sed \
-e 's|@pkgdatadir[@]|$(pkgdatadir)|g' \
-e 's|@libdir[@]|$(libdir)|g' \
-e 's|@DEFAULT_PCSC_PROVIDER[@]|$(DEFAULT_PCSC_PROVIDER)|g' \
diff --git a/src/common/compat_getopt.c b/src/common/compat_getopt.c
index 688e6cc8..e44ebca6 100644
--- a/src/common/compat_getopt.c
+++ b/src/common/compat_getopt.c
@@ -23,7 +23,9 @@
* DEALINGS IN THE SOFTWARE.
*/
+#if HAVE_CONFIG_H
#include "config.h"
+#endif
#if ! ( defined(HAVE_GETOPT_H) && defined(HAVE_GETOPT_LONG) && defined(HAVE_GETOPT_LONG_ONLY) )
diff --git a/src/common/compat_getpass.c b/src/common/compat_getpass.c
index f0b09e92..22a1abd1 100644
--- a/src/common/compat_getpass.c
+++ b/src/common/compat_getpass.c
@@ -1,4 +1,6 @@
+#if HAVE_CONFIG_H
#include "config.h"
+#endif
#ifndef HAVE_GETPASS /* empty file if getpass is available */
#include
diff --git a/src/common/compat_strlcat.c b/src/common/compat_strlcat.c
index 7fe0cd6b..af373f11 100644
--- a/src/common/compat_strlcat.c
+++ b/src/common/compat_strlcat.c
@@ -27,7 +27,9 @@
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+#if HAVE_CONFIG_H
#include "config.h"
+#endif
#ifndef HAVE_STRLCAT
#include
diff --git a/src/common/compat_strlcpy.c b/src/common/compat_strlcpy.c
index 3e09da73..88f3a5fb 100644
--- a/src/common/compat_strlcpy.c
+++ b/src/common/compat_strlcpy.c
@@ -16,7 +16,9 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
+#if HAVE_CONFIG_H
#include "config.h"
+#endif
#ifndef HAVE_STRLCPY /* empty file if strlcpy is available */
#include
diff --git a/src/common/libpkcs11.c b/src/common/libpkcs11.c
index b22d16de..58fb814c 100644
--- a/src/common/libpkcs11.c
+++ b/src/common/libpkcs11.c
@@ -5,7 +5,9 @@
* Copyright (C) 2002 Olaf Kirch
*/
+#if HAVE_CONFIG_H
#include "config.h"
+#endif
#include
#include
diff --git a/src/libopensc/apdu.c b/src/libopensc/apdu.c
index 38c75153..1a52d5a5 100644
--- a/src/libopensc/apdu.c
+++ b/src/libopensc/apdu.c
@@ -18,7 +18,9 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#if HAVE_CONFIG_H
#include "config.h"
+#endif
#include
#include
diff --git a/src/libopensc/asn1.c b/src/libopensc/asn1.c
index 1eeb2ef2..6938f193 100644
--- a/src/libopensc/asn1.c
+++ b/src/libopensc/asn1.c
@@ -18,7 +18,9 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#if HAVE_CONFIG_H
#include "config.h"
+#endif
#include
#include
diff --git a/src/libopensc/base64.c b/src/libopensc/base64.c
index 9152080c..961bd436 100644
--- a/src/libopensc/base64.c
+++ b/src/libopensc/base64.c
@@ -18,7 +18,9 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#if HAVE_CONFIG_H
#include "config.h"
+#endif
#include
#include
diff --git a/src/libopensc/card-acos5.c b/src/libopensc/card-acos5.c
index ff6ee3db..3e392585 100644
--- a/src/libopensc/card-acos5.c
+++ b/src/libopensc/card-acos5.c
@@ -18,7 +18,9 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#if HAVE_CONFIG_H
#include "config.h"
+#endif
#include
diff --git a/src/libopensc/card-akis.c b/src/libopensc/card-akis.c
index 684b8b0a..c84e5513 100644
--- a/src/libopensc/card-akis.c
+++ b/src/libopensc/card-akis.c
@@ -19,7 +19,9 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#if HAVE_CONFIG_H
#include "config.h"
+#endif
#include
#include
diff --git a/src/libopensc/card-asepcos.c b/src/libopensc/card-asepcos.c
index 05f8b399..ad0f514d 100644
--- a/src/libopensc/card-asepcos.c
+++ b/src/libopensc/card-asepcos.c
@@ -16,7 +16,9 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#if HAVE_CONFIG_H
#include "config.h"
+#endif
#include
#include
diff --git a/src/libopensc/card-atrust-acos.c b/src/libopensc/card-atrust-acos.c
index f0ac176b..9d3c41fd 100644
--- a/src/libopensc/card-atrust-acos.c
+++ b/src/libopensc/card-atrust-acos.c
@@ -20,7 +20,9 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#if HAVE_CONFIG_H
#include "config.h"
+#endif
#include
#include
diff --git a/src/libopensc/card-belpic.c b/src/libopensc/card-belpic.c
index cfb963eb..bbfb0582 100644
--- a/src/libopensc/card-belpic.c
+++ b/src/libopensc/card-belpic.c
@@ -80,7 +80,9 @@
* language-selection functionality.
*/
+#if HAVE_CONFIG_H
#include "config.h"
+#endif
#include
#include
diff --git a/src/libopensc/card-cardos.c b/src/libopensc/card-cardos.c
index 52a90d94..b6b208ae 100644
--- a/src/libopensc/card-cardos.c
+++ b/src/libopensc/card-cardos.c
@@ -21,7 +21,9 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#if HAVE_CONFIG_H
#include "config.h"
+#endif
#include
#include
diff --git a/src/libopensc/card-default.c b/src/libopensc/card-default.c
index b5501560..a17c2acb 100644
--- a/src/libopensc/card-default.c
+++ b/src/libopensc/card-default.c
@@ -18,7 +18,9 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#if HAVE_CONFIG_H
#include "config.h"
+#endif
#include
diff --git a/src/libopensc/card-entersafe.c b/src/libopensc/card-entersafe.c
index b024a283..798d28fb 100644
--- a/src/libopensc/card-entersafe.c
+++ b/src/libopensc/card-entersafe.c
@@ -16,7 +16,9 @@
/* Initially written by Weitao Sun (weitao@ftsafe.com) 2008 */
+#if HAVE_CONFIG_H
#include "config.h"
+#endif
#ifdef ENABLE_OPENSSL /* empty file without openssl */
#include
diff --git a/src/libopensc/card-epass2003.c b/src/libopensc/card-epass2003.c
index 162e00d0..8c75a15e 100644
--- a/src/libopensc/card-epass2003.c
+++ b/src/libopensc/card-epass2003.c
@@ -19,7 +19,9 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#if HAVE_CONFIG_H
#include "config.h"
+#endif
#ifdef ENABLE_SM /* empty file without SM enabled */
#ifdef ENABLE_OPENSSL /* empty file without openssl */
diff --git a/src/libopensc/card-flex.c b/src/libopensc/card-flex.c
index ff4c5085..3c031285 100644
--- a/src/libopensc/card-flex.c
+++ b/src/libopensc/card-flex.c
@@ -18,7 +18,9 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#if HAVE_CONFIG_H
#include "config.h"
+#endif
#include
#include
diff --git a/src/libopensc/card-gemsafeV1.c b/src/libopensc/card-gemsafeV1.c
index 9c6816b6..be3ea5b5 100644
--- a/src/libopensc/card-gemsafeV1.c
+++ b/src/libopensc/card-gemsafeV1.c
@@ -17,7 +17,9 @@
/* Initially written by David Mattes (david.mattes@boeing.com) */
/* Portuguese eID card support by Joao Poupino (joao.poupino@ist.utl.pt) */
+#if HAVE_CONFIG_H
#include "config.h"
+#endif
#include
#include
diff --git a/src/libopensc/card-gpk.c b/src/libopensc/card-gpk.c
index 2b44884b..b7a2670a 100644
--- a/src/libopensc/card-gpk.c
+++ b/src/libopensc/card-gpk.c
@@ -18,7 +18,9 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#if HAVE_CONFIG_H
#include "config.h"
+#endif
#ifdef ENABLE_OPENSSL /* empty file without openssl */
#include
diff --git a/src/libopensc/card-ias.c b/src/libopensc/card-ias.c
index 489087c5..584d5d9d 100644
--- a/src/libopensc/card-ias.c
+++ b/src/libopensc/card-ias.c
@@ -22,7 +22,9 @@
* Thanks to Andre Cruz, Jorge Ferreira and Paulo F. Andrade
*/
+#if HAVE_CONFIG_H
#include "config.h"
+#endif
#include
#include
diff --git a/src/libopensc/card-incrypto34.c b/src/libopensc/card-incrypto34.c
index 117596ee..676a755d 100644
--- a/src/libopensc/card-incrypto34.c
+++ b/src/libopensc/card-incrypto34.c
@@ -21,7 +21,9 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#if HAVE_CONFIG_H
#include "config.h"
+#endif
#include
#include
diff --git a/src/libopensc/card-jcop.c b/src/libopensc/card-jcop.c
index d01324c0..08a10972 100644
--- a/src/libopensc/card-jcop.c
+++ b/src/libopensc/card-jcop.c
@@ -18,7 +18,9 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#if HAVE_CONFIG_H
#include "config.h"
+#endif
#include
#include
diff --git a/src/libopensc/card-mcrd.c b/src/libopensc/card-mcrd.c
index a72f4da7..3b4481ce 100644
--- a/src/libopensc/card-mcrd.c
+++ b/src/libopensc/card-mcrd.c
@@ -22,7 +22,9 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#if HAVE_CONFIG_H
#include "config.h"
+#endif
#include
#include
diff --git a/src/libopensc/card-miocos.c b/src/libopensc/card-miocos.c
index 89638f5b..ad8add74 100644
--- a/src/libopensc/card-miocos.c
+++ b/src/libopensc/card-miocos.c
@@ -18,7 +18,9 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#if HAVE_CONFIG_H
#include "config.h"
+#endif
#include
#include
diff --git a/src/libopensc/card-muscle.c b/src/libopensc/card-muscle.c
index 81a482e5..dc43029d 100644
--- a/src/libopensc/card-muscle.c
+++ b/src/libopensc/card-muscle.c
@@ -18,7 +18,9 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#if HAVE_CONFIG_H
#include "config.h"
+#endif
#include
#include
diff --git a/src/libopensc/card-myeid.c b/src/libopensc/card-myeid.c
index 6a9fd752..63eeaf03 100644
--- a/src/libopensc/card-myeid.c
+++ b/src/libopensc/card-myeid.c
@@ -18,7 +18,9 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#if HAVE_CONFIG_H
#include "config.h"
+#endif
#include
#include
diff --git a/src/libopensc/card-oberthur.c b/src/libopensc/card-oberthur.c
index 99352e26..b8a5cbc4 100644
--- a/src/libopensc/card-oberthur.c
+++ b/src/libopensc/card-oberthur.c
@@ -23,7 +23,9 @@
* best view with tabstop=4
*/
+#if HAVE_CONFIG_H
#include "config.h"
+#endif
#ifdef ENABLE_OPENSSL /* empty file without openssl */
#include
diff --git a/src/libopensc/card-openpgp.c b/src/libopensc/card-openpgp.c
index 6c63a5e8..e819cf62 100644
--- a/src/libopensc/card-openpgp.c
+++ b/src/libopensc/card-openpgp.c
@@ -25,7 +25,9 @@
* http://www.g10code.de/docs/openpgp-card-2.0.pdf
*/
+#if HAVE_CONFIG_H
#include "config.h"
+#endif
#include
#include
diff --git a/src/libopensc/card-piv.c b/src/libopensc/card-piv.c
index e397c599..017a56b5 100644
--- a/src/libopensc/card-piv.c
+++ b/src/libopensc/card-piv.c
@@ -22,7 +22,9 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#if HAVE_CONFIG_H
#include "config.h"
+#endif
#include
#include
diff --git a/src/libopensc/card-rtecp.c b/src/libopensc/card-rtecp.c
index d0634d04..8e3a4983 100644
--- a/src/libopensc/card-rtecp.c
+++ b/src/libopensc/card-rtecp.c
@@ -18,7 +18,9 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#if HAVE_CONFIG_H
#include "config.h"
+#endif
#include
#include
diff --git a/src/libopensc/card-rutoken.c b/src/libopensc/card-rutoken.c
index efbf6b5b..295c23eb 100644
--- a/src/libopensc/card-rutoken.c
+++ b/src/libopensc/card-rutoken.c
@@ -19,7 +19,9 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#if HAVE_CONFIG_H
#include "config.h"
+#endif
#include
#include
diff --git a/src/libopensc/card-sc-hsm.c b/src/libopensc/card-sc-hsm.c
index 98f7b9e5..efe43ab8 100644
--- a/src/libopensc/card-sc-hsm.c
+++ b/src/libopensc/card-sc-hsm.c
@@ -20,7 +20,9 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#if HAVE_CONFIG_H
#include "config.h"
+#endif
#include
#include
diff --git a/src/libopensc/card-setcos.c b/src/libopensc/card-setcos.c
index 15da346e..2b0182a9 100644
--- a/src/libopensc/card-setcos.c
+++ b/src/libopensc/card-setcos.c
@@ -20,7 +20,9 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#if HAVE_CONFIG_H
#include "config.h"
+#endif
#include
#include
diff --git a/src/libopensc/card-starcos.c b/src/libopensc/card-starcos.c
index 9d43e51d..db746aaf 100644
--- a/src/libopensc/card-starcos.c
+++ b/src/libopensc/card-starcos.c
@@ -19,7 +19,9 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#if HAVE_CONFIG_H
#include "config.h"
+#endif
#include
#include
diff --git a/src/libopensc/card-tcos.c b/src/libopensc/card-tcos.c
index e41db406..f7d07f22 100644
--- a/src/libopensc/card-tcos.c
+++ b/src/libopensc/card-tcos.c
@@ -20,7 +20,9 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#if HAVE_CONFIG_H
#include "config.h"
+#endif
#include
#include
diff --git a/src/libopensc/card-westcos.c b/src/libopensc/card-westcos.c
index 60bcb999..76788bcf 100644
--- a/src/libopensc/card-westcos.c
+++ b/src/libopensc/card-westcos.c
@@ -18,7 +18,9 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#if HAVE_CONFIG_H
#include "config.h"
+#endif
#include
#include
diff --git a/src/libopensc/card.c b/src/libopensc/card.c
index 33a55a89..7daee5c5 100644
--- a/src/libopensc/card.c
+++ b/src/libopensc/card.c
@@ -18,7 +18,9 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#if HAVE_CONFIG_H
#include "config.h"
+#endif
#include
#include
diff --git a/src/libopensc/compression.c b/src/libopensc/compression.c
index d26ef1ff..9b38d822 100644
--- a/src/libopensc/compression.c
+++ b/src/libopensc/compression.c
@@ -18,7 +18,9 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#if HAVE_CONFIG_H
#include "config.h"
+#endif
#ifdef ENABLE_ZLIB /* empty file without zlib */
#include
diff --git a/src/libopensc/ctbcs.c b/src/libopensc/ctbcs.c
index ad51cac8..4b08ad6c 100644
--- a/src/libopensc/ctbcs.c
+++ b/src/libopensc/ctbcs.c
@@ -18,7 +18,9 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#if HAVE_CONFIG_H
#include "config.h"
+#endif
#include
#include
diff --git a/src/libopensc/ctx.c b/src/libopensc/ctx.c
index 2297193e..f6f7bde7 100644
--- a/src/libopensc/ctx.c
+++ b/src/libopensc/ctx.c
@@ -18,7 +18,9 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#if HAVE_CONFIG_H
#include "config.h"
+#endif
#include
#include
diff --git a/src/libopensc/dir.c b/src/libopensc/dir.c
index 4a3b1485..189fbee3 100644
--- a/src/libopensc/dir.c
+++ b/src/libopensc/dir.c
@@ -18,7 +18,9 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#if HAVE_CONFIG_H
#include "config.h"
+#endif
#include
#include
diff --git a/src/libopensc/errors.c b/src/libopensc/errors.c
index adc55b87..b6c6eb48 100644
--- a/src/libopensc/errors.c
+++ b/src/libopensc/errors.c
@@ -18,7 +18,9 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#if HAVE_CONFIG_H
#include "config.h"
+#endif
#include
diff --git a/src/libopensc/log.c b/src/libopensc/log.c
index 9d98413b..cac82803 100644
--- a/src/libopensc/log.c
+++ b/src/libopensc/log.c
@@ -19,7 +19,9 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#if HAVE_CONFIG_H
#include "config.h"
+#endif
#include
#include
diff --git a/src/libopensc/muscle-filesystem.c b/src/libopensc/muscle-filesystem.c
index dc618a67..602c40dd 100644
--- a/src/libopensc/muscle-filesystem.c
+++ b/src/libopensc/muscle-filesystem.c
@@ -18,7 +18,9 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#if HAVE_CONFIG_H
#include "config.h"
+#endif
#include
#include
diff --git a/src/libopensc/muscle.c b/src/libopensc/muscle.c
index 29a2f562..f0b1e921 100644
--- a/src/libopensc/muscle.c
+++ b/src/libopensc/muscle.c
@@ -18,7 +18,9 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#if HAVE_CONFIG_H
#include "config.h"
+#endif
#include
diff --git a/src/libopensc/p15card-helper.c b/src/libopensc/p15card-helper.c
index 3bf698c8..1a16da7d 100644
--- a/src/libopensc/p15card-helper.c
+++ b/src/libopensc/p15card-helper.c
@@ -18,7 +18,9 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#if HAVE_CONFIG_H
#include "config.h"
+#endif
#ifdef ENABLE_OPENSSL /* empty file without openssl */
#include
diff --git a/src/libopensc/padding.c b/src/libopensc/padding.c
index 21a56098..290e6160 100644
--- a/src/libopensc/padding.c
+++ b/src/libopensc/padding.c
@@ -19,7 +19,9 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#if HAVE_CONFIG_H
#include "config.h"
+#endif
#include
#include
diff --git a/src/libopensc/pkcs15-actalis.c b/src/libopensc/pkcs15-actalis.c
index b8b2a0f7..9391418a 100644
--- a/src/libopensc/pkcs15-actalis.c
+++ b/src/libopensc/pkcs15-actalis.c
@@ -22,7 +22,9 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#if HAVE_CONFIG_H
#include "config.h"
+#endif
#include
#include
diff --git a/src/libopensc/pkcs15-algo.c b/src/libopensc/pkcs15-algo.c
index f66692de..0465ccda 100644
--- a/src/libopensc/pkcs15-algo.c
+++ b/src/libopensc/pkcs15-algo.c
@@ -18,7 +18,9 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#if HAVE_CONFIG_H
#include "config.h"
+#endif
#include
#include
diff --git a/src/libopensc/pkcs15-atrust-acos.c b/src/libopensc/pkcs15-atrust-acos.c
index f59539bb..69bdb50e 100644
--- a/src/libopensc/pkcs15-atrust-acos.c
+++ b/src/libopensc/pkcs15-atrust-acos.c
@@ -19,7 +19,9 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#if HAVE_CONFIG_H
#include "config.h"
+#endif
#include
#include
diff --git a/src/libopensc/pkcs15-cache.c b/src/libopensc/pkcs15-cache.c
index b0c8269d..74d56431 100644
--- a/src/libopensc/pkcs15-cache.c
+++ b/src/libopensc/pkcs15-cache.c
@@ -18,7 +18,9 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#if HAVE_CONFIG_H
#include "config.h"
+#endif
#include
#include
diff --git a/src/libopensc/pkcs15-cert.c b/src/libopensc/pkcs15-cert.c
index a930311a..80051b51 100644
--- a/src/libopensc/pkcs15-cert.c
+++ b/src/libopensc/pkcs15-cert.c
@@ -18,7 +18,9 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#if HAVE_CONFIG_H
#include "config.h"
+#endif
#include
#include
diff --git a/src/libopensc/pkcs15-data.c b/src/libopensc/pkcs15-data.c
index 5d7ad32a..1e0de8f7 100644
--- a/src/libopensc/pkcs15-data.c
+++ b/src/libopensc/pkcs15-data.c
@@ -20,7 +20,9 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#if HAVE_CONFIG_H
#include "config.h"
+#endif
#include
#include
diff --git a/src/libopensc/pkcs15-dnie.c b/src/libopensc/pkcs15-dnie.c
index 077215f4..94d7f4cb 100644
--- a/src/libopensc/pkcs15-dnie.c
+++ b/src/libopensc/pkcs15-dnie.c
@@ -21,7 +21,9 @@
#include
#include
+#if HAVE_CONFIG_H
#include "config.h"
+#endif
#include "libopensc/log.h"
#include "libopensc/asn1.h"
#include "libopensc/pkcs15.h"
diff --git a/src/libopensc/pkcs15-esinit.c b/src/libopensc/pkcs15-esinit.c
index f551b5bb..cabdb47e 100644
--- a/src/libopensc/pkcs15-esinit.c
+++ b/src/libopensc/pkcs15-esinit.c
@@ -15,7 +15,9 @@
*/
/* Initially written by Weitao Sun (weitao@ftsafe.com) 2008*/
+#if HAVE_CONFIG_H
#include "config.h"
+#endif
#include
#include
diff --git a/src/libopensc/pkcs15-esteid.c b/src/libopensc/pkcs15-esteid.c
index 6975fe10..3b4062f3 100644
--- a/src/libopensc/pkcs15-esteid.c
+++ b/src/libopensc/pkcs15-esteid.c
@@ -21,7 +21,9 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#if HAVE_CONFIG_H
#include "config.h"
+#endif
#include
#include
diff --git a/src/libopensc/pkcs15-gemsafeGPK.c b/src/libopensc/pkcs15-gemsafeGPK.c
index 551b0a3b..f31d9af2 100644
--- a/src/libopensc/pkcs15-gemsafeGPK.c
+++ b/src/libopensc/pkcs15-gemsafeGPK.c
@@ -19,7 +19,9 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#if HAVE_CONFIG_H
#include "config.h"
+#endif
#include
#include
diff --git a/src/libopensc/pkcs15-gemsafeV1.c b/src/libopensc/pkcs15-gemsafeV1.c
index c1191eef..b757b116 100644
--- a/src/libopensc/pkcs15-gemsafeV1.c
+++ b/src/libopensc/pkcs15-gemsafeV1.c
@@ -17,7 +17,9 @@
/* Initially written by David Mattes */
/* Support for multiple key containers by Lukas Wunner */
+#if HAVE_CONFIG_H
#include "config.h"
+#endif
#include
#include
diff --git a/src/libopensc/pkcs15-infocamere.c b/src/libopensc/pkcs15-infocamere.c
index 1ea1fefa..e51b37a9 100644
--- a/src/libopensc/pkcs15-infocamere.c
+++ b/src/libopensc/pkcs15-infocamere.c
@@ -21,7 +21,9 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#if HAVE_CONFIG_H
#include "config.h"
+#endif
#include
#include
diff --git a/src/libopensc/pkcs15-openpgp.c b/src/libopensc/pkcs15-openpgp.c
index 4daaa98c..044ed163 100644
--- a/src/libopensc/pkcs15-openpgp.c
+++ b/src/libopensc/pkcs15-openpgp.c
@@ -19,7 +19,9 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#if HAVE_CONFIG_H
#include "config.h"
+#endif
#include
#include
diff --git a/src/libopensc/pkcs15-pin.c b/src/libopensc/pkcs15-pin.c
index 9ae07405..d73915a0 100644
--- a/src/libopensc/pkcs15-pin.c
+++ b/src/libopensc/pkcs15-pin.c
@@ -18,7 +18,9 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#if HAVE_CONFIG_H
#include "config.h"
+#endif
#include
#include
diff --git a/src/libopensc/pkcs15-piv.c b/src/libopensc/pkcs15-piv.c
index 724987bd..549a91b9 100644
--- a/src/libopensc/pkcs15-piv.c
+++ b/src/libopensc/pkcs15-piv.c
@@ -24,7 +24,9 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#if HAVE_CONFIG_H
#include "config.h"
+#endif
#include
#include
diff --git a/src/libopensc/pkcs15-postecert.c b/src/libopensc/pkcs15-postecert.c
index a62edd3a..6842bda4 100644
--- a/src/libopensc/pkcs15-postecert.c
+++ b/src/libopensc/pkcs15-postecert.c
@@ -20,7 +20,9 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#if HAVE_CONFIG_H
#include "config.h"
+#endif
#include
#include
diff --git a/src/libopensc/pkcs15-prkey.c b/src/libopensc/pkcs15-prkey.c
index 6460f1f8..d96008f5 100644
--- a/src/libopensc/pkcs15-prkey.c
+++ b/src/libopensc/pkcs15-prkey.c
@@ -18,7 +18,9 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#if HAVE_CONFIG_H
#include "config.h"
+#endif
#include
#include
diff --git a/src/libopensc/pkcs15-pteid.c b/src/libopensc/pkcs15-pteid.c
index 028ef27d..da9c0887 100644
--- a/src/libopensc/pkcs15-pteid.c
+++ b/src/libopensc/pkcs15-pteid.c
@@ -35,7 +35,9 @@
*
*/
+#if HAVE_CONFIG_H
#include "config.h"
+#endif
#include
#include
diff --git a/src/libopensc/pkcs15-pubkey.c b/src/libopensc/pkcs15-pubkey.c
index 9cf75e35..8fd8f533 100644
--- a/src/libopensc/pkcs15-pubkey.c
+++ b/src/libopensc/pkcs15-pubkey.c
@@ -18,7 +18,9 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#if HAVE_CONFIG_H
#include "config.h"
+#endif
#include
#include
diff --git a/src/libopensc/pkcs15-sc-hsm.c b/src/libopensc/pkcs15-sc-hsm.c
index 77d329bb..3e087d11 100644
--- a/src/libopensc/pkcs15-sc-hsm.c
+++ b/src/libopensc/pkcs15-sc-hsm.c
@@ -18,7 +18,9 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#if HAVE_CONFIG_H
#include "config.h"
+#endif
#include
#include
diff --git a/src/libopensc/pkcs15-sec.c b/src/libopensc/pkcs15-sec.c
index 3b3366b0..df78f604 100644
--- a/src/libopensc/pkcs15-sec.c
+++ b/src/libopensc/pkcs15-sec.c
@@ -19,7 +19,9 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#if HAVE_CONFIG_H
#include "config.h"
+#endif
#include
#include
diff --git a/src/libopensc/pkcs15-starcert.c b/src/libopensc/pkcs15-starcert.c
index 19faefc8..96e0b8ac 100644
--- a/src/libopensc/pkcs15-starcert.c
+++ b/src/libopensc/pkcs15-starcert.c
@@ -18,7 +18,9 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#if HAVE_CONFIG_H
#include "config.h"
+#endif
#include
#include
diff --git a/src/libopensc/pkcs15-syn.c b/src/libopensc/pkcs15-syn.c
index 3d758016..f4f0d193 100644
--- a/src/libopensc/pkcs15-syn.c
+++ b/src/libopensc/pkcs15-syn.c
@@ -19,7 +19,9 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#if HAVE_CONFIG_H
#include "config.h"
+#endif
#include
#include
diff --git a/src/libopensc/pkcs15-tccardos.c b/src/libopensc/pkcs15-tccardos.c
index 42103987..1715752d 100644
--- a/src/libopensc/pkcs15-tccardos.c
+++ b/src/libopensc/pkcs15-tccardos.c
@@ -18,7 +18,9 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#if HAVE_CONFIG_H
#include "config.h"
+#endif
#include
#include
diff --git a/src/libopensc/pkcs15-tcos.c b/src/libopensc/pkcs15-tcos.c
index 30762156..29712888 100644
--- a/src/libopensc/pkcs15-tcos.c
+++ b/src/libopensc/pkcs15-tcos.c
@@ -18,7 +18,9 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#if HAVE_CONFIG_H
#include "config.h"
+#endif
#include
#include
diff --git a/src/libopensc/pkcs15-westcos.c b/src/libopensc/pkcs15-westcos.c
index ebc02cda..7974fe62 100644
--- a/src/libopensc/pkcs15-westcos.c
+++ b/src/libopensc/pkcs15-westcos.c
@@ -18,7 +18,9 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#if HAVE_CONFIG_H
#include "config.h"
+#endif
#include
#include
diff --git a/src/libopensc/reader-ctapi.c b/src/libopensc/reader-ctapi.c
index a3d0cce1..919c3f0e 100644
--- a/src/libopensc/reader-ctapi.c
+++ b/src/libopensc/reader-ctapi.c
@@ -18,7 +18,9 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#if HAVE_CONFIG_H
#include "config.h"
+#endif
#ifdef ENABLE_CTAPI
#include
diff --git a/src/libopensc/reader-openct.c b/src/libopensc/reader-openct.c
index c127306e..a276d52b 100644
--- a/src/libopensc/reader-openct.c
+++ b/src/libopensc/reader-openct.c
@@ -4,7 +4,9 @@
* Copyright (C) 2003 Olaf Kirch
*/
+#if HAVE_CONFIG_H
#include "config.h"
+#endif
#ifdef ENABLE_OPENCT /* empty file without openct */
#include
diff --git a/src/libopensc/reader-pcsc.c b/src/libopensc/reader-pcsc.c
index 06192cf3..87e47651 100644
--- a/src/libopensc/reader-pcsc.c
+++ b/src/libopensc/reader-pcsc.c
@@ -19,7 +19,9 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#if HAVE_CONFIG_H
#include "config.h"
+#endif
#ifdef ENABLE_PCSC /* empty file without pcsc */
#include
diff --git a/src/libopensc/sc.c b/src/libopensc/sc.c
index 490b365b..052d6ebc 100644
--- a/src/libopensc/sc.c
+++ b/src/libopensc/sc.c
@@ -18,7 +18,9 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#if HAVE_CONFIG_H
#include "config.h"
+#endif
#include
#include
diff --git a/src/libopensc/sec.c b/src/libopensc/sec.c
index 1244e857..140c562a 100644
--- a/src/libopensc/sec.c
+++ b/src/libopensc/sec.c
@@ -18,7 +18,9 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#if HAVE_CONFIG_H
#include "config.h"
+#endif
#include
#include
diff --git a/src/libopensc/sm.c b/src/libopensc/sm.c
index 4705ba62..44cdfa48 100644
--- a/src/libopensc/sm.c
+++ b/src/libopensc/sm.c
@@ -18,7 +18,9 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#if HAVE_CONFIG_H
#include "config.h"
+#endif
#include
#include