From 38cfc79deb0fba2fa5e5cc641f2ad278c2d6e0db Mon Sep 17 00:00:00 2001
From: mbjornstk <mbjornstk@178a84e3-b1eb-0310-8ba1-8eac791a3b58>
Date: Thu, 20 Sep 2012 01:13:32 +0000
Subject: [PATCH] Update build system after enet & bullet got moved to lib/
 directory.

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11614 178a84e3-b1eb-0310-8ba1-8eac791a3b58
---
 configure.ac    | 14 +++++++-------
 src/Makefile.am |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/configure.ac b/configure.ac
index 1728a2e75..644714bc1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -370,8 +370,8 @@ fi
 # Bullet physics
 # ==============
 AC_DEFINE([BT_NO_PROFILE], [], [Disable bullet internal profiling])
-BULLETTREE="src/bullet"
-bullet_LIBS="-Lbullet/src -lbulletdynamics -lbulletcollision -lbulletmath"
+BULLETTREE="lib/bullet"
+bullet_LIBS="-L../lib/bullet/src -lbulletdynamics -lbulletcollision -lbulletmath"
 
 
 # ====
@@ -399,10 +399,10 @@ case "${host}" in
   enet_LIBS="-Lenet -lenet -lws2_32"
   ;;
 *)
-  enet_LIBS="-Lenet -lenet"
+  enet_LIBS="-L../lib/enet -lenet"
   ;;
 esac
-ENETTREE="src/enet"
+ENETTREE="lib/enet"
 
 # ==========================================
 # Check for a known compiler bug, details in 
@@ -453,9 +453,9 @@ AC_CONFIG_FILES([                   \
  doc/Makefile                       \
  src/Makefile                       \
  src/ide/Makefile                   \
- src/bullet/Makefile                \
- src/bullet/src/Makefile            \
- src/enet/Makefile                  \
+ lib/bullet/Makefile                \
+ lib/bullet/src/Makefile            \
+ lib/enet/Makefile                  \
  tools/Makefile                 
 ])
 AC_OUTPUT
diff --git a/src/Makefile.am b/src/Makefile.am
index 07bf0d34d..8b4c4a87b 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -6,7 +6,7 @@ bindir=$(prefix)/games
 bin_PROGRAMS = supertuxkart
 
 AM_CPPFLAGS = -DSUPERTUXKART_DATADIR="\"$(datadir)/games/$(PACKAGE)/\""  \
- -I$(srcdir)/bullet/src/ -I$(srcdir)/enet/include/
+ -I$(srcdir)/../lib/bullet/src/ -I$(srcdir)/../lib/enet/include/
 
 supertuxkart_SOURCES = \
  main.cpp \