diff options
| author | Marcel Holtmann <marcel@holtmann.org> | 2007-01-13 23:53:00 +0000 |
|---|---|---|
| committer | Marcel Holtmann <marcel@holtmann.org> | 2007-01-13 23:53:00 +0000 |
| commit | 54b33571eb8833f86d17957ff5a3309512aab57b (patch) | |
| tree | bc1987428bd7cc2c479a62f3dcef27c249079905 | |
| parent | f69ca2b89cb0e3913c7da700031c4290a20d2d01 (diff) | |
Make installation of hcid and sdpd conditional
| -rw-r--r-- | acinclude.m4 | 14 | ||||
| -rw-r--r-- | hcid/Makefile.am | 6 | ||||
| -rw-r--r-- | sdpd/Makefile.am | 2 |
3 files changed, 20 insertions, 2 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 14fea03e..88488064 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -145,6 +145,8 @@ AC_DEFUN([AC_ARG_BLUEZ], [ sync_enable=${opensync_found} fuse_enable=no alsa_enable=no + hcid_enable=yes + sdpd_enable=no test_enable=no cups_enable=no configfiles_enable=yes @@ -172,6 +174,8 @@ AC_DEFUN([AC_ARG_BLUEZ], [ obex_enable=${enableval} fuse_enable=${enableval} alsa_enable=${enableval} + hcid_enable=${enableval} + sdpd_enable=${enableval} test_enable=${enableval} cups_enable=${enableval} configfiles_enable=${enableval} @@ -211,6 +215,14 @@ AC_DEFUN([AC_ARG_BLUEZ], [ alsa_enable=${enableval} ]) + AC_ARG_ENABLE(hcid, AC_HELP_STRING([--enable-hcid], [install HCI daemon]), [ + hcid_enable=${enableval} + ]) + + AC_ARG_ENABLE(sdpd, AC_HELP_STRING([--enable-sdpd], [install SDP daemon]), [ + sdpd_enable=${enableval} + ]) + AC_ARG_ENABLE(test, AC_HELP_STRING([--enable-test], [install test programs]), [ test_enable=${enableval} ]) @@ -271,6 +283,8 @@ AC_DEFUN([AC_ARG_BLUEZ], [ AM_CONDITIONAL(SYNC, test "${sync_enable}" = "yes" && test "${opensync_found}" = "yes") AM_CONDITIONAL(FUSE, test "${fuse_enable}" = "yes" && test "${openobex_found}" = "yes" && test "${fuse_found}" = "yes") AM_CONDITIONAL(ALSA, test "${alsa_enable}" = "yes" && test "${alsa_found}" = "yes") + AM_CONDITIONAL(HCID, test "${hcid_enable}" = "yes") + AM_CONDITIONAL(SDPD, test "${sdpd_enable}" = "yes") AM_CONDITIONAL(TEST, test "${test_enable}" = "yes") AM_CONDITIONAL(CUPS, test "${cups_enable}" = "yes") AM_CONDITIONAL(CONFIGFILES, test "${configfiles_enable}" = "yes") diff --git a/hcid/Makefile.am b/hcid/Makefile.am index dfa54bd9..2fde3c14 100644 --- a/hcid/Makefile.am +++ b/hcid/Makefile.am @@ -32,10 +32,9 @@ libhciserver_a_SOURCES = hcid.h security.c device.c \ dbus-sdp.c dbus-sdp.h dbus-rfcomm.c dbus-rfcomm.h \ dbus-test.c dbus-test.h +if HCID sbin_PROGRAMS = hcid -noinst_PROGRAMS = passkey-agent service-agent auth-agent - hcid_SOURCES = main.c hcid_LDADD = $(glib_ldadd) @DBUS_LIBS@ @BLUEZ_LIBS@ \ @@ -46,6 +45,9 @@ hcid_LDADD = $(glib_ldadd) @DBUS_LIBS@ @BLUEZ_LIBS@ \ if EXPAT hcid_LDADD += -lexpat endif +endif + +noinst_PROGRAMS = passkey-agent service-agent auth-agent passkey_agent_SOURCES = passkey-agent.c diff --git a/sdpd/Makefile.am b/sdpd/Makefile.am index f1f01ecb..0a425f74 100644 --- a/sdpd/Makefile.am +++ b/sdpd/Makefile.am @@ -11,11 +11,13 @@ noinst_LIBRARIES = libsdpserver.a libsdpserver_a_SOURCES = sdpd.h server.c cstate.c request.c service.c servicedb.c +if SDPD sbin_PROGRAMS = sdpd sdpd_SOURCES = main.c sdpd_LDADD = $(glib_ldadd) @BLUEZ_LIBS@ libsdpserver.a $(top_builddir)/common/libhelper.a +endif AM_CFLAGS = @BLUEZ_CFLAGS@ $(glib_cflags) |