From a95a19c2336c7a257f1eaa9eafa4b58221daec17 Mon Sep 17 00:00:00 2001
From: Fons Rademakers <Fons.Rademakers@cern.ch>
Date: Wed, 29 Feb 2012 10:15:08 +0000
Subject: [PATCH] remove reference to external libungif as we will always use
libAfterImage builtin version.
git-svn-id: http://root.cern.ch/svn/root/trunk@43169 27541ba8-7e3a-0410-8455-c3a389f83636
---
config/Makefile.in | 1 -
configure | 16 ++--------------
graf2d/asimage/Module.mk | 4 ----
3 files changed, 2 insertions(+), 19 deletions(-)
diff --git a/config/Makefile.in b/config/Makefile.in
index b5e33dd6f30..8095d11645c 100644
--- a/config/Makefile.in
+++ b/config/Makefile.in
@@ -199,7 +199,6 @@ ASEXTRALIBDIR := @asextralibdir@
ASJPEGINCDIR := $(filter-out /usr/include, @asjpegincdir@)
ASPNGINCDIR := $(filter-out /usr/include, @aspngincdir@)
ASTIFFINCDIR := $(filter-out /usr/include, @astiffincdir@)
-ASGIFINCDIR := $(filter-out /usr/include, @asgifincdir@)
ASINCDIR := $(filter-out /usr/include, @asimageincdir@)
ASLIB := @asimagelib@
ASLIBDIR := @asimagelibdir@
diff --git a/configure b/configure
index ee55279d337..10fa78b81cd 100755
--- a/configure
+++ b/configure
@@ -3990,11 +3990,6 @@ if test ! "x$enable_asimage" = "xno" ; then
else
astiffincdir="--with-tiff=no"
fi
- check_header "gif_lib.h" "" \
- $ASIMAGE ${ASIMAGE:+$ASIMAGE/include} \
- ${finkdir:+$finkdir/include} \
- /usr/local/include /usr/include /opt/include
- asgifincdir=$found_dir
asextralib=""
asextralibdir=""
@@ -4002,12 +3997,10 @@ if test ! "x$enable_asimage" = "xno" ; then
found_dirz=""
# libz must be before libpng, if libz is not found don't
# add libpng which needs libz
- # note that failure to find system libungif is not fatal since
- # libAfterImage contains embedded libungif source if needed
if test ! "x$enable_astiff" = "xno" ; then
- aslibs="libjpeg libtiff libungif libz libpng"
+ aslibs="libjpeg libtiff libz libpng"
else
- aslibs="libjpeg libungif libz libpng"
+ aslibs="libjpeg libz libpng"
fi
for k in $aslibs ; do
check_library $k "$enable_shared" "" \
@@ -4022,9 +4015,6 @@ if test ! "x$enable_asimage" = "xno" ; then
if test "x$k" = "xlibpng" && test "x$found_libz" = "x" ; then
break;
fi
- if test "x$k" = "xlibungif" && test "x$found_lib" = "x" ; then
- asgifincdir=""
- fi
if test ! "x$found_lib" = "x" ; then
asextralib="$asextralib $found_lib"
asextralibdir="$asextralibdir $found_dir"
@@ -4036,7 +4026,6 @@ if test ! "x$enable_asimage" = "xno" ; then
asjpegincdir=""
aspngincdir=""
astiffincdir=""
- asgifincdir=""
else
asextralib="$asextralib $found_libz"
asextralibdir="$asextralibdir $found_dirz"
@@ -6423,7 +6412,6 @@ sed -e "s|@aclocaldir@|$aclocaldir|" \
-e "s|@asjpegincdir@|$asjpegincdir|" \
-e "s|@aspngincdir@|$aspngincdir|" \
-e "s|@astiffincdir@|$astiffincdir|" \
- -e "s|@asgifincdir@|$asgifincdir|" \
-e "s|@asimageincdir@|$asimageincdir|" \
-e "s|@asimagelib@|$asimagelib|" \
-e "s|@asimagelibdir@|$asimagelibdir|" \
diff --git a/graf2d/asimage/Module.mk b/graf2d/asimage/Module.mk
index 0af756a0e1e..9f3cca1cecb 100644
--- a/graf2d/asimage/Module.mk
+++ b/graf2d/asimage/Module.mk
@@ -171,9 +171,6 @@ else
elif [ "$(ASTIFFINCDIR)" != "" ]; then \
TIFFINCDIR="--with-tiff-includes=$(ASTIFFINCDIR)"; \
fi; \
- if [ "$(ASGIFINCDIR)" != "" ]; then \
- GIFINCDIR="--with-gif-includes=$(ASGIFINCDIR)"; \
- fi; \
if [ "$(FREETYPEDIRI)" != "" ]; then \
TTFINCDIR="--with-ttf-includes=-I../../../../$(FREETYPEDIRI)"; \
fi; \
@@ -186,7 +183,6 @@ else
$$MMX \
$(ASTEPDBG) \
--with-builtin-ungif \
- $$GIFINCDIR \
--with-jpeg \
$$JPEGINCDIR \
--with-png \
--
GitLab