[dia] Fix path to libEMF emf.h

[Hans Breuer <hans src gnome org>]

commit 65822bb7e638093a4bc88b0e3763396ac8501537
Author: Daniel Macks <dmacks netspace org>
Date:   Tue Dec 3 10:59:39 2013 -0500

    Fix path to libEMF emf.h
    
    All libEMF headers are in a libEMF subdir but that bdir does not
    appear to be needed as a separate -I path. Instead of hardcoding
    -I/usr/include/libEMF (bad idea to assume /usr as its prefix anyway)
    and use "emf.h" via it, just directly check and use "libEMF/emf.h".
    
    https://bugzilla.gnome.org/show_bug.cgi?id=719781
    
    Signed-off-by: Hans Breuer <hans breuer org>

 configure.in         |    4 +---
 plug-ins/wmf/wmf.cpp |    2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)
---
diff --git a/configure.in b/configure.in
index d6b2eb0..eec699f 100644
--- a/configure.in
+++ b/configure.in
@@ -257,12 +257,10 @@ if test "$enable_libemf" = "yes"; then
        old_CFLAGS="${CFLAGS}"
        old_LIBS="${LIBS}"
 
-       CPPFLAGS="${CPPFLAGS} -I /usr/include/libEMF"
-       AC_CHECK_HEADER(emf.h, emf_ok=yes, emf_ok=no)
+       AC_CHECK_HEADER(libEMF/emf.h, emf_ok=yes, emf_ok=no)
        AC_CHECK_LIB(EMF, CreateEnhMetaFileWithFILEW, , emf_ok=no, -lstdc++)
 
        if test "$emf_ok" = yes; then
-               LIBEMF_CFLAGS='-I /usr/include/libEMF'
                LIBEMF_LIBS='-lEMF -lstdc++'
                AC_DEFINE(HAVE_LIBEMF,1,[libEMF library available])
        fi
diff --git a/plug-ins/wmf/wmf.cpp b/plug-ins/wmf/wmf.cpp
index 1783afc..cc55892 100644
--- a/plug-ins/wmf/wmf.cpp
+++ b/plug-ins/wmf/wmf.cpp
@@ -64,7 +64,7 @@ wmf.cpp:1383:40: error: cast from 'void*' to 'W32::HDC' loses precision
  */
 #define STRICT
   namespace W32 {
-#  include <emf.h>
+#  include <libEMF/emf.h>
   }
 #undef STRICT
 #else