Author: Henrik Nordström <henrik@henriknordstrom.net>

- The log_msg/log_xxd functions is a bit special and only available
  runtime. Hardcode configure probe to always declare these available.
  If there is interest in supporting old pcsc-lite versions then a more
  elaborate configure test is needed.

- Need to include config.h at suitable places for the results of configure
  to be available while compiling the source

diff -ru agmiiusb-1.0.0-orig/configure.ac agmiiusb-1.0.0-hno/configure.ac
--- agmiiusb-1.0.0-orig/configure.ac	2005-06-03 10:02:40.000000000 +0200
+++ agmiiusb-1.0.0-hno/configure.ac	2006-11-13 15:37:18.000000000 +0100
@@ -151,8 +151,9 @@
 fi
 
 # Check for log system of new pcsc-lite (1.2.9). 
-AC_CHECK_LIB(pcsclite, log_msg)
-AC_CHECK_FUNCS(log_msg log_xxd)
+AC_CHECK_LIB(pcsclite, main)
+AC_DEFINE(HAVE_LOG_MSG, 1, [Have log_msg function])
+AC_DEFINE(HAVE_LOG_XXD, 1, [Have log_xxd function])
 
 AC_SUBST(usbdropdir)
 AC_SUBST(ac_aux_dir)
Endast i agmiiusb-1.0.0-hno/: libtool
Endast i agmiiusb-1.0.0-hno/: Makefile
diff -ru agmiiusb-1.0.0-orig/src/agmdebug.c agmiiusb-1.0.0-hno/src/agmdebug.c
--- agmiiusb-1.0.0-orig/src/agmdebug.c	2005-06-02 12:38:46.000000000 +0200
+++ agmiiusb-1.0.0-hno/src/agmdebug.c	2006-11-13 15:03:47.000000000 +0100
@@ -14,6 +14,11 @@
 #include <stdio.h>
 #include <string.h>
 #include <stdarg.h>
+
+#if HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "agmdebug.h"
 
 /* Max string size when dumping a 256 bytes longs APDU
diff -ru agmiiusb-1.0.0-orig/src/AgmII.h agmiiusb-1.0.0-hno/src/AgmII.h
--- agmiiusb-1.0.0-orig/src/AgmII.h	2005-05-23 11:30:08.000000000 +0200
+++ agmiiusb-1.0.0-hno/src/AgmII.h	2006-11-13 14:50:26.000000000 +0100
@@ -9,6 +9,10 @@
 #ifndef __AGMII_H
 #define __AGMII_H
 
+#if HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <unistd.h>
 #include <sys/stat.h>
 #include <sys/ioctl.h>
--- agmiiusb-1.0.0/agmiiusb.spec.in.orig	2007-12-25 04:18:36.000000000 +0100
+++ agmiiusb-1.0.0/agmiiusb.spec.in	2007-12-25 04:18:44.000000000 +0100
@@ -1,16 +1,17 @@
 # $Id: agmiiusb.spec.in,v 1.1 2005/06/03 08:02:40 kath Exp $
 Name:           agmiiusb
 Version:        @PACKAGE_VERSION@
-Release:        1
+Release:        2
 Summary:        USB smart card reader driver for Argos Mini II USB
 
 Group:          System Environment/Libraries
 License:        LGPL
 URL:            http://www.todos.se/Todos/products/products_ArgosMini.html
-Source0:        http://www.todos.se/Todos/downloads/files/agmiiusb-@PACKAGE_VERSION@.tar.gz
+Source0:        http://www.todos.se/Todos/downloads/files/agmiiusb-1.0.0.tar.gz
+Patch0:		agmiiusb-1.0.0-log_msg.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  pkgconfig
+BuildRequires:  pkgconfig autoconf automake
 BuildRequires:  libusb-devel >= 0.1.7, pcsc-lite-devel >= 1.2.0
 Requires:       libusb >= 0.1.7, pcsc-lite >= 1.2.0
 Provides:       pcsc-ifd-handler
@@ -21,6 +22,8 @@
 
 %prep
 %setup -q
+%patch0 -p1
+autoreconf -i
 
 
 %build
@@ -54,5 +57,7 @@
 
 
 %changelog
+* Mon Nov 13 2006 Henrik Nordström <henrik at henriknordstrom.net> - 1.0.0-2
+- Fixed some minor build environment issues
 * Fri May 27 2005 Karl Dahlén <karl at todos.se> - 1.0.0-1
 - First build.