[SCM] libgnokii and core programs branch, master, updated. rel_0_6_29-235-g8d64f55

[Daniele Forsi]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "libgnokii and core programs".

The branch, master has been updated
       via  8d64f558ed0fb0ba0a3d292a60309815e903fe28 (commit)
      from  e6264f671c8757a44f3aa4062253ae4256333d8c (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit/gnokii.git/commit/?id=8d64f558ed0fb0ba0a3d292a60309815e903fe28


commit 8d64f558ed0fb0ba0a3d292a60309815e903fe28
Author: Daniele Forsi <address@hidden>
Date:   Sat Jun 4 11:57:27 2011 +0200

    Remove detection of broken installs of libpcsclite
    
    Configure was trying to detect a case where libpcsclite.pc was
    present so PKG_CHECK_MODULES succeeded, but the includes where
    missing so compilation would fail. In such an unlikely case
    users should fix their libpcsclite installation or pass
    --disable-libpcsclite to ./configure instead.

diff --git a/configure.in b/configure.in
index fec08a6..0673a82 100644
--- a/configure.in
+++ b/configure.in
@@ -801,34 +801,16 @@ AC_ARG_ENABLE(libpcsclite,
 if test "$enable_libpcsclite" = "yes"; then
        PKG_CHECK_MODULES(LIBPCSCLITE, libpcsclite >= 1.3.1, 
USE_LIBPCSCLITE=yes, USE_LIBPCSCLITE=no)
        if test "$USE_LIBPCSCLITE" = yes; then
+               AC_DEFINE([HAVE_PCSC], [1], [Define if you have libpcsclite])
                OLD_CFLAGS="$CFLAGS"
                CFLAGS="$LIBPCSCLITE_CFLAGS $OLD_CFLAGS"
-               AC_MSG_CHECKING([if libpcsclite includes are installed and 
usable])
-               AC_TRY_COMPILE([#include <PCSC/wintypes.h>
-                               #include <PCSC/winscard.h>],
-                               [SCARDCONTEXT hContext;
-                               SCARDHANDLE hCard;
-                               DWORD dwActiveProtocol;
-                               SCARD_IO_REQUEST *pioSendPci, pioRecvPci;
-                               BYTE buf[256];],
-                               USE_LIBPCSCLITE=yes,
-                               USE_LIBPCSCLITE=no)
-               AC_MSG_RESULT($USE_LIBPCSCLITE)
+               AC_CHECK_TYPE([LPCSTR],
+                   [AC_DEFINE([HAVE_LPCSTR], 1, 
+                      [Define to 1 if libpcsclite defines the type 
'LPCSTR'.])],
+                   [], [#include <PCSC/wintypes.h>])
                CFLAGS="$OLD_CFLAGS"
-               if test "$USE_LIBPCSCLITE" = yes; then
-                       AC_DEFINE([HAVE_PCSC], [1], [Define if you have 
libpcsclite])
-               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 <PCSC/wintypes.h>])
-       CFLAGS="$OLD_CFLAGS"
-fi
 
 AC_ARG_ENABLE(win,
    [  --enable-win            if you want Windows support ],

-----------------------------------------------------------------------

Summary of changes:
 configure.in |   28 +++++-----------------------
 1 files changed, 5 insertions(+), 23 deletions(-)


hooks/post-receive
-- 
libgnokii and core programs