From f4c08337360562b855f2035c2cfae319b3a64e34 Mon Sep 17 00:00:00 2001
From: davilla <davilla@svn>
Date: Sat, 27 Nov 2010 15:53:28 +0000
Subject: complete replacement of liblzo with liblzo2, linux was already
 liblzo2

git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/trunk@35484 568bbfeb-2a22-0410-94d2-cc84cf5bfa90
---
 configure.in                    | 7 -------
 tools/TexturePacker/Makefile.in | 2 +-
 tools/TexturePacker/XBMCTex.cpp | 2 +-
 3 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/configure.in b/configure.in
index 4511bd7682..9cf7b68922 100644
--- a/configure.in
+++ b/configure.in
@@ -1073,7 +1073,6 @@ AC_CHECK_PROG(HAVE_GIT,git,"yes","no",)
 AC_HEADER_DIRENT
 AC_HEADER_STDC
 AC_HEADER_SYS_WAIT
-AC_CHECK_HEADERS([lzo/lzo1.h])
 AC_CHECK_HEADERS([arpa/inet.h fcntl.h float.h inttypes.h limits.h locale.h \
   malloc.h memory.h netdb.h netinet/in.h stddef.h stdint.h stdlib.h string.h \
   strings.h sys/file.h sys/ioctl.h sys/mount.h sys/param.h sys/socket.h \
@@ -1187,12 +1186,6 @@ else
   final_message="$final_message\n  MID Support:\tNo"
 fi
 
-if test -d "/usr/include/lzo"; then
-  INCLUDES="$INCLUDES -I/usr/include/lzo"
-else
-  INCLUDES="$INCLUDES"
-fi
-
 if test "x$use_ccache" != "xno"; then
   AC_PATH_PROG(CCACHE,ccache,none)
   if test "$ac_cv_path_CCACHE" = "none"; then
diff --git a/tools/TexturePacker/Makefile.in b/tools/TexturePacker/Makefile.in
index be9600733b..f669eb04e7 100644
--- a/tools/TexturePacker/Makefile.in
+++ b/tools/TexturePacker/Makefile.in
@@ -2,7 +2,7 @@ ARCH=@ARCH@
 INCLUDES =-I../../xbmc/utils -I../../guilib -I../../xbmc/linux -I../../xbmc/lib/libsquish
 DEFINES = 
 ifeq ($(findstring osx,$(ARCH)),osx)
-LIBS = ../../xbmc/lib/libsquish/libsquish-@ARCH@.a -L/opt/local/lib -lSDL_image -lSDL -llzo
+LIBS = ../../xbmc/lib/libsquish/libsquish-@ARCH@.a -L/opt/local/lib -lSDL_image -lSDL -llzo2
 else
 LIBS = ../../xbmc/lib/libsquish/libsquish-@ARCH@.a -lSDL_image -lSDL -llzo2
 endif
diff --git a/tools/TexturePacker/XBMCTex.cpp b/tools/TexturePacker/XBMCTex.cpp
index a9278295fb..dabf131c33 100644
--- a/tools/TexturePacker/XBMCTex.cpp
+++ b/tools/TexturePacker/XBMCTex.cpp
@@ -40,7 +40,7 @@
 #endif
 
 #ifdef _LINUX
-#include <lzo1x.h>
+#include <lzo/lzo1x.h>
 #else
 #include "../../xbmc/lib/liblzo/LZO1X.H"
 #endif
-- 
cgit v1.2.3