From c1166cf3d5f68f3b23f3a9ddd3d5aaa583a08eb8 Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Wed, 10 Sep 2003 19:55:14 +0000
Subject: [PATCH] Addeed LIBXML2_INCLUDE defined to Make/makedefs to handle non
 standard placement of libxml2 in OSX.

---
 Make/makedefs                         | 7 +++++--
 examples/slideshow3D/GNUmakefile      | 2 +-
 examples/slideshow3D/GNUmakefile.inst | 2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/Make/makedefs b/Make/makedefs
index d47cfbf58..03094723e 100644
--- a/Make/makedefs
+++ b/Make/makedefs
@@ -103,6 +103,8 @@ 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
@@ -403,9 +405,10 @@ ifeq ($(OS),Darwin)
   SOCKET_LIBS       = 
   OTHER_LIBS        = -lm -lstdc++ -lobjc -lOpenThreads
   LIB_EXT           = dylib
-  QUICKTIME	        = -framework QuickTime $(CARBON_LIB)
+  QUICKTIME	    = -framework QuickTime $(CARBON_LIB)
   FREETYPE_INCLUDE  = -I/sw/include/freetype2
-  TIFF_LIB	        = -ltiff
+  LIBXML2_INCLUDE   = -I/sw/include/libxml2
+  TIFF_LIB	    = -ltiff
   LIBVERSION	    = -current_version $(VERSION) \
                         -compatibility_version \
                         $(VERSION_MAJOR).$(VERSION_MINOR).0
diff --git a/examples/slideshow3D/GNUmakefile b/examples/slideshow3D/GNUmakefile
index e8710aa70..181267ab3 100644
--- a/examples/slideshow3D/GNUmakefile
+++ b/examples/slideshow3D/GNUmakefile
@@ -16,7 +16,7 @@ INSTFILES = \
 
 EXEC = slideshow3D
 
-INC +=  $(X_INC) -I/usr/include/libxml2
+INC +=  $(X_INC) $(LIBXML2_INCLUDE)
 
 include $(TOPDIR)/Make/makerules 
 
diff --git a/examples/slideshow3D/GNUmakefile.inst b/examples/slideshow3D/GNUmakefile.inst
index 173ecf5db..a5bc3d5d7 100644
--- a/examples/slideshow3D/GNUmakefile.inst
+++ b/examples/slideshow3D/GNUmakefile.inst
@@ -12,7 +12,7 @@ LIBS     += -lxml2 -losgProducer -lProducer -losgDB -losgText -losgUtil -losg $(
 
 EXEC = slideshow3D
 
-INC += $(PRODUCER_INCLUDE_DIR) $(X_INC) -I/usr/include/libxml2
+INC += $(PRODUCER_INCLUDE_DIR) $(X_INC) $(LIBXML2_INCLUDE)
 LDFLAGS  += $(PRODUCER_LIB_DIR)
 
 include $(TOPDIR)/Make/makerules