diff options
| author | Marcel Holtmann <marcel@holtmann.org> | 2006-09-01 00:20:45 +0000 |
|---|---|---|
| committer | Marcel Holtmann <marcel@holtmann.org> | 2006-09-01 00:20:45 +0000 |
| commit | 3d6f08cb24a31bf76cb3e934dddbc1f8d52d4c94 (patch) | |
| tree | c917b9aadd9baedef758ac2f59f326b6c402a5b5 | |
| parent | 453d87840fd35b1e29322710a02fd2bc2c5da7b3 (diff) | |
Add option to disable installation of config files
| -rw-r--r-- | acinclude.m4 | 7 | ||||
| -rwxr-xr-x | bootstrap-configure | 5 | ||||
| -rw-r--r-- | hcid/Makefile.am | 4 | ||||
| -rw-r--r-- | rfcomm/Makefile.am | 4 |
4 files changed, 16 insertions, 4 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 47fc9115..feb08a3c 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -120,6 +120,7 @@ AC_DEFUN([AC_ARG_BLUEZ], [ alsa_enable=no test_enable=no cups_enable=no + configfiles_enable=yes initscripts_enable=no pcmciarules_enable=no bccmd_enable=no @@ -146,6 +147,7 @@ AC_DEFUN([AC_ARG_BLUEZ], [ alsa_enable=${enableval} test_enable=${enableval} cups_enable=${enableval} + configfiles_enable=${enableval} initscripts_enable=${enableval} pcmciarules_enable=${enableval} bccmd_enable=${enableval} @@ -178,6 +180,10 @@ AC_DEFUN([AC_ARG_BLUEZ], [ cups_enable=${enableval} ]) + AC_ARG_ENABLE(configfiles, AC_HELP_STRING([--enable-configfiles], [install Bluetooth config files]), [ + configfiles_enable=${enableval} + ]) + AC_ARG_ENABLE(initscripts, AC_HELP_STRING([--enable-initscripts], [install Bluetooth boot scripts]), [ initscripts_enable=${enableval} ]) @@ -221,6 +227,7 @@ AC_DEFUN([AC_ARG_BLUEZ], [ AM_CONDITIONAL(ALSA, test "${alsa_enable}" = "yes" && test "${alsa_found}" = "yes") AM_CONDITIONAL(TEST, test "${test_enable}" = "yes") AM_CONDITIONAL(CUPS, test "${cups_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(BCCMD, test "${bccmd_enable}" = "yes" && test "${usb_found}" = "yes") diff --git a/bootstrap-configure b/bootstrap-configure index 01db02a1..8881fd59 100755 --- a/bootstrap-configure +++ b/bootstrap-configure @@ -13,6 +13,7 @@ fi --localstatedir=/var \ --libexecdir=/lib \ --enable-all \ - --disable-cups \ + --disable-configfiles \ --disable-initscripts \ - --disable-pcmciarules + --disable-pcmciarules \ + --disable-cups diff --git a/hcid/Makefile.am b/hcid/Makefile.am index 93f17814..3c3c52b1 100644 --- a/hcid/Makefile.am +++ b/hcid/Makefile.am @@ -1,4 +1,5 @@ +if CONFIGFILES confdir = $(sysconfdir)/bluetooth conf_DATA = hcid.conf @@ -10,6 +11,7 @@ state_DATA = dbusdir = $(sysconfdir)/dbus-1/system.d dbus_DATA = bluez-hcid.conf +endif sbin_PROGRAMS = hcid @@ -41,6 +43,6 @@ AM_YFLAGS = -d CLEANFILES = lexer.c parser.c parser.h -EXTRA_DIST = $(man_MANS) $(conf_DATA) bluez-hcid.conf dbus-test dbus-api.txt +EXTRA_DIST = $(man_MANS) hcid.conf bluez-hcid.conf dbus-test dbus-api.txt MAINTAINERCLEANFILES = Makefile.in diff --git a/rfcomm/Makefile.am b/rfcomm/Makefile.am index 8e883540..a1a97b8a 100644 --- a/rfcomm/Makefile.am +++ b/rfcomm/Makefile.am @@ -1,7 +1,9 @@ +if CONFIGFILES confdir = $(sysconfdir)/bluetooth conf_DATA = rfcomm.conf +endif bin_PROGRAMS = rfcomm @@ -18,6 +20,6 @@ AM_YFLAGS = -d CLEANFILES = lexer.c parser.c parser.h -EXTRA_DIST = $(man_MANS) $(conf_DATA) +EXTRA_DIST = $(man_MANS) rfcomm.conf MAINTAINERCLEANFILES = Makefile.in |