Finalize pn53x-tamashell integration (add readline m4, fiw minor warnings, adjust Makefile.am)

examples/Makefile.am

@@ -66,9 +66,7 @@ pn53x_diagnose_LDADD = $(top_builddir)/libnfc/libnfc.la \
 pn53x_tamashell_SOURCES = pn53x-tamashell.c
 pn53x_tamashell_LDADD = $(top_builddir)/libnfc/libnfc.la \
 		    libnfcutils.la
-# Should be guarded by test on availability of readline
-#pn53x_tamashell_CFLAGS = -DHAVE_READLINE
-#pn53x_tamashell_LDFLAGS = -lreadline
+pn53x_tamashell_LDFLAGS = @READLINE_LIBS@
 
 nfc_sam_SOURCES = nfc-sam.c
 nfc_sam_LDADD = $(top_builddir)/libnfc/libnfc.la \

examples/pn53x-diagnose.c

@@ -29,7 +29,6 @@
 #include <nfc/nfc-messages.h>
 
 #include "nfc-utils.h"
-// FIXME: Delete me
 #include "chips/pn53x.h"
 
 #define MAX_DEVICE_COUNT 16

examples/pn53x-tamashell.c

@@ -17,23 +17,30 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 */
+#ifdef HAVE_CONFIG_H
+#  include "config.h"
+#endif // HAVE_CONFIG_H
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <ctype.h>
 #include <unistd.h>
+
 #if defined(HAVE_READLINE)
 #  include <readline/readline.h>
 #  include <readline/history.h>
 #else
    extern FILE* stdin;
 #endif //HAVE_READLINE
+
 #include <nfc/nfc.h>
 #include <nfc/nfc-messages.h>
 
 #include "nfc-utils.h"
 
+#include "chips/pn53x.h"
+
 #define MAX_FRAME_LEN 264
 
 int main(int argc, const char* argv[])