Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 107076 | Differences between
and this patch

Collapse All | Expand All

(-)configure.in.orig (-10 / +18 lines)
Lines 50-55 Link Here
50
esac
50
esac
51
AC_MSG_RESULT([$ac_system])
51
AC_MSG_RESULT([$ac_system])
52
52
53
if test "x$ac_system" = "xLinux"
54
then
55
	AC_ARG_VAR([KERNEL_DIR], [path to Linux kernel sources])
56
	if test -z "$KERNEL_DIR"
57
	then
58
		KERNEL_DIR="/lib/modules/`uname -r`/source"
59
	fi
60
61
	KERNEL_CFLAGS="-I$KERNEL_DIR/include"
62
	AC_SUBST(KERNEL_CFLAGS)
63
fi
64
53
#
65
#
54
# Checks for header files.
66
# Checks for header files.
55
#
67
#
Lines 278-285 Link Here
278
have_ip_vs_h="no"
290
have_ip_vs_h="no"
279
if test "x$ac_system" = "xLinux"
291
if test "x$ac_system" = "xLinux"
280
then
292
then
293
	SAVE_CFLAGS=$CFLAGS
294
	CFLAGS="$CFLAGS $KERNEL_CFLAGS"
295
281
	AC_CHECK_HEADERS(net/ip_vs.h, [have_net_ip_vs_h="yes"])
296
	AC_CHECK_HEADERS(net/ip_vs.h, [have_net_ip_vs_h="yes"])
282
	AC_CHECK_HEADERS(ip_vs.h, [have_ip_vs_h="yes"])
297
	AC_CHECK_HEADERS(ip_vs.h, [have_ip_vs_h="yes"])
298
299
	CFLAGS=$SAVE_CFLAGS
283
fi
300
fi
284
301
285
# For quota module
302
# For quota module
Lines 1599-1613 Link Here
1599
	LDFLAGS=$SAVE_LDFLAGS
1616
	LDFLAGS=$SAVE_LDFLAGS
1600
fi
1617
fi
1601
1618
1602
if test "x$ac_system" = "xLinux"
1603
then
1604
	AC_ARG_VAR([KERNEL_DIR], [path to Linux kernel sources])
1605
	if test -z "$KERNEL_DIR"
1606
	then
1607
		KERNEL_DIR="/lib/modules/`uname -r`/source"
1608
	fi
1609
fi
1610
1611
with_own_libiptc="no"
1619
with_own_libiptc="no"
1612
AC_ARG_WITH(libiptc, [AS_HELP_STRING([--with-libiptc@<:@=PREFIX@:>@], [Path to libiptc.])],
1620
AC_ARG_WITH(libiptc, [AS_HELP_STRING([--with-libiptc@<:@=PREFIX@:>@], [Path to libiptc.])],
1613
[
1621
[
Lines 1653-1659 Link Here
1653
if test "x$with_libiptc" = "xyes"
1661
if test "x$with_libiptc" = "xyes"
1654
then
1662
then
1655
	SAVE_CFLAGS=$CFLAGS
1663
	SAVE_CFLAGS=$CFLAGS
1656
	CFLAGS="$CFLAGS -I$KERNEL_DIR/include"
1664
	CFLAGS="$CFLAGS $KERNEL_CFLAGS"
1657
1665
1658
	AC_CHECK_HEADERS(linux/netfilter_ipv4/ip_tables.h linux/netfilter_ipv6/ip6_tables.h, [],
1666
	AC_CHECK_HEADERS(linux/netfilter_ipv4/ip_tables.h linux/netfilter_ipv6/ip6_tables.h, [],
1659
	[
1667
	[
(-)src/Makefile.am.orig (+1 lines)
Lines 311-316 Link Here
311
if BUILD_PLUGIN_IPVS
311
if BUILD_PLUGIN_IPVS
312
pkglib_LTLIBRARIES += ipvs.la
312
pkglib_LTLIBRARIES += ipvs.la
313
ipvs_la_SOURCES = ipvs.c
313
ipvs_la_SOURCES = ipvs.c
314
ipvs_la_CFLAGS = $(KERNEL_CFLAGS)
314
ipvs_la_LDFLAGS = -module -avoid-version
315
ipvs_la_LDFLAGS = -module -avoid-version
315
collectd_LDADD += "-dlopen" ipvs.la
316
collectd_LDADD += "-dlopen" ipvs.la
316
collectd_DEPENDENCIES += ipvs.la
317
collectd_DEPENDENCIES += ipvs.la

Return to bug 107076