[SCM] libgnokii and core programs branch, master, updated. rel_0_6_29-46-g1e79ccb

[Pawel Kot]

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  1e79ccb15dd9f15e10bfa93011120ef56723c1c1 (commit)
      from  d2bbdcb6ea0a7806b96de2be275e273208315e0c (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=1e79ccb15dd9f15e10bfa93011120ef56723c1c1


commit 1e79ccb15dd9f15e10bfa93011120ef56723c1c1
Author: Pawel Kot <address@hidden>
Date:   Fri Aug 20 16:28:28 2010 +0200

    The first PKG_CHECK_MODULES call in configure.in must not be conditional.

diff --git a/configure.in b/configure.in
index b80abce..c837c14 100644
--- a/configure.in
+++ b/configure.in
@@ -5,9 +5,11 @@ dnl  Copyright (C) 1999 Hugh Blemings & Pavel Janik ml.
 dnl                2000 Karel Zak, Pawel Kot
 dnl                2002 BORBELY Zoltan
 dnl
-dnl  $Id$
-dnl
 
+dnl
+dnl IMPORTANT NOTE
+dnl The first PKG_CHECK_MODULES call must not be conditional
+dnl
 
 AC_INIT([gnokii],
        [0.6.30git],
@@ -607,45 +609,6 @@ if test `uname -s` = "NetBSD" ; then
        fi
 fi
 
-dnl ======================== Checks for libpcsclite
-USE_LIBPCSCLITE="no"
-AC_ARG_ENABLE(libpcsclite,
-              AC_HELP_STRING([--disable-libpcsclite],
-                             [disable libpcsclite support (default is 
autodetected)]
-                            ),,
-              [enable_libpcsclite=yes])
-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
-               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)
-               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
-
 dnl ======================== Checks for X base support
 
 found_gtk=no
@@ -791,6 +754,45 @@ AC_ARG_ENABLE(security,
    [ security="no" ]
 )
 
+dnl ======================== Checks for libpcsclite
+USE_LIBPCSCLITE="no"
+AC_ARG_ENABLE(libpcsclite,
+              AC_HELP_STRING([--disable-libpcsclite],
+                             [disable libpcsclite support (default is 
autodetected)]
+                            ),,
+              [enable_libpcsclite=yes])
+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
+               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)
+               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 ],
    [ if test x$enable_win32 = xyes; then

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

Summary of changes:
 configure.in |   84 +++++++++++++++++++++++++++++----------------------------
 1 files changed, 43 insertions(+), 41 deletions(-)


hooks/post-receive
-- 
libgnokii and core programs