Message ID | 1345426907-4236-1-git-send-email-lw@cn.fujitsu.com |
---|---|
State | Accepted, archived |
Delegated to: | stephen hemminger |
Headers | show |
On Mon, 2012-08-20 at 09:41 +0800, Li Wei wrote: > Use pkg-config to tell us the library path and fallback to search > old paths if xtables.pc not exists. > > Signed-off-by: Li Wei <lw@cn.fujitsu.com> Tested-by: Ben Hutchings <bhutchings@solarflare.com> Works for me on Fedora 16. You should probably change the subject line, as this doesn't change the search path but mostly replaces it. Ben. > --- > > Changes from v1: > - use pkg-config as Ben and Stephen suggested. > > configure | 8 +++++++- > 1 file changed, 7 insertions(+), 1 deletion(-) > > diff --git a/configure b/configure > index a1916de..db7cd6a 100755 > --- a/configure > +++ b/configure > @@ -148,7 +148,13 @@ check_ipt() > > check_ipt_lib_dir() > { > - IPT_LIB_DIR="" > + IPT_LIB_DIR=$(pkg-config --variable=xtlibdir xtables) > + if [ -n "$IPT_LIB_DIR" ]; then > + echo $IPT_LIB_DIR > + echo "IPT_LIB_DIR:=$IPT_LIB_DIR" >> Config > + return > + fi > + > for dir in /lib /usr/lib /usr/local/lib > do > for file in $dir/{xtables,iptables}/lib*t_*so ; do
On Mon, 20 Aug 2012 09:41:47 +0800 Li Wei <lw@cn.fujitsu.com> wrote: > Use pkg-config to tell us the library path and fallback to search > old paths if xtables.pc not exists. > > Signed-off-by: Li Wei <lw@cn.fujitsu.com> > --- > > Changes from v1: > - use pkg-config as Ben and Stephen suggested. > > configure | 8 +++++++- > 1 file changed, 7 insertions(+), 1 deletion(-) > > diff --git a/configure b/configure > index a1916de..db7cd6a 100755 > --- a/configure > +++ b/configure > @@ -148,7 +148,13 @@ check_ipt() > > check_ipt_lib_dir() > { > - IPT_LIB_DIR="" > + IPT_LIB_DIR=$(pkg-config --variable=xtlibdir xtables) > + if [ -n "$IPT_LIB_DIR" ]; then > + echo $IPT_LIB_DIR > + echo "IPT_LIB_DIR:=$IPT_LIB_DIR" >> Config > + return > + fi > + > for dir in /lib /usr/lib /usr/local/lib > do > for file in $dir/{xtables,iptables}/lib*t_*so ; do Applied -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/configure b/configure index a1916de..db7cd6a 100755 --- a/configure +++ b/configure @@ -148,7 +148,13 @@ check_ipt() check_ipt_lib_dir() { - IPT_LIB_DIR="" + IPT_LIB_DIR=$(pkg-config --variable=xtlibdir xtables) + if [ -n "$IPT_LIB_DIR" ]; then + echo $IPT_LIB_DIR + echo "IPT_LIB_DIR:=$IPT_LIB_DIR" >> Config + return + fi + for dir in /lib /usr/lib /usr/local/lib do for file in $dir/{xtables,iptables}/lib*t_*so ; do
Use pkg-config to tell us the library path and fallback to search old paths if xtables.pc not exists. Signed-off-by: Li Wei <lw@cn.fujitsu.com> --- Changes from v1: - use pkg-config as Ben and Stephen suggested. configure | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)