diff options
Diffstat (limited to 'acinclude.m4')
| -rw-r--r-- | acinclude.m4 | 18 | 
1 files changed, 9 insertions, 9 deletions
| diff --git a/acinclude.m4 b/acinclude.m4 index 8b8b4f06..65ae27b3 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -297,9 +297,9 @@ AC_DEFUN([AC_ARG_BLUEZ], [  	cups_enable=no  	pcmcia_enable=no  	initscripts_enable=no -	avctrl_enable=${usb_found} +	bccmd_enable=no +	avctrl_enable=no  	hid2hci_enable=${usb_found} -	csrinit_enable=no  	dfutool_enable=no  	bcm203x_enable=no  	bluepin_enable=yes @@ -325,9 +325,9 @@ AC_DEFUN([AC_ARG_BLUEZ], [  		cups_enable=${enableval}  		pcmcia_enable=${enableval}  		initscripts_enable=${enableval} +		bccmd_enable=${enableval}  		avctrl_enable=${enableval}  		hid2hci_enable=${enableval} -		csrinit_enable=${enableval}  		dfutool_enable=${enableval}  		bcm203x_enable=${enableval}  		bluepin_enable=${enableval} @@ -365,6 +365,10 @@ AC_DEFUN([AC_ARG_BLUEZ], [  		initscripts_enable=${enableval}  	]) +	AC_ARG_ENABLE(bccmd, AC_HELP_STRING([--enable-bccmd], [install BCCMD interface utility]), [ +		bccmd_enable=${enableval} +	]) +  	AC_ARG_ENABLE(avctrl, AC_HELP_STRING([--enable-avctrl], [install Audio/Video control utility]), [  		avctrl_enable=${enableval}  	]) @@ -373,10 +377,6 @@ AC_DEFUN([AC_ARG_BLUEZ], [  		hid2hci_enable=${enableval}  	]) -	AC_ARG_ENABLE(csrinit, AC_HELP_STRING([--enable-csrinit], [install CSR ROM chip setup utility]), [ -		csrinit_enable=${enableval} -	]) -  	AC_ARG_ENABLE(dfutool, AC_HELP_STRING([--enable-dfutool], [install DFU firmware upgrade utility]), [  		dfutool_enable=${enableval}  	]) @@ -385,7 +385,7 @@ AC_DEFUN([AC_ARG_BLUEZ], [  		bcm203x_enable=${enableval}  	]) -	AC_ARG_ENABLE(bluepin, AC_HELP_STRING([--enable-bluepin], [install Python based PIN helper utility]), [ +	AC_ARG_ENABLE(bluepin, AC_HELP_STRING([--enable-bluepin], [install Python based PIN helper]), [  		bluepin_enable=${enableval}  	]) @@ -410,9 +410,9 @@ AC_DEFUN([AC_ARG_BLUEZ], [  	AM_CONDITIONAL(CUPS, test "${cups_enable}" = "yes")  	AM_CONDITIONAL(PCMCIA, test "${pcmcia_enable}" = "yes")  	AM_CONDITIONAL(INITSCRIPTS, test "${initscripts_enable}" = "yes") +	AM_CONDITIONAL(BCCMD, test "${bccmd_enable}" = "yes")  	AM_CONDITIONAL(AVCTRL, test "${avctrl_enable}" = "yes" && test "${usb_found}" = "yes")  	AM_CONDITIONAL(HID2HCI, test "${hid2hci_enable}" = "yes" && test "${usb_found}" = "yes") -	AM_CONDITIONAL(CSRINIT, test "${csrinit_enable}" = "yes" && test "${usb_found}" = "yes")  	AM_CONDITIONAL(DFUTOOL, test "${dfutool_enable}" = "yes" && test "${usb_found}" = "yes")  	AM_CONDITIONAL(BCM203X, test "${bcm203x_enable}" = "yes" && test "${usb_found}" = "yes")  	AM_CONDITIONAL(BLUEPIN, test "${bluepin_enable}" = "yes") | 
