[gst-devel] [PATCH] fix search path for libFLAC
Lauri Myllari
lauri.myllari+gstreamer-devel at movial.fi
Fri Sep 8 14:38:49 CEST 2006
Attached is a patch against gst-plugins-good-0.10.4 (applies also to
CVS). It allows you to install FLAC to any prefix and use --with-libFLAC
on gst-plugins-good configure.
I've copied libFLAC.m4 from flac-1.1.2, added AM_PATH_LIBFLAC to
configure.ac and changed ext/flac/Makefile.am to use LIBFLAC_LIBS and
LIBFLAC_CFLAGS.
--rez
-------------- next part --------------
--- gst-plugins-good-0.10.4-orig/m4/libFLAC.m4 1970-01-01 02:00:00.000000000 +0200
+++ gst-plugins-good-0.10.4/m4/libFLAC.m4 2006-09-08 14:38:23.000000000 +0300
@@ -0,0 +1,104 @@
+# 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$prefix/include"
+ 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
+])
--- gst-plugins-good-0.10.4-orig/configure.ac 2006-08-14 12:19:48.000000000 +0300
+++ gst-plugins-good-0.10.4/configure.ac 2006-09-08 14:35:43.000000000 +0300
@@ -476,15 +476,21 @@
dnl *** FLAC ***
translit(dnm, m, l) AM_CONDITIONAL(USE_FLAC, true)
GST_CHECK_FEATURE(FLAC, [FLAC lossless audio], flac, [
- GST_CHECK_LIBHEADER(FLAC, FLAC, FLAC__seekable_stream_encoder_new, -lm, FLAC/all.h, FLAC_LIBS="-lFLAC -lm")
- dnl API change in FLAC 1.1.1, so require that...
- if test x$HAVE_FLAC = xyes; then
+ AM_PATH_LIBFLAC([
+ OLD_LIBS="$LIBS"
+ OLD_FLAGS="$CFLAGS"
+ LIBS="$LIBS $LIBFLAC_LIBS"
+ CFLAGS="$CFLAGS $LIBFLAC_CFLAGS"
+ dnl API change in FLAC 1.1.1, so require that...
AC_CHECK_DECL(FLAC__SEEKABLE_STREAM_ENCODER_TELL_ERROR,
HAVE_FLAC="yes", HAVE_FLAC="no", [
#include <FLAC/seekable_stream_encoder.h>
])
- fi
- AC_SUBST(FLAC_LIBS)
+ LIBS="$OLD_LIBS"
+ CFLAGS="$OLD_CFLAGS"
+ AC_SUBST(LIBFLAC_LIBS)
+ AC_SUBST(LIBFLAC_CFLAGS)
+ ])
])
dnl *** GConf ***
--- gst-plugins-good-0.10.4-orig/ext/flac/Makefile.am 2006-08-08 13:27:27.000000000 +0300
+++ gst-plugins-good-0.10.4/ext/flac/Makefile.am 2006-09-08 14:41:29.000000000 +0300
@@ -1,10 +1,10 @@
plugin_LTLIBRARIES = libgstflac.la
libgstflac_la_SOURCES = gstflac.c gstflacdec.c gstflacenc.c
-libgstflac_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS)
+libgstflac_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(LIBFLAC_CFLAGS)
libgstflac_la_LIBADD = \
$(GST_PLUGINS_BASE_LIBS) -lgsttag-$(GST_MAJORMINOR) \
- $(GST_BASE_LIBS) $(GST_LIBS) $(FLAC_LIBS)
+ $(GST_BASE_LIBS) $(GST_LIBS) $(LIBFLAC_LIBS)
libgstflac_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
noinst_HEADERS = gstflacenc.h gstflacdec.h
More information about the gstreamer-devel
mailing list