[mupen64plus] 100/262: Check for liblzma development files before using them

[Sven Eckelmann]

This is an automated email from the git hooks/post-receive script.

ecsv-guest pushed a commit to branch master
in repository mupen64plus.

commit 698ef099605dc121e40d47b45d62416e31549fb6
Author: Sven Eckelmann <sven.eckelmann at gmx.de>
Date:   Mon Aug 31 20:35:12 2009 +0200

    Check for liblzma development files before using them
---
 debian/patches/114-system-liblzma.patch | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/debian/patches/114-system-liblzma.patch b/debian/patches/114-system-liblzma.patch
index 43ced79..fc7a24e 100644
--- a/debian/patches/114-system-liblzma.patch
+++ b/debian/patches/114-system-liblzma.patch
@@ -1,4 +1,4 @@
-From 2e610df0652e2b715afc88bf77e7f7623538d497 Mon Sep 17 00:00:00 2001
+From 99c3d4e67b8f00bcd3d233e242a3a246faad84ec Mon Sep 17 00:00:00 2001
 From: Sven Eckelmann <sven.eckelmann at gmx.de>
 Date: Tue, 25 Aug 2009 15:19:39 +0200
 Subject: [PATCH] Use liblzma from system instead of buildin one
@@ -11,8 +11,8 @@ Signed-off-by: Sven Eckelmann <sven.eckelmann at gmx.de>
  main/gui_qt4/globals.h  |    1 +
  main/rom.c              |   24 ++++++++++--------------
  main/romcache.c         |    2 +-
- pre.mk                  |    5 +++++
- 6 files changed, 22 insertions(+), 21 deletions(-)
+ pre.mk                  |    9 +++++++++
+ 6 files changed, 26 insertions(+), 21 deletions(-)
 
 diff --git a/Makefile b/Makefile
 index be81163..839ab60 100644
@@ -169,15 +169,19 @@ index 5f31cc8..54f8169 100644
  
  static void scan_dir(const char* dirname, int* romcounter);
 diff --git a/pre.mk b/pre.mk
-index d2eb261..f596c77 100644
+index d2eb261..0a2d965 100644
 --- a/pre.mk
 +++ b/pre.mk
-@@ -101,6 +101,11 @@ GTK_FLAGS	= $(shell pkg-config gtk+-2.0 --cflags)
+@@ -101,6 +101,15 @@ GTK_FLAGS	= $(shell pkg-config gtk+-2.0 --cflags)
  GTK_LIBS	= $(shell pkg-config gtk+-2.0 --libs)
  GTHREAD_LIBS 	= $(shell pkg-config gthread-2.0 --libs)
  
 +# test for presence of liblzma
-+# set GTK flags and libraries
++ifeq ("$(shell pkg-config liblzma --modversion )", "")
++  $(error No liblzma development libraries found!)
++endif
++
++# set LZMA flags and libraries
 +LZMA_FLAGS	= $(shell pkg-config liblzma --cflags)
 +LZMA_LIBS	= $(shell pkg-config liblzma --libs)
 +

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/mupen64plus.git