aboutsummaryrefslogtreecommitdiffstats
path: root/m4/libFLAC.m4
diff options
context:
space:
mode:
authorEnrico Weigelt <weigelt@metux.de>2008-10-15 20:39:46 +0200
committerMax Kellermann <max@duempel.org>2008-10-15 20:39:46 +0200
commit30cd3455812b5a839552d5a0f6fa87a99f09c46a (patch)
tree5ec18adc6e0d31e9f9269428f6c247fa3b7526ac /m4/libFLAC.m4
parent047043d2a8ee4482a845ed9860dbf4cd01540eef (diff)
downloadmpd-30cd3455812b5a839552d5a0f6fa87a99f09c46a.tar.gz
mpd-30cd3455812b5a839552d5a0f6fa87a99f09c46a.tar.xz
mpd-30cd3455812b5a839552d5a0f6fa87a99f09c46a.zip
fixing several imports to work via pkg-config
This patch fixes several imports to use pkg-config instead of certain esoteric tests.
Diffstat (limited to '')
-rw-r--r--m4/libFLAC.m4104
1 files changed, 0 insertions, 104 deletions
diff --git a/m4/libFLAC.m4 b/m4/libFLAC.m4
deleted file mode 100644
index 8f111b2fa..000000000
--- a/m4/libFLAC.m4
+++ /dev/null
@@ -1,104 +0,0 @@
-# Configure paths for libFLAC
-# "Inspired" by ogg.m4
-
-dnl AM_PATH_LIBFLAC([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
-dnl Test for libFLAC, and define LIBFLAC_CFLAGS and LIBFLAC_LIBS
-dnl
-AC_DEFUN([AM_PATH_LIBFLAC],
-[dnl
-dnl Get the cflags and libraries
-dnl
-AC_ARG_WITH(libFLAC,[ --with-libFLAC=PFX Prefix where libFLAC is installed (optional)], libFLAC_prefix="$withval", libFLAC_prefix="")
-AC_ARG_WITH(libFLAC-libraries,[ --with-libFLAC-libraries=DIR Directory where libFLAC library is installed (optional)], libFLAC_libraries="$withval", libFLAC_libraries="")
-AC_ARG_WITH(libFLAC-includes,[ --with-libFLAC-includes=DIR Directory where libFLAC header files are installed (optional)], libFLAC_includes="$withval", libFLAC_includes="")
-AC_ARG_ENABLE(libFLACtest, [ --disable-libFLACtest Do not try to compile and run a test libFLAC program],, enable_libFLACtest=yes)
-
- if test "x$libFLAC_libraries" != "x" ; then
- LIBFLAC_LIBS="-L$libFLAC_libraries"
- elif test "x$libFLAC_prefix" != "x" ; then
- LIBFLAC_LIBS="-L$libFLAC_prefix/lib"
- elif test "x$prefix" != "xNONE" ; then
- LIBFLAC_LIBS="-L$libdir"
- fi
-
- LIBFLAC_LIBS="$LIBFLAC_LIBS -lFLAC -lm"
-
- if test "x$libFLAC_includes" != "x" ; then
- LIBFLAC_CFLAGS="-I$libFLAC_includes"
- elif test "x$libFLAC_prefix" != "x" ; then
- LIBFLAC_CFLAGS="-I$libFLAC_prefix/include"
- elif test "$prefix" != "xNONE"; then
- LIBFLAC_CFLAGS="-I$libdir"
- fi
-
- AC_MSG_CHECKING(for libFLAC)
- no_libFLAC=""
-
-
- if test "x$enable_libFLACtest" = "xyes" ; then
- ac_save_CFLAGS="$CFLAGS"
- ac_save_CXXFLAGS="$CXXFLAGS"
- ac_save_LIBS="$LIBS"
- CFLAGS="$CFLAGS $LIBFLAC_CFLAGS"
- CXXFLAGS="$CXXFLAGS $LIBFLAC_CFLAGS"
- LIBS="$LIBS $LIBFLAC_LIBS"
-dnl
-dnl Now check if the installed libFLAC is sufficiently new.
-dnl
- rm -f conf.libFLACtest
- AC_TRY_RUN([
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <FLAC/format.h>
-
-int main ()
-{
- system("touch conf.libFLACtest");
- return 0;
-}
-
-],, no_libFLAC=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
- CFLAGS="$ac_save_CFLAGS"
- LIBS="$ac_save_LIBS"
- fi
-
- if test "x$no_libFLAC" = "x" ; then
- AC_MSG_RESULT(yes)
- ifelse([$1], , :, [$1])
- else
- AC_MSG_RESULT(no)
- if test -f conf.libFLACtest ; then
- :
- else
- echo "*** Could not run libFLAC test program, checking why..."
- CFLAGS="$CFLAGS $LIBFLAC_CFLAGS"
- LIBS="$LIBS $LIBFLAC_LIBS"
- AC_TRY_LINK([
-#include <stdio.h>
-#include <FLAC/format.h>
-], [ return 0; ],
- [ echo "*** The test program compiled, but did not run. This usually means"
- echo "*** that the run-time linker is not finding libFLAC or finding the wrong"
- echo "*** version of libFLAC. If it is not finding libFLAC, you'll need to set your"
- echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
- echo "*** to the installed location Also, make sure you have run ldconfig if that"
- echo "*** is required on your system"
- echo "***"
- echo "*** If you have an old version installed, it is best to remove it, although"
- echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"],
- [ echo "*** The test program failed to compile or link. See the file config.log for the"
- echo "*** exact error that occured. This usually means libFLAC was incorrectly installed"
- echo "*** or that you have moved libFLAC since it was installed. In the latter case, you"
- echo "*** may want to edit the libFLAC-config script: $LIBFLAC_CONFIG" ])
- CFLAGS="$ac_save_CFLAGS"
- LIBS="$ac_save_LIBS"
- fi
- LIBFLAC_CFLAGS=""
- LIBFLAC_LIBS=""
- ifelse([$2], , :, [$2])
- fi
- AC_SUBST(LIBFLAC_CFLAGS)
- AC_SUBST(LIBFLAC_LIBS)
- rm -f conf.libFLACtest
-])