From fa1a9f40601af98ed6633820bcd545bdd02b7b6c Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Thu, 5 Feb 2004 10:10:18 +0000
Subject: [PATCH] Removed slideshow3D from list of example apps, and rejigged
 makedefs handling of the QUICK_TIME

---
 Make/dependencies |  1 -
 Make/makedefs     | 14 ++++++++------
 Make/makedirdefs  |  4 ----
 3 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/Make/dependencies b/Make/dependencies
index ba98e8a43..707c2d1b5 100644
--- a/Make/dependencies
+++ b/Make/dependencies
@@ -2,7 +2,6 @@
 # Dependency library which have been installed on this system
 
 GDAL_INSTALLED = yes
-LIBXML2_INSTALLED = yes
 JASPER_INSTALLED = yes
 
 FREETYPE_INSTALLED = yes
diff --git a/Make/makedefs b/Make/makedefs
index f36531cf5..e04282635 100644
--- a/Make/makedefs
+++ b/Make/makedefs
@@ -413,15 +413,17 @@ ifeq ($(OS),Darwin)
   LIBVERSION	    = -current_version $(VERSION) \
                         -compatibility_version \
                         $(VERSION_MAJOR).$(VERSION_MINOR).0
+
   ifeq ($(DARWIN_QUICKTIME),yes)
-    QUICKTIME	    = -framework QuickTime $(CARBON_LIB)
     DEF             += -DDARWIN_QUICKTIME
-  else
-    PNG_LIBS        = -lpng -lz
-    JPEG_LIBS       = -ljpeg
-    GIF_LIBS        = -lungif
-    TIFF_LIBS       = -ltiff -lz -ljpeg
   endif
+
+  QUICKTIME	    = -framework QuickTime $(CARBON_LIB)
+  PNG_LIBS        = -lpng -lz
+  JPEG_LIBS       = -ljpeg
+  GIF_LIBS        = -lungif
+  TIFF_LIBS       = -ltiff -lz -ljpeg
+
 endif
 
 #### Cygwin/Mingw specific definitions
diff --git a/Make/makedirdefs b/Make/makedirdefs
index 27ceb9e14..2f436b61a 100644
--- a/Make/makedirdefs
+++ b/Make/makedirdefs
@@ -189,10 +189,6 @@ ifeq ($(LIBMPEG3_INSTALLED),yes)
     EXAMPLE_DIRS += osgmovie
 endif
 
-ifeq ($(LIBXML2_INSTALLED),yes)
-    EXAMPLE_DIRS += slideshow3D
-endif
-
 ifeq ($(DEMETER_INSTALLED),yes)
     EXAMPLE_DIRS += osgdemeter
 endif