[Pcsclite-cvs-commit] PCSC configure.in,1.22,1.23

[rousseau@quantz.debian.org]

Update of /cvsroot/pcsclite/PCSC
In directory quantz:/tmp/cvs-serv16950

Modified Files:
	configure.in 
Log Message:
--enable-usb is deprecated and off by default. Use --enable-libusb instead.


Index: configure.in
===================================================================
RCS file: /cvsroot/pcsclite/PCSC/configure.in,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** configure.in	15 Aug 2003 09:10:34 -0000	1.22
--- configure.in	26 Aug 2003 13:14:28 -0000	1.23
***************
*** 14,18 ****
  
  dnl Every other copy of the package version number gets its value from here
! AM_INIT_AUTOMAKE(pcsc-lite, 1.1.2)
  
  dnl create a config.h file (Automake will add -DHAVE_CONFIG_H)
--- 14,18 ----
  
  dnl Every other copy of the package version number gets its value from here
! AM_INIT_AUTOMAKE(pcsc-lite, 1.2.0-rc1)
  
  dnl create a config.h file (Automake will add -DHAVE_CONFIG_H)
***************
*** 124,135 ****
  
  
  dnl --enable-libusb=DIR
! AC_ARG_ENABLE(libusb, [  --enable-libusb=PATH    enable libusb support],
  	[
  		use_libusb=false
  		case ${enableval} in
  			"" | "yes" | "YES")
- 				AC_CHECK_LIB(usb, usb_init, [ use_libusb=true ], [ use_libusb=false ])
- 				AC_CHECK_HEADERS(usb.h, [ use_libusb=true ], [ use_libusb=false ])
  				if test x$use_libusb = xtrue; then
  					LIBS="${LIBS} -lusb"
--- 124,137 ----
  
  
+ dnl check if libusb is available
+ AC_CHECK_LIB(usb, usb_init, [ use_libusb=true ], [ use_libusb=false ])
+ AC_CHECK_HEADERS(usb.h, [ use_libusb=true ], [ use_libusb=false ])
+ 
  dnl --enable-libusb=DIR
! AC_ARG_ENABLE(libusb, [  --enable-libusb=PATH    enable USB hotplug using libusb],
  	[
  		use_libusb=false
  		case ${enableval} in
  			"" | "yes" | "YES")
  				if test x$use_libusb = xtrue; then
  					LIBS="${LIBS} -lusb"
***************
*** 150,156 ****
  				;;
  		esac
- 	],
- 	[
- 		use_libusb=false
  	]
  )
--- 152,155 ----
***************
*** 177,185 ****
  dnl --enable-usb option.
  AC_ARG_ENABLE(usb,
! [  --enable-usb            enable USB hotplug support (Linux only)],
  [ case "${enableval}" in
    yes)
     case "${build_os}" in
!     *linux*)	usb=true ;;
      *) AC_MSG_WARN([USB hotplug support only available on Linux])
  		usb=false
--- 176,188 ----
  dnl --enable-usb option.
  AC_ARG_ENABLE(usb,
! [  --enable-usb            enable USB hotplug support (Linux only), deprecated],
  [ case "${enableval}" in
    yes)
+    AC_MSG_WARN([This option is deprecated. Use libusb instead.])
     case "${build_os}" in
!     *linux*)
! 		usb=true
! 		libusb=false
! 	;;
      *) AC_MSG_WARN([USB hotplug support only available on Linux])
  		usb=false
***************
*** 190,201 ****
    *) AC_MSG_ERROR([bad value ${enableval} for --enable-usb]) ;;
   esac], 
! [ case "${build_os}" in
!     *linux*)	usb=true ;;
!     *) usb=false
!      ;;
!    esac
  ])
  
! AC_MSG_RESULT([enable linux usb capability   : $usb])
  
  AM_CONDITIONAL(PCSC_LINUX_USB, test x$usb = xtrue)
--- 193,201 ----
    *) AC_MSG_ERROR([bad value ${enableval} for --enable-usb]) ;;
   esac], 
! [
!     usb=false
  ])
  
! AC_MSG_RESULT([enable linux usb capability   : $usb (deprecated, use libusb)])
  
  AM_CONDITIONAL(PCSC_LINUX_USB, test x$usb = xtrue)
***************
*** 347,350 ****
--- 347,351 ----
  AC_CONFIG_FILES(Makefile src/Makefile src/utils/Makefile etc/Makefile
  				doc/Makefile doc/bundleTool.8 doc/pcscd.8
+ 				doc/example/Makefile
  				etc/reader.conf src/libpcsclite.pc)
  AC_OUTPUT