crewID/libnfc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Romuald Conty 2010-10-04 10:24:45 +00:00
parent 87161b5b7b
commit 17b940c610
5 changed files with 61 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
configure.ac
View file

@ -125,6 +125,7 @@ if test x$ac_cv_with_cutter = xyes -a x$ac_cv_use_cutter = xno; then
fi
AM_CONDITIONAL([WITH_CUTTER], [test "$ac_cv_use_cutter" != "no"])
AC_CHECK_READLINE
# Defines and C flags
CFLAGS="$CFLAGS -std=c99"

4
examples/Makefile.am
View file

@ -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 \

1
examples/pn53x-diagnose.c
View file

@ -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

7
examples/pn53x-tamashell.c
View file

@ -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[])

52
m4/readline.m4 Normal file
View file

@ -0,0 +1,52 @@
dnl Based on wojtekka's m4 from http://wloc.wsinf.edu.pl/~kklos/ekg-20080219/m4/readline.m4
AC_DEFUN(AC_CHECK_READLINE,[
AC_SUBST(READLINE_LIBS)
AC_SUBST(READLINE_INCLUDES)
AC_ARG_WITH(readline,
[[ --with-readline[=dir] Compile with readline/locate base dir]],
if test "x$withval" = "xno" ; then
without_readline=yes
elif test "x$withval" != "xyes" ; then
with_arg="$withval/include:-L$withval/lib $withval/include/readline:-L$withval/lib"
fi)
AC_MSG_CHECKING(for readline.h)
if test "x$without_readline" != "xyes"; then
for i in $with_arg \
/usr/include: \
/usr/local/include:-L/usr/local/lib \
/usr/pkg/include:-L/usr/pkg/lib; do
incl=`echo "$i" | sed 's/:.*//'`
lib=`echo "$i" | sed 's/.*://'`
if test -f $incl/readline/readline.h ; then
AC_MSG_RESULT($incl/readline/readline.h)
READLINE_LIBS="$lib -lreadline"
if test "$incl" != "/usr/include"; then
READLINE_INCLUDES="-I$incl/readline -I$incl"
else
READLINE_INCLUDES="-I$incl/readline"
fi
AC_DEFINE(HAVE_READLINE, 1, [define if you have readline])
have_readline=yes
break
elif test -f $incl/readline.h -a "x$incl" != "x/usr/include"; then
AC_MSG_RESULT($incl/readline.h)
READLINE_LIBS="$lib -lreadline"
READLINE_INCLUDES="-I$incl"
AC_DEFINE(HAVE_READLINE, 1, [define if you have readline])
have_readline=yes
break
fi
done
fi
if test "x$have_readline" != "xyes"; then
AC_MSG_RESULT(not found)
fi
])