diff options
| author | Max Kellermann <max@duempel.org> | 2009-01-05 09:31:04 +0100 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2009-01-05 09:31:04 +0100 |
| commit | 694a919b8ea893415c5c791cb853a900e596e1a3 (patch) | |
| tree | fd878a2a32210267a411602ee44dd2c5008abf96 | |
| parent | e178a6f6a7b2adcb27dcd54a43e779fe466814dd (diff) | |
| download | mpd-694a919b8ea893415c5c791cb853a900e596e1a3.tar.gz mpd-694a919b8ea893415c5c791cb853a900e596e1a3.tar.xz mpd-694a919b8ea893415c5c791cb853a900e596e1a3.zip | |
configure.ac: moved mandatory checks up
First do the checks for mandatory stuff (libc features, glib,
pkg-config), then all the options.
| -rw-r--r-- | configure.ac | 53 |
1 files changed, 35 insertions, 18 deletions
diff --git a/configure.ac b/configure.ac index 7cdc98f37..4ccd33ed1 100644 --- a/configure.ac +++ b/configure.ac @@ -5,17 +5,22 @@ AM_INIT_AUTOMAKE([foreign 1.9 dist-bzip2]) AM_CONFIG_HEADER(config.h) AC_CONFIG_MACRO_DIR([m4]) -AC_SUBST(MPD_LIBS) -AC_SUBST(MPD_CFLAGS) +AC_DEFINE(PROTOCOL_VERSION, "0.14.0", [The mpd protocol version]) + + +dnl +dnl programs +dnl AC_PROG_CC_C99 AC_PROG_INSTALL AC_PROG_MAKE_SET +PKG_PROG_PKG_CONFIG -AC_DEFINE(PROTOCOL_VERSION, "0.14.0", [The mpd protocol version]) -MPD_LIBS="" -MPD_CFLAGS="" +dnl +dnl OS specific defaults +dnl case "$host" in *-mingw32* | *-windows*) @@ -61,6 +66,16 @@ fi dnl +dnl declare variables +dnl + +AC_SUBST(MPD_LIBS) +AC_SUBST(MPD_CFLAGS) +MPD_LIBS="" +MPD_CFLAGS="" + + +dnl dnl libc features dnl @@ -74,6 +89,21 @@ if test $ac_cv_func_syslog = no; then done fi +AC_CHECK_LIB(socket,socket,MPD_LIBS="$MPD_LIBS -lsocket",) +AC_CHECK_LIB(nsl,gethostbyname,MPD_LIBS="$MPD_LIBS -lnsl",) + +AC_CHECK_LIB(m,exp,MPD_LIBS="$MPD_LIBS -lm",) + +AC_CHECK_HEADER(locale.h,[enable_locale=yes;AC_DEFINE(HAVE_LOCALE,1,[Define if locale.h is present])],enable_locale=no) + + +dnl +dnl mandatory libraries +dnl + +PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.4 gthread-2.0],, + [AC_MSG_ERROR([glib-2.4 is required])]) + dnl dnl build options @@ -358,19 +388,6 @@ AC_ARG_WITH(faad-libraries,[ --with-faad-libraries=DIR Directory where faad2 AC_ARG_WITH(faad-includes,[ --with-faad-includes=DIR Directory where faad2 header files are installed (optional)], faad_includes="$withval", faad_includes="") AC_ARG_WITH(zeroconf,[[ --with-zeroconf=[auto|avahi|bonjour|no] Enable zeroconf backend (default=auto)]], with_zeroconf="$withval", with_zeroconf="auto") -AC_CHECK_LIB(socket,socket,MPD_LIBS="$MPD_LIBS -lsocket",) -AC_CHECK_LIB(nsl,gethostbyname,MPD_LIBS="$MPD_LIBS -lnsl",) - -AC_CHECK_LIB(m,exp,MPD_LIBS="$MPD_LIBS -lm",) - -# Check for pkg-config before using it -PKG_PROG_PKG_CONFIG - -PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.4 gthread-2.0],, - [AC_MSG_ERROR([glib-2.4 is required])]) - -AC_CHECK_HEADER(locale.h,[enable_locale=yes;AC_DEFINE(HAVE_LOCALE,1,[Define if locale.h is present])],enable_locale=no) - if test x$enable_tcp = xno; then # if we don't support TCP, we don't need IPv6 either enable_ipv6=no |