66 lines
3.0 KiB
Diff
66 lines
3.0 KiB
Diff
|
From 83b4f84b1c490b9bb816e1ecbc743d80d48cc06d Mon Sep 17 00:00:00 2001
|
||
|
|
From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
|
||
|
|
Date: Tue, 18 Dec 2012 12:05:22 +0100
|
||
|
|
Subject: [PATCH] Fix bashism in configure script.
|
||
|
|
|
||
|
|
The configure script uses +=, which is not POSIX. Debians that
|
||
|
|
have the default dash as /bin/sh define a variable ending with
|
||
|
|
+ instead of appending to it.
|
||
|
|
|
||
|
|
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
|
||
|
|
---
|
||
|
|
configure.ac | 22 +++++++++++-----------
|
||
|
|
1 file changed, 11 insertions(+), 11 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/configure.ac b/configure.ac
|
||
|
|
index 5968eb6..1a31a06 100755
|
||
|
|
--- a/configure.ac
|
||
|
|
+++ b/configure.ac
|
||
|
|
@@ -60,10 +60,10 @@ AC_DEFUN([CHECK_DISABLE_FEATURE],
|
||
|
|
[use_[$1]=yes])
|
||
|
|
if test "$use_[$1]" = "yes"; then
|
||
|
|
SAVE_CPPFLAGS="$CPPFLAGS"
|
||
|
|
- CPPFLAGS=`$PKG_CONFIG --cflags libfslaudiocodec`
|
||
|
|
- CPPFLAGS+=`$PKG_CONFIG --cflags libfslvideocodec`
|
||
|
|
- CPPFLAGS+=`$PKG_CONFIG --cflags libfslparser`
|
||
|
|
- CPPFLAGS+=`$PKG_CONFIG --cflags libfslvpuwrap`
|
||
|
|
+ CPPFLAGS="$CPPFLAGS `$PKG_CONFIG --cflags libfslaudiocodec`"
|
||
|
|
+ CPPFLAGS="$CPPFLAGS `$PKG_CONFIG --cflags libfslvideocodec`"
|
||
|
|
+ CPPFLAGS="$CPPFLAGS `$PKG_CONFIG --cflags libfslparser`"
|
||
|
|
+ CPPFLAGS="$CPPFLAGS `$PKG_CONFIG --cflags libfslvpuwrap`"
|
||
|
|
AC_CHECK_HEADERS([$4], HAVE_[$3]=yes, HAVE_[$3]=no && break)
|
||
|
|
CPPFLAGS="$SAVE_CPPFLAGS"
|
||
|
|
if test "x$HAVE_[$3]" = "xyes"; then
|
||
|
|
@@ -157,7 +157,7 @@ AC_SUBST(GST_PLUGINS_BASE_LIBS)
|
||
|
|
AC_CHECK_HEADERS([vpu_lib.h], [HAVE_VPU_LIB=yes], [HAVE_VPU_LIB=no])
|
||
|
|
if test "x$HAVE_VPU_LIB" = "xyes"; then
|
||
|
|
VPU_LIBS=`$PKG_CONFIG --libs libfslvpuwrap 2>/dev/null`
|
||
|
|
- VPU_LIBS+=" -lvpu"
|
||
|
|
+ VPU_LIBS="$VPU_LIBS -lvpu"
|
||
|
|
fi
|
||
|
|
AC_SUBST(VPU_LIBS)
|
||
|
|
|
||
|
|
@@ -173,15 +173,15 @@ AC_SUBST(IPU_CFLAGS)
|
||
|
|
AC_SUBST(IPU_LIBS)
|
||
|
|
|
||
|
|
FSL_MM_CORE_CFLAGS=`$PKG_CONFIG --cflags libfslaudiocodec 2>/dev/null`
|
||
|
|
-FSL_MM_CORE_CFLAGS+=`$PKG_CONFIG --cflags libfslvideocodec 2>/dev/null`
|
||
|
|
-FSL_MM_CORE_CFLAGS+=`$PKG_CONFIG --cflags libfslparser 2>/dev/null`
|
||
|
|
-FSL_MM_CORE_CFLAGS+=`$PKG_CONFIG --cflags libfslvpuwrap 2>/dev/null`
|
||
|
|
+FSL_MM_CORE_CFLAGS="$FSL_MM_CORE_CFLAGS `$PKG_CONFIG --cflags libfslvideocodec 2>/dev/null`"
|
||
|
|
+FSL_MM_CORE_CFLAGS="$FSL_MM_CORE_CFLAGS `$PKG_CONFIG --cflags libfslparser 2>/dev/null`"
|
||
|
|
+FSL_MM_CORE_CFLAGS="$FSL_MM_CORE_CFLAGS `$PKG_CONFIG --cflags libfslvpuwrap 2>/dev/null`"
|
||
|
|
AC_SUBST(FSL_MM_CORE_CFLAGS)
|
||
|
|
|
||
|
|
FSL_MM_CORE_LIBS=`$PKG_CONFIG --libs libfslaudiocodec 2>/dev/null`
|
||
|
|
-FSL_MM_CORE_LIBS+=`$PKG_CONFIG --libs libfslvideocodec 2>/dev/null`
|
||
|
|
-FSL_MM_CORE_LIBS+=`$PKG_CONFIG --libs libfslparser 2>/dev/null`
|
||
|
|
-FSL_MM_CORE_LIBS+=`$PKG_CONFIG --libs libfslvpuwrap 2>/dev/null`
|
||
|
|
+FSL_MM_CORE_LIBS="$FSL_MM_CORE_LIBS `$PKG_CONFIG --libs libfslvideocodec 2>/dev/null`"
|
||
|
|
+FSL_MM_CORE_LIBS="$FSL_MM_CORE_LIBS `$PKG_CONFIG --libs libfslparser 2>/dev/null`"
|
||
|
|
+FSL_MM_CORE_LIBS="$FSL_MM_CORE_LIBS `$PKG_CONFIG --libs libfslvpuwrap 2>/dev/null`"
|
||
|
|
AC_SUBST(FSL_MM_CORE_LIBS)
|
||
|
|
|
||
|
|
EXTRAPLATFORMCFLAGS="-DARM -D_GNUC_"
|
||
|
|
--
|