From 013a7a0aa76b6ec65807fecbc8a70849447f1e76 Mon Sep 17 00:00:00 2001
From: Darren Salt <linux@youmustbejoking.demon.co.uk>
Date: Wed, 30 Jan 2008 14:30:03 +0000
Subject: Make sure that PKG_CONFIG_PATH is set properly by xine-config.

--HG--
rename : misc/xine-config => misc/xine-config.in
---
 configure.ac        |  5 ++++
 misc/Makefile.am    |  1 -
 misc/xine-config    | 70 -------------------------------------------------
 misc/xine-config.in | 75 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 80 insertions(+), 71 deletions(-)
 delete mode 100644 misc/xine-config
 create mode 100644 misc/xine-config.in

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
deleted file mode 100644
index 5723a1a46..000000000
--- a/misc/xine-config
+++ /dev/null
@@ -1,70 +0,0 @@
-#!/bin/sh
-#
-#
-
-unset prefix
-unset exec_prefix
-unset args
-
-usage()
-{
-	cat <<EOF
-Usage: xine-config [OPTIONS] [LIBRARIES]
-Options:
-	[--prefix[=DIR]]
-	[--exec-prefix[=DIR]]
-	[--version]
-        [--libs]
-	[--acflags]
-	[--cflags]
-	[--plugindir]
-	[--datadir]
-	[--scriptdir]
-	[--localedir]
-	[--objcflags]
-EOF
-	exit $1
-}
-
-if test $# -eq 0; then
-	usage 1 1>&2
-fi
-
-while test $# -gt 0; do
-  case "$1" in
-  -*=*) optarg="${1#--*=}" ;;
-  *) optarg= ;;
-  esac
-
-  case "$1" in
-    --prefix=*)
-      prefix="$optarg"
-      if [ "$exec_prefix" = '' ]; then
-        exec_prefix="$optarg"
-      fi
-      ;;
-    --exec-prefix=*)
-      exec_prefix="$optarg"
-      ;;
-    --version)
-      args="$args${args+ }--modversion"
-      ;;
-    --cflags|--libs)
-      args="$args${args+ }$1"
-      ;;
-    --prefix|--acflags|--plugindir|--datadir|--scriptdir|--localedir|--objcflags)
-      args="$args${args+ }--variable=${1#--}"
-      ;;
-    --exec-prefix)
-      args="$args${args+ }--variable=exec_prefix"
-      ;;
-    *)
-      usage 1 1>&2
-      ;;
-  esac
-  shift
-done
-
-exec pkg-config "${prefix+--define-variable=prefix=}$prefix" \
-		"${exec_prefix+--define-variable=exec_prefix=}$exec_prefix" \
-		$args libxine
diff --git a/misc/xine-config.in b/misc/xine-config.in
new file mode 100644
index 000000000..719d9667e
--- /dev/null
+++ b/misc/xine-config.in
@@ -0,0 +1,75 @@
+#!/bin/sh
+#
+#
+
+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
+Usage: xine-config [OPTIONS] [LIBRARIES]
+Options:
+	[--prefix[=DIR]]
+	[--exec-prefix[=DIR]]
+	[--version]
+        [--libs]
+	[--acflags]
+	[--cflags]
+	[--plugindir]
+	[--datadir]
+	[--scriptdir]
+	[--localedir]
+	[--objcflags]
+EOF
+	exit $1
+}
+
+if test $# -eq 0; then
+	usage 1 1>&2
+fi
+
+while test $# -gt 0; do
+  case "$1" in
+  -*=*) optarg="${1#--*=}" ;;
+  *) optarg= ;;
+  esac
+
+  case "$1" in
+    --prefix=*)
+      prefix="$optarg"
+      if [ "$exec_prefix" = '' ]; then
+        exec_prefix="$optarg"
+      fi
+      ;;
+    --exec-prefix=*)
+      exec_prefix="$optarg"
+      ;;
+    --version)
+      args="$args${args+ }--modversion"
+      ;;
+    --cflags|--libs)
+      args="$args${args+ }$1"
+      ;;
+    --prefix|--acflags|--plugindir|--datadir|--scriptdir|--localedir|--objcflags)
+      args="$args${args+ }--variable=${1#--}"
+      ;;
+    --exec-prefix)
+      args="$args${args+ }--variable=exec_prefix"
+      ;;
+    *)
+      usage 1 1>&2
+      ;;
+  esac
+  shift
+done
+
+exec pkg-config "${prefix+--define-variable=prefix=}$prefix" \
+		"${exec_prefix+--define-variable=exec_prefix=}$exec_prefix" \
+		$args libxine
-- 
cgit v1.2.3