/[gentoo-x86]/net-misc/tinc/files/fix-ac-arg-enable.patch
Gentoo

Contents of /net-misc/tinc/files/fix-ac-arg-enable.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1.2 - (show annotations) (download)
Mon Mar 26 12:40:17 2012 UTC (2 years, 8 months ago) by blueness
Branch: MAIN
Changes since 1.1: +21 -13 lines
Force disable tunemu, fix bug #409749

(Portage version: 2.1.10.49/cvs/Linux x86_64)

1 diff --git a/configure.in b/configure.in
2 index 2ea69f6..7eaeca6 100644
3 --- a/configure.in
4 +++ b/configure.in
5 @@ -73,30 +73,44 @@ case $host_os in
6 esac
7
8 AC_ARG_ENABLE(uml,
9 - AS_HELP_STRING([--enable-uml], [enable support for User Mode Linux]),
10 - [ AC_DEFINE(ENABLE_UML, 1, [Support for UML])
11 - uml=true
12 - ]
13 + AS_HELP_STRING([--disable-uml], [enable support for User Mode Linux]),
14 + [ AS_IF([test "x$enable_uml" = "xyes"],
15 + [ AC_DEFINE(ENABLE_UML, 1, [Support for UML])
16 + uml=true
17 + ],
18 + [uml=false])
19 + ],
20 + [uml=false]
21 )
22
23 AC_ARG_ENABLE(vde,
24 - AS_HELP_STRING([--enable-vde], [enable support for Virtual Distributed Ethernet]),
25 - [ AC_CHECK_HEADERS(libvdeplug_dyn.h, [], [AC_MSG_ERROR([VDE plug header files not found.]); break])
26 - AC_DEFINE(ENABLE_VDE, 1, [Support for VDE])
27 - vde=true
28 - ]
29 + AS_HELP_STRING([--disable-vde], [enable support for Virtual Distributed Ethernet]),
30 + [ AS_IF([test "x$enable_vde" = "xyes"],
31 + [ AC_CHECK_HEADERS(libvdeplug_dyn.h, [], [AC_MSG_ERROR([VDE plug header files not found.]); break])
32 + AC_DEFINE(ENABLE_VDE, 1, [Support for VDE])
33 + vde=true
34 + ],
35 + [vde=false])
36 + ],
37 + [vde=false]
38 )
39
40 AC_ARG_ENABLE(tunemu,
41 - AS_HELP_STRING([--enable-tunemu], [enable support for the tunemu driver]),
42 - [ AC_DEFINE(ENABLE_TUNEMU, 1, [Support for tunemu])
43 - tunemu=true
44 - ]
45 + AS_HELP_STRING([--disable-tunemu], [enable support for the tunemu driver]),
46 + [ AS_IF([test "x$enable_tunemu" = "xyes"],
47 + [ AC_DEFINE(ENABLE_TUNEMU, 1, [Support for tunemu])
48 + tunemu=true
49 + ],
50 + [tunemu=false])
51 + ],
52 + [tunemu=false]
53 )
54
55 AC_ARG_WITH(windows2000,
56 - AS_HELP_STRING([--with-windows2000], [compile with support for Windows 2000. This disables support for tunneling over existing IPv6 networks.]),
57 - [AC_DEFINE(WITH_WINDOWS2000, 1, [Compile with support for Windows 2000])]
58 + AS_HELP_STRING([--without-windows2000], [compile with support for Windows 2000. This disables support for tunneling over existing IPv6 networks.]),
59 + [ AS_IF([test "x$with_windows2000" = "xyes"],
60 + [AC_DEFINE(WITH_WINDOWS2000, 1, [Compile with support for Windows 2000])])
61 + ]
62 )
63
64 AM_CONDITIONAL(UML, test "$uml" = true)
65 @@ -176,8 +190,10 @@ tinc_OPENSSL
66
67 dnl Check if support for jumbograms is requested
68 AC_ARG_ENABLE(jumbograms,
69 - AS_HELP_STRING([--enable-jumbograms], [enable support for jumbograms (packets up to 9000 bytes)]),
70 - [ AC_DEFINE(ENABLE_JUMBOGRAMS, 1, [Support for jumbograms (packets up to 9000 bytes)]) ]
71 + AS_HELP_STRING([--disable-jumbograms], [enable support for jumbograms (packets up to 9000 bytes)]),
72 + [ AS_IF([test "x$enable_jumbograms" = "xyes"],
73 + [ AC_DEFINE(ENABLE_JUMBOGRAMS, 1, [Support for jumbograms (packets up to 9000 bytes)]) ])
74 + ]
75 )
76
77 AC_SUBST(INCLUDES)

  ViewVC Help
Powered by ViewVC 1.1.20