diff -urNp ctapi-cyberjack-2.0.13.org/configure.ac ctapi-cyberjack-2.0.13/configure.ac --- ctapi-cyberjack-2.0.13.org/configure.ac 2007-01-09 08:51:18.000000000 +0100 +++ ctapi-cyberjack-2.0.13/configure.ac 2007-01-20 01:21:30.000000000 +0100 @@ -284,7 +284,24 @@ fi AC_SUBST(STRIPALL) AC_MSG_RESULT($enable_release) - +AC_ARG_ENABLE(udev, + [ --enable-udev create udev files], + [ ENABLE_UDEV="${enableval}" ], + [ ENABLE_UDEV="yes" ] +) +AM_CONDITIONAL(UDEV, test "${ENABLE_UDEV}" = "yes") +AC_ARG_ENABLE(pcsc, + [ --enable-pcsc create pcsc files], + [ ENABLE_PCSC="${enableval}" ], + [ ENABLE_PCSC="yes" ] +) +AM_CONDITIONAL(PCSC, test "${ENABLE_PCSC}" = "yes") +AC_ARG_WITH(usbdropdir, + [ --with-usbdropdir pcsc bundle location], + [ usbdropdir="${withval}" ], + [ usbdropdir="\$(libdir)/pcsc/drivers" ] +) +AC_SUBST(usbdropdir) ###------------------------------------------------------------------------- # @@ -374,7 +391,11 @@ RPM_COMMAND="`which rpm`" RPM_DIST_NAME="" RPM_DIST_TAG="" RPM_DIST_VER="" -ETC_SUBDIRS="udev" +if test "$ENABLE_UDEV" = "yes"; then + ETC_SUBDIRS="udev" +else + ETC_SUBDIRS="" +fi USE_HOTPLUG=0 USE_UDEV=0 diff -urNp ctapi-cyberjack-2.0.13.org/pcsc/Makefile.am ctapi-cyberjack-2.0.13/pcsc/Makefile.am --- ctapi-cyberjack-2.0.13.org/pcsc/Makefile.am 2006-12-24 15:20:42.000000000 +0100 +++ ctapi-cyberjack-2.0.13/pcsc/Makefile.am 2007-01-20 01:20:57.000000000 +0100 @@ -1,21 +1,30 @@ -INCLUDES=-I$(top_srcdir)/ctapi/include -I$(top_srcdir)/ctapi -I.. EXTRA_DIST=Info.plist PkgInfo +ifd_cyberjack_la_SOURCES=ifdhandler.c + +noinst_HEADERS=\ + ctbcs.h \ + ifdhandler.h \ + pcscdefines.h + +if PCSC + +INCLUDES=-I$(top_srcdir)/ctapi/include -I$(top_srcdir)/ctapi -I.. + AM_CFLAGS=$(visibility_cflags) -bundledir=$(libdir)/pcsc/drivers/ifd-cyberjack.bundle/Contents +bundledir=$(usbdropdir)/ifd-cyberjack.bundle/Contents bundle_DATA=Info.plist PkgInfo -bundlelinuxdir=$(libdir)/pcsc/drivers/ifd-cyberjack.bundle/Contents/Linux +bundlelinuxdir=$(usbdropdir)/ifd-cyberjack.bundle/Contents/Linux bundlelinux_LTLIBRARIES=ifd-cyberjack.la ifd_cyberjack_la_LDFLAGS=-module ifd_cyberjack_la_LIBADD=$(top_builddir)/ctapi/libctapi-cyberjack.la -ifd_cyberjack_la_SOURCES=ifdhandler.c -noinst_HEADERS=\ - ctbcs.h \ - ifdhandler.h \ - pcscdefines.h +else + +EXTRA_DIST += $(ifd_cyberjack_la_SOURCES) $(noinst_HEADERS) +endif