From e59fcfe6ce4fb4d84a7e55646b7adce6487b9a99 Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Wed, 4 Aug 2004 10:03:57 +0000
Subject: [PATCH] Cleaned up the gdal-config usage to work with gdal-1.1.9

---
 Make/makedefs                       | 37 ++++++++++-------------------
 src/osgPlugins/freetype/GNUmakefile | 11 ++-------
 2 files changed, 15 insertions(+), 33 deletions(-)

diff --git a/Make/makedefs b/Make/makedefs
index 082cb8ea1..d121ef5c2 100644
--- a/Make/makedefs
+++ b/Make/makedefs
@@ -113,8 +113,6 @@ PLUGIN_EXT     = so
 MAKEDIST       = echo "   === Distribution build is not implemented yet for $(OS)"; printf "\n"
 INSTLOGFILE    = /tmp/.osg_inst_log
 
-LIBXML2_INCLUDE = -I/usr/include/libxml2
-
 ifneq ("$(OPENTHREADS_INC_DIR)","")
 INC += -I$(OPENTHREADS_INC_DIR)
 endif
@@ -216,9 +214,8 @@ ifeq ($(OS),SunOS)
   FREETYPE_INCLUDE  = `freetype-config --cflags`
   FREETYPE_LIB      = `freetype-config --libs`
 
-  GDAL_INCLUDES     = -I`gdal-config --prefix`/include
-  GDAL_LIBS         = `gdal-config --dep-libs`
-  GDAL_LIBS         += `gdal-config --libs`
+  GDAL_INCLUDES     = `gdal-config --cflags`
+  GDAL_LIBS         = `gdal-config --libs`
 
 
 endif
@@ -304,9 +301,8 @@ ifeq ($(OS),IRIX)
   FREETYPE_INCLUDE  = `freetype-config --cflags`
   FREETYPE_LIB      = `freetype-config --libs`
 
-  GDAL_INCLUDES     = -I`gdal-config --prefix`/include
-  GDAL_LIBS         = `gdal-config --dep-libs`
-  GDAL_LIBS         += `gdal-config --libs`
+  GDAL_INCLUDES     = `gdal-config --cflags`
+  GDAL_LIBS         = `gdal-config --libs`
 
 
 endif
@@ -389,9 +385,8 @@ ifeq ($(OS),Linux)
   FREETYPE_INCLUDE  = `freetype-config --cflags`
   FREETYPE_LIB      = `freetype-config --libs`
 
-  GDAL_INCLUDES     = -I`gdal-config --prefix`/include
-  GDAL_LIBS         = `gdal-config --dep-libs`
-  GDAL_LIBS         += `gdal-config --libs`
+  GDAL_INCLUDES     = `gdal-config --cflags`
+  GDAL_LIBS         = `gdal-config --libs`
 
 endif
 
@@ -423,9 +418,8 @@ ifeq ($(OS),FreeBSD)
   FREETYPE_INCLUDE  = `freetype-config --cflags`
   FREETYPE_LIB      = `freetype-config --libs`
 
-  GDAL_INCLUDES     = -I`gdal-config --prefix`/include
-  GDAL_LIBS         = `gdal-config --dep-libs`
-  GDAL_LIBS         += `gdal-config --libs`
+  GDAL_INCLUDES     = `gdal-config --cflags`
+  GDAL_LIBS         = `gdal-config --libs`
 
 endif
 
@@ -456,7 +450,6 @@ ifeq ($(OS),Darwin)
   SOCKET_LIBS       = 
   OTHER_LIBS        = -lm -lstdc++ -lobjc -lOpenThreads
   LIB_EXT           = dylib
-  LIBXML2_INCLUDE   = -I/usr/include/libxml2 -I/sw/include/libxml2 
   LIBVERSION	    = -current_version $(VERSION) \
                         -compatibility_version \
                         $(VERSION_MAJOR).$(VERSION_MINOR).0
@@ -474,9 +467,8 @@ ifeq ($(OS),Darwin)
   FREETYPE_INCLUDE  = `freetype-config --cflags`
   FREETYPE_LIB      = `freetype-config --libs`
 
-  GDAL_INCLUDES     = -I`gdal-config --prefix`/include
-  GDAL_LIBS         = `gdal-config --dep-libs`
-  GDAL_LIBS         += `gdal-config --libs`
+  GDAL_INCLUDES     = `gdal-config --cflags`
+  GDAL_LIBS         = `gdal-config --libs`
 
 endif
 
@@ -512,7 +504,7 @@ ifeq ($(OS),CYGWIN)
   FREETYPE_INCLUDE  = `freetype-config --cflags`
   FREETYPE_LIB      = `freetype-config --libs`
 
-  GDAL_INCLUDES     = -I`gdal-config --prefix`/include
+  GDAL_INCLUDES     = `gdal-config --cflags`
   GDAL_LIBS         = `gdal-config --dep-libs`
   GDAL_LIBS         += `gdal-config --libs`
 
@@ -571,8 +563,6 @@ ifeq ($(OS),MINGW)
 
   GDAL_LIB          =  -lgdal -ljpeg -lgeotiff -ltiff -lpng -lz
 
-  LIBXML2_INCLUDE = -I/usr/mingw/include/libxml2
-
   LIBINST    = bin
   PLUGININST = bin/$(OS)$(ARCH)
 
@@ -640,9 +630,8 @@ endif
   FREETYPE_INCLUDE  = `freetype-config --cflags`
   FREETYPE_LIB      = `freetype-config --libs`
 
-  GDAL_INCLUDES     = -I`gdal-config --prefix`/include
-  GDAL_LIBS         = `gdal-config --dep-libs`
-  GDAL_LIBS         += `gdal-config --libs`
+  GDAL_INCLUDES     = `gdal-config --cflags`
+  GDAL_LIBS         = `gdal-config --libs`
 
 endif
 
diff --git a/src/osgPlugins/freetype/GNUmakefile b/src/osgPlugins/freetype/GNUmakefile
index 3ce08ccbf..943b26d92 100644
--- a/src/osgPlugins/freetype/GNUmakefile
+++ b/src/osgPlugins/freetype/GNUmakefile
@@ -6,17 +6,10 @@ CXXFILES =\
         FreeTypeFont.cpp\
         ReaderWriterFreeType.cpp\
 
+INC += $(FREETYPE_INCLUDE)
+
 LIBS   += -losgText $(OSG_LIBS) $(FREETYPE_LIB) $(OTHER_LIBS)
 
-ifneq ($(OS),HP-UX)
-INC += -I$(OSGHOME)/include \
-    -I/usr/include/freetype2 \
-    -I/usr/local/include \
-    -I/usr/local/include/freetype2  \
-    -I/usr/freeware/include \
-    -I/usr/freeware/include/freetype2
-endif
-INC += $(FREETYPE_INCLUDE)
 
 TARGET_BASENAME = freetype
 include $(TOPDIR)/Make/cygwin_plugin_def