j3d1/tinc
1
0
Fork 0
Code Issues 1 Pull requests Releases Wiki Activity

configure.in: fix AC_ARG_ENABLE and AC_ARG_WITH

Browse source 
The current configure.in file does not correctly make use of these
macros.  The resulting configure file will therefore enable an item
even if --disable-FEATURE is given.  This patch restores the intended
behavior.
This commit is contained in:
Anthony G. Basile 2012-03-26 06:29:40 -04:00 committed by Guus Sliepen
parent b23681dddb
commit 16e6769fee
1 changed files with 33 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
configure.in
View file

@ -73,30 +73,44 @@ case $host_os in
esac esac
AC_ARG_ENABLE(uml, AC_ARG_ENABLE(uml,
AS_HELP_STRING([--enable-uml], [enable support for User Mode Linux]), AS_HELP_STRING([--disable-uml], [enable support for User Mode Linux]),
[ AC_DEFINE(ENABLE_UML, 1, [Support for UML]) [ AS_IF([test "x$enable_uml" = "xyes"],
uml=true [ AC_DEFINE(ENABLE_UML, 1, [Support for UML])
] uml=true
],
[uml=false])
],
[uml=false]
) )
AC_ARG_ENABLE(vde, AC_ARG_ENABLE(vde,
AS_HELP_STRING([--enable-vde], [enable support for Virtual Distributed Ethernet]), AS_HELP_STRING([--disable-vde], [enable support for Virtual Distributed Ethernet]),
[ AC_CHECK_HEADERS(libvdeplug_dyn.h, [], [AC_MSG_ERROR([VDE plug header files not found.]); break]) [ AS_IF([test "x$enable_vde" = "xyes"],
AC_DEFINE(ENABLE_VDE, 1, [Support for VDE]) [ AC_CHECK_HEADERS(libvdeplug_dyn.h, [], [AC_MSG_ERROR([VDE plug header files not found.]); break])
vde=true AC_DEFINE(ENABLE_VDE, 1, [Support for VDE])
] vde=true
],
[vde=false])
],
[vde=false]
) )
AC_ARG_ENABLE(tunemu, AC_ARG_ENABLE(tunemu,
AS_HELP_STRING([--enable-tunemu], [enable support for the tunemu driver]), AS_HELP_STRING([--disable-tunemu], [enable support for the tunemu driver]),
[ AC_DEFINE(ENABLE_TUNEMU, 1, [Support for tunemu]) [ AS_IF([test "x$enable_tunemu" = "xyes"],
tunemu=true [ AC_DEFINE(ENABLE_TUNEMU, 1, [Support for tunemu])
] tunemu=true
],
[tunemu=false])
],
[tunemu=false]
) )
AC_ARG_WITH(windows2000, AC_ARG_WITH(windows2000,
AS_HELP_STRING([--with-windows2000], [compile with support for Windows 2000. This disables support for tunneling over existing IPv6 networks.]), AS_HELP_STRING([--without-windows2000], [compile with support for Windows 2000. This disables support for tunneling over existing IPv6 networks.]),
[AC_DEFINE(WITH_WINDOWS2000, 1, [Compile with support for Windows 2000])] [ AS_IF([test "x$with_windows2000" = "xyes"],
[AC_DEFINE(WITH_WINDOWS2000, 1, [Compile with support for Windows 2000])])
]
) )
AM_CONDITIONAL(UML, test "$uml" = true) AM_CONDITIONAL(UML, test "$uml" = true)
@ -176,8 +190,10 @@ tinc_OPENSSL
dnl Check if support for jumbograms is requested dnl Check if support for jumbograms is requested
AC_ARG_ENABLE(jumbograms, AC_ARG_ENABLE(jumbograms,
AS_HELP_STRING([--enable-jumbograms], [enable support for jumbograms (packets up to 9000 bytes)]), AS_HELP_STRING([--disable-jumbograms], [enable support for jumbograms (packets up to 9000 bytes)]),
[ AC_DEFINE(ENABLE_JUMBOGRAMS, 1, [Support for jumbograms (packets up to 9000 bytes)]) ] [ AS_IF([test "x$enable_jumbograms" = "xyes"],
[ AC_DEFINE(ENABLE_JUMBOGRAMS, 1, [Support for jumbograms (packets up to 9000 bytes)]) ])
]
) )
AC_SUBST(INCLUDES) AC_SUBST(INCLUDES)