diff options
Diffstat (limited to 'acinclude.m4')
| -rw-r--r-- | acinclude.m4 | 16 | 
1 files changed, 12 insertions, 4 deletions
| diff --git a/acinclude.m4 b/acinclude.m4 index c154d9b8..b0292eb7 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -195,15 +195,16 @@ AC_DEFUN([AC_ARG_BLUEZ], [  	hidd_enable=no  	pand_enable=no  	dund_enable=no -	test_enable=no  	cups_enable=no +	test_enable=no  	manpages_enable=yes  	configfiles_enable=yes  	initscripts_enable=no  	pcmciarules_enable=no +	tools_enable=yes  	bccmd_enable=no  	avctrl_enable=no -	hid2hci_enable=${usb_found} +	hid2hci_enable=no  	dfutool_enable=no  	dfubabel_enable=no @@ -228,12 +229,13 @@ AC_DEFUN([AC_ARG_BLUEZ], [  		hidd_enable=${enableval}  		pand_enable=${enableval}  		dund_enable=${enableval} -		test_enable=${enableval}  		cups_enable=${enableval} +		test_enable=${enableval}  		manpages_enable=${enableval}  		configfiles_enable=${enableval}  		initscripts_enable=${enableval}  		pcmciarules_enable=${enableval} +		tools_enable=${enableval}  		bccmd_enable=${enableval}  		avctrl_enable=${enableval}  		hid2hci_enable=${enableval} @@ -317,6 +319,7 @@ AC_DEFUN([AC_ARG_BLUEZ], [  		dund_enable=${enableval}  	]) +	  	AC_ARG_ENABLE(test, AC_HELP_STRING([--enable-test], [install test programs]), [  		test_enable=${enableval}  	]) @@ -341,6 +344,10 @@ AC_DEFUN([AC_ARG_BLUEZ], [  		pcmciarules_enable=${enableval}  	]) +	AC_ARG_ENABLE(tools, AC_HELP_STRING([--enable-tools], [install Bluetooth utilities]), [ +		tools_enable=${enableval} +	]) +  	AC_ARG_ENABLE(bccmd, AC_HELP_STRING([--enable-bccmd], [install BCCMD interface utility]), [  		bccmd_enable=${enableval}  	]) @@ -417,12 +424,13 @@ AC_DEFUN([AC_ARG_BLUEZ], [  	AM_CONDITIONAL(HIDD, test "${hidd_enable}" = "yes")  	AM_CONDITIONAL(PAND, test "${pand_enable}" = "yes")  	AM_CONDITIONAL(DUND, test "${dund_enable}" = "yes") -	AM_CONDITIONAL(TEST, test "${test_enable}" = "yes")  	AM_CONDITIONAL(CUPS, test "${cups_enable}" = "yes") +	AM_CONDITIONAL(TEST, test "${test_enable}" = "yes")  	AM_CONDITIONAL(MANPAGES, test "${manpages_enable}" = "yes")  	AM_CONDITIONAL(CONFIGFILES, test "${configfiles_enable}" = "yes")  	AM_CONDITIONAL(INITSCRIPTS, test "${initscripts_enable}" = "yes")  	AM_CONDITIONAL(PCMCIARULES, test "${pcmciarules_enable}" = "yes") +	AM_CONDITIONAL(TOOLS, test "${tools_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") | 
