--
Best regards,
Heiko Becker
>From bcc6f8f709724c91a568cc596af8424b38aaad44 Mon Sep 17 00:00:00 2001
From: Heiko Becker <heire...@exherbo.org>
Date: Thu, 2 Apr 2015 11:29:04 +0200
Subject: [PATCH] Use env var ${PKG_CONFIG} instead of hard coding pkg-config
---
configure | 2 ++
src/examples/Makefile | 4 ++--
src/modules/avformat/Makefile | 4 ++--
src/modules/avformat/configure | 30 +++++++++++++++---------------
src/modules/dv/Makefile | 4 ++--
src/modules/dv/configure | 2 +-
src/modules/frei0r/Makefile | 4 ++--
src/modules/frei0r/configure | 2 +-
src/modules/gtk2/Makefile | 14 +++++++-------
src/modules/gtk2/configure | 12 ++++++------
src/modules/jackrack/Makefile | 12 ++++++------
src/modules/jackrack/configure | 6 +++---
src/modules/kino/Makefile | 10 +++++-----
src/modules/kino/configure | 4 ++--
src/modules/opengl/Makefile | 10 +++++-----
src/modules/opengl/configure | 2 +-
src/modules/qt/configure | 28 ++++++++++++++--------------
src/modules/resample/Makefile | 4 ++--
src/modules/resample/configure | 2 +-
src/modules/rtaudio/Makefile | 4 ++--
src/modules/sox/configure | 8 ++++----
src/modules/swfdec/configure | 18 +++++++++---------
src/modules/vid.stab/Makefile | 4 ++--
src/modules/vid.stab/configure | 6 +++---
src/modules/vorbis/Makefile | 8 ++++----
src/modules/vorbis/configure | 2 +-
src/modules/xml/Makefile | 4 ++--
src/modules/xml/configure | 2 +-
28 files changed, 107 insertions(+), 105 deletions(-)
diff --git a/configure b/configure
index f6656f0..5303be5 100755
--- a/configure
+++ b/configure
@@ -147,6 +147,8 @@ build_config()
echo export prefix=$prefix
echo export libdir=$libdir
echo export bindir=$prefix/bin
+ [ -z ${PKG_CONFIG} ] && PKG_CONFIG="pkg-config"
+ echo export PKG_CONFIG="${PKG_CONFIG}"
) >> mlt-config
cat < mlt-config-template >> mlt-config
diff --git a/src/examples/Makefile b/src/examples/Makefile
index 0fabce8..b4d99a7 100644
--- a/src/examples/Makefile
+++ b/src/examples/Makefile
@@ -1,5 +1,5 @@
-CXXFLAGS += -Wall -g $(shell pkg-config mlt++ --cflags)
-LDFLAGS += $(shell pkg-config mlt++ --libs)
+CXXFLAGS += -Wall -g $(shell ${PKG_CONFIG} mlt++ --cflags)
+LDFLAGS += $(shell ${PKG_CONFIG} mlt++ --libs)
CC=c++
all: play
diff --git a/src/modules/avformat/Makefile b/src/modules/avformat/Makefile
index 845cdce..c13c2f2 100644
--- a/src/modules/avformat/Makefile
+++ b/src/modules/avformat/Makefile
@@ -23,8 +23,8 @@ CFLAGS += -DFILTERS
endif
ifdef VDPAU
-CFLAGS += -DVDPAU $(shell pkg-config pkg-config --cflags x11)
-LDFLAGS += $(LIBDL) $(shell pkg-config pkg-config --libs x11)
+CFLAGS += -DVDPAU $(shell ${PKG_CONFIG} pkg-config --cflags x11)
+LDFLAGS += $(LIBDL) $(shell ${PKG_CONFIG} pkg-config --libs x11)
endif
ifdef CODECS
diff --git a/src/modules/avformat/configure b/src/modules/avformat/configure
index 158000e..570b567 100755
--- a/src/modules/avformat/configure
+++ b/src/modules/avformat/configure
@@ -60,7 +60,7 @@ else
export filters=true
export devices=true
export vdpau=false
- pkg-config x11 > /dev/null 2>&1
+ ${PKG_CONFIG} x11 > /dev/null 2>&1
export x11=$?
for i in "$@"
@@ -78,7 +78,7 @@ else
esac
done
- : ${shared_ffmpeg:=$(pkg-config --variable=prefix libavformat${avformat_suffix})}
+ : ${shared_ffmpeg:=$(${PKG_CONFIG} --variable=prefix libavformat${avformat_suffix})}
if [ "$static_ffmpeg" != "" ]
then
@@ -109,7 +109,7 @@ else
fi
elif [ "$shared_ffmpeg" != "" ]
then
- if ! $(pkg-config libswscale${avformat_suffix}); then
+ if ! $(${PKG_CONFIG} libswscale${avformat_suffix}); then
echo "- libswscale not found: disabling"
touch ../disable-avformat
exit 0
@@ -123,28 +123,28 @@ else
echo "CFLAGS+=-DAVDATADIR=\\\"${shared_ffmpeg}/share/ffmpeg${avformat_suffix}/\\\"" >> config.mak
;;
esac
- echo "CFLAGS+=$(pkg-config --cflags libavcodec${avformat_suffix})" >> config.mak
- echo "LDFLAGS+=$(pkg-config --libs libavcodec${avformat_suffix})" >> config.mak
- echo "CFLAGS+=$(pkg-config --cflags libavutil${avformat_suffix})" >> config.mak
- echo "LDFLAGS+=$(pkg-config --libs libavutil${avformat_suffix})" >> config.mak
- echo "CFLAGS+=$(pkg-config --cflags libavformat${avformat_suffix})" >> config.mak
- echo "LDFLAGS+=$(pkg-config --libs libavformat${avformat_suffix})" >> config.mak
- echo "CFLAGS+=$(pkg-config --cflags libswscale${avformat_suffix})" >> config.mak
- echo "LDFLAGS+=$(pkg-config --libs libswscale${avformat_suffix})" >> config.mak
+ echo "CFLAGS+=$(${PKG_CONFIG} --cflags libavcodec${avformat_suffix})" >> config.mak
+ echo "LDFLAGS+=$(${PKG_CONFIG} --libs libavcodec${avformat_suffix})" >> config.mak
+ echo "CFLAGS+=$(${PKG_CONFIG} --cflags libavutil${avformat_suffix})" >> config.mak
+ echo "LDFLAGS+=$(${PKG_CONFIG} --libs libavutil${avformat_suffix})" >> config.mak
+ echo "CFLAGS+=$(${PKG_CONFIG} --cflags libavformat${avformat_suffix})" >> config.mak
+ echo "LDFLAGS+=$(${PKG_CONFIG} --libs libavformat${avformat_suffix})" >> config.mak
+ echo "CFLAGS+=$(${PKG_CONFIG} --cflags libswscale${avformat_suffix})" >> config.mak
+ echo "LDFLAGS+=$(${PKG_CONFIG} --libs libswscale${avformat_suffix})" >> config.mak
if [ "$devices" = "true" ]
then
- if ! $(pkg-config libavdevice${avformat_suffix}); then
+ if ! $(${PKG_CONFIG} libavdevice${avformat_suffix}); then
echo "- libavdevice not found: disabling"
touch ../disable-avformat
exit 0
fi
- echo "CFLAGS+=$(pkg-config --cflags libavdevice${avformat_suffix})" >> config.mak
- echo "LDFLAGS+=$(pkg-config --libs libavdevice${avformat_suffix})" >> config.mak
+ echo "CFLAGS+=$(${PKG_CONFIG} --cflags libavdevice${avformat_suffix})" >> config.mak
+ echo "LDFLAGS+=$(${PKG_CONFIG} --libs libavdevice${avformat_suffix})" >> config.mak
fi
if [ "$vdpau" = "true" ]
then
- printf "#include <libavcodec/vdpau.h>\n int main(){ VdpBitstreamBuffer test; test.struct_version; return 0;}" | $CC $(pkg-config --cflags libavformat${avformat_suffix}) -I"$shared_ffmpeg/include" $CFLAGS -c -x c - >/dev/null 2>&1
+ printf "#include <libavcodec/vdpau.h>\n int main(){ VdpBitstreamBuffer test; test.struct_version; return 0;}" | $CC $(${PKG_CONFIG} --cflags libavformat${avformat_suffix}) -I"$shared_ffmpeg/include" $CFLAGS -c -x c - >/dev/null 2>&1
[ "$x11" = "0" -a "$?" = "0" ] && echo "VDPAU=1" >> config.mak
fi
else
diff --git a/src/modules/dv/Makefile b/src/modules/dv/Makefile
index 4252ef1..6055c68 100644
--- a/src/modules/dv/Makefile
+++ b/src/modules/dv/Makefile
@@ -10,9 +10,9 @@ OBJS = factory.o \
producer_libdv.o \
consumer_libdv.o
-CFLAGS += `pkg-config --cflags libdv`
+CFLAGS += `${PKG_CONFIG} --cflags libdv`
-LDFLAGS += `pkg-config --libs libdv`
+LDFLAGS += `${PKG_CONFIG} --libs libdv`
SRCS := $(OBJS:.o=.c)
diff --git a/src/modules/dv/configure b/src/modules/dv/configure
index 6712ea6..b2066b5 100755
--- a/src/modules/dv/configure
+++ b/src/modules/dv/configure
@@ -3,7 +3,7 @@
if [ "$help" != "1" ]
then
- pkg-config libdv 2> /dev/null
+ ${PKG_CONFIG} libdv 2> /dev/null
disable_libdv=$?
if [ "$disable_libdv" != "0" ]
diff --git a/src/modules/frei0r/Makefile b/src/modules/frei0r/Makefile
index 3380402..ee0113c 100644
--- a/src/modules/frei0r/Makefile
+++ b/src/modules/frei0r/Makefile
@@ -12,10 +12,10 @@ OBJS = factory.o \
transition_frei0r.o \
frei0r_helper.o
-CFLAGS += $(shell pkg-config --cflags frei0r 2> /dev/null)
+CFLAGS += $(shell ${PKG_CONFIG} --cflags frei0r 2> /dev/null)
LDFLAGS += -lm $(LIBDL)
-LDFLAGS += $(shell pkg-config --libs frei0r 2> /dev/null)
+LDFLAGS += $(shell ${PKG_CONFIG} --libs frei0r 2> /dev/null)
SRCS := $(OBJS:.o=.c)
diff --git a/src/modules/frei0r/configure b/src/modules/frei0r/configure
index e911ea9..55e8ed5 100755
--- a/src/modules/frei0r/configure
+++ b/src/modules/frei0r/configure
@@ -3,7 +3,7 @@
if [ "$help" != "1" ]
then
- echo "#include <frei0r.h> int main(){ f0r_plugin_info_t test; test.name;return 0;}"| $CC $(pkg-config --cflags frei0r) $CFLAGS -c -x c - >/dev/null 2>&1
+ echo "#include <frei0r.h> int main(){ f0r_plugin_info_t test; test.name;return 0;}"| $CC $(${PKG_CONFIG} --cflags frei0r) $CFLAGS -c -x c - >/dev/null 2>&1
if [ "$?" = "1" ]
then
diff --git a/src/modules/gtk2/Makefile b/src/modules/gtk2/Makefile
index bb11cfb..bbe9771 100644
--- a/src/modules/gtk2/Makefile
+++ b/src/modules/gtk2/Makefile
@@ -11,14 +11,14 @@ OBJS = factory.o
ifdef USE_GTK2
OBJS += consumer_gtk2.o
-CFLAGS += $(shell pkg-config $(PKGCONFIG_PREFIX) --cflags gtk+-2.0)
-LDFLAGS += $(shell pkg-config $(PKGCONFIG_PREFIX) --libs gtk+-2.0)
+CFLAGS += $(shell ${PKG_CONFIG} $(PKGCONFIG_PREFIX) --cflags gtk+-2.0)
+LDFLAGS += $(shell ${PKG_CONFIG} $(PKGCONFIG_PREFIX) --libs gtk+-2.0)
endif
ifdef USE_PIXBUF
OBJS += producer_pixbuf.o pixops.o filter_rescale.o
-CFLAGS += $(shell pkg-config $(PKGCONFIG_PREFIX) --cflags gdk-pixbuf-2.0)
-LDFLAGS += $(shell pkg-config $(PKGCONFIG_PREFIX) --libs gdk-pixbuf-2.0)
+CFLAGS += $(shell ${PKG_CONFIG} $(PKGCONFIG_PREFIX) --cflags gdk-pixbuf-2.0)
+LDFLAGS += $(shell ${PKG_CONFIG} $(PKGCONFIG_PREFIX) --libs gdk-pixbuf-2.0)
endif
ifdef USE_EXIF
@@ -34,9 +34,9 @@ endif
ifdef USE_PANGO
OBJS += producer_pango.o
-CFLAGS += $(shell pkg-config $(PKGCONFIG_PREFIX) --cflags pangoft2)
-CFLAGS += $(shell pkg-config $(PKGCONFIG_PREFIX) --cflags-only-I freetype2 | awk '{for (i=1; i<=NF; i++) $$i=sprintf("%s/freetype", $$i); print}')
-LDFLAGS += $(shell pkg-config $(PKGCONFIG_PREFIX) --libs pangoft2)
+CFLAGS += $(shell ${PKG_CONFIG} $(PKGCONFIG_PREFIX) --cflags pangoft2)
+CFLAGS += $(shell ${PKG_CONFIG} $(PKGCONFIG_PREFIX) --cflags-only-I freetype2 | awk '{for (i=1; i<=NF; i++) $$i=sprintf("%s/freetype", $$i); print}')
+LDFLAGS += $(shell ${PKG_CONFIG} $(PKGCONFIG_PREFIX) --libs pangoft2)
ifeq ($(targetos),Darwin)
LDFLAGS += -liconv
endif
diff --git a/src/modules/gtk2/configure b/src/modules/gtk2/configure
index 5071f48..79a4b4c 100755
--- a/src/modules/gtk2/configure
+++ b/src/modules/gtk2/configure
@@ -19,13 +19,13 @@ else
done
[ "$pkgconfig_prefix" != "" ] && pkgconfig_prefix="--define-variable=prefix=\"$pkgconfig_prefix\""
- pkg-config $pkgconfig_prefix gtk+-2.0 2> /dev/null
+ ${PKG_CONFIG} $pkgconfig_prefix gtk+-2.0 2> /dev/null
disable_gtk2=$?
- pkg-config $pkgconfig_prefix gdk-pixbuf-2.0 2> /dev/null
+ ${PKG_CONFIG} $pkgconfig_prefix gdk-pixbuf-2.0 2> /dev/null
disable_pixbuf=$?
- pkg-config $pkgconfig_prefix gdk-pixbuf-2.0 pangoft2 2> /dev/null
+ ${PKG_CONFIG} $pkgconfig_prefix gdk-pixbuf-2.0 pangoft2 2> /dev/null
disable_pango=$?
if [ "$disable_gtk2" != "0" -a "$disable_pixbuf" != 0 -a "$disable_pango" != "0" ]
@@ -63,14 +63,14 @@ else
[ "$pkgconfig_prefix" != "" ] && echo "PKGCONFIG_PREFIX=$pkgconfig_prefix" >> config.mak
- pkg-config --exists 'libexif'
+ ${PKG_CONFIG} --exists 'libexif'
if [ $? -eq 0 ]
then
echo "- Libexif found, enabling auto rotate"
echo "USE_EXIF=1" >> config.mak
- echo EXIFCXXFLAGS=$(pkg-config --cflags libexif ) >> config.mak
+ echo EXIFCXXFLAGS=$(${PKG_CONFIG} --cflags libexif ) >> config.mak
echo EXIFCXXFLAGS += -DUSE_EXIF >> config.mak
- echo EXIFLIBS=$(pkg-config --libs libexif) >> config.mak
+ echo EXIFLIBS=$(${PKG_CONFIG} --libs libexif) >> config.mak
elif [ -d "$exif_libdir" -a -d "$exif_includedir" ]
then
# test if we have a libexif
diff --git a/src/modules/jackrack/Makefile b/src/modules/jackrack/Makefile
index aa5a3a1..9beb3df 100644
--- a/src/modules/jackrack/Makefile
+++ b/src/modules/jackrack/Makefile
@@ -21,18 +21,18 @@ GPL_OBJS = jack_rack.o \
OBJS = factory.o \
consumer_jack.o
-CFLAGS += $(shell pkg-config --cflags jack)
-LDFLAGS += $(shell pkg-config --libs jack)
+CFLAGS += $(shell ${PKG_CONFIG} --cflags jack)
+LDFLAGS += $(shell ${PKG_CONFIG} --libs jack)
ifdef GPL
OBJS += $(GPL_OBJS)
CFLAGS += -DGPL
-CFLAGS += $(shell pkg-config --cflags libxml-2.0)
-CFLAGS += $(shell pkg-config $(PKGCONFIG_PREFIX) --cflags glib-2.0)
+CFLAGS += $(shell ${PKG_CONFIG} --cflags libxml-2.0)
+CFLAGS += $(shell ${PKG_CONFIG} $(PKGCONFIG_PREFIX) --cflags glib-2.0)
LDFLAGS += $(LIBDL)
-LDFLAGS += $(shell pkg-config --libs libxml-2.0)
-LDFLAGS += $(shell pkg-config $(PKGCONFIG_PREFIX) --libs glib-2.0)
+LDFLAGS += $(shell ${PKG_CONFIG} --libs libxml-2.0)
+LDFLAGS += $(shell ${PKG_CONFIG} $(PKGCONFIG_PREFIX) --libs glib-2.0)
LDFLAGS += -lm
YML_FILES = *.yml
diff --git a/src/modules/jackrack/configure b/src/modules/jackrack/configure
index fee51cb..362da49 100755
--- a/src/modules/jackrack/configure
+++ b/src/modules/jackrack/configure
@@ -11,14 +11,14 @@ EOF
else
- pkg-config jack
+ ${PKG_CONFIG} jack
disable_jack=$?
echo > config.mak
if [ "$gpl" = "true" ]
then
- pkg-config libxml-2.0 > /dev/null 2>&1
+ ${PKG_CONFIG} libxml-2.0 > /dev/null 2>&1
disable_xml2=$?
ladspa_prefix=`which listplugins 2> /dev/null`
@@ -27,7 +27,7 @@ else
ladspa_prefix=`dirname "$ladspa_prefix"`
ladspa_prefix=`dirname "$ladspa_prefix"`
else
- ladspa_prefix=`pkg-config --variable=prefix jack`
+ ladspa_prefix=`${PKG_CONFIG} --variable=prefix jack`
fi
disable_ladspa=`[ -f "$ladspa_prefix/include/ladspa.h" ] && echo 0 || echo 1`
echo GPL=1 > config.mak
diff --git a/src/modules/kino/Makefile b/src/modules/kino/Makefile
index 8452dd9..ae181f6 100644
--- a/src/modules/kino/Makefile
+++ b/src/modules/kino/Makefile
@@ -14,14 +14,14 @@ CPPOBJS = kino_wrapper.o avi.o error.o filehandler.o riff.o
LDFLAGS += -lstdc++
ifdef HAVE_LIBQUICKTIME
-CFLAGS += `pkg-config --cflags libquicktime`
-CXXFLAGS += `pkg-config --cflags libquicktime`
-LDFLAGS += `pkg-config --libs libquicktime`
+CFLAGS += `${PKG_CONFIG} --cflags libquicktime`
+CXXFLAGS += `${PKG_CONFIG} --cflags libquicktime`
+LDFLAGS += `${PKG_CONFIG} --libs libquicktime`
endif
ifdef HAVE_LIBDV
-CFLAGS += `pkg-config --cflags libdv`
-LDFLAGS += `pkg-config --libs libdv`
+CFLAGS += `${PKG_CONFIG} --cflags libdv`
+LDFLAGS += `${PKG_CONFIG} --libs libdv`
endif
diff --git a/src/modules/kino/configure b/src/modules/kino/configure
index 5949890..f7df5c4 100755
--- a/src/modules/kino/configure
+++ b/src/modules/kino/configure
@@ -11,10 +11,10 @@ then
fi
# Entirely optional...
- pkg-config libquicktime 2> /dev/null
+ ${PKG_CONFIG} libquicktime 2> /dev/null
lqt_disabled=$?
- pkg-config libdv 2> /dev/null
+ ${PKG_CONFIG} libdv 2> /dev/null
libdv_disabled=$?
echo > config.mak
diff --git a/src/modules/opengl/Makefile b/src/modules/opengl/Makefile
index 4450eae..d95a27f 100644
--- a/src/modules/opengl/Makefile
+++ b/src/modules/opengl/Makefile
@@ -30,18 +30,18 @@ CPPOBJS += transition_movit_mix.o
CPPOBJS += transition_movit_overlay.o
CXXFLAGS := -Wno-deprecated $(CFLAGS) $(CXXFLAGS)
-CXXFLAGS += $(shell pkg-config --cflags movit 2> /dev/null)
+CXXFLAGS += $(shell ${PKG_CONFIG} --cflags movit 2> /dev/null)
-SHADERDIR = $(shell pkg-config --variable=shaderdir movit)
+SHADERDIR = $(shell ${PKG_CONFIG} --variable=shaderdir movit)
CXXFLAGS += -DSHADERDIR=\"$(SHADERDIR)\"
LDFLAGS += -L../../mlt++ -lmlt++
ifeq ($(targetos), MinGW)
- CXXFLAGS += $(shell pkg-config --cflags movit)
- LDFLAGS += $(shell pkg-config --libs movit) -lopengl32 -lpthread
+ CXXFLAGS += $(shell ${PKG_CONFIG} --cflags movit)
+ LDFLAGS += $(shell ${PKG_CONFIG} --libs movit) -lopengl32 -lpthread
else
- LDFLAGS += $(shell pkg-config --libs movit 2> /dev/null)
+ LDFLAGS += $(shell ${PKG_CONFIG} --libs movit 2> /dev/null)
ifeq ($(targetos), Darwin)
CXXFLAGS += -FOpenGL
LDFLAGS += -lpthread -framework OpenGL
diff --git a/src/modules/opengl/configure b/src/modules/opengl/configure
index 3065ba1..ec93571 100755
--- a/src/modules/opengl/configure
+++ b/src/modules/opengl/configure
@@ -2,7 +2,7 @@
if [ "$help" != "1" ]
then
- if ! $(pkg-config movit)
+ if ! $(${PKG_CONFIG} movit)
then
echo "- movit not found: disabling"
touch ../disable-opengl
diff --git a/src/modules/qt/configure b/src/modules/qt/configure
index 66427f6..27c4a9f 100755
--- a/src/modules/qt/configure
+++ b/src/modules/qt/configure
@@ -58,14 +58,14 @@ else
echo > config.mak
- pkg-config --exists 'libexif'
+ ${PKG_CONFIG} --exists 'libexif'
if [ $? -eq 0 ]
then
echo "- Libexif found, enabling auto rotate"
echo "USE_EXIF=1" >> config.mak
- echo EXIFCXXFLAGS=$(pkg-config --cflags libexif ) >> config.mak
+ echo EXIFCXXFLAGS=$(${PKG_CONFIG} --cflags libexif ) >> config.mak
echo EXIFCXXFLAGS += -DUSE_EXIF >> config.mak
- echo EXIFLIBS=$(pkg-config --libs libexif) >> config.mak
+ echo EXIFLIBS=$(${PKG_CONFIG} --libs libexif) >> config.mak
elif [ -d "$exif_libdir" -a -d "$exif_includedir" ]
then
# test if we have a libexif
@@ -131,8 +131,8 @@ else
# Qt4 on OS X
elif [ -d "$qt_libdir/QtGui.framework" ]
then
- echo QTCXXFLAGS=$(pkg-config --cflags QtCore QtGui QtXml QtSvg QtOpenGL) >> config.mak
- echo QTLIBS=$(pkg-config --libs QtCore QtGui QtXml QtSvg QtOpenGL) >> config.mak
+ echo QTCXXFLAGS=$(${PKG_CONFIG} --cflags QtCore QtGui QtXml QtSvg QtOpenGL) >> config.mak
+ echo QTLIBS=$(${PKG_CONFIG} --libs QtCore QtGui QtXml QtSvg QtOpenGL) >> config.mak
# Qt4 on Windows
elif [ -f "$qt_libdir/libQtCore4.a" ]
then
@@ -144,24 +144,24 @@ else
echo QTLIBS=-L$qt_libdir -lQtCore -lQtGui -lQtXml -lQtSvg -lQtOpenGL >> config.mak
fi
else
- pkg-config --exists 'QtGui >= 4'
+ ${PKG_CONFIG} --exists 'QtGui >= 4'
if [ $? -eq 0 ]
then
echo "- Qt version 4.x detected"
- echo QTCXXFLAGS=$(pkg-config --cflags QtCore QtGui QtXml QtSvg QtOpenGL) >> config.mak
- echo QTLIBS=$(pkg-config --libs QtCore QtGui QtXml QtSvg QtOpenGL) >> config.mak
+ echo QTCXXFLAGS=$(${PKG_CONFIG} --cflags QtCore QtGui QtXml QtSvg QtOpenGL) >> config.mak
+ echo QTLIBS=$(${PKG_CONFIG} --libs QtCore QtGui QtXml QtSvg QtOpenGL) >> config.mak
else
- pkg-config --exists 'Qt5Gui'
+ ${PKG_CONFIG} --exists 'Qt5Gui'
if [ $? -eq 0 ]
then
echo "- Qt version 5.x detected"
- echo QTCXXFLAGS=$(pkg-config --cflags Qt5Core Qt5Gui Qt5Xml Qt5Svg Qt5Widgets) >> config.mak
- echo QTLIBS=$(pkg-config --libs Qt5Core Qt5Gui Qt5Xml Qt5Svg Qt5Widgets) >> config.mak
- pkg-config --exists 'Qt5OpenGL'
+ echo QTCXXFLAGS=$(${PKG_CONFIG} --cflags Qt5Core Qt5Gui Qt5Xml Qt5Svg Qt5Widgets) >> config.mak
+ echo QTLIBS=$(${PKG_CONFIG} --libs Qt5Core Qt5Gui Qt5Xml Qt5Svg Qt5Widgets) >> config.mak
+ ${PKG_CONFIG} --exists 'Qt5OpenGL'
if [ $? -eq 0 ]
then
- echo QTCXXFLAGS+=$(pkg-config --cflags Qt5OpenGL) >> config.mak
- echo QTLIBS+=$(pkg-config --libs Qt5OpenGL) >> config.mak
+ echo QTCXXFLAGS+=$(${PKG_CONFIG} --cflags Qt5OpenGL) >> config.mak
+ echo QTLIBS+=$(${PKG_CONFIG} --libs Qt5OpenGL) >> config.mak
else
echo "- Qt5OpenGL not found: disabling"
without_opengl=true
diff --git a/src/modules/resample/Makefile b/src/modules/resample/Makefile
index 0b9f2b9..90175d4 100644
--- a/src/modules/resample/Makefile
+++ b/src/modules/resample/Makefile
@@ -9,9 +9,9 @@ TARGET = ../libmltresample$(LIBSUF)
OBJS = factory.o \
filter_resample.o
-CFLAGS += $(shell pkg-config --cflags samplerate)
+CFLAGS += $(shell ${PKG_CONFIG} --cflags samplerate)
-LDFLAGS += $(shell pkg-config --libs samplerate)
+LDFLAGS += $(shell ${PKG_CONFIG} --libs samplerate)
SRCS := $(OBJS:.o=.c)
diff --git a/src/modules/resample/configure b/src/modules/resample/configure
index 954cb04..81ca104 100755
--- a/src/modules/resample/configure
+++ b/src/modules/resample/configure
@@ -3,7 +3,7 @@
if [ "$help" != "1" ]
then
- pkg-config samplerate 2> /dev/null
+ ${PKG_CONFIG} samplerate 2> /dev/null
disable_samplerate=$?
if [ "$disable_samplerate" != "0" ]
diff --git a/src/modules/rtaudio/Makefile b/src/modules/rtaudio/Makefile
index 18749d7..f1a6dfa 100644
--- a/src/modules/rtaudio/Makefile
+++ b/src/modules/rtaudio/Makefile
@@ -24,8 +24,8 @@ LDFLAGS += -lole32 -ldsound -lwinmm
#CXXFLAGS +=-D__WINDOWS_ASIO__
else ifeq ($(targetos), Linux)
CXXFLAGS += -D__LINUX_ALSA__
-CXXFLAGS += $(shell pkg-config --cflags alsa)
-LDFLAGS += $(shell pkg-config --libs alsa)
+CXXFLAGS += $(shell ${PKG_CONFIG} --cflags alsa)
+LDFLAGS += $(shell ${PKG_CONFIG} --libs alsa)
else ifeq ($(targetos), NetBSD)
CXXFLAGS += -D__LINUX_OSS__
LDFLAGS += -lossaudio
diff --git a/src/modules/sox/configure b/src/modules/sox/configure
index 1c40113..a5191e0 100755
--- a/src/modules/sox/configure
+++ b/src/modules/sox/configure
@@ -15,13 +15,13 @@ then
;;
esac
- pkg-config sox
+ ${PKG_CONFIG} sox
if [ $? -eq 0 ]
then
disable_sox=0
- echo "CFLAGS += $(pkg-config --cflags sox)" > config.mak
- echo "LDFLAGS += $(pkg-config --libs sox)" >> config.mak
- [ $(pkg-config --modversion sox | cut -d. -f1) -gt 13 ] && echo "CFLAGS += -DSOX14" >> config.mak
+ echo "CFLAGS += $(${PKG_CONFIG} --cflags sox)" > config.mak
+ echo "LDFLAGS += $(${PKG_CONFIG} --libs sox)" >> config.mak
+ [ $(${PKG_CONFIG} --modversion sox | cut -d. -f1) -gt 13 ] && echo "CFLAGS += -DSOX14" >> config.mak
else
which libst-config > /dev/null 2>&1
if [ $? -eq 0 ]
diff --git a/src/modules/swfdec/configure b/src/modules/swfdec/configure
index cffd6df..139b749 100755
--- a/src/modules/swfdec/configure
+++ b/src/modules/swfdec/configure
@@ -2,27 +2,27 @@
if [ "$help" != "1" ]
then
- pkg-config swfdec-0.9 2> /dev/null
+ ${PKG_CONFIG} swfdec-0.9 2> /dev/null
disable_swfdec=$?
echo > config.mak
if [ "$disable_swfdec" = "0" ]
then
- echo "CFLAGS += $(pkg-config --cflags swfdec-0.9)" >> config.mak
- echo "LDFLAGS += $(pkg-config --libs swfdec-0.9)" >> config.mak
+ echo "CFLAGS += $(${PKG_CONFIG} --cflags swfdec-0.9)" >> config.mak
+ echo "LDFLAGS += $(${PKG_CONFIG} --libs swfdec-0.9)" >> config.mak
else
- pkg-config swfdec-0.8 2> /dev/null
+ ${PKG_CONFIG} swfdec-0.8 2> /dev/null
disable_swfdec=$?
if [ "$disable_swfdec" = "0" ]
then
- echo "CFLAGS += $(pkg-config --cflags swfdec-0.8)" >> config.mak
- echo "LDFLAGS += $(pkg-config --libs swfdec-0.8)" >> config.mak
+ echo "CFLAGS += $(${PKG_CONFIG} --cflags swfdec-0.8)" >> config.mak
+ echo "LDFLAGS += $(${PKG_CONFIG} --libs swfdec-0.8)" >> config.mak
else
- pkg-config swfdec-0.7 2> /dev/null
+ ${PKG_CONFIG} swfdec-0.7 2> /dev/null
disable_swfdec=$?
if [ "$disable_swfdec" = "0" ]
then
- echo "CFLAGS += $(pkg-config --cflags swfdec-0.7)" >> config.mak
- echo "LDFLAGS += $(pkg-config --libs swfdec-0.7)" >> config.mak
+ echo "CFLAGS += $(${PKG_CONFIG} --cflags swfdec-0.7)" >> config.mak
+ echo "LDFLAGS += $(${PKG_CONFIG} --libs swfdec-0.7)" >> config.mak
else
echo "- swfdec not found: disabling"
touch ../disable-swfdec
diff --git a/src/modules/vid.stab/Makefile b/src/modules/vid.stab/Makefile
index 7f829f8..56eb4fc 100644
--- a/src/modules/vid.stab/Makefile
+++ b/src/modules/vid.stab/Makefile
@@ -13,10 +13,10 @@ CPPOBJS = filter_deshake.o
CPPOBJS += filter_vidstab.o
CXXFLAGS += -Wno-deprecated $(CFLAGS)
-CXXFLAGS += $(shell pkg-config --cflags vidstab)
+CXXFLAGS += $(shell ${PKG_CONFIG} --cflags vidstab)
LDFLAGS += -L../../mlt++ -lmlt++
-LDFLAGS += $(shell pkg-config --libs vidstab)
+LDFLAGS += $(shell ${PKG_CONFIG} --libs vidstab)
SRCS := $(OBJS:.o=.c) $(CPPOBJS:.o=.cpp)
diff --git a/src/modules/vid.stab/configure b/src/modules/vid.stab/configure
index e501888..7cb8213 100755
--- a/src/modules/vid.stab/configure
+++ b/src/modules/vid.stab/configure
@@ -2,7 +2,7 @@
if [ "$help" != "1" ]
then
- if ! $(pkg-config vidstab)
+ if ! $(${PKG_CONFIG} vidstab)
then
echo "- vid.stab not found: disabling"
touch ../disable-vid.stab
@@ -10,8 +10,8 @@ then
fi
minver="0.98"
- modver=$(pkg-config --modversion vidstab)
- pkg-config --exists "vidstab >= $minver"
+ modver=$(${PKG_CONFIG} --modversion vidstab)
+ ${PKG_CONFIG} --exists "vidstab >= $minver"
if [ $? -ne 0 ]
then
echo "- vid.stab $modver found, but $minver or newer is required: disabling"
diff --git a/src/modules/vorbis/Makefile b/src/modules/vorbis/Makefile
index dbc9fcb..0502588 100644
--- a/src/modules/vorbis/Makefile
+++ b/src/modules/vorbis/Makefile
@@ -9,11 +9,11 @@ TARGET = ../libmltvorbis$(LIBSUF)
OBJS = factory.o \
producer_vorbis.o
-CFLAGS += $(shell pkg-config --cflags vorbis)
-CFLAGS += $(shell pkg-config --cflags vorbisfile)
+CFLAGS += $(shell ${PKG_CONFIG} --cflags vorbis)
+CFLAGS += $(shell ${PKG_CONFIG} --cflags vorbisfile)
-LDFLAGS += $(shell pkg-config --libs vorbis)
-LDFLAGS += $(shell pkg-config --libs vorbisfile)
+LDFLAGS += $(shell ${PKG_CONFIG} --libs vorbis)
+LDFLAGS += $(shell ${PKG_CONFIG} --libs vorbisfile)
SRCS := $(OBJS:.o=.c)
diff --git a/src/modules/vorbis/configure b/src/modules/vorbis/configure
index 2f8c117..efd003f 100755
--- a/src/modules/vorbis/configure
+++ b/src/modules/vorbis/configure
@@ -3,7 +3,7 @@
if [ "$help" != "1" ]
then
- pkg-config vorbisfile 2> /dev/null
+ ${PKG_CONFIG} vorbisfile 2> /dev/null
disable_vorbis=$?
if [ "$disable_vorbis" != "0" ]
diff --git a/src/modules/xml/Makefile b/src/modules/xml/Makefile
index 6bdf19e..d5781bf 100644
--- a/src/modules/xml/Makefile
+++ b/src/modules/xml/Makefile
@@ -10,9 +10,9 @@ OBJS = factory.o \
consumer_xml.o \
producer_xml.o
-CFLAGS += $(shell pkg-config libxml-2.0 --cflags)
+CFLAGS += $(shell ${PKG_CONFIG} libxml-2.0 --cflags)
-LDFLAGS += $(shell pkg-config libxml-2.0 --libs)
+LDFLAGS += $(shell ${PKG_CONFIG} libxml-2.0 --libs)
SRCS := $(OBJS:.o=.c)
diff --git a/src/modules/xml/configure b/src/modules/xml/configure
index f2dba76..dc10635 100755
--- a/src/modules/xml/configure
+++ b/src/modules/xml/configure
@@ -3,7 +3,7 @@
if [ "$help" != "1" ]
then
- pkg-config libxml-2.0 > /dev/null 2>&1
+ ${PKG_CONFIG} libxml-2.0 > /dev/null 2>&1
disable_xml2=$?
if [ "$disable_xml2" != "0" ]
--
2.3.3
------------------------------------------------------------------------------
Dive into the World of Parallel Programming The Go Parallel Website, sponsored
by Intel and developed in partnership with Slashdot Media, is your hub for all
things parallel software development, from weekly thought leadership blogs to
news, videos, case studies, tutorials and more. Take a look and join the
conversation now. http://goparallel.sourceforge.net/
_______________________________________________
Mlt-devel mailing list
Mlt-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/mlt-devel
