From 9f8387710f92c2873df645283b2ecdfa1d92ff69 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Wed, 17 Nov 2004 19:31:02 +0000 Subject: [PATCH] Changed the dependencies file to use ?= instead of = to allow env vars to override local settings. --- Make/dependencies | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/Make/dependencies b/Make/dependencies index 772634a8e..0b6c9441c 100644 --- a/Make/dependencies +++ b/Make/dependencies @@ -1,39 +1,39 @@ ################################################################ # Dependency library which have been installed on this system -GDAL_INSTALLED = no -JASPER_INSTALLED = no +GDAL_INSTALLED ?= no +JASPER_INSTALLED ?= no -FREETYPE_INSTALLED = yes +FREETYPE_INSTALLED ?= yes ifeq ($(OS),Darwin) - DARWIN_QUICKTIME = yes + DARWIN_QUICKTIME ?= yes endif ifeq ($(DARWIN_QUICKTIME),yes) - QUICKTIME_INSTALLED = yes - LIBJPEG_INSTALLED = no - LIBUNGIF_INSTALLED = no - LIBTIFF_INSTALLED = no - LIBPNG_INSTALLED = no - LIBMPEG3_INSTALLED = no + QUICKTIME_INSTALLED ?= yes + LIBJPEG_INSTALLED ?= no + LIBUNGIF_INSTALLED ?= no + LIBTIFF_INSTALLED ?= no + LIBPNG_INSTALLED ?= no + LIBMPEG3_INSTALLED ?= no else - QUICKTIME_INSTALLED = no - LIBJPEG_INSTALLED = yes - LIBUNGIF_INSTALLED = yes - LIBTIFF_INSTALLED = yes - LIBPNG_INSTALLED = yes - LIBMPEG3_INSTALLED = no + QUICKTIME_INSTALLED ?= no + LIBJPEG_INSTALLED ?= yes + LIBUNGIF_INSTALLED ?= yes + LIBTIFF_INSTALLED ?= yes + LIBPNG_INSTALLED ?= yes + LIBMPEG3_INSTALLED ?= no endif -COIN_INSTALLED = no -INVENTOR_INSTALLED = no +COIN_INSTALLED ?= no +INVENTOR_INSTALLED ?= no -PERFORMER_INSTALLED = no +PERFORMER_INSTALLED ?= no -DEMETER_INSTALLED = no +DEMETER_INSTALLED ?= no