diff options
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rwxr-xr-x | bootstrap-configure | 3 | ||||
| -rw-r--r-- | configure.ac | 18 | ||||
| -rw-r--r-- | tools/Makefile.am | 2 |
4 files changed, 20 insertions, 5 deletions
diff --git a/Makefile.am b/Makefile.am index 8651e978..a949a551 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,5 +1,5 @@ -SUBDIRS = gdbus include src plugins client scripts test doc +SUBDIRS = gdbus include src plugins client tools scripts test doc pkgconfigdir = $(libdir)/pkgconfig diff --git a/bootstrap-configure b/bootstrap-configure index 265d8815..ac7d8bd1 100755 --- a/bootstrap-configure +++ b/bootstrap-configure @@ -33,4 +33,5 @@ fi --enable-iospm \ --enable-iwmxsdk \ --enable-polkit \ - --enable-client $* + --enable-client \ + --enable-tools $* diff --git a/configure.ac b/configure.ac index 69f028a1..16025ac6 100644 --- a/configure.ac +++ b/configure.ac @@ -235,6 +235,16 @@ AC_ARG_ENABLE(client, AC_HELP_STRING([--enable-client], [enable command line client]), [enable_client=${enableval}]) AM_CONDITIONAL(CLIENT, test "${enable_client}" = "yes") +AC_ARG_ENABLE(tools, AC_HELP_STRING([--enable-tools], + [enable testing tools]), [enable_tools=${enableval}]) +if (test "${enable_tools}" = "yes"); then + PKG_CHECK_MODULES(NETLINK, libnl-1, enable_netlink=yes, + AC_MSG_ERROR(Netlink library is required)) + AC_SUBST(NETLINK_CFLAGS) + AC_SUBST(NETLINK_LIBS) +fi +AM_CONDITIONAL(TOOLS, test "${enable_tools}" = "yes") + AC_ARG_ENABLE(fake, AC_HELP_STRING([--enable-fake], [enable fake device support]), [enable_fake=${enableval}]) AM_CONDITIONAL(FAKE, test "${enable_fake}" = "yes") @@ -247,6 +257,8 @@ AM_CONDITIONAL(DATAFILES, test "${enable_datafiles}" != "no") SHAVE_INIT AC_OUTPUT(Makefile gdbus/Makefile include/Makefile include/version.h - src/Makefile src/connman.service scripts/connman - scripts/Makefile plugins/Makefile client/Makefile - test/Makefile doc/Makefile doc/version.xml connman.pc) + src/Makefile src/connman.service + scripts/connman scripts/Makefile + plugins/Makefile client/Makefile + tools/Makefile test/Makefile + doc/Makefile doc/version.xml connman.pc) diff --git a/tools/Makefile.am b/tools/Makefile.am new file mode 100644 index 00000000..02742923 --- /dev/null +++ b/tools/Makefile.am @@ -0,0 +1,2 @@ + +MAINTAINERCLEANFILES = Makefile.in |