diff options
| author | Max Kellermann <max@duempel.org> | 2009-01-05 09:43:07 +0100 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2009-01-05 09:43:07 +0100 |
| commit | 2856be540f0aef98df109597588c625fd8de3cc5 (patch) | |
| tree | 3d9a57331ac7dc015e4df2da5068b845110625c5 | |
| parent | 3f4bfd22c67041a3bd12075b1352121bc0548d0c (diff) | |
| download | mpd-2856be540f0aef98df109597588c625fd8de3cc5.tar.gz mpd-2856be540f0aef98df109597588c625fd8de3cc5.tar.xz mpd-2856be540f0aef98df109597588c625fd8de3cc5.zip | |
configure.ac: moved checks to argument declarations I
Don't separate basic options from their according tests. Due to lots
of interdependencies, we won't do that for the plugins yet.
Diffstat (limited to '')
| -rw-r--r-- | configure.ac | 76 |
1 files changed, 38 insertions, 38 deletions
diff --git a/configure.ac b/configure.ac index 35bdc3b05..e2376175f 100644 --- a/configure.ac +++ b/configure.ac @@ -109,17 +109,45 @@ dnl dnl protocol options dnl +AC_ARG_ENABLE(tcp, + AS_HELP_STRING([--disable-tcp], + [disable support for clients connecting via TCP (default: enable)]), + [enable_tcp=$enableval], + [enable_tcp=yes]) + AC_ARG_ENABLE(ipv6, AS_HELP_STRING([--disable-ipv6], [disable IPv6 support (default: enable)]), [enable_ipv6=$enableval], [enable_ipv6=yes]) -AC_ARG_ENABLE(tcp, - AS_HELP_STRING([--disable-tcp], - [disable support for clients connecting via TCP (default: enable)]), - [enable_tcp=$enableval], - [enable_tcp=yes]) +if test x$enable_tcp = xno; then + # if we don't support TCP, we don't need IPv6 either + enable_ipv6=no +fi + +if test x$enable_ipv6 = xyes; then + AC_MSG_CHECKING(for ipv6) + AC_EGREP_CPP([AP_maGiC_VALUE], + [ +#include <sys/types.h> +#include <sys/socket.h> +#include <netdb.h> +#ifdef PF_INET6 +#ifdef AF_INET6 +AP_maGiC_VALUE +#endif +#endif + ], + AC_DEFINE(HAVE_IPV6, 1, [Define if IPv6 support present]) + AC_MSG_RESULT([yes]), + AC_MSG_RESULT([no]) +) +fi + +if test x$enable_tcp = xyes; then + AC_DEFINE(HAVE_TCP, 1, [Define if TCP socket support is enabled]) +fi AC_ARG_ENABLE(un, AS_HELP_STRING([--disable-un], @@ -127,6 +155,11 @@ AC_ARG_ENABLE(un, [enable_un=$enableval], [enable_un=yes]) +if test x$enable_un = xyes; then + AC_DEFINE(HAVE_UN, 1, [Define if unix domain socket support is enabled]) + STRUCT_UCRED +fi + dnl dnl misc libraries @@ -385,39 +418,6 @@ AC_ARG_ENABLE(shout-mp3, [enable_shout_mp3=$enableval], [enable_shout_mp3=yes]) -if test x$enable_tcp = xno; then - # if we don't support TCP, we don't need IPv6 either - enable_ipv6=no -fi - -if test x$enable_ipv6 = xyes; then - AC_MSG_CHECKING(for ipv6) - AC_EGREP_CPP([AP_maGiC_VALUE], - [ -#include <sys/types.h> -#include <sys/socket.h> -#include <netdb.h> -#ifdef PF_INET6 -#ifdef AF_INET6 -AP_maGiC_VALUE -#endif -#endif - ], - AC_DEFINE(HAVE_IPV6, 1, [Define if IPv6 support present]) - AC_MSG_RESULT([yes]), - AC_MSG_RESULT([no]) -) -fi - -if test x$enable_tcp = xyes; then - AC_DEFINE(HAVE_TCP, 1, [Define if TCP socket support is enabled]) -fi - -if test x$enable_un = xyes; then - AC_DEFINE(HAVE_UN, 1, [Define if unix domain socket support is enabled]) - STRUCT_UCRED -fi - enable_osx=no case $host in *-darwin*) |