mirror of
https://gitlab.xiph.org/xiph/ezstream.git
synced 2025-02-02 15:07:45 -05:00
Update m4 macros, allowing for more easy control over the build process among
other things. Fix a silly bug in --enable-debug while there. git-svn-id: https://svn.xiph.org/trunk/ezstream@16149 0101bb08-14d6-0310-b084-bc0e0c8e3800
This commit is contained in:
moritz
parent
c6474005f8
commit
ca84146c77
3
NEWS
3
NEWS
@ -4,6 +4,9 @@ Changes in 0.5.5, released on XXXX-XX-XX:
|
||||
- [FIX] Re-enable TagLib support in MSVC build. Found by Roman Donchenko.
|
||||
(Ticket #1535)
|
||||
|
||||
* various:
|
||||
- [MISC] Further improvements and minor fixes in the build system.
|
||||
|
||||
|
||||
|
||||
Changes in 0.5.4, released on 2009-03-28:
|
||||
|
||||
27
README
27
README
@ -64,6 +64,25 @@ configure script, a couple of additional options are available:
|
||||
example configuration files installation directory
|
||||
(default: DATADIR/examples/ezstream)
|
||||
--enable-debug enable memory debugging (default: no)
|
||||
--with-libshout=PFX prefix where the libshout header files and library
|
||||
are installed (default: autodetect)
|
||||
--with-libshout-includes=DIR
|
||||
directory where libshout header files are installed
|
||||
(optional)
|
||||
--with-libshout-libs=DIR
|
||||
directory where libshout is installed (optional)
|
||||
--with-libxml2=PFX prefix where the libxml2 header files and library
|
||||
are installed (default: autodetect)
|
||||
--with-libxml2-includes=DIR
|
||||
directory where libxml2 header files are installed
|
||||
(optional)
|
||||
--with-libxml2-libs=DIR directory where libxml2 is installed (optional)
|
||||
--with-taglib=PFX prefix where the TagLib header files and library are
|
||||
installed (default: autodetect)
|
||||
--with-taglib-includes=DIR
|
||||
directory where TagLib header files are installed
|
||||
(optional)
|
||||
--with-taglib-libs=DIR directory where TagLib is installed (optional)
|
||||
--with-libvorbis=PFX prefix where the Vorbis library header files and
|
||||
library are installed (default: autodetect)
|
||||
--with-libvorbis-includes=DIR
|
||||
@ -72,12 +91,8 @@ configure script, a couple of additional options are available:
|
||||
--with-libvorbis-libs=DIR
|
||||
directory where the Vorbis libraries are installed
|
||||
(optional)
|
||||
--with-taglib=PFX prefix where the TagLib header files and library are
|
||||
installed (default: autodetect)
|
||||
--with-taglib-includes=DIR
|
||||
directory where TagLib header files are installed
|
||||
(optional)
|
||||
--with-taglib-libs=DIR directory where TagLib is installed (optional)
|
||||
--with-libiconv-prefix[=DIR] search for libiconv in DIR/include and DIR/lib
|
||||
--without-libiconv-prefix don't search for libiconv in includedir and libdir
|
||||
|
||||
The compilation and installation process then boils down to the usual
|
||||
|
||||
|
||||
@ -103,7 +103,7 @@ AC_CHECK_HEADERS([ \
|
||||
|
||||
COMPAT_INCLUDES=""
|
||||
if test x"${ez_enable_debug}" = "xyes"; then
|
||||
AX_HEADER_TREE([RB_FOREACHx], [],
|
||||
AX_HEADER_TREE([RB_FOREACH], [],
|
||||
[
|
||||
COMPAT_INCLUDES="-I\$(top_srcdir)/compat"
|
||||
])
|
||||
|
||||
@ -1,25 +1,28 @@
|
||||
dnl $Id$
|
||||
dnl # $Id$
|
||||
|
||||
dnl * Check if the compiler understands a certain flag or not.
|
||||
dnl Inspiration for this came from watching TagLib configure.
|
||||
dnl * Check for the CFLAG required to turn warnings into errors.
|
||||
dnl # * Check if the compiler understands a certain flag or not.
|
||||
dnl # Inspiration for this came from watching TagLib configure.
|
||||
dnl # * Check for the CFLAG required to turn warnings into errors.
|
||||
|
||||
dnl Copyright (c) 2008 Moritz Grimm <mgrimm@mrsserver.net>
|
||||
dnl
|
||||
dnl Permission to use, copy, modify, and distribute this software for any
|
||||
dnl purpose with or without fee is hereby granted, provided that the above
|
||||
dnl copyright notice and this permission notice appear in all copies.
|
||||
dnl
|
||||
dnl THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
|
||||
dnl WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
|
||||
dnl MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
|
||||
dnl ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
|
||||
dnl WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
|
||||
dnl ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
|
||||
dnl OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
||||
|
||||
dnl AX_CHECK_CFLAG(CFLAG, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
|
||||
dnl AX_CHECK_CXXFLAG(CXXFLAG, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
|
||||
dnl # Copyright (c) 2008 Moritz Grimm <mgrimm@mrsserver.net>
|
||||
dnl #
|
||||
dnl # Permission to use, copy, modify, and distribute this software for any
|
||||
dnl # purpose with or without fee is hereby granted, provided that the above
|
||||
dnl # copyright notice and this permission notice appear in all copies.
|
||||
dnl #
|
||||
dnl # THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
|
||||
dnl # WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
|
||||
dnl # MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
|
||||
dnl # ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
|
||||
dnl # WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
|
||||
dnl # ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
|
||||
dnl # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
||||
|
||||
|
||||
dnl # AX_CHECK_CFLAG(CFLAG, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
|
||||
dnl # AX_CHECK_CXXFLAG(CXXFLAG, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
|
||||
|
||||
|
||||
AC_DEFUN([AX_CHECK_CFLAG],
|
||||
[
|
||||
|
||||
140
m4/libshout.m4
140
m4/libshout.m4
@ -1,4 +1,4 @@
|
||||
dnl $Id$
|
||||
dnl # $Id$
|
||||
|
||||
dnl # Check for a working installation of libshout.
|
||||
dnl # Provides appropriate --with configuration options, fills and substitutes
|
||||
@ -6,12 +6,12 @@ dnl # the LIBSHOUT_CFLAGS, LIBSHOUT_CPPFLAGS, LIBSHOUT_LDFLAGS and
|
||||
dnl # LIBSHOUT_LIBS variables accordingly.
|
||||
|
||||
|
||||
dnl # Copyright (c) 2008 Moritz Grimm <mgrimm@mrsserver.net>
|
||||
dnl # Copyright (c) 2009 Moritz Grimm <mgrimm@mrsserver.net>
|
||||
dnl #
|
||||
dnl # Permission to use, copy, modify, and distribute this software for any
|
||||
dnl # purpose with or without fee is hereby granted, provided that the above
|
||||
dnl # copyright notice and this permission notice appear in all copies.
|
||||
dnl
|
||||
dnl #
|
||||
dnl # THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
|
||||
dnl # WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
|
||||
dnl # MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
|
||||
@ -27,28 +27,130 @@ dnl # AX_CHECK_LIBSHOUT([LIBSHOUT-VERSION], [ACTION-IF-FOUND],
|
||||
dnl # [ACTION-IF-NOT-FOUND])
|
||||
|
||||
|
||||
AC_DEFUN([AX_CHECK_LIBSHOUT],
|
||||
AC_DEFUN([_AX_CHECK_LIBSHOUT_OPTS],
|
||||
[
|
||||
AC_REQUIRE([PKG_PROG_PKG_CONFIG])
|
||||
AC_REQUIRE([AC_PROG_FGREP])
|
||||
if test -z "${PKG_CONFIG}"; then
|
||||
AC_MSG_ERROR([The pkg-config utility is required.], [1])
|
||||
fi
|
||||
AC_ARG_VAR([LIBSHOUT_CFLAGS],
|
||||
[C compiler flags for libshout])
|
||||
AC_ARG_VAR([LIBSHOUT_CPPFLAGS],
|
||||
[C preprocessor flags for libshout])
|
||||
AC_ARG_VAR([LIBSHOUT_LDFLAGS],
|
||||
[linker flags for libshout])
|
||||
if test x"${prefix}" = "xNONE"; then
|
||||
have_libshout_prefix="/usr/local"
|
||||
else
|
||||
have_libshout_prefix="${prefix}"
|
||||
fi
|
||||
have_libshout_includes=""
|
||||
have_libshout_libs=""
|
||||
want_libshout="auto"
|
||||
AC_ARG_WITH([libshout],
|
||||
[AS_HELP_STRING([--with-libshout=PFX],
|
||||
[prefix where the libshout header files and library are installed (default: autodetect)])],
|
||||
[
|
||||
case "${withval}" in
|
||||
yes)
|
||||
want_libshout="yes"
|
||||
;;
|
||||
no)
|
||||
want_libshout="no"
|
||||
;;
|
||||
*)
|
||||
have_libshout_prefix="${withval}"
|
||||
want_libshout="yes"
|
||||
;;
|
||||
esac
|
||||
]
|
||||
)
|
||||
AC_ARG_WITH([libshout-includes],
|
||||
[AS_HELP_STRING([--with-libshout-includes=DIR],
|
||||
[directory where libshout header files are installed (optional)]) ],
|
||||
[
|
||||
case "${withval}" in
|
||||
yes|no) ;;
|
||||
*)
|
||||
have_libshout_includes="${withval}"
|
||||
;;
|
||||
esac
|
||||
]
|
||||
)
|
||||
AC_ARG_WITH([libshout-libs],
|
||||
[AS_HELP_STRING([--with-libshout-libs=DIR],
|
||||
[directory where libshout is installed (optional)]) ],
|
||||
[
|
||||
case "${withval}" in
|
||||
yes|no) ;;
|
||||
*)
|
||||
have_libshout_libs="${withval}"
|
||||
;;
|
||||
esac
|
||||
]
|
||||
)
|
||||
AC_CACHE_VAL([local_cv_have_lib_libshout_opts],
|
||||
[
|
||||
ax_check_libshout_shout_pc="no"
|
||||
PKG_CONFIG_PATH="${PKG_CONFIG_PATH}:${have_libshout_prefix}/lib/pkgconfig"
|
||||
PKG_CHECK_EXISTS([shout], [ax_check_libshout_shout_pc=yes])
|
||||
if test -z "${LIBSHOUT_CFLAGS}" \
|
||||
-a x"${ax_check_libshout_shout_pc}" = "xyes"; then
|
||||
LIBSHOUT_CFLAGS="`${PKG_CONFIG} --cflags-only-other shout`"
|
||||
fi
|
||||
if test -n "${LIBSHOUT_CPPFLAGS}"; then
|
||||
if test x"${have_libshout_includes}" != "x"; then
|
||||
LIBSHOUT_CPPFLAGS="${LIBSHOUT_CPPFLAGS} -I${have_libshout_includes}"
|
||||
fi
|
||||
else
|
||||
if test x"${have_libshout_includes}" != "x"; then
|
||||
LIBSHOUT_CPPFLAGS="-I${have_libshout_includes}"
|
||||
else
|
||||
if test x"${want_libshout}" = "xauto" \
|
||||
-a x"${ax_check_libshout_shout_pc}" = "xyes"; then
|
||||
LIBSHOUT_CPPFLAGS="`${PKG_CONFIG} --cflags-only-I shout`"
|
||||
else
|
||||
LIBSHOUT_CPPFLAGS="-I${have_libshout_prefix}/include"
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
if test -n "${LIBSHOUT_LDFLAGS}"; then
|
||||
if test x"${have_libshout_libs}" != "x"; then
|
||||
LIBSHOUT_LDFLAGS="-L${have_libshout_libs} ${LIBSHOUT_LDFLAGS}"
|
||||
fi
|
||||
else
|
||||
if test -n "${have_libshout_libs}"; then
|
||||
LIBSHOUT_LDFLAGS="-L${have_libshout_libs}"
|
||||
else
|
||||
if test x"${want_libshout}" = "xauto" \
|
||||
-a x"${ax_check_libshout_shout_pc}" = "xyes"; then
|
||||
LIBSHOUT_LDFLAGS=" \
|
||||
`${PKG_CONFIG} --libs-only-L shout` \
|
||||
`${PKG_CONFIG} --libs-only-other shout` \
|
||||
"
|
||||
else
|
||||
LIBSHOUT_LDFLAGS="-L${have_libshout_prefix}/lib"
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
local_cv_have_lib_libshout_opts=yes
|
||||
])
|
||||
])
|
||||
|
||||
|
||||
AC_DEFUN([AX_CHECK_LIBSHOUT],
|
||||
[
|
||||
AC_REQUIRE([_AX_CHECK_LIBSHOUT_OPTS])
|
||||
AC_REQUIRE([AC_PROG_FGREP])
|
||||
AC_ARG_VAR([LIBSHOUT_LIBS],
|
||||
[libraries to use for libshout])
|
||||
if test x"${prefix}" = "xNONE"; then
|
||||
ax_check_libshout_prefix="/usr/local"
|
||||
else
|
||||
ax_check_libshout_prefix="${prefix}"
|
||||
fi
|
||||
AC_CACHE_VAL([local_cv_have_lib_libshout],
|
||||
[
|
||||
local_cv_have_lib_libshout=no
|
||||
|
||||
PKG_CONFIG_PATH="${PKG_CONFIG_PATH}:${ax_check_libshout_prefix}/lib/pkgconfig"
|
||||
if test x"${want_libshout}" != "xno"; then # want_libshout != no
|
||||
|
||||
PKG_CONFIG_PATH="${PKG_CONFIG_PATH}:${have__libshout_prefix}/lib/pkgconfig"
|
||||
if test -z "${PKG_CONFIG}"; then
|
||||
AC_MSG_ERROR([The pkg-config utility is required.], [1])
|
||||
fi
|
||||
@ -58,25 +160,13 @@ PKG_CHECK_EXISTS([shout $1], [
|
||||
dnl ##########################
|
||||
|
||||
libshout_libs_autodetect=no
|
||||
if test -z "${LIBSHOUT_CFLAGS}"; then
|
||||
LIBSHOUT_CFLAGS="`${PKG_CONFIG} --cflags-only-other shout`"
|
||||
fi
|
||||
if test -z "${LIBSHOUT_CPPFLAGS}"; then
|
||||
LIBSHOUT_CPPFLAGS="`${PKG_CONFIG} --cflags-only-I shout`"
|
||||
fi
|
||||
if test -z "${LIBSHOUT_LDFLAGS}"; then
|
||||
LIBSHOUT_LDFLAGS="\
|
||||
`${PKG_CONFIG} --libs-only-L shout` \
|
||||
`${PKG_CONFIG} --libs-only-other shout` \
|
||||
"
|
||||
fi
|
||||
if test -z "${LIBSHOUT_LIBS}"; then
|
||||
LIBSHOUT_LIBS="`${PKG_CONFIG} --libs-only-l shout`"
|
||||
libshout_libs_autodetect=yes
|
||||
fi
|
||||
|
||||
# If libshout required libm, make sure that it is listed at the end:
|
||||
if test "${libshout_libs_autodetect}" = "yes"; then
|
||||
if test x"${libshout_libs_autodetect}" = x"yes"; then
|
||||
if test -n "`echo ${LIBSHOUT_LIBS} | ${FGREP} -e ' -lm'`"; then
|
||||
xt_shout_TEMP="`echo ${LIBSHOUT_LIBS} | sed -e 's, -lm,,g'`"
|
||||
LIBSHOUT_LIBS="${xt_shout_TEMP} -lm"
|
||||
@ -123,6 +213,8 @@ dnl ####### END CHECK ########
|
||||
], [])
|
||||
dnl ##########################
|
||||
|
||||
fi # want_libshout != no
|
||||
|
||||
])
|
||||
|
||||
AC_MSG_CHECKING([for libshout $1])
|
||||
|
||||
@ -7,7 +7,7 @@ dnl # the VORBIS_CFLAGS, VORBIS_CPPFLAGS, VORBIS_LDFLAGS, LIBVORBIS_LIBS,
|
||||
dnl # LIBVORBISENC_LIBS and LIBVORBISFILE_LIBS variables accordingly.
|
||||
|
||||
|
||||
dnl # Copyright (c) 2008 Moritz Grimm <mgrimm@mrsserver.net>
|
||||
dnl # Copyright (c) 2008, 2009 Moritz Grimm <mgrimm@mrsserver.net>
|
||||
dnl #
|
||||
dnl # Permission to use, copy, modify, and distribute this software for any
|
||||
dnl # purpose with or without fee is hereby granted, provided that the above
|
||||
@ -41,6 +41,9 @@ dnl # [ACTION-IF-NOT-FOUND])
|
||||
AC_DEFUN([_AX_CHECK_VORBIS_OPTS],
|
||||
[
|
||||
AC_REQUIRE([PKG_PROG_PKG_CONFIG])
|
||||
if test -z "${PKG_CONFIG}"; then
|
||||
AC_MSG_ERROR([The pkg-config utility is required.], [1])
|
||||
fi
|
||||
AC_ARG_VAR([VORBIS_CFLAGS],
|
||||
[C compiler flags for the Vorbis libraries])
|
||||
AC_ARG_VAR([VORBIS_CPPFLAGS],
|
||||
@ -99,7 +102,11 @@ esac
|
||||
)
|
||||
AC_CACHE_VAL([local_cv_have_lib_libvorbis_opts],
|
||||
[
|
||||
if test -z "${VORBIS_CFLAGS}"; then
|
||||
ax_check_libvorbis_vorbis_pc="no"
|
||||
PKG_CONFIG_PATH="${PKG_CONFIG_PATH}:${have_libvorbis_prefix}/lib/pkgconfig"
|
||||
PKG_CHECK_EXISTS([vorbis], [ax_check_libvorbis_vorbis_pc=yes])
|
||||
if test -z "${VORBIS_CFLAGS}" \
|
||||
-a x"${ax_check_libvorbis_vorbis_pc}" = "xyes"; then
|
||||
VORBIS_CFLAGS="`${PKG_CONFIG} --cflags-only-other vorbis`"
|
||||
fi
|
||||
if test -n "${VORBIS_CPPFLAGS}"; then
|
||||
@ -110,7 +117,8 @@ else
|
||||
if test x"${have_libvorbis_includes}" != "x"; then
|
||||
VORBIS_CPPFLAGS="-I${have_libvorbis_includes}"
|
||||
else
|
||||
if test x"${want_libvorbis}" = "xauto"; then
|
||||
if test x"${want_libvorbis}" = "xauto" \
|
||||
-a x"${ax_check_libvorbis_vorbis_pc}" = "xyes"; then
|
||||
VORBIS_CPPFLAGS="`${PKG_CONFIG} --cflags-only-I vorbis`"
|
||||
else
|
||||
VORBIS_CPPFLAGS="-I${have_libvorbis_prefix}/include"
|
||||
@ -125,7 +133,8 @@ else
|
||||
if test -n "${have_libvorbis_libs}"; then
|
||||
VORBIS_LDFLAGS="-L${have_libvorbis_libs}"
|
||||
else
|
||||
if test x"${want_libvorbis}" = "xauto"; then
|
||||
if test x"${want_libvorbis}" = "xauto" \
|
||||
-a x"${ax_check_libvorbis_vorbis_pc}" = "xyes"; then
|
||||
VORBIS_LDFLAGS=" \
|
||||
`${PKG_CONFIG} --libs-only-L vorbis` \
|
||||
`${PKG_CONFIG} --libs-only-other vorbis` \
|
||||
@ -139,6 +148,7 @@ local_cv_have_lib_libvorbis_opts=yes
|
||||
])
|
||||
])
|
||||
|
||||
|
||||
AC_DEFUN([AX_CHECK_LIBVORBIS],
|
||||
[
|
||||
AC_REQUIRE([_AX_CHECK_VORBIS_OPTS])
|
||||
@ -148,7 +158,9 @@ AC_CACHE_VAL([local_cv_have_lib_libvorbis],
|
||||
[
|
||||
local_cv_have_lib_libvorbis=no
|
||||
|
||||
PKG_CONFIG_PATH="${PKG_CONFIG_PATH}:${ax_check_libogg_prefix}/lib/pkgconfig"
|
||||
if test x"${want_libvorbis}" != "xno"; then # want_libvorbis != no
|
||||
|
||||
PKG_CONFIG_PATH="${PKG_CONFIG_PATH}:${have_libvorbis_prefix}/lib/pkgconfig"
|
||||
if test -z "${PKG_CONFIG}"; then
|
||||
AC_MSG_ERROR([The pkg-config utility is required.], [1])
|
||||
fi
|
||||
@ -157,7 +169,6 @@ dnl ####### BEGIN CHECK ######
|
||||
PKG_CHECK_EXISTS([vorbis $1], [
|
||||
dnl ##########################
|
||||
|
||||
if test x"${want_libvorbis}" != "xno"; then # want_libvorbis != no
|
||||
libvorbis_libs_autodetect=no
|
||||
if test -z "${LIBVORBIS_LIBS}"; then
|
||||
LIBVORBIS_LIBS="`${PKG_CONFIG} --libs-only-l vorbis`"
|
||||
@ -210,13 +221,15 @@ CPPFLAGS="${ax_check_libvorbis_save_CPPFLAGS}"
|
||||
LDFLAGS="${ax_check_libvorbis_save_LDFLAGS}"
|
||||
LIBS="${ax_check_libvorbis_save_LIBS}"
|
||||
AC_LANG_POP([C])
|
||||
fi # want_libvorbis != no
|
||||
|
||||
dnl ####### END CHECK ########
|
||||
], [])
|
||||
dnl ##########################
|
||||
|
||||
fi # want_libvorbis != no
|
||||
|
||||
])
|
||||
|
||||
AC_MSG_CHECKING([for libvorbis $1])
|
||||
if test x"${local_cv_have_lib_libvorbis}" = "xyes"; then
|
||||
AC_MSG_RESULT([yes])
|
||||
@ -230,6 +243,7 @@ fi
|
||||
|
||||
])
|
||||
|
||||
|
||||
AC_DEFUN([AX_CHECK_LIBVORBISFILE],
|
||||
[
|
||||
AC_REQUIRE([_AX_CHECK_VORBIS_OPTS])
|
||||
@ -239,7 +253,9 @@ AC_CACHE_VAL([local_cv_have_lib_libvorbisfile],
|
||||
[
|
||||
local_cv_have_lib_libvorbisfile=no
|
||||
|
||||
PKG_CONFIG_PATH="${PKG_CONFIG_PATH}:${ax_check_libogg_prefix}/lib/pkgconfig"
|
||||
if test x"${want_libvorbis}" != "xno"; then # want_libvorbis != no
|
||||
|
||||
PKG_CONFIG_PATH="${PKG_CONFIG_PATH}:${have_libvorbis_prefix}/lib/pkgconfig"
|
||||
if test -z "${PKG_CONFIG}"; then
|
||||
AC_MSG_ERROR([The pkg-config utility is required.], [1])
|
||||
fi
|
||||
@ -248,7 +264,6 @@ dnl ####### BEGIN CHECK ######
|
||||
PKG_CHECK_EXISTS([vorbisfile $1], [
|
||||
dnl ##########################
|
||||
|
||||
if test x"${want_libvorbis}" != "xno"; then # want_libvorbis != no
|
||||
libvorbisfile_libs_autodetect=no
|
||||
if test -z "${LIBVORBISFILE_LIBS}"; then
|
||||
LIBVORBISFILE_LIBS="`${PKG_CONFIG} --libs-only-l vorbisfile`"
|
||||
@ -290,13 +305,15 @@ CPPFLAGS="${ax_check_libvorbisfile_save_CPPFLAGS}"
|
||||
LDFLAGS="${ax_check_libvorbisfile_save_LDFLAGS}"
|
||||
LIBS="${ax_check_libvorbisfile_save_LIBS}"
|
||||
AC_LANG_POP([C])
|
||||
fi # want_libvorbis != no
|
||||
|
||||
dnl ####### END CHECK ########
|
||||
], [])
|
||||
dnl ##########################
|
||||
|
||||
fi # want_libvorbis != no
|
||||
|
||||
])
|
||||
|
||||
AC_MSG_CHECKING([for libvorbisfile $1])
|
||||
if test x"${local_cv_have_lib_libvorbisfile}" = "xyes"; then
|
||||
AC_MSG_RESULT([yes])
|
||||
@ -310,6 +327,7 @@ fi
|
||||
|
||||
])
|
||||
|
||||
|
||||
AC_DEFUN([AX_CHECK_LIBVORBISENC],
|
||||
[
|
||||
AC_REQUIRE([_AX_CHECK_VORBIS_OPTS])
|
||||
@ -319,7 +337,9 @@ AC_CACHE_VAL([local_cv_have_lib_libvorbisenc],
|
||||
[
|
||||
local_cv_have_lib_libvorbisenc=no
|
||||
|
||||
PKG_CONFIG_PATH="${PKG_CONFIG_PATH}:${ax_check_libogg_prefix}/lib/pkgconfig"
|
||||
if test x"${want_libvorbis}" != "xno"; then # want_libvorbis != no
|
||||
|
||||
PKG_CONFIG_PATH="${PKG_CONFIG_PATH}:${have_libvorbis_prefix}/lib/pkgconfig"
|
||||
if test -z "${PKG_CONFIG}"; then
|
||||
AC_MSG_ERROR([The pkg-config utility is required.], [1])
|
||||
fi
|
||||
@ -328,7 +348,6 @@ dnl ####### BEGIN CHECK ######
|
||||
PKG_CHECK_EXISTS([vorbisenc $1], [
|
||||
dnl ##########################
|
||||
|
||||
if test x"${want_libvorbis}" != "xno"; then # want_libvorbis != no
|
||||
libvorbisenc_libs_autodetect=no
|
||||
if test -z "${LIBVORBISENC_LIBS}"; then
|
||||
LIBVORBISENC_LIBS="`${PKG_CONFIG} --libs-only-l vorbisenc`"
|
||||
@ -372,13 +391,15 @@ CPPFLAGS="${ax_check_libvorbisenc_save_CPPFLAGS}"
|
||||
LDFLAGS="${ax_check_libvorbisenc_save_LDFLAGS}"
|
||||
LIBS="${ax_check_libvorbisenc_save_LIBS}"
|
||||
AC_LANG_POP([C])
|
||||
fi # want_libvorbis != no
|
||||
|
||||
dnl ####### END CHECK ########
|
||||
], [])
|
||||
dnl ##########################
|
||||
|
||||
fi # want_libvorbis != no
|
||||
|
||||
])
|
||||
|
||||
AC_MSG_CHECKING([for libvorbisenc $1])
|
||||
if test x"${local_cv_have_lib_libvorbisenc}" = "xyes"; then
|
||||
AC_MSG_RESULT([yes])
|
||||
|
||||
139
m4/libxml2.m4
139
m4/libxml2.m4
@ -5,7 +5,8 @@ dnl # Provides appropriate --with configuration options, fills and substitutes
|
||||
dnl # the LIBXML2_CFLAGS, LIBXML2_CPPFLAGS, LIBXML2_LDFLAGS and LIBXML2_LIBS
|
||||
dnl # variables accordingly.
|
||||
|
||||
dnl # Copyright (c) 2008 Moritz Grimm <mgrimm@mrsserver.net>
|
||||
|
||||
dnl # Copyright (c) 2008, 2009 Moritz Grimm <mgrimm@mrsserver.net>
|
||||
dnl #
|
||||
dnl # Permission to use, copy, modify, and distribute this software for any
|
||||
dnl # purpose with or without fee is hereby granted, provided that the above
|
||||
@ -19,30 +20,135 @@ dnl # WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
|
||||
dnl # ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
|
||||
dnl # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
||||
|
||||
|
||||
dnl # For LIBXML2_CFLAGS, LIBXML2_CPPFLAGS, LIBXML2_LDFLAGS and LIBXML2_LIBS:
|
||||
dnl # AX_CHECK_LIBXML2([LIBXML2-VERSION], [ACTION-IF-FOUND],
|
||||
dnl # [ACTION-IF-NOT-FOUND])
|
||||
|
||||
AC_DEFUN([AX_CHECK_LIBXML2],
|
||||
|
||||
AC_DEFUN([_AX_CHECK_LIBXML2_OPTS],
|
||||
[
|
||||
AC_REQUIRE([PKG_PROG_PKG_CONFIG])
|
||||
if test -z "${PKG_CONFIG}"; then
|
||||
AC_MSG_ERROR([The pkg-config utility is required.], [1])
|
||||
fi
|
||||
AC_ARG_VAR([LIBXML2_CFLAGS],
|
||||
[C compiler flags for libxml2])
|
||||
AC_ARG_VAR([LIBXML2_CPPFLAGS],
|
||||
[C preprocessor flags for libxml2])
|
||||
AC_ARG_VAR([LIBXML2_LDFLAGS],
|
||||
[linker flags for libxml2])
|
||||
if test x"${prefix}" = "xNONE"; then
|
||||
have_libxml2_prefix="/usr/local"
|
||||
else
|
||||
have_libxml2_prefix="${prefix}"
|
||||
fi
|
||||
have_libxml2_includes=""
|
||||
have_libxml2_libs=""
|
||||
want_libxml2="auto"
|
||||
AC_ARG_WITH([libxml2],
|
||||
[AS_HELP_STRING([--with-libxml2=PFX],
|
||||
[prefix where the libxml2 header files and library are installed (default: autodetect)])],
|
||||
[
|
||||
case "${withval}" in
|
||||
yes)
|
||||
want_libxml2="yes"
|
||||
;;
|
||||
no)
|
||||
want_libxml2="no"
|
||||
;;
|
||||
*)
|
||||
have_libxml2_prefix="${withval}"
|
||||
want_libxml2="yes"
|
||||
;;
|
||||
esac
|
||||
]
|
||||
)
|
||||
AC_ARG_WITH([libxml2-includes],
|
||||
[AS_HELP_STRING([--with-libxml2-includes=DIR],
|
||||
[directory where libxml2 header files are installed (optional)]) ],
|
||||
[
|
||||
case "${withval}" in
|
||||
yes|no) ;;
|
||||
*)
|
||||
have_libxml2_includes="${withval}"
|
||||
;;
|
||||
esac
|
||||
]
|
||||
)
|
||||
AC_ARG_WITH([libxml2-libs],
|
||||
[AS_HELP_STRING([--with-libxml2-libs=DIR],
|
||||
[directory where libxml2 is installed (optional)]) ],
|
||||
[
|
||||
case "${withval}" in
|
||||
yes|no) ;;
|
||||
*)
|
||||
have_libxml2_libs="${withval}"
|
||||
;;
|
||||
esac
|
||||
]
|
||||
)
|
||||
AC_CACHE_VAL([local_cv_have_lib_libxml2_opts],
|
||||
[
|
||||
ax_check_libxml2_xml2_pc="no"
|
||||
PKG_CONFIG_PATH="${PKG_CONFIG_PATH}:${have_libxml2_prefix}/lib/pkgconfig"
|
||||
PKG_CHECK_EXISTS([libxml-2.0], [ax_check_libxml2_xml2_pc=yes])
|
||||
if test -z "${LIBXML2_CFLAGS}" \
|
||||
-a x"${ax_check_libxml2_xml2_pc}" = "xyes"; then
|
||||
LIBXML2_CFLAGS="`${PKG_CONFIG} --cflags-only-other libxml-2.0`"
|
||||
fi
|
||||
if test -n "${LIBXML2_CPPFLAGS}"; then
|
||||
if test x"${have_libxml2_includes}" != "x"; then
|
||||
LIBXML2_CPPFLAGS="${LIBXML2_CPPFLAGS} -I${have_libxml2_includes}"
|
||||
fi
|
||||
else
|
||||
if test x"${have_libxml2_includes}" != "x"; then
|
||||
LIBXML2_CPPFLAGS="-I${have_libxml2_includes}"
|
||||
else
|
||||
if test x"${want_libxml2}" = "xauto" \
|
||||
-a x"${ax_check_libxml2_xml2_pc}" = "xyes"; then
|
||||
LIBXML2_CPPFLAGS="`${PKG_CONFIG} --cflags-only-I libxml-2.0`"
|
||||
else
|
||||
LIBXML2_CPPFLAGS="-I${have_libxml2_prefix}/include"
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
if test -n "${LIBXML2_LDFLAGS}"; then
|
||||
if test x"${have_libxml2_libs}" != "x"; then
|
||||
LIBXML2_LDFLAGS="-L${have_libxml2_libs} ${LIBXML2_LDFLAGS}"
|
||||
fi
|
||||
else
|
||||
if test -n "${have_libxml2_libs}"; then
|
||||
LIBXML2_LDFLAGS="-L${have_libxml2_libs}"
|
||||
else
|
||||
if test x"${want_libxml2}" = "xauto" \
|
||||
-a x"${ax_check_libxml2_xml2_pc}" = "xyes"; then
|
||||
LIBXML2_LDFLAGS=" \
|
||||
`${PKG_CONFIG} --libs-only-L libxml-2.0` \
|
||||
`${PKG_CONFIG} --libs-only-other libxml-2.0` \
|
||||
"
|
||||
else
|
||||
LIBXML2_LDFLAGS="-L${have_libxml2_prefix}/lib"
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
local_cv_have_lib_libxml2_opts=yes
|
||||
])
|
||||
])
|
||||
|
||||
|
||||
AC_DEFUN([AX_CHECK_LIBXML2],
|
||||
[
|
||||
AC_REQUIRE([_AX_CHECK_LIBXML2_OPTS])
|
||||
AC_ARG_VAR([LIBXML2_LIBS],
|
||||
[libraries to use for libxml2])
|
||||
if test x"${prefix}" = "xNONE"; then
|
||||
ax_check_libxml2_prefix="/usr/local"
|
||||
else
|
||||
ax_check_libxml2_prefix="${prefix}"
|
||||
fi
|
||||
AC_CACHE_VAL([local_cv_have_lib_libxml2],
|
||||
[
|
||||
local_cv_have_lib_libxml2=no
|
||||
|
||||
PKG_CONFIG_PATH="${PKG_CONFIG_PATH}:${ax_check_libxml2_prefix}/lib/pkgconfig"
|
||||
if test x"${want_libxml2}" != "xno"; then # want_libxml2 != no
|
||||
|
||||
PKG_CONFIG_PATH="${PKG_CONFIG_PATH}:${have_libxml2_prefix}/lib/pkgconfig"
|
||||
if test -z "${PKG_CONFIG}"; then
|
||||
AC_MSG_ERROR([The pkg-config utility is required.], [1])
|
||||
fi
|
||||
@ -52,18 +158,6 @@ PKG_CHECK_EXISTS([libxml-2.0 $1], [
|
||||
dnl ##########################
|
||||
|
||||
libxml2_libs_autodetect=no
|
||||
if test -z "${LIBXML2_CFLAGS}"; then
|
||||
LIBXML2_CFLAGS="`${PKG_CONFIG} --cflags-only-other libxml-2.0`"
|
||||
fi
|
||||
if test -z "${LIBXML2_CPPFLAGS}"; then
|
||||
LIBXML2_CPPFLAGS="`${PKG_CONFIG} --cflags-only-I libxml-2.0`"
|
||||
fi
|
||||
if test -z "${LIBXML2_LDFLAGS}"; then
|
||||
LIBXML2_LDFLAGS="\
|
||||
`${PKG_CONFIG} --libs-only-L libxml-2.0` \
|
||||
`${PKG_CONFIG} --libs-only-other libxml-2.0` \
|
||||
"
|
||||
fi
|
||||
if test -z "${LIBXML2_LIBS}"; then
|
||||
LIBXML2_LIBS="`${PKG_CONFIG} --libs-only-l libxml-2.0`"
|
||||
libxml2_libs_autodetect=yes
|
||||
@ -78,7 +172,8 @@ CFLAGS="${CFLAGS} ${LIBXML2_CFLAGS}"
|
||||
CPPFLAGS="${CPPFLAGS} ${LIBXML2_CPPFLAGS}"
|
||||
LDFLAGS="${LDFLAGS} ${LIBXML2_LDFLAGS}"
|
||||
LIBS="${LIBXML2_LIBS} ${LIBS}"
|
||||
AC_CHECK_HEADERS([libxml/parser.h], [
|
||||
AC_CHECK_HEADERS([libxml/parser.h],
|
||||
[
|
||||
AC_MSG_CHECKING([if libxml2 works])
|
||||
AC_LINK_IFELSE(
|
||||
[AC_LANG_PROGRAM(
|
||||
@ -130,6 +225,8 @@ dnl ####### END CHECK ########
|
||||
], [])
|
||||
dnl ##########################
|
||||
|
||||
fi # want_libxml2 != no
|
||||
|
||||
])
|
||||
|
||||
AC_MSG_CHECKING([for libxml2 $1])
|
||||
|
||||
@ -1,24 +1,26 @@
|
||||
dnl $Id$
|
||||
dnl # $Id$
|
||||
|
||||
dnl Check whether libc defines __progname. Defines HAVE___PROGNAME, if
|
||||
dnl applicable. This check is heavily inspired by the one in OpenNTPd
|
||||
dnl (portable.)
|
||||
dnl # Check whether libc defines __progname. Defines HAVE___PROGNAME, if
|
||||
dnl # applicable. This check is heavily inspired by the one in OpenNTPd
|
||||
dnl # (portable.)
|
||||
|
||||
dnl Copyright (c) 2008 Moritz Grimm <mgrimm@mrsserver.net>
|
||||
dnl
|
||||
dnl Permission to use, copy, modify, and distribute this software for any
|
||||
dnl purpose with or without fee is hereby granted, provided that the above
|
||||
dnl copyright notice and this permission notice appear in all copies.
|
||||
dnl
|
||||
dnl THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
|
||||
dnl WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
|
||||
dnl MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
|
||||
dnl ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
|
||||
dnl WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
|
||||
dnl ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
|
||||
dnl OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
||||
dnl # Copyright (c) 2008 Moritz Grimm <mgrimm@mrsserver.net>
|
||||
dnl #
|
||||
dnl # Permission to use, copy, modify, and distribute this software for any
|
||||
dnl # purpose with or without fee is hereby granted, provided that the above
|
||||
dnl # copyright notice and this permission notice appear in all copies.
|
||||
dnl #
|
||||
dnl # THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
|
||||
dnl # WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
|
||||
dnl # MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
|
||||
dnl # ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
|
||||
dnl # WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
|
||||
dnl # ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
|
||||
dnl # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
||||
|
||||
|
||||
dnl # AX_CHECK___PROGNAME([ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
|
||||
|
||||
dnl AX_CHECK___PROGNAME([ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
|
||||
|
||||
AC_DEFUN([AX_CHECK___PROGNAME],
|
||||
[
|
||||
|
||||
48
m4/taglib.m4
48
m4/taglib.m4
@ -1,4 +1,4 @@
|
||||
dnl $Id$
|
||||
dnl # $Id$
|
||||
|
||||
dnl # Check for working installations of TagLib and its C-wrapper library,
|
||||
dnl # libtag_c.
|
||||
@ -7,12 +7,12 @@ dnl # the TAGLIB_CFLAGS, TAGLIB_CPPFLAGS, TAGLIB_LDFLAGS, TAGLIB_LIBS and
|
||||
dnl # TAGLIB_C_LIBS variables accordingly.
|
||||
|
||||
|
||||
dnl # Copyright (c) 2008 Moritz Grimm <mgrimm@mrsserver.net>
|
||||
dnl
|
||||
dnl # Copyright (c) 2008, 2009 Moritz Grimm <mgrimm@mrsserver.net>
|
||||
dnl #
|
||||
dnl # Permission to use, copy, modify, and distribute this software for any
|
||||
dnl # purpose with or without fee is hereby granted, provided that the above
|
||||
dnl # copyright notice and this permission notice appear in all copies.
|
||||
dnl
|
||||
dnl #
|
||||
dnl # THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
|
||||
dnl # WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
|
||||
dnl # MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
|
||||
@ -21,6 +21,7 @@ dnl # WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
|
||||
dnl # ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
|
||||
dnl # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
||||
|
||||
|
||||
dnl # Both check functions provide TAGLIB_CPPFLAGS and TAGLIB_LDFLAGS.
|
||||
|
||||
dnl # For TAGLIB_LIBS:
|
||||
@ -35,6 +36,9 @@ dnl # [ACTION-IF-NOT-FOUND])
|
||||
AC_DEFUN([_AX_CHECK_TAGLIB_OPTS],
|
||||
[
|
||||
AC_REQUIRE([PKG_PROG_PKG_CONFIG])
|
||||
if test -z "${PKG_CONFIG}"; then
|
||||
AC_MSG_ERROR([The pkg-config utility is required.], [1])
|
||||
fi
|
||||
AC_ARG_VAR([TAGLIB_CFLAGS],
|
||||
[C compiler flags for TagLib])
|
||||
AC_ARG_VAR([TAGLIB_CPPFLAGS],
|
||||
@ -93,7 +97,11 @@ esac
|
||||
)
|
||||
AC_CACHE_VAL([local_cv_have_lib_taglib_opts],
|
||||
[
|
||||
if test -z "${TAGLIB_CFLAGS}"; then
|
||||
ax_check_taglib_taglib_pc="no"
|
||||
PKG_CONFIG_PATH="${PKG_CONFIG_PATH}:${have_taglib_prefix}/lib/pkgconfig"
|
||||
PKG_CHECK_EXISTS([taglib], [ax_check_taglib_taglib_pc=yes])
|
||||
if test -z "${TAGLIB_CFLAGS}" \
|
||||
-a x"${ax_check_taglib_taglib_pc}" = "xyes"; then
|
||||
TAGLIB_CFLAGS="`${PKG_CONFIG} --cflags-only-other taglib`"
|
||||
fi
|
||||
if test -n "${TAGLIB_CPPFLAGS}"; then
|
||||
@ -104,7 +112,8 @@ else
|
||||
if test x"${have_taglib_includes}" != "x"; then
|
||||
TAGLIB_CPPFLAGS="-I${have_taglib_includes}"
|
||||
else
|
||||
if test x"${want_taglib}" = "xauto"; then
|
||||
if test x"${want_taglib}" = "xauto" \
|
||||
-a x"${ax_check_taglib_taglib_pc}" = "xyes"; then
|
||||
TAGLIB_CPPFLAGS="`${PKG_CONFIG} --cflags-only-I taglib`"
|
||||
else
|
||||
TAGLIB_CPPFLAGS="-I${have_taglib_prefix}/include/taglib"
|
||||
@ -119,7 +128,8 @@ else
|
||||
if test -n "${have_taglib_libs}"; then
|
||||
TAGLIB_LDFLAGS="-L${have_taglib_libs}"
|
||||
else
|
||||
if test x"${want_taglib}" = "xauto"; then
|
||||
if test x"${want_taglib}" = "xauto" \
|
||||
-a x"${ax_check_taglib_taglib_pc}" = "xyes"; then
|
||||
TAGLIB_LDFLAGS=" \
|
||||
`${PKG_CONFIG} --libs-only-L taglib` \
|
||||
`${PKG_CONFIG} --libs-only-other taglib` \
|
||||
@ -133,6 +143,7 @@ local_cv_have_lib_taglib_opts=yes
|
||||
])
|
||||
])
|
||||
|
||||
|
||||
AC_DEFUN([AX_CHECK_TAGLIB],
|
||||
[
|
||||
AC_REQUIRE([_AX_CHECK_TAGLIB_OPTS])
|
||||
@ -142,6 +153,8 @@ AC_CACHE_VAL([local_cv_have_lib_taglib],
|
||||
[
|
||||
local_cv_have_lib_taglib=no
|
||||
|
||||
if test x"${want_taglib}" != "xno"; then # want_taglib != no
|
||||
|
||||
PKG_CONFIG_PATH="${PKG_CONFIG_PATH}:${have_taglib_prefix}/lib/pkgconfig"
|
||||
if test -z "${PKG_CONFIG}"; then
|
||||
AC_MSG_ERROR([The pkg-config utility is required.], [1])
|
||||
@ -151,16 +164,18 @@ dnl ####### BEGIN CHECK ######
|
||||
PKG_CHECK_EXISTS([taglib $1], [
|
||||
dnl ##########################
|
||||
|
||||
if test x"${want_taglib}" != "xno"; then # want_taglib != no
|
||||
libtag_libs_autodetected=no
|
||||
if test -z "${TAGLIB_LIBS}"; then
|
||||
TAGLIB_LIBS="`${PKG_CONFIG} --libs-only-l taglib`"
|
||||
libtag_libs_autodetected=yes
|
||||
fi
|
||||
|
||||
ax_check_taglib_save_CXXFLAGS="${CXXFLAGS}"
|
||||
ax_check_taglib_save_CPPFLAGS="${CPPFLAGS}"
|
||||
ax_check_taglib_save_LDFLAGS="${LDFLAGS}"
|
||||
ax_check_taglib_save_LIBS="${LIBS}"
|
||||
AC_LANG_PUSH([C++])
|
||||
CXXFLAGS="${CXXFLAGS} ${TAGLIB_CFLAGS}"
|
||||
CPPFLAGS="${CPPFLAGS} ${TAGLIB_CPPFLAGS}"
|
||||
LDFLAGS="${LDFLAGS} ${TAGLIB_LDFLAGS}"
|
||||
LIBS="${TAGLIB_LIBS} ${LIBS}"
|
||||
@ -207,17 +222,20 @@ AC_CHECK_HEADER([tag.h],
|
||||
]
|
||||
)
|
||||
])
|
||||
CXXFLAGS="${ax_check_taglib_save_CXXFLAGS}"
|
||||
CPPFLAGS="${ax_check_taglib_save_CPPFLAGS}"
|
||||
LDFLAGS="${ax_check_taglib_save_LDFLAGS}"
|
||||
LIBS="${ax_check_taglib_save_LIBS}"
|
||||
AC_LANG_POP([C++])
|
||||
fi # want_taglib != no
|
||||
|
||||
dnl ####### END CHECK ########
|
||||
], [])
|
||||
dnl ##########################
|
||||
|
||||
fi # want_taglib != no
|
||||
|
||||
])
|
||||
|
||||
AC_MSG_CHECKING([for TagLib])
|
||||
if test x"${local_cv_have_lib_taglib}" = "xyes"; then
|
||||
AC_MSG_RESULT([yes])
|
||||
@ -230,6 +248,7 @@ else
|
||||
fi
|
||||
])
|
||||
|
||||
|
||||
AC_DEFUN([AX_CHECK_TAGLIB_C],
|
||||
[
|
||||
AC_REQUIRE([_AX_CHECK_TAGLIB_OPTS])
|
||||
@ -239,6 +258,8 @@ AC_CACHE_VAL([local_cv_have_lib_taglib_c],
|
||||
[
|
||||
local_cv_have_lib_taglib_c=no
|
||||
|
||||
if test x"${want_taglib}" != "xno"; then # want_taglib != no
|
||||
|
||||
PKG_CONFIG_PATH="${PKG_CONFIG_PATH}:${have_taglib_prefix}/lib/pkgconfig"
|
||||
if test -z "${PKG_CONFIG}"; then
|
||||
AC_MSG_ERROR([The pkg-config utility is required.], [1])
|
||||
@ -248,14 +269,16 @@ dnl ####### BEGIN CHECK ######
|
||||
PKG_CHECK_EXISTS([taglib $1], [
|
||||
dnl ##########################
|
||||
|
||||
if test x"${want_taglib}" != "xno"; then # want_taglib != no
|
||||
if test -z "${TAGLIB_C_LIBS}"; then
|
||||
TAGLIB_C_LIBS="-ltag_c"
|
||||
fi
|
||||
|
||||
ax_check_taglib_c_save_CFLAGS="${CFLAGS}"
|
||||
ax_check_taglib_c_save_CPPFLAGS="${CPPFLAGS}"
|
||||
ax_check_taglib_c_save_LDFLAGS="${LDFLAGS}"
|
||||
ax_check_taglib_c_save_LIBS="${LIBS}"
|
||||
AC_LANG_PUSH([C])
|
||||
CFLAGS="${CFLAGS} ${TAGLIB_CFLAGS}"
|
||||
CPPFLAGS="${CPPFLAGS} ${TAGLIB_CPPFLAGS}"
|
||||
LDFLAGS="${LDFLAGS} ${TAGLIB_LDFLAGS}"
|
||||
LIBS="${TAGLIB_C_LIBS} ${LIBS}"
|
||||
@ -300,17 +323,20 @@ AC_CHECK_HEADER([tag_c.h],
|
||||
]
|
||||
)
|
||||
])
|
||||
CFLAGS="${ax_check_taglib_c_save_CFLAGS}"
|
||||
CPPFLAGS="${ax_check_taglib_c_save_CPPFLAGS}"
|
||||
LDFLAGS="${ax_check_taglib_c_save_LDFLAGS}"
|
||||
LIBS="${ax_check_taglib_c_save_LIBS}"
|
||||
AC_LANG_POP([C])
|
||||
fi # want_taglib != no
|
||||
|
||||
dnl ####### END CHECK ########
|
||||
], [])
|
||||
dnl ##########################
|
||||
|
||||
fi # want_taglib != no
|
||||
|
||||
])
|
||||
|
||||
AC_MSG_CHECKING([for libtag_c])
|
||||
if test x"${local_cv_have_lib_taglib_c}" = "xyes"; then
|
||||
AC_MSG_RESULT([yes])
|
||||
|
||||
38
m4/tree.m4
38
m4/tree.m4
@ -1,24 +1,26 @@
|
||||
dnl $Id$
|
||||
dnl # $Id$
|
||||
|
||||
dnl Check for sys/tree.h and if it is recent enough by looking at a certain
|
||||
dnl macro. Defines HAVE_SYS_TREE_H if all conditions are met.
|
||||
dnl # Check for sys/tree.h and if it is recent enough by looking at a certain
|
||||
dnl # macro. Defines HAVE_SYS_TREE_H if all conditions are met.
|
||||
|
||||
dnl Copyright (c) 2008 Moritz Grimm <mgrimm@mrsserver.net>
|
||||
dnl
|
||||
dnl Permission to use, copy, modify, and distribute this software for any
|
||||
dnl purpose with or without fee is hereby granted, provided that the above
|
||||
dnl copyright notice and this permission notice appear in all copies.
|
||||
dnl
|
||||
dnl THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
|
||||
dnl WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
|
||||
dnl MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
|
||||
dnl ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
|
||||
dnl WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
|
||||
dnl ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
|
||||
dnl OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
||||
dnl # Copyright (c) 2008 Moritz Grimm <mgrimm@mrsserver.net>
|
||||
dnl #
|
||||
dnl # Permission to use, copy, modify, and distribute this software for any
|
||||
dnl # purpose with or without fee is hereby granted, provided that the above
|
||||
dnl # copyright notice and this permission notice appear in all copies.
|
||||
dnl #
|
||||
dnl # THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
|
||||
dnl # WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
|
||||
dnl # MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
|
||||
dnl # ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
|
||||
dnl # WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
|
||||
dnl # ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
|
||||
dnl # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
||||
|
||||
|
||||
dnl # AX_HEADER_TREE([REQUIRED-MACRO], [ACTION-IF-FOUND],
|
||||
dnl # [ACTION-IF-NOT-FOUND])
|
||||
|
||||
dnl AX_HEADER_TREE([REQUIRED-MACRO], [ACTION-IF-FOUND],
|
||||
dnl [ACTION-IF-NOT-FOUND])
|
||||
|
||||
AC_DEFUN([AX_HEADER_TREE],
|
||||
[
|
||||
|
||||
39
m4/vacopy.m4
39
m4/vacopy.m4
@ -1,24 +1,27 @@
|
||||
dnl $Id$
|
||||
dnl # $Id$
|
||||
|
||||
dnl Check for means to copy variable argument lists. After this check,
|
||||
dnl va_copy will at least be defined to something working.
|
||||
dnl This requires stdarg.h, which is assumed to exist.
|
||||
dnl # Check for means to copy variable argument lists. After this check,
|
||||
dnl # va_copy will at least be defined to something working.
|
||||
dnl # This requires stdarg.h, which is assumed to exist.
|
||||
|
||||
dnl Copyright (c) 2008 Moritz Grimm <mgrimm@mrsserver.net>
|
||||
dnl
|
||||
dnl Permission to use, copy, modify, and distribute this software for any
|
||||
dnl purpose with or without fee is hereby granted, provided that the above
|
||||
dnl copyright notice and this permission notice appear in all copies.
|
||||
dnl
|
||||
dnl THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
|
||||
dnl WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
|
||||
dnl MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
|
||||
dnl ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
|
||||
dnl WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
|
||||
dnl ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
|
||||
dnl OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
||||
|
||||
dnl AX_FUNC_VA_COPY
|
||||
dnl # Copyright (c) 2008 Moritz Grimm <mgrimm@mrsserver.net>
|
||||
dnl #
|
||||
dnl # Permission to use, copy, modify, and distribute this software for any
|
||||
dnl # purpose with or without fee is hereby granted, provided that the above
|
||||
dnl # copyright notice and this permission notice appear in all copies.
|
||||
dnl #
|
||||
dnl # THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
|
||||
dnl # WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
|
||||
dnl # MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
|
||||
dnl # ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
|
||||
dnl # WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
|
||||
dnl # ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
|
||||
dnl # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
||||
|
||||
|
||||
dnl # AX_FUNC_VA_COPY
|
||||
|
||||
|
||||
AC_DEFUN([AX_FUNC_VA_COPY],
|
||||
[
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
dnl $Id$
|
||||
dnl # $Id$
|
||||
|
||||
dnl # Append or prepend items to a variable, but keep the items in the
|
||||
dnl # variable unique.
|
||||
@ -7,7 +7,7 @@ dnl # by Karl Heyes of the Icecast project, in action. The end result turned
|
||||
dnl # out to be quite similar ...
|
||||
|
||||
|
||||
dnl # Copyright (c) 2008 Moritz Grimm <mgrimm@mrsserver.net>
|
||||
dnl # Copyright (c) 2008, 2009 Moritz Grimm <mgrimm@mrsserver.net>
|
||||
dnl #
|
||||
dnl # Permission to use, copy, modify, and distribute this software for any
|
||||
dnl # purpose with or without fee is hereby granted, provided that the above
|
||||
@ -41,6 +41,7 @@ do
|
||||
done
|
||||
])
|
||||
|
||||
|
||||
AC_DEFUN([AX_UNIQVAR_PREPEND],
|
||||
[
|
||||
AC_REQUIRE([AC_PROG_FGREP])
|
||||
|
||||
Loading…
Reference in New Issue
Block a user