diff options
| author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2008-01-30 14:30:03 +0000 |
|---|---|---|
| committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2008-01-30 14:30:03 +0000 |
| commit | 013a7a0aa76b6ec65807fecbc8a70849447f1e76 (patch) | |
| tree | 279a940e36b033bc663afebe9377a77431d9174b | |
| parent | 3343d52e459bfc9c9db28dcba7afb0c6e2f05f59 (diff) | |
| download | xine-lib-013a7a0aa76b6ec65807fecbc8a70849447f1e76.tar.gz xine-lib-013a7a0aa76b6ec65807fecbc8a70849447f1e76.tar.bz2 | |
Make sure that PKG_CONFIG_PATH is set properly by xine-config.
--HG--
rename : misc/xine-config => misc/xine-config.in
| -rw-r--r-- | configure.ac | 5 | ||||
| -rw-r--r-- | misc/Makefile.am | 1 | ||||
| -rw-r--r-- | misc/xine-config.in (renamed from misc/xine-config) | 5 |
3 files changed, 10 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index c9396cf27..9badb9d23 100644 --- a/configure.ac +++ b/configure.ac @@ -2394,8 +2394,10 @@ makeexpand () { xinelibdir='${libdir}/xine' xinedatadir='${datadir}/xine' +pkgconfigdir='${libdir}/pkgconfig' AC_SUBST(xinelibdir) AC_SUBST(xinedatadir) +AC_SUBST(pkgconfigdir) XINE_PLUGINDIR="\${xinelibdir}/plugins/$XINE_MAJOR.$XINE_MINOR.$XINE_SUB$XINE_PATCH" XINE_FONTDIR="\${xinedatadir}/libxine$XINE_MAJOR/fonts" @@ -2404,6 +2406,7 @@ XINE_REL_PLUGINDIR="`makeexpand "$XINE_PLUGINDIR"`" XINE_REL_PLUGINDIR="`makeexpand "$XINE_REL_PLUGINDIR" | sed -e "s,^${prefix}/,,"`" XINE_REL_FONTDIR="`makeexpand "$XINE_FONTDIR" | sed -e "s,^${prefix}/,,"`" XINE_REL_LOCALEDIR="`makeexpand "$XINE_LOCALEDIR" | sed -e "s,^${prefix}/,,"`" +XINE_PKGCONFIG_DIR="`makeexpand "$pkgconfigdir"`" if test "x$SYS" = "xmingw32" -o "x$SYS" = "xcygwin"; then dnl polish paths (MinGW runtime accepts both \ and / anyway) XINE_REL_PLUGINDIR="`echo "$XINE_REL_PLUGINDIR" | sed -e 's/\\//\\\\\\\\/g'`" @@ -2441,6 +2444,7 @@ AC_SUBST(XINE_LOCALEPATH) AC_SUBST(XINE_PLUGINDIR) AC_SUBST(XINE_FONTDIR) AC_SUBST(XINE_LOCALEDIR) +AC_SUBST(XINE_PKGCONFIG_DIR) dnl Where aclocal m4 files should be installed XINE_ACFLAGS="-I ${datarootdir}/aclocal" @@ -2656,6 +2660,7 @@ misc/build_rpms.sh misc/fonts/Makefile misc/libxine.pc misc/relchk.sh +misc/xine-config misc/xine-lib.spec po/Makefile.in src/Makefile diff --git a/misc/Makefile.am b/misc/Makefile.am index 70cbe59ee..ef61b325d 100644 --- a/misc/Makefile.am +++ b/misc/Makefile.am @@ -17,7 +17,6 @@ EXTRA_DIST = build_rpms.sh \ bin_SCRIPTS = xine-config -pkgconfigdir=$(libdir)/pkgconfig pkgconfig_DATA=libxine.pc xine-fontconv: xine-fontconv.c diff --git a/misc/xine-config b/misc/xine-config.in index 5723a1a46..719d9667e 100644 --- a/misc/xine-config +++ b/misc/xine-config.in @@ -6,6 +6,11 @@ unset prefix unset exec_prefix unset args +PKG_CONFIG_PATH="$(cat <<'EOF' +@XINE_PKGCONFIG_DIR@ +EOF +)${PKG_CONFIG_PATH:+:}$PKG_CONFIG_PATH" + usage() { cat <<EOF |