Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[configure.ac] Add the option of passing libnl path to configure script #1824

Merged
merged 3 commits into from
Jul 20, 2021
Merged

[configure.ac] Add the option of passing libnl path to configure script #1824

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ce132b4
add support to link custom libnl libs
smaheshm Jul 16, 2021
1e1c48e
fix type
smaheshm Jul 16, 2021
55bae9b
updated the API name to check
smaheshm Jul 20, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 21 additions & 3 deletions configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@ AC_HEADER_STDC
AC_CHECK_LIB([hiredis], [redisConnect],,
AC_MSG_ERROR([libhiredis is not installed.]))

AC_CHECK_LIB([nl-genl-3], [genl_connect])

AC_CHECK_LIB([team], [team_alloc],
AM_CONDITIONAL(HAVE_LIBTEAM, true),
[AC_MSG_WARN([libteam is not installed.])
Expand Down Expand Up @@ -46,7 +44,27 @@ AC_ARG_WITH(extra-lib,
prefix where extra libraries are installed],
[AC_SUBST(LDFLAGS, "$LDFLAGS -L${withval}")])

CFLAGS_COMMON="-std=c++14 -Wall -fPIC -Wno-write-strings -I/usr/include/libnl3 -I/usr/include/swss"
AC_ARG_WITH(extra-usr-lib,
[ --with-extra-usr-lib=DIR
prefix where extra libraries are installed],
[AC_SUBST(LDFLAGS, "$LDFLAGS -L${withval}")])

AC_CHECK_LIB([nl-3], [nl_addr_alloc])
Copy link
Contributor

@qiluo-msft qiluo-msft Jul 17, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nl_addr_alloc

Since you are requiring a local patched libnl3, do you want to check the required new function rtnl_route_nh_get_encap_mpls_dst? #Closed

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

updated.

checking for sai_object_type_query in -lsai... no                                                                                                                                    
configure: WARNING: libsai is not installed.                                                                                                                                         
checking for nl_addr_alloc in -lnl-3... yes                                                                                                                                          
checking for nl_socket_get_cb in -lnl-genl-3... yes                                                                                                                                  
checking for rtnl_route_nh_get_encap_mpls_dst in -lnl-route-3... yes                                                                                                                 
checking for nfnl_connect in -lnl-nf-3... yes                                                                                                                                        
checking that generated files are newer than configure... done

Copy link
Contributor

@qiluo-msft qiluo-msft Jul 17, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nl-3

If you have installed Debian vanilla libnl3, and extract patched libnl3 into a folder, which one will you prefer? #Closed

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the extracted one, always. The '-L' includes the path to the extracted libs so it will be the ones that will be linked.

AC_CHECK_LIB([nl-genl-3], [nl_socket_get_cb])
AC_CHECK_LIB([nl-route-3], [rtnl_route_nh_get_encap_mpls_dst])
AC_CHECK_LIB([nl-nf-3], [nfnl_connect])

CFLAGS_COMMON="-std=c++14 -Wall -fPIC -Wno-write-strings -I/usr/include/swss"

AC_ARG_WITH(libnl-3.0-inc,
[ --with-libnl-3.0-inc=DIR
prefix where libnl-3.0 includes are installed],
[AC_SUBST(CPPFLAGS, "$CPPFLAGS -I${withval}")
AC_SUBST(LIBNL_INC_DIR, "${withval}")])

if test "${with_libnl_3_0_inc+set}" != set; then
CFLAGS_COMMON+=" -I/usr/include/libnl3"
fi

CFLAGS_COMMON+=" -Werror"
CFLAGS_COMMON+=" -Wno-reorder"
Expand Down