Description: Include Freetype headers in recommended way.
 This change should fix <https://sourceforge.net/p/lasi/bugs/2/>. The
 change goes a bit beyond the macports patch for the problem linked in
 that bug report which was incomplete. (I searched for all occurrences
 of #include and freetype in the code base and changed to the standard
 form.)
 .
 Tested on Linux with Freetype version 2.4.9 which implies this change
 does not disrupt anything for that Freetype version. A further test
 for Freetype version 2.5.1 (which previously could not be used with
 libLASi because of the non-standard #includes in the old version
 of that code) has been requested.
Author: Alan W. Irwin
Origin: http://sourceforge.net/p/lasi/code/182/
Bug: http://sourceforge.net/p/lasi/bugs/2/
Bug-Debian: http://bugs.debian.org/733405
Reviewed-By: Juhani Numminen <juhaninumminen0@gmail.com> 

--- lasi-1.1.0.orig/include/LASi.h
+++ lasi-1.1.0/include/LASi.h
@@ -11,7 +11,8 @@
 #include <sstream>
 #include <map>
 #include <pango/pango.h>
-#include <freetype/ftglyph.h>
+#include <ft2build.h>
+#include FT_GLYPH_H
 
 class FreetypeGlyphMgr;
 class ContextMgr;
--- lasi-1.1.0.orig/src/drawGlyph.cpp
+++ lasi-1.1.0/src/drawGlyph.cpp
@@ -6,7 +6,8 @@
  */
 
 #include <ostream>
-#include <freetype/ftoutln.h>
+#include <ft2build.h>
+#include FT_OUTLINE_H
 #include <algorithm>
 #include <LASi.h>
 #include <config.h>
--- lasi-1.1.0.orig/src/drawGlyph.h
+++ lasi-1.1.0/src/drawGlyph.h
@@ -10,7 +10,8 @@
 
 #include <iostream>
 #include <pango/pango.h>
-#include <freetype/freetype.h>
+#include <ft2build.h>
+#include FT_FREETYPE_H
 
 /** Generate the Postscript commands to draw the glyph
   * using the font in pPangoCtx.
--- lasi-1.1.0.orig/src/glyphMgr.cpp
+++ lasi-1.1.0/src/glyphMgr.cpp
@@ -10,8 +10,7 @@
 
 #include <ft2build.h>
 #include FT_FREETYPE_H
-
-#include <freetype/ftglyph.h>
+#include FT_GLYPH_H
 
 #include <cassert>
 #include "util.h"
--- lasi-1.1.0.orig/src/glyphMgr.h
+++ lasi-1.1.0/src/glyphMgr.h
@@ -15,8 +15,7 @@
 
 #include <ft2build.h>
 #include FT_FREETYPE_H
-
-#include <freetype/ftglyph.h>
+#include FT_GLYPH_H
 
 /** Manage FT_Glyph by insuring that FT_Glyph is handled correctly.
  */
--- lasi-1.1.0.orig/src/util.cpp
+++ lasi-1.1.0/src/util.cpp
@@ -11,7 +11,6 @@
 
 #include <ft2build.h>
 #include FT_FREETYPE_H
-//#include <freetype/freetype.h>
 
 using namespace std;
 
--- lasi-1.1.0.orig/src/util.h
+++ lasi-1.1.0/src/util.h
@@ -18,7 +18,7 @@
 
 #include <ft2build.h>
 #include FT_FREETYPE_H
-#include <freetype/ftglyph.h>
+#include FT_GLYPH_H
 
 std::ostream& operator<<(std::ostream&, const FT_Library);
 std::ostream& operator<<(std::ostream&, const FT_Face);
