diff -urN -x '*.swp' -x '*.l[ao]' -x '*.*o' -x '*.*a*' -x '*.pc' -x 'config.[^h]*' -x configure -x aclocal.m4 -x autom4te.cache -x 'Makefile*' -x '*intltool*' -x 'libtool*' gnokii-0.6.24.orig/configure.in gnokii-0.6.24/configure.in --- gnokii-0.6.24.orig/configure.in 2008-03-20 19:09:39.000000000 +0100 +++ gnokii-0.6.24/configure.in 2008-03-24 15:08:02.000000000 +0100 @@ -499,7 +499,7 @@ ),, [enable_libpcsclite=yes]) if test "$enable_libpcsclite" == "yes"; then - PKG_CHECK_MODULES(LIBPCSCLITE, libpcsclite >= 1.4.2, USE_LIBPCSCLITE=yes, USE_LIBPCSCLITE=no) + PKG_CHECK_MODULES(LIBPCSCLITE, libpcsclite >= 1.3.1, USE_LIBPCSCLITE=yes, USE_LIBPCSCLITE=no) if test "$USE_LIBPCSCLITE" == yes; then OLD_CFLAGS="$CFLAGS" CFLAGS="$LIBPCSCLITE_CFLAGS $OLD_CFLAGS" @@ -520,6 +520,15 @@ fi fi fi +if test "$USE_LIBPCSCLITE" == yes; then + OLD_CFLAGS="$CFLAGS" + CFLAGS="$LIBPCSCLITE_CFLAGS $OLD_CFLAGS" + AC_CHECK_TYPE([LPCSTR], + [AC_DEFINE([HAVE_LPCSTR], 1, + [Define to 1 if libpcsclite defines the type 'LPCSTR'.])], + [], [#include ]) + CFLAGS="$OLD_CFLAGS" +fi dnl ======================== Checks for X base support diff -urN -x '*.swp' -x '*.l[ao]' -x '*.*o' -x '*.*a*' -x '*.pc' -x 'config.[^h]*' -x configure -x aclocal.m4 -x autom4te.cache -x 'Makefile*' -x '*intltool*' -x 'libtool*' gnokii-0.6.24.orig/include/config.h.in gnokii-0.6.24/include/config.h.in --- gnokii-0.6.24.orig/include/config.h.in 2008-03-20 19:10:42.000000000 +0100 +++ gnokii-0.6.24/include/config.h.in 2008-03-24 15:58:34.000000000 +0100 @@ -110,6 +110,9 @@ /* Whether the platform has a long long int type */ #undef HAVE_LONG_LONG +/* Define to 1 if libpcsclite defines the type 'LPCSTR'. */ +#undef HAVE_LPCSTR + /* Define to 1 if you have the header file. */ #undef HAVE_MEMORY_H diff -urN -x '*.swp' -x '*.l[ao]' -x '*.*o' -x '*.*a*' -x '*.pc' -x 'config.[^h]*' -x configure -x aclocal.m4 -x autom4te.cache -x 'Makefile*' -x '*intltool*' -x 'libtool*' gnokii-0.6.24.orig/include/phones/pcsc.h gnokii-0.6.24/include/phones/pcsc.h --- gnokii-0.6.24.orig/include/phones/pcsc.h 2008-02-15 10:20:59.000000000 +0100 +++ gnokii-0.6.24/include/phones/pcsc.h 2008-03-24 18:24:15.000000000 +0100 @@ -39,6 +39,10 @@ #include #include +#if !HAVE_LPCSTR +typedef const char *LPCSTR; +#endif + /* some CLAss, INStruction pairs defined by GSM specs taken from ETSI TS 100 977 V8.13.0 (2005-06)