diff options
| author | Marcel Holtmann <marcel@holtmann.org> | 2010-10-29 20:08:05 +0200 |
|---|---|---|
| committer | Marcel Holtmann <marcel@holtmann.org> | 2010-10-29 20:08:05 +0200 |
| commit | 1eed303ab1717b25eba1c05a708eae9625af6efc (patch) | |
| tree | 2c92926f8a800b59634bc089436e4325adbdd931 | |
| parent | 0663c1943f5cbbcb7e887d9f312b77059ed21ca5 (diff) | |
| download | connman-1eed303ab1717b25eba1c05a708eae9625af6efc.tar.gz connman-1eed303ab1717b25eba1c05a708eae9625af6efc.tar.bz2 connman-1eed303ab1717b25eba1c05a708eae9625af6efc.zip | |
Check for GnuTLS library when tools are enabled
| -rw-r--r-- | Makefile.am | 7 | ||||
| -rw-r--r-- | configure.ac | 7 |
2 files changed, 9 insertions, 5 deletions
diff --git a/Makefile.am b/Makefile.am index 9ac6f3ae..056fff82 100644 --- a/Makefile.am +++ b/Makefile.am @@ -78,8 +78,7 @@ src_connmand_SOURCES += $(gsupplicant_sources) endif src_connmand_LDADD = $(builtin_libadd) @GLIB_LIBS@ @DBUS_LIBS@ \ - @CAPNG_LIBS@ @XTABLES_LIBS@ \ - -lresolv -ldl + @CAPNG_LIBS@ @XTABLES_LIBS@ -lresolv -ldl src_connmand_LDFLAGS = -Wl,--export-dynamic \ -Wl,--version-script=$(srcdir)/src/connman.ver @@ -102,8 +101,8 @@ build_plugindir = $(plugindir) build_scriptdir = $(scriptdir) endif -AM_CFLAGS = @XTABLES_CFLAGS@ @NETLINK_CFLAGS@ @CAPNG_CFLAGS@ \ - @DBUS_CFLAGS@ @GLIB_CFLAGS@ @XTABLES_CFLAGS@ \ +AM_CFLAGS = @DBUS_CFLAGS@ @GLIB_CFLAGS@ @CAPNG_CFLAGS@ @XTABLES_CFLAGS@ \ + @NETLINK_CFLAGS@ @GNUTLS_CFLAGS@ \ $(builtin_cflags) \ -DCONNMAN_PLUGIN_BUILTIN \ -DSTATEDIR=\""$(statedir)"\" \ diff --git a/configure.ac b/configure.ac index f36a7662..1f406f07 100644 --- a/configure.ac +++ b/configure.ac @@ -317,7 +317,7 @@ fi AC_SUBST(DBUS_DATADIR) PKG_CHECK_MODULES(XTABLES, xtables, dummy=yes, - AC_MSG_ERROR(xtables library is required)) + AC_MSG_ERROR(Xtables library is required)) AC_SUBST(XTABLES_CFLAGS) AC_SUBST(XTABLES_LIBS) @@ -360,6 +360,11 @@ if (test "${enable_tools}" = "yes"); then AC_MSG_ERROR(Netlink library is required)) AC_SUBST(NETLINK_CFLAGS) AC_SUBST(NETLINK_LIBS) + + PKG_CHECK_MODULES(GNUTLS, gnutls, dummy=yes, + AC_MSG_ERROR(GnuTLS library is required)) + AC_SUBST(GNUTLS_CFLAGS) + AC_SUBST(GNUTLS_LIBS) fi AM_CONDITIONAL(TOOLS, test "${enable_tools}" = "yes") |