From ce091f7c0a5f7bdab5ce1c298e56f7009f58a2cd Mon Sep 17 00:00:00 2001
From: Siggi Langauf <siggi@users.sourceforge.net>
Date: Tue, 18 Dec 2001 01:14:18 +0000
Subject: configure hack to prevent the hppa linker from dying (cannot link
 static archives to shared libs, better fix is welcome)

CVS patchset: 1269
CVS date: 2001/12/18 01:14:18
---
 configure.in     | 32 ++++++++++++++++++++++----------
 debian/changelog |  6 ++++++
 2 files changed, 28 insertions(+), 10 deletions(-)

diff --git a/configure.in b/configure.in
index 2a05be4c6..f3b41ebc0 100644
--- a/configure.in
+++ b/configure.in
@@ -225,6 +225,28 @@ dnl but only dynamic linking is possible when using libtool < 1.4.0
 
 AC_PREREQ_LIBTOOL(1.4.0, xv_lib="libXv.a", xv_lib="libXv.so")
 
+
+host_or_hostalias="$host"
+if test "$host_or_hostalias" = ""; then
+    dnl user has called ./configure with a host parameter unknown to
+    dnl config.sub; the canonical "$host" is empty
+    dnl
+    dnl Try the following switch with user's original host_alias 
+    dnl input instead.
+    dnl
+    host_or_hostalias="$host_alias"
+fi
+
+case "$host_or_hostalias" in
+  hppa*)
+	if test "$xv_lib" = "libXv.a"; then
+	  echo "warning: hppa linker - disabling static libXv"
+	  xv_lib="libXv.so"
+	fi
+	;;
+esac
+
+
 AC_ARG_WITH(xv-path,[  --with-xv-path=path    Where $xv_lib is installed],
             xv_path="$withval", xv_path="/usr/X11R6/lib")
 
@@ -454,16 +476,6 @@ COMMON_CFLAGS="$wall -D_REENTRANT -D_FILE_OFFSET_BITS=64 -DXINE_COMPILE"
 enable_w32dll="no"
 enable_ffmmx="no"
 
-host_or_hostalias="$host"
-if test "$host_or_hostalias" = ""; then
-    dnl user has called ./configure with a host parameter unknown to
-    dnl config.sub; the canonical "$host" is empty
-    dnl
-    dnl Try the following switch with user's original host_alias 
-    dnl input instead.
-    dnl
-    host_or_hostalias="$host_alias"
-fi
 
 case "$host_or_hostalias" in
   i386-*-freebsd*)
diff --git a/debian/changelog b/debian/changelog
index 34a4fa30e..4b9395c57 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xine-lib (0.9.7-3) unstable; urgency=high
+
+  * re-added check for HPPA (closes: #123036)
+
+ -- Siggi Langauf <siggi@debian.org>  Mon, 17 Dec 2001 11:44:24 +0100
+
 xine-lib (0.9.7-2) unstable; urgency=low
 
   * this package is based on a recent CVS snapshot, fixes a few things:
-- 
cgit v1.2.3