diff options
| -rw-r--r-- | acinclude.m4 | 7 | ||||
| -rwxr-xr-x | bootstrap-configure | 1 | ||||
| -rw-r--r-- | dund/Makefile.am | 4 | ||||
| -rw-r--r-- | hcid/Makefile.am | 4 | ||||
| -rw-r--r-- | hidd/Makefile.am | 2 | ||||
| -rw-r--r-- | pand/Makefile.am | 2 | ||||
| -rw-r--r-- | rfcomm/Makefile.am | 4 | ||||
| -rw-r--r-- | sdpd/Makefile.am | 2 | ||||
| -rw-r--r-- | tools/Makefile.am | 5 |
9 files changed, 28 insertions, 3 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 2d8c75b1..8cb46f3b 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -170,6 +170,7 @@ AC_DEFUN([AC_ARG_BLUEZ], [ pand_enable=yes test_enable=no cups_enable=no + manpages_enable=yes configfiles_enable=yes initscripts_enable=no pcmciarules_enable=no @@ -200,6 +201,7 @@ AC_DEFUN([AC_ARG_BLUEZ], [ pand_enalbe=${enableval} test_enable=${enableval} cups_enable=${enableval} + manpages_enable=${enableval} configfiles_enable=${enableval} initscripts_enable=${enableval} pcmciarules_enable=${enableval} @@ -285,6 +287,10 @@ AC_DEFUN([AC_ARG_BLUEZ], [ cups_enable=${enableval} ]) + AC_ARG_ENABLE(manpages, AC_HELP_STRING([--enable-manpages], [install Bluetooth manual pages]), [ + manpages_enable=${enableval} + ]) + AC_ARG_ENABLE(configfiles, AC_HELP_STRING([--enable-configfiles], [install Bluetooth config files]), [ configfiles_enable=${enableval} ]) @@ -365,6 +371,7 @@ AC_DEFUN([AC_ARG_BLUEZ], [ AM_CONDITIONAL(PAND, test "${pand_enable}" = "yes") AM_CONDITIONAL(TEST, test "${test_enable}" = "yes") AM_CONDITIONAL(CUPS, test "${cups_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") diff --git a/bootstrap-configure b/bootstrap-configure index 0b608ce6..60f61813 100755 --- a/bootstrap-configure +++ b/bootstrap-configure @@ -19,6 +19,7 @@ fi --enable-input \ --enable-audio \ --enable-echo \ + --disable-manpages \ --disable-configfiles \ --disable-initscripts \ --disable-pcmciarules \ diff --git a/dund/Makefile.am b/dund/Makefile.am index 84e3a150..91fb1d2e 100644 --- a/dund/Makefile.am +++ b/dund/Makefile.am @@ -6,8 +6,10 @@ dund_LDADD = @BLUEZ_LIBS@ AM_CFLAGS = @BLUEZ_CFLAGS@ +if MANPAGES man_MANS = dund.1 +endif -EXTRA_DIST = $(man_MANS) +EXTRA_DIST = dund.1 MAINTAINERCLEANFILES = Makefile.in diff --git a/hcid/Makefile.am b/hcid/Makefile.am index 13e2b256..b690d4a0 100644 --- a/hcid/Makefile.am +++ b/hcid/Makefile.am @@ -1,4 +1,5 @@ +if HCID if CONFIGFILES confdir = $(sysconfdir)/bluetooth @@ -8,6 +9,7 @@ statedir = $(localstatedir)/lib/bluetooth state_DATA = endif +endif noinst_LIBRARIES = libhciserver.a @@ -42,8 +44,10 @@ INCLUDES = -I$(top_srcdir)/common -I$(top_srcdir)/sdpd BUILT_SOURCES = parser.h if HCID +if MANPAGES man_MANS = hcid.8 hcid.conf.5 endif +endif AM_YFLAGS = -d diff --git a/hidd/Makefile.am b/hidd/Makefile.am index 309dd1f3..508372b4 100644 --- a/hidd/Makefile.am +++ b/hidd/Makefile.am @@ -12,8 +12,10 @@ AM_CFLAGS = @BLUEZ_CFLAGS@ INCLUDES = -I$(top_srcdir)/common if HIDD +if MANPAGES man_MANS = hidd.1 endif +endif EXTRA_DIST = hidd.1 fakehid.txt diff --git a/pand/Makefile.am b/pand/Makefile.am index 66021f30..85d70542 100644 --- a/pand/Makefile.am +++ b/pand/Makefile.am @@ -12,8 +12,10 @@ AM_CFLAGS = @BLUEZ_CFLAGS@ INCLUDES = -I$(top_srcdir)/common if PAND +if MANPAGES man_MANS = pand.1 endif +endif EXTRA_DIST = pand.1 diff --git a/rfcomm/Makefile.am b/rfcomm/Makefile.am index 7fe2d743..5eec05e8 100644 --- a/rfcomm/Makefile.am +++ b/rfcomm/Makefile.am @@ -16,12 +16,14 @@ INCLUDES = -I$(top_srcdir)/common BUILT_SOURCES = parser.h +if MANPAGES man_MANS = rfcomm.1 +endif AM_YFLAGS = -d CLEANFILES = lexer.c parser.c parser.h -EXTRA_DIST = $(man_MANS) rfcomm.conf +EXTRA_DIST = rfcomm.1 rfcomm.conf MAINTAINERCLEANFILES = Makefile.in diff --git a/sdpd/Makefile.am b/sdpd/Makefile.am index 46989209..a7efa56f 100644 --- a/sdpd/Makefile.am +++ b/sdpd/Makefile.am @@ -18,8 +18,10 @@ AM_CFLAGS = @BLUEZ_CFLAGS@ @GLIB_CFLAGS@ INCLUDES = -I$(top_srcdir)/common if SDPD +if MANPAGES man_MANS = sdpd.8 endif +endif EXTRA_DIST = sdpd.8 diff --git a/tools/Makefile.am b/tools/Makefile.am index 0ebb351b..880036ea 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -80,9 +80,12 @@ AM_CFLAGS = @BLUEZ_CFLAGS@ @USB_CFLAGS@ INCLUDES = -I$(top_srcdir)/common +if MANPAGES man_MANS = hciattach.8 hciconfig.8 hcitool.1 l2ping.1 sdptool.1 ciptool.1 \ $(bccmd_manfiles) $(avctrl_manfiles) $(hid2hci_manfiles) $(dfutool_manfiles) +endif -EXTRA_DIST = $(man_MANS) bccmd.8 avctrl.8 hid2hci.8 dfutool.1 example.psr +EXTRA_DIST = hciattach.8 hciconfig.8 hcitool.1 l2ping.1 sdptool.1 ciptool.1 \ + bccmd.8 avctrl.8 hid2hci.8 dfutool.1 example.psr MAINTAINERCLEANFILES = Makefile.in |