From c0dfd5ff7e9d3a6663faed3c99b406b9c2e98b0d Mon Sep 17 00:00:00 2001 From: frankmorgner Date: Tue, 7 Dec 2010 15:48:33 +0000 Subject: [PATCH] linking against libopensc not easily possible. we need to remove this dependancy git-svn-id: https://vsmartcard.svn.sourceforge.net/svnroot/vsmartcard@366 96b47cad-a561-4643-ad3b-153ac7d7599c --- ccid/configure.ac | 8 ++++---- ccid/src/scutil.h | 1 - npa/configure.ac | 8 ++++---- 3 files changed, 8 insertions(+), 9 deletions(-) delete mode 120000 ccid/src/scutil.h diff --git a/ccid/configure.ac b/ccid/configure.ac index afe8305..7e9ff8f 100644 --- a/ccid/configure.ac +++ b/ccid/configure.ac @@ -20,18 +20,18 @@ PKG_PROG_PKG_CONFIG # Checks for libraries. PKG_CHECK_EXISTS([libopensc], - [PKG_CHECK_MODULES([OPENSC], [libopensc])], - [AC_MSG_WARN([libopensc not found by pkg-config])]) + [PKG_CHECK_MODULES([OPENSC], [libopensc < 0.12])], + [AC_MSG_WARN([libopensc < 0.12 not found by pkg-config])]) saved_CPPFLAGS="$CPPFLAGS" saved_LIBS="$LIBS" CPPFLAGS="$CPPFLAGS $OPENSC_CFLAGS" LIBS="$LDFLAGS $OPENSC_LIBS" AC_CHECK_HEADERS(opensc/opensc.h,, - [ AC_MSG_ERROR([opensc/opensc.h not found, install libopensc or use ./configure OPENSC_CFLAGS=...]) ]) + [ AC_MSG_ERROR([opensc/opensc.h not found, install libopensc < 0.12 or use ./configure OPENSC_CFLAGS=...]) ]) AC_MSG_CHECKING([for sc_context_create]) AC_TRY_LINK_FUNC(sc_context_create, [ AC_MSG_RESULT([yes]) ], - [ AC_MSG_ERROR([libopensc not found, use ./configure OPENSC_LIBS=...]) ]) + [ AC_MSG_ERROR([libopensc < 0.12 not found, use ./configure OPENSC_LIBS=...]) ]) CPPFLAGS="$saved_CPPFLAGS" LIBS="$saved_LIBS" diff --git a/ccid/src/scutil.h b/ccid/src/scutil.h deleted file mode 120000 index c9b7835..0000000 --- a/ccid/src/scutil.h +++ /dev/null @@ -1 +0,0 @@ -../../npa/src/scutil.h \ No newline at end of file diff --git a/npa/configure.ac b/npa/configure.ac index 2e77890..ac32c6a 100644 --- a/npa/configure.ac +++ b/npa/configure.ac @@ -20,8 +20,8 @@ PKG_PROG_PKG_CONFIG # Checks for libraries. PKG_CHECK_EXISTS([libopensc], - [PKG_CHECK_MODULES([OPENSC], [libopensc])], - [AC_MSG_WARN([libopensc not found by pkg-config])]) + [PKG_CHECK_MODULES([OPENSC], [libopensc < 0.12 ])], + [AC_MSG_WARN([libopensc < 0.12 not found by pkg-config])]) PKG_CHECK_EXISTS([libssl], [PKG_CHECK_MODULES([OPENSSL], [libssl])], [AC_MSG_WARN([libssl not found by pkg-config])]) @@ -33,10 +33,10 @@ CPPFLAGS="$CPPFLAGS $OPENSC_CFLAGS $OPENSSL_CFLAGS" LIBS="$LDFLAGS $OPENSC_LIBS $OPENSSL_LIBS" AC_CHECK_HEADERS(opensc/opensc.h,, - [ AC_MSG_ERROR([opensc/opensc.h not found, install libopensc or use ./configure OPENSC_CFLAGS=...]) ]) + [ AC_MSG_ERROR([opensc/opensc.h not found, install libopensc < 0.12 or use ./configure OPENSC_CFLAGS=...]) ]) AC_MSG_CHECKING([for sc_context_create]) AC_TRY_LINK_FUNC(sc_context_create, [ AC_MSG_RESULT([yes]) ], - [ AC_MSG_ERROR([libopensc not found, use ./configure OPENSC_LIBS=...]) ]) + [ AC_MSG_ERROR([libopensc < 0.12 not found, use ./configure OPENSC_LIBS=...]) ]) AC_CHECK_HEADERS(openssl/evp.h, [], [ AC_MSG_ERROR([openssl/evp.h not found, install OpenSSL or use ./configure OPENSSL_CFLAGS=...]) ]) AC_MSG_CHECKING([for EVP_read_pw_string_min])