[vlc-devel] commit: Use eval to call programs (Christophe Mutricy )
git version control
git at videolan.org
Fri Dec 11 22:00:57 CET 2009
vlc | branch: 1.0-bugfix | Christophe Mutricy <xtophe at videolan.org> | Mon Oct 26 12:20:03 2009 +0100| [eb2ea62e87c0920c20dbaf3c3683712546b1199d] | committer: Pierre Ynard
Use eval to call programs
Else we have troubles executing $FOO when FOO=prog --some-options
Should fix [5d6f80f267]
(cherry picked from commit a15d8784547b5bcc637cb0238e87ba4185b8836d)
Signed-off-by: Pierre Ynard <linkfanel at yahoo.fr>
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=eb2ea62e87c0920c20dbaf3c3683712546b1199d
---
configure.ac | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/configure.ac b/configure.ac
index 7ca409b..3d4b863 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5083,12 +5083,12 @@ AS_IF([test "${enable_qt4}" != "no"], [
], [
VLC_ADD_LIBS([qt4],[$QT4_LIBS])
])
- QT4LOCALEDIR="$($PKG_CONFIG --variable=prefix QtCore)/share/qt4/translations/"
+ QT4LOCALEDIR="$(eval $PKG_CONFIG --variable=prefix QtCore)/share/qt4/translations/"
AC_SUBST(QT4LOCALEDIR)
VLC_ADD_CXXFLAGS([qt4],[$QT4_CFLAGS -DQT4LOCALEDIR=\\\\\\\"${QT4LOCALEDIR}\\\\\\\"])
- AC_PATH_PROGS(MOC, [moc-qt4 moc], moc,`$PKG_CONFIG --variable=exec_prefix QtCore`/bin)
- AC_PATH_PROG(RCC, rcc, rcc,`$PKG_CONFIG --variable=exec_prefix QtCore`/bin)
- AC_PATH_PROGS(UIC, [uic-qt4 uic], uic,`$PKG_CONFIG --variable=exec_prefix QtCore`/bin)
+ AC_PATH_PROGS(MOC, [moc-qt4 moc], moc,`eval $PKG_CONFIG --variable=exec_prefix QtCore`/bin)
+ AC_PATH_PROG(RCC, rcc, rcc,`eval $PKG_CONFIG --variable=exec_prefix QtCore`/bin)
+ AC_PATH_PROGS(UIC, [uic-qt4 uic], uic,`eval $PKG_CONFIG --variable=exec_prefix QtCore`/bin)
], [
AS_IF([test "${enable_qt4}" = "yes"],[
AC_MSG_ERROR([Qt 4 library not found])
@@ -5639,8 +5639,8 @@ then
echo "Using $i.pc files." >&5
echo "Using $i.pc files." >&6
found=1
- MOZILLA_CFLAGS=$( $PKG_CONFIG --cflags "$i" )
- MOZILLA_LIBS=$( $PKG_CONFIG --libs "$i" )
+ MOZILLA_CFLAGS=$(eval $PKG_CONFIG --cflags "$i" )
+ MOZILLA_LIBS=$(eval $PKG_CONFIG --libs "$i" )
break
fi
done
More information about the vlc-devel
mailing list