honour HAVE_CONFIG_H

2015-04-22 23:55:33 +02:00 · 2015-04-22 23:55:33 +02:00 · bcb5fc15e5
parent 17eb40e5f9
commit bcb5fc15e5
80 changed files with 160 additions and 0 deletions
--- 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) )

--- 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 <stdio.h>
--- 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 <sys/types.h>
--- 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 <sys/types.h>
--- a/src/common/libpkcs11.c
+++ b/src/common/libpkcs11.c
@ -5,7 +5,9 @@
 * Copyright (C) 2002  Olaf Kirch <okir@lst.de>
 */

+#if HAVE_CONFIG_H
 #include "config.h"
+#endif

 #include <stdlib.h>
 #include <stdio.h>
--- 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 <stdio.h>
 #include <stdlib.h>
--- 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 <stdio.h>
 #include <string.h>
--- 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 <stdlib.h>
 #include <string.h>
--- 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 <string.h>

--- 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 <string.h>
 #include <stdlib.h>
--- 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 <ctype.h>
 #include <string.h>
--- 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 <stdlib.h>
 #include <string.h>
--- 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 <stdlib.h>
 #include <string.h>
--- 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 <ctype.h>
 #include <string.h>
--- 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 <string.h>

--- 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 <stdlib.h>
--- 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 */

--- 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 <stdlib.h>
 #include <string.h>
--- 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 <stdlib.h>
 #include <string.h>
--- 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 <stdlib.h>
--- 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 <stdlib.h>
 #include <string.h>
--- 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 <ctype.h>
 #include <string.h>
--- 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 <string.h>
 #include <stdlib.h>
--- 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 <stdlib.h>
 #include <string.h>
--- 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 <stdlib.h>
 #include <string.h>
--- 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 <stdlib.h>
 #include <string.h>
--- 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 <string.h>
 #include <stdlib.h>
--- 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 <stdlib.h>
--- 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 <stdlib.h>
 #include <string.h>
--- 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 <ctype.h>
 #include <stdlib.h>
--- 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 <assert.h>
 #include <stddef.h>
--- 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 <sys/types.h>
 #include <assert.h>
--- 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 <string.h>
 #include <stdlib.h>
--- 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 <stdlib.h>
 #include <string.h>
--- 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 <stdlib.h>
 #include <string.h>
--- 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 <string.h>
 #include <ctype.h>
--- 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 <assert.h>
 #include <string.h>
--- 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 <assert.h>
 #include <stdlib.h>
--- 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 <zlib.h>
--- 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 <assert.h>
 #include <stdlib.h>
--- 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 <stdio.h>
 #include <stdlib.h>
--- 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 <assert.h>
 #include <stdlib.h>
--- 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 <stdio.h>

--- 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 <stdarg.h>
 #include <stdlib.h>
--- 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 <memory.h>
 #include <stdio.h>
--- 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 <string.h>

--- 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 <string.h>
--- 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 <string.h>
 #include <stdlib.h>
--- 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 <stdlib.h>
 #include <string.h>
--- 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 <stdio.h>
 #include <string.h>
--- 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 <stdlib.h>
 #include <string.h>
--- 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 <stdio.h>
 #include <stdlib.h>
--- 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 <stdlib.h>
 #include <string.h>
--- 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 <stdlib.h>
 #include <string.h>
--- a/src/libopensc/pkcs15-dnie.c
+++ b/src/libopensc/pkcs15-dnie.c
@ -21,7 +21,9 @@

 #include <stdlib.h>
 #include <string.h>
+#if HAVE_CONFIG_H
 #include "config.h"
+#endif
 #include "libopensc/log.h"
 #include "libopensc/asn1.h"
 #include "libopensc/pkcs15.h"
--- 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 <stdlib.h>
 #include <string.h>
--- 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 <stdlib.h>
 #include <string.h>
--- 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 <stdlib.h>
 #include <string.h>
--- a/src/libopensc/pkcs15-gemsafeV1.c
+++ b/src/libopensc/pkcs15-gemsafeV1.c
@ -17,7 +17,9 @@
 /* Initially written by David Mattes <david.mattes@boeing.com> */
 /* Support for multiple key containers by Lukas Wunner <lukas@wunner.de> */

+#if HAVE_CONFIG_H
 #include "config.h"
+#endif

 #include <stdlib.h>
 #include <string.h>
--- 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 <stdlib.h>
 #include <string.h>
--- 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 <stdlib.h>
 #include <string.h>
--- 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 <assert.h>
 #include <string.h>
--- 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 <stdlib.h>
 #include <string.h>
--- 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 <stdlib.h>
 #include <string.h>
--- 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 <stdlib.h>
 #include <string.h>
--- 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 <stdlib.h>
 #include <string.h>
--- 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 <stdlib.h>
 #include <string.h>
--- 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 <stdlib.h>
 #include <string.h>
--- 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 <string.h>
 #include <stdlib.h>
--- 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 <stdlib.h>
 #include <string.h>
--- 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 <stdlib.h>
 #include <string.h>
--- 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 <stdlib.h>
 #include <string.h>
--- 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 <stdlib.h>
 #include <string.h>
--- 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 <string.h>
 #include <stdlib.h>
--- 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 <assert.h>
--- a/src/libopensc/reader-openct.c
+++ b/src/libopensc/reader-openct.c
@ -4,7 +4,9 @@
 * Copyright (C) 2003  Olaf Kirch <okir@suse.de>
 */

+#if HAVE_CONFIG_H
 #include "config.h"
+#endif

 #ifdef ENABLE_OPENCT	/* empty file without openct */
 #include <errno.h>
--- 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 <assert.h>
--- 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 <stdio.h>
 #include <ctype.h>
--- 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 <stdio.h>
 #include <string.h>
--- 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 <stdio.h>
 #include <stdlib.h>