From a86e0f3922263d341c2fbf0d661bfc288e6582fd Mon Sep 17 00:00:00 2001 From: frankmorgner Date: Wed, 9 Jun 2010 15:36:36 +0000 Subject: [PATCH] added missing files for distribution packages. fixed installation when no serialdropdir is given. git-svn-id: https://vsmartcard.svn.sourceforge.net/svnroot/vsmartcard@142 96b47cad-a561-4643-ad3b-153ac7d7599c --- virtualsmartcard/configure.ac | 13 ++++++++++--- virtualsmartcard/src/vpcd/Makefile.am | 2 ++ 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/virtualsmartcard/configure.ac b/virtualsmartcard/configure.ac index 7081758..479d352 100644 --- a/virtualsmartcard/configure.ac +++ b/virtualsmartcard/configure.ac @@ -34,9 +34,16 @@ AC_ARG_ENABLE(serialdropdir, serial wrapper driver (default to pcscd config or $(prefix)/pcsc/drivers/serial)]), [serialdropdir="${enableval}"], [serialdropdir=false]) if test "${serialdropdir}" = false ; then - serialdropdir=${prefix}`$PKG_CONFIG libpcsclite --variable=usbdropdir`/serial - if test "${serialdropdir}" = "${prefix}/serial" ; then - AC_MSG_ERROR([use --enable-serialdropdir=DIR]) + if test "${prefix}" = NONE ; then + serialdropdir=`$PKG_CONFIG libpcsclite --variable=usbdropdir`/serial + if test "${serialdropdir}" = "/serial" ; then + AC_MSG_ERROR([use --enable-serialdropdir=DIR]) + fi + else + serialdropdir=${prefix}`$PKG_CONFIG libpcsclite --variable=usbdropdir`/serial + if test "${serialdropdir}" = "${prefix}/serial" ; then + AC_MSG_ERROR([use --enable-serialdropdir=DIR]) + fi fi fi diff --git a/virtualsmartcard/src/vpcd/Makefile.am b/virtualsmartcard/src/vpcd/Makefile.am index 5bf02d1..5630cea 100644 --- a/virtualsmartcard/src/vpcd/Makefile.am +++ b/virtualsmartcard/src/vpcd/Makefile.am @@ -5,6 +5,8 @@ libvpcd_la_SOURCES = ifd.c vpcd.c #libvpcd_la_LIBADD = $(PCSC_LIBS) libvpcd_la_CFLAGS = $(PCSC_CFLAGS) +noinst_HEADERS = vpcd.h + EXTRA_DIST = reader.conf.in install: install_libvpcd