[PATCH 3/3] Fix configure flags

[Guillem Jover]

---
 debian/rules |   18 +++++++++++-------
 1 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/debian/rules b/debian/rules
index 99483f3..c96c578 100755
--- a/debian/rules
+++ b/debian/rules
@@ -24,14 +24,17 @@ export DEB_HOST_GNU_TYPE
 export DEB_BUILD_GNU_TYPE
 
 confflags = --prefix=/usr
-confflags += --disable-rpath --enable-dlopen \
-	     --enable-dependency-tracking \
+confflags += --disable-rpath --enable-sdl-dlopen \
+	     --disable-video-ggi \
 	     --enable-arts-shared=no --enable-alsa-shared=no \
-	     --enable-esd-shared=no --enable-pulseaudio-shared=no
-all_confflags = --disable-video-ggi \
-		--enable-video-aalib --enable-video-directfb \
+	     --enable-esd-shared=no --enable-pulseaudio-shared=no \
+	     --enable-nas-shared=no --enable-x11-shared=no
+flavour_conffflags = --enable-video-x11 \
+		     --disable-video-directfb --disable-video-svga \
+		     --disable-video-aalib --disable-video-caca
+all_confflags = --enable-video-directfb --enable-video-aalib \
 		--enable-video-caca
-udeb_confflags = --enable-video-directfb --disable-video-ggi \
+udeb_confflags = --enable-video-directfb \
 		 --disable-video-svga --disable-video-x11 \
 		 --disable-video-aalib --disable-dga --disable-video-photon \
 		 --disable-video-fbcon --disable-video-ps2gs \
@@ -92,7 +95,7 @@ configure-stamp:
 	    elif ( [ "$$dir" = "udeb" ] ); then \
 	        SWITCHES="$(udeb_confflags)"; \
 	    else \
-	        SWITCHES=""; \
+	        SWITCHES="$(flavour_conffflags)"; \
 	        for switch in $(FLAVOURS); do \
 	            if ( [ "$$dir" = "$$switch" ] ); then \
 	                SWITCHES="$$SWITCHES --enable-$$switch"; \
@@ -102,6 +105,7 @@ configure-stamp:
 	        done; \
 	    fi; \
 	    mkdir -p builddir/$$dir; \
+	    echo "Configuring flavour $$dir with flags: $$SWITCHES"; \
 	    (cd builddir/$$dir; ../../configure $(confflags) $$SWITCHES); \
 	done
 	touch configure-stamp
-- 
1.7.4.1


--GvXjxJ+pjyke8COw--