[ekiga] [windows] Do not use the now useless local directx headers anymore

[Eugen Dedu <ededu src gnome org>]

commit d06f3f0c484642ab75545735809cc4dd86d23f1b
Author: Eugen Dedu <Eugen Dedu pu-pm univ-fcomte fr>
Date:   Wed May 16 17:37:41 2012 +0200

    [windows] Do not use the now useless local directx headers anymore
    
    They will be removed later.  Tested with mingw-w64 from current
    unstable.

 win32/Makefile |   14 ++++++++++----
 1 files changed, 10 insertions(+), 4 deletions(-)
---
diff --git a/win32/Makefile b/win32/Makefile
index d71718f..ad8409b 100644
--- a/win32/Makefile
+++ b/win32/Makefile
@@ -251,8 +251,11 @@ DOC_LINGUAS :=
 
 confflags := --prefix=$(BUILDROOT) --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE)
 
-confptlib := $(confflags) \
-	--enable-vfw --with-directx-includedir=$(EKIGA_DIR)/win32/directx \
+confptlib := $(confflags) --enable-vfw \
+ifeq ($(MINGW32), 1)
+	# directx dir can be removed for mingw-w64
+	--with-directx-includedir=$(EKIGA_DIR)/win32/directx \
+endif
 	--disable-qos --disable-alsa --disable-esd --disable-oss --disable-sunaudio --disable-shmaudio \
 	--disable-v4l --disable-v4l2 --disable-bsdvideo --disable-avc --disable-dc
 
@@ -260,8 +263,11 @@ confptlib := $(confflags) \
 confopal := $(confflags) --disable-t38 --disable-fax --disable-iLBC --disable-silk
 
 confekiga:= $(confflags) \
-	--with-directx-dir=$(EKIGA_DIR)/win32/directx --prefix=$(EKIGA_PREFIX) \
-	--bindir=$(EKIGA_PREFIX) --datadir=$(EKIGA_PREFIX) \
+ifeq ($(MINGW32), 1)
+	# directx dir can be removed for mingw-w64
+	--with-directx-dir=$(EKIGA_DIR)/win32/directx \
+endif
+	--prefix=$(EKIGA_PREFIX) --bindir=$(EKIGA_PREFIX) --datadir=$(EKIGA_PREFIX) \
 	--sysconfdir=$(EKIGA_PREFIX) --libdir=$(EKIGA_PREFIX) \
 	--with-ldap-dir=$(OPENLDAP_DIR) --with-libsasl2-dir=$(LIBSASL2_DIR) --with-boost=$(BUILDROOT) # --enable-static-libs