diff options
author | Nishant Chaprana <n.chaprana@samsung.com> | 2019-05-22 22:18:39 +0530 |
---|---|---|
committer | Nishant Chaprana <n.chaprana@samsung.com> | 2019-05-22 22:23:32 +0530 |
commit | 52770f14eb36bd8b4f587d67ae66a44a2d276921 (patch) | |
tree | b8223f3da9af80bad71abc84b6d2d5cec5e10bc0 | |
parent | 5b0ef68d400aa263a42b8ca47ce6a7c38b588441 (diff) | |
download | connman-52770f14eb36bd8b4f587d67ae66a44a2d276921.tar.gz connman-52770f14eb36bd8b4f587d67ae66a44a2d276921.tar.bz2 connman-52770f14eb36bd8b4f587d67ae66a44a2d276921.zip |
Fixed build issue when built with --enable-tizen-ext-wifi-mesh optionsubmit/tizen/20190604.083831accepted/tizen/unified/20190605.215650
Below error comes when compiled with --enable-tizen-ext-wifi-mesh option:-
[ 168s] src/mesh-netlink.c:29:31: fatal error: netlink/genl/genl.h: No such file or directory
[ 168s] #include <netlink/genl/genl.h>
[ 168s] ^
[ 168s] compilation terminated.
[ 168s] Makefile:4430: recipe for target 'src/src_connmand-mesh-netlink.o' failed
[ 168s] make[1]: *** [src/src_connmand-mesh-netlink.o] Error 1
[ 168s] make[1]: *** Waiting for unfinished jobs....
[ 168s] CC gweb/vpn_connman_vpnd-gionotls.o
[ 169s] Makefile:1815: recipe for target 'all' failed
[ 169s] make: *** [all] Error 2
Change-Id: Ib62a65cc0dbecca86a6ae9d67bfae880fcb30bbd
Signed-off-by: Nishant Chaprana <n.chaprana@samsung.com>
-rw-r--r-- | Makefile.am | 12 | ||||
-rw-r--r-- | configure.ac | 10 | ||||
-rw-r--r-- | packaging/connman.spec | 1 |
3 files changed, 21 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am index 94c6e9d3..ac196e71 100644 --- a/Makefile.am +++ b/Makefile.am @@ -142,7 +142,7 @@ src_connmand_LDADD = gdbus/libgdbus-internal.la $(builtin_libadd) \ -lresolv -ldl -lrt if TIZEN_EXT_WIFI_MESH -src_connmand_LDADD += -lnl -lnl-genl +src_connmand_LDADD += @LIBNL_LIBS@ @LIBNL_GENL_LIBS@ endif src_connmand_LDFLAGS = -Wl,--export-dynamic -pie \ @@ -212,7 +212,7 @@ vpn_connman_vpnd_LDADD = gdbus/libgdbus-internal.la $(builtin_vpn_libadd) \ -lresolv -ldl if TIZEN_EXT_WIFI_MESH -vpn_connman_vpnd_LDADD += -lnl -lnl-genl +vpn_connman_vpnd_LDADD += @LIBNL_LIBS@ @LIBNL_GENL_LIBS@ endif vpn_connman_vpnd_LDFLAGS = -Wl,--export-dynamic \ @@ -314,6 +314,14 @@ AM_CFLAGS += @NFTABLES_CFLAGS@ src_connmand_CFLAGS += @NFTABLES_CFLAGS@ endif +if TIZEN_EXT_WIFI_MESH +AM_CFLAGS += @LIBNL_CFLAGS@ @LIBNL_GENL_CFLAGS@ +src_connmand_CFLAGS += @LIBNL_CFLAGS@ @LIBNL_GENL_CFLAGS@ +if VPN +vpn_connman_vpnd_CFLAGS += @LIBNL_CFLAGS@ @LIBNL_GENL_CFLAGS@ +endif +endif + EXTRA_DIST += vpn/vpn-dbus.conf vpn/vpn-polkit.conf script_DATA = diff --git a/configure.ac b/configure.ac index d1b76538..48ea09f6 100644 --- a/configure.ac +++ b/configure.ac @@ -270,6 +270,16 @@ PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.28, dummy=yes, AC_SUBST(GLIB_CFLAGS) AC_SUBST(GLIB_LIBS) +PKG_CHECK_MODULES(LIBNL, libnl-3.0, dummy=yes, + AC_MSG_ERROR(libnl-3.0 is required)) +AC_SUBST(LIBNL_CFLAGS) +AC_SUBST(LIBNL_LIBS) + +PKG_CHECK_MODULES(LIBNL_GENL, libnl-genl-3.0, dummy=yes, + AC_MSG_ERROR(libnl-genl-3.0 is required)) +AC_SUBST(LIBNL_GENL_CFLAGS) +AC_SUBST(LIBNL_GENL_LIBS) + PKG_CHECK_MODULES(LIBSYSTEMD, libsystemd-daemon, dummy=yes, AC_MSG_ERROR(libsystemd-daemon library is required)) AC_SUBST(LIBSYSTEMD_CFLAGS) diff --git a/packaging/connman.spec b/packaging/connman.spec index 5b7b5ffd..080b4655 100644 --- a/packaging/connman.spec +++ b/packaging/connman.spec @@ -19,6 +19,7 @@ BuildRequires: pkgconfig(libiptc) BuildRequires: pkgconfig(xtables) BuildRequires: pkgconfig(libsmack) BuildRequires: pkgconfig(libnl-3.0) +BuildRequires: pkgconfig(libnl-genl-3.0) BuildRequires: pkgconfig(libsystemd-daemon) %if %{with connman_openconnect} BuildRequires: openconnect |