From 282a48a38b48feae40915d9cfe9f824b846642ca Mon Sep 17 00:00:00 2001
From: Fons Rademakers <Fons.Rademakers@cern.ch>
Date: Fri, 6 Jan 2006 16:57:23 +0000
Subject: [PATCH] added new option --disable-astiff in ./configure in case the
system libtiff is not good or compatible (happened on some platforms).
git-svn-id: http://root.cern.ch/svn/root/trunk@13790 27541ba8-7e3a-0410-8455-c3a389f83636
---
asimage/Module.mk | 9 ++++++++-
configure | 19 +++++++++++++++----
2 files changed, 23 insertions(+), 5 deletions(-)
diff --git a/asimage/Module.mk b/asimage/Module.mk
index 29ea53ebab6..9ef684c9539 100644
--- a/asimage/Module.mk
+++ b/asimage/Module.mk
@@ -161,6 +161,11 @@ else
if [ "$(ASPNGINCDIR)" != "" ]; then \
PNGINCDIR="--with-png-includes=$(ASPNGINCDIR)"; \
fi; \
+ if [ "$(ASTIFFINCDIR)" = "--with-tiff=no" ]; then \
+ TIFFINCDIR="$(ASTIFFINCDIR)"; \
+ elif [ "$(ASTIFFINCDIR)" != "" ]; then \
+ TIFFINCDIR="--with-tiff-includes=$(ASTIFFINCDIR)"; \
+ fi; \
if [ "$(ASGIFINCDIR)" != "" ]; then \
GIFINCDIR="--with-gif-includes=$(ASGIFINCDIR)"; \
NOUNGIF="--with-ungif --with-builtin-ungif=no"; \
@@ -173,14 +178,16 @@ else
GNUMAKE=$(MAKE) CC=$$ACC CFLAGS=$$ACFLAGS \
./configure \
--with-ttf $$TTFINCDIR \
- --with-tiff=no \
--with-afterbase=no \
--disable-glx \
$$MMX \
$(ASTEPDBG) \
--with-builtin-ungif \
+ --with-jpeg \
$$JPEGINCDIR \
+ --with-png \
$$PNGINCDIR \
+ $$TIFFINCDIR \
$$GIFINCDIR; \
$(MAKE))
endif
diff --git a/configure b/configure
index 3b4d98763b4..88a32c4b839 100755
--- a/configure
+++ b/configure
@@ -25,6 +25,7 @@ options=" \
enable_afs \
enable_alien \
enable_asimage \
+ enable_astiff \
enable_builtin_afterimage \
enable_builtin_freetype \
enable_builtin_pcre \
@@ -729,6 +730,7 @@ enable/disable options, prefix with either --enable- or --disable-
afs AFS support, requires AFS libs and objects
alien AliEn support, requires libgliteUI from ALICE
asimage Image processing support, requires libAfterImage
+ astiff Include tiff support in image processing
builtin-afterimage Built included libAfterImage, or use system libAfterImage
builtin-freetype Built included libfreetype, or use system libfreetype
builtin-pcre Built included libpcre, or use system libpcre
@@ -1901,9 +1903,13 @@ if test ! "x$enable_asimage" = "xno" ; then
/usr/local/include /usr/include /usr/local/include/libpng \
/opt/include
aspngincdir=$found_dir
- check_header "tiffio.h" "" $ASIMAGE $ASIMAGE/include \
- /usr/local/include /usr/include /opt/include
- astiffincdir=$found_dir
+ if test ! "x$enable_astiff" = "xno" ; then
+ check_header "tiffio.h" "" $ASIMAGE $ASIMAGE/include \
+ /usr/local/include /usr/include /opt/include
+ astiffincdir=$found_dir
+ else
+ astiffincdir="--with-tiff=no"
+ fi
check_header "gif_lib.h" "" $ASIMAGE $ASIMAGE/include \
/usr/local/include /usr/include /opt/include
asgifincdir=$found_dir
@@ -1916,7 +1922,12 @@ if test ! "x$enable_asimage" = "xno" ; then
# add libpng which needs libz
# don't look for libungif since we use the one built-in in libAfterImage
#for k in libjpeg libtiff libungif libz libpng ; do
- for k in libjpeg libtiff libz libpng ; do
+ if test ! "x$enable_astiff" = "xno" ; then
+ aslibs="libjpeg libtiff libz libpng"
+ else
+ aslibs="libjpeg libz libpng"
+ fi
+ for k in $aslibs ; do
check_library $k "$enable_shared" "" \
$ASIMAGE $ASIMAGE/lib /usr/local/lib /usr/lib /opt/lib
if test "x$k" = "xlibz" ; then
--
GitLab