Upgrade to 1.1.

This commit is contained in:
Vanilla I. Shu 1998-03-11 02:58:23 +00:00
parent 1d3aeb2e64
commit 7ce515e529
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=10101
13 changed files with 251 additions and 114 deletions

View file

@ -1,13 +1,13 @@
# New ports collection makefile for: imlib
# Version required: 1.0
# Version required: 1.1
# Date created: 10 June 1997
# Whom: Yukihiro Nakai <Nakai@Mlab.t.u-tokyo.ac.jp>
#
# $Id: Makefile,v 1.13 1998/02/18 15:36:01 vanilla Exp $
# $Id: Makefile,v 1.14 1998/02/27 01:56:19 alex Exp $
#
DISTNAME= Imlib-1.0
PKGNAME= imlib-1.0
DISTNAME= Imlib-1.1
PKGNAME= imlib-1.1
CATEGORIES= graphics
MASTER_SITES= ftp://ftp.enlightenment.org/pub/imlib/TAR/ \
ftp://ftp.labs.redhat.com/pub/imlib/TAR/
@ -16,7 +16,8 @@ MAINTAINER= vanilla@FreeBSD.ORG
LIB_DEPENDS= png\\.0\\.:${PORTSDIR}/graphics/png \
jpeg\\.7\\.:${PORTSDIR}/graphics/jpeg \
tiff34\\.1\\.:${PORTSDIR}/graphics/tiff34
tiff34\\.1\\.:${PORTSDIR}/graphics/tiff34 \
gif\\.3\\.:${PORTSDIR}/graphics/giflib
RUN_DEPENDS= djpeg:${PORTSDIR}/graphics/jpeg \
tgatoppm:${PORTSDIR}/graphics/netpbm \
convert:${PORTSDIR}/graphics/ImageMagick

View file

@ -1 +1 @@
MD5 (Imlib-1.0.tar.gz) = cc3c3eceb65a2a65e6f4de69bfbe5e18
MD5 (Imlib-1.1.tar.gz) = 27f85550e7eb6b2c8ed6e72e962931b7

View file

@ -1,14 +1,22 @@
--- configure.orig Tue Feb 17 17:22:20 1998
+++ configure Tue Feb 17 17:23:31 1998
@@ -2462,14 +2462,14 @@
echo "********** Disabling libpng support ************"
fi
--- configure.orig Fri Feb 20 09:42:49 1998
+++ configure Tue Mar 10 09:40:36 1998
@@ -826,6 +826,7 @@
# AFS /usr/afsws/bin/install, which mishandles nonexistent args
# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
# ./install, which can be erroneously created by make from ./install.sh.
+INSTALL='/usr/bin/install -c'
echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
echo "configure:831: checking for a BSD compatible install" >&5
if test -z "$INSTALL"; then
@@ -2590,14 +2591,14 @@
fi
-echo $ac_n "checking for TIFFOpen in -ltiff""... $ac_c" 1>&6
-echo "configure:2467: checking for TIFFOpen in -ltiff" >&5
- echo $ac_n "checking for TIFFOpen in -ltiff""... $ac_c" 1>&6
-echo "configure:2595: checking for TIFFOpen in -ltiff" >&5
-ac_lib_var=`echo tiff'_'TIFFOpen | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for TIFFOpen in -ltiff34""... $ac_c" 1>&6
+echo "configure:2467: checking for TIFFOpen in -ltiff34" >&5
+ echo $ac_n "checking for TIFFOpen in -ltiff34""... $ac_c" 1>&6
+echo "configure:2595: checking for TIFFOpen in -ltiff34" >&5
+ac_lib_var=`echo tiff34'_'TIFFOpen | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@ -16,20 +24,56 @@
ac_save_LIBS="$LIBS"
-LIBS="-ltiff \
+LIBS="-ltiff34 \
-L/usr/lib -L/lib -L/usr/local/lib -L/usr/X11/lib -L/usr/local/X11/lib \
-L/usr/openwin/lib -lc -lm $LIBS"
-L/usr/lib -L/lib -L/usr/local/lib -L/usr/X11/lib -L/usr/X11R6/lib \
-L/usr/local/X11/lib -L/usr/openwin/lib -lc -lm $LIBS"
cat > conftest.$ac_ext <<EOF
@@ -2500,11 +2500,11 @@
@@ -2627,13 +2628,13 @@
fi
if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
echo "$ac_t""yes" 1>&6
\
-extras="$extras -DBUILTIN_TIFF"; LIBS="$LIBS -lm -ltiff"
+extras="$extras -DBUILTIN_TIFF"; LIBS="$LIBS -lm -ltiff34"
- ac_tr_lib=HAVE_LIB`echo tiff | sed -e 's/[^a-zA-Z0-9_]/_/g' \
+ ac_tr_lib=HAVE_LIB`echo tiff34 | sed -e 's/[^a-zA-Z0-9_]/_/g' \
-e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
cat >> confdefs.h <<EOF
#define $ac_tr_lib 1
EOF
- LIBS="-ltiff $LIBS"
+ LIBS="-ltiff34 $LIBS"
else
echo "$ac_t""no" 1>&6
\
-echo "********** Disabling libtiff support ************"
+echo "********** Disabling libtiff34 support ************"
fi
@@ -2642,7 +2643,7 @@
if test "" != ""; then
enl_lib_subdir=
else
- enl_lib_subdir=tiff
+ enl_lib_subdir=tiff34
fi
enl_cur_var=tiff_TIFFOpen
echo $ac_n "checking for tiffio.h""... $ac_c" 1>&6
@@ -2673,11 +2674,11 @@
fi
echo "$ac_t""$enl_tmp_var" 1>&6
\
-extras="$extras -DBUILTIN_TIFF"; LIBS="$LIBS -lm -ltiff"
+extras="$extras -DBUILTIN_TIFF"; LIBS="$LIBS -lm -ltiff34"
else
echo "$ac_t""no" 1>&6
\
-{ echo "configure: error: ********** Disabling libtiff support ************" 1>&2; exit 1; }
+{ echo "configure: error: ********** Disabling libtiff34 support ************" 1>&2; exit 1; }
fi
echo $ac_n "checking for DGifOpenFileName in -lgif""... $ac_c" 1>&6
@@ -2788,8 +2789,8 @@
if test $GIFTOPPM = "/usr/local/bin/tgatoppm"; then
NETPBM_PATH=/usr/local/bin
fi
-if test $GIFTOPPM = "/usr/openwin/bin/tgatoppm"; then
- NETPBM_PATH=/usr/openwin/bin
+if test $GIFTOPPM = "/usr/X11R6/bin/tgatoppm"; then
+ NETPBM_PATH=/usr/X11R6/bin
fi
if test $DJPEG = "/usr/bin/djpeg"; then
JPEG_PATH=/usr/bin

View file

@ -1,6 +1,6 @@
--- Makefile.in.orig Tue Feb 10 07:55:09 1998
+++ Makefile.in Tue Feb 17 17:49:08 1998
@@ -29,7 +29,7 @@
--- Makefile.in.orig Wed Feb 25 00:34:26 1998
+++ Makefile.in Tue Mar 10 09:47:49 1998
@@ -30,7 +30,7 @@
INSTALL = @INSTALL@
INSTALLBIN = $(INSTALL) -m 755
INSTALLLIB = $(INSTALL) -m 644
@ -9,29 +9,26 @@
.SUFFIXES:
.SUFFIXES: .c .o
@@ -39,14 +39,14 @@
@@ -51,15 +51,14 @@
top_srcdir = @top_srcdir@
srcdir = @srcdir@
-prefix = /usr
-exec_prefix = /usr
-prefix = @prefix@
-exec_prefix = @prefix@
+prefix = /usr/X11R6
+exec_prefix = /usr/X11R6
bindir = $(exec_prefix)/bin
-datadir = /usr/lib
-incdir = /usr/include
-libdir = /usr/lib
-exe2dir = /usr/bin
-mandir = /usr/man
+datadir = /usr/X11R6/share
+incdir = /usr/X11R6/include
+libdir = /usr/X11R6/lib
+exe2dir = /usr/X11R6/bin
+mandir = /usr/X11R6/man
-datadir = $(prefix)/lib
+datadir = $(prefix)/share
incdir = $(prefix)/include
libdir = $(prefix)/lib
exe2dir = $(prefix)bin
mandir = $(prefix)/man
-SYS_CONFIG = @sysconfdir@
LN_S = @LN_S@
RANLIB = @RANLIB@
@@ -79,7 +79,7 @@
@@ -93,7 +92,7 @@
LIB = \
-lm \
@ -40,40 +37,45 @@
-ljpeg \
-lpng \
-lgif \
@@ -94,6 +94,7 @@
@X_LIBS@ \
@X_EXTRA_LIBS@ \
$(LIB) \
+-I/usr/local/lib \
$(XLIB)
@@ -101,6 +100,7 @@
OPT= \
@@ -110,8 +111,8 @@
@CFLAGS@ \
@X_CFLAGS@ \
XLIB = \
-lX11 \
+-L/usr/local/lib \
-lXext
LIBS = \
@@ -122,11 +122,11 @@
CFLAGS = \
-fPIC \
--shared \
-I. \
@CFLAGS@ \
@X_CFLAGS@ \
@INCLUDES@ \
+-I/usr/local/include \
$(OPT)
all: $(lib)
@@ -121,6 +122,9 @@
@@ -136,6 +136,9 @@
$(INSTALLBIN) $(lib) $(libdir)/$(lib)
/bin/ln -sf $(libdir)/$(lib) $(libdir)/$(libname2)
/bin/ln -sf $(libdir)/$(lib) $(libdir)/$(libname).so
+ if [ ! -d $(SYS_CONFIG) ]; then \
+ mkdir $(SYS_CONFIG); \
+ fi
$(INSTALL) $(conf_dir)/imrc $(SYS_CONFIG)/imrc
$(INSTALL) $(conf_dir)/im_palette.pal $(SYS_CONFIG)/im_palette.pal
sed s@/etc/@$(SYS_CONFIG)/@g< $(conf_dir)/imrc > $(SYS_CONFIG)/imrc
$(INSTALL) Imlib.h $(incdir)/Imlib.h
@@ -146,7 +150,7 @@
@@ -159,8 +162,8 @@
.c.o:
$(CC) -c $(CPPFLAGS) $(CFLAGS) $<
$(lib): $(OBJS)
- $(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) -Wl,-soname,$(libname2)
+ ld -Bshareable -o libImlib.so.1.0 $(OBJS) /usr/lib/c++rt0.o
-$(lib): $(OBJS)
- $(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SONAME)
+$(lib): $(OBJS)
+ ld -Bshareable -o libImlib.so.1.1 $(OBJS) /usr/lib/c++rt0.o
@echo "--------------------------------------------------------------------------------"
@echo "Imlib compiled."
@echo ""

View file

@ -5,5 +5,5 @@ include/Imlib_private.h
include/Imlib_types.h
lib/libImlib.so
lib/libImlib.so.1
lib/libImlib.so.1.0
lib/libImlib.so.1.1
@dirrm etc/imlib

View file

@ -1,13 +1,13 @@
# New ports collection makefile for: imlib
# Version required: 1.0
# Version required: 1.1
# Date created: 10 June 1997
# Whom: Yukihiro Nakai <Nakai@Mlab.t.u-tokyo.ac.jp>
#
# $Id: Makefile,v 1.13 1998/02/18 15:36:01 vanilla Exp $
# $Id: Makefile,v 1.14 1998/02/27 01:56:19 alex Exp $
#
DISTNAME= Imlib-1.0
PKGNAME= imlib-1.0
DISTNAME= Imlib-1.1
PKGNAME= imlib-1.1
CATEGORIES= graphics
MASTER_SITES= ftp://ftp.enlightenment.org/pub/imlib/TAR/ \
ftp://ftp.labs.redhat.com/pub/imlib/TAR/
@ -16,7 +16,8 @@ MAINTAINER= vanilla@FreeBSD.ORG
LIB_DEPENDS= png\\.0\\.:${PORTSDIR}/graphics/png \
jpeg\\.7\\.:${PORTSDIR}/graphics/jpeg \
tiff34\\.1\\.:${PORTSDIR}/graphics/tiff34
tiff34\\.1\\.:${PORTSDIR}/graphics/tiff34 \
gif\\.3\\.:${PORTSDIR}/graphics/giflib
RUN_DEPENDS= djpeg:${PORTSDIR}/graphics/jpeg \
tgatoppm:${PORTSDIR}/graphics/netpbm \
convert:${PORTSDIR}/graphics/ImageMagick

View file

@ -1 +1 @@
MD5 (Imlib-1.0.tar.gz) = cc3c3eceb65a2a65e6f4de69bfbe5e18
MD5 (Imlib-1.1.tar.gz) = 27f85550e7eb6b2c8ed6e72e962931b7

View file

@ -1,14 +1,22 @@
--- configure.orig Tue Feb 17 17:22:20 1998
+++ configure Tue Feb 17 17:23:31 1998
@@ -2462,14 +2462,14 @@
echo "********** Disabling libpng support ************"
fi
--- configure.orig Fri Feb 20 09:42:49 1998
+++ configure Tue Mar 10 09:40:36 1998
@@ -826,6 +826,7 @@
# AFS /usr/afsws/bin/install, which mishandles nonexistent args
# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
# ./install, which can be erroneously created by make from ./install.sh.
+INSTALL='/usr/bin/install -c'
echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
echo "configure:831: checking for a BSD compatible install" >&5
if test -z "$INSTALL"; then
@@ -2590,14 +2591,14 @@
fi
-echo $ac_n "checking for TIFFOpen in -ltiff""... $ac_c" 1>&6
-echo "configure:2467: checking for TIFFOpen in -ltiff" >&5
- echo $ac_n "checking for TIFFOpen in -ltiff""... $ac_c" 1>&6
-echo "configure:2595: checking for TIFFOpen in -ltiff" >&5
-ac_lib_var=`echo tiff'_'TIFFOpen | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for TIFFOpen in -ltiff34""... $ac_c" 1>&6
+echo "configure:2467: checking for TIFFOpen in -ltiff34" >&5
+ echo $ac_n "checking for TIFFOpen in -ltiff34""... $ac_c" 1>&6
+echo "configure:2595: checking for TIFFOpen in -ltiff34" >&5
+ac_lib_var=`echo tiff34'_'TIFFOpen | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@ -16,20 +24,56 @@
ac_save_LIBS="$LIBS"
-LIBS="-ltiff \
+LIBS="-ltiff34 \
-L/usr/lib -L/lib -L/usr/local/lib -L/usr/X11/lib -L/usr/local/X11/lib \
-L/usr/openwin/lib -lc -lm $LIBS"
-L/usr/lib -L/lib -L/usr/local/lib -L/usr/X11/lib -L/usr/X11R6/lib \
-L/usr/local/X11/lib -L/usr/openwin/lib -lc -lm $LIBS"
cat > conftest.$ac_ext <<EOF
@@ -2500,11 +2500,11 @@
@@ -2627,13 +2628,13 @@
fi
if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
echo "$ac_t""yes" 1>&6
\
-extras="$extras -DBUILTIN_TIFF"; LIBS="$LIBS -lm -ltiff"
+extras="$extras -DBUILTIN_TIFF"; LIBS="$LIBS -lm -ltiff34"
- ac_tr_lib=HAVE_LIB`echo tiff | sed -e 's/[^a-zA-Z0-9_]/_/g' \
+ ac_tr_lib=HAVE_LIB`echo tiff34 | sed -e 's/[^a-zA-Z0-9_]/_/g' \
-e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
cat >> confdefs.h <<EOF
#define $ac_tr_lib 1
EOF
- LIBS="-ltiff $LIBS"
+ LIBS="-ltiff34 $LIBS"
else
echo "$ac_t""no" 1>&6
\
-echo "********** Disabling libtiff support ************"
+echo "********** Disabling libtiff34 support ************"
fi
@@ -2642,7 +2643,7 @@
if test "" != ""; then
enl_lib_subdir=
else
- enl_lib_subdir=tiff
+ enl_lib_subdir=tiff34
fi
enl_cur_var=tiff_TIFFOpen
echo $ac_n "checking for tiffio.h""... $ac_c" 1>&6
@@ -2673,11 +2674,11 @@
fi
echo "$ac_t""$enl_tmp_var" 1>&6
\
-extras="$extras -DBUILTIN_TIFF"; LIBS="$LIBS -lm -ltiff"
+extras="$extras -DBUILTIN_TIFF"; LIBS="$LIBS -lm -ltiff34"
else
echo "$ac_t""no" 1>&6
\
-{ echo "configure: error: ********** Disabling libtiff support ************" 1>&2; exit 1; }
+{ echo "configure: error: ********** Disabling libtiff34 support ************" 1>&2; exit 1; }
fi
echo $ac_n "checking for DGifOpenFileName in -lgif""... $ac_c" 1>&6
@@ -2788,8 +2789,8 @@
if test $GIFTOPPM = "/usr/local/bin/tgatoppm"; then
NETPBM_PATH=/usr/local/bin
fi
-if test $GIFTOPPM = "/usr/openwin/bin/tgatoppm"; then
- NETPBM_PATH=/usr/openwin/bin
+if test $GIFTOPPM = "/usr/X11R6/bin/tgatoppm"; then
+ NETPBM_PATH=/usr/X11R6/bin
fi
if test $DJPEG = "/usr/bin/djpeg"; then
JPEG_PATH=/usr/bin

View file

@ -5,5 +5,5 @@ include/Imlib_private.h
include/Imlib_types.h
lib/libImlib.so
lib/libImlib.so.1
lib/libImlib.so.1.0
lib/libImlib.so.1.1
@dirrm etc/imlib

View file

@ -1,13 +1,13 @@
# New ports collection makefile for: imlib
# Version required: 1.0
# Version required: 1.1
# Date created: 10 June 1997
# Whom: Yukihiro Nakai <Nakai@Mlab.t.u-tokyo.ac.jp>
#
# $Id: Makefile,v 1.13 1998/02/18 15:36:01 vanilla Exp $
# $Id: Makefile,v 1.14 1998/02/27 01:56:19 alex Exp $
#
DISTNAME= Imlib-1.0
PKGNAME= imlib-1.0
DISTNAME= Imlib-1.1
PKGNAME= imlib-1.1
CATEGORIES= graphics
MASTER_SITES= ftp://ftp.enlightenment.org/pub/imlib/TAR/ \
ftp://ftp.labs.redhat.com/pub/imlib/TAR/
@ -16,7 +16,8 @@ MAINTAINER= vanilla@FreeBSD.ORG
LIB_DEPENDS= png\\.0\\.:${PORTSDIR}/graphics/png \
jpeg\\.7\\.:${PORTSDIR}/graphics/jpeg \
tiff34\\.1\\.:${PORTSDIR}/graphics/tiff34
tiff34\\.1\\.:${PORTSDIR}/graphics/tiff34 \
gif\\.3\\.:${PORTSDIR}/graphics/giflib
RUN_DEPENDS= djpeg:${PORTSDIR}/graphics/jpeg \
tgatoppm:${PORTSDIR}/graphics/netpbm \
convert:${PORTSDIR}/graphics/ImageMagick

View file

@ -1 +1 @@
MD5 (Imlib-1.0.tar.gz) = cc3c3eceb65a2a65e6f4de69bfbe5e18
MD5 (Imlib-1.1.tar.gz) = 27f85550e7eb6b2c8ed6e72e962931b7

View file

@ -1,14 +1,22 @@
--- configure.orig Tue Feb 17 17:22:20 1998
+++ configure Tue Feb 17 17:23:31 1998
@@ -2462,14 +2462,14 @@
echo "********** Disabling libpng support ************"
fi
--- configure.orig Fri Feb 20 09:42:49 1998
+++ configure Tue Mar 10 09:40:36 1998
@@ -826,6 +826,7 @@
# AFS /usr/afsws/bin/install, which mishandles nonexistent args
# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
# ./install, which can be erroneously created by make from ./install.sh.
+INSTALL='/usr/bin/install -c'
echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
echo "configure:831: checking for a BSD compatible install" >&5
if test -z "$INSTALL"; then
@@ -2590,14 +2591,14 @@
fi
-echo $ac_n "checking for TIFFOpen in -ltiff""... $ac_c" 1>&6
-echo "configure:2467: checking for TIFFOpen in -ltiff" >&5
- echo $ac_n "checking for TIFFOpen in -ltiff""... $ac_c" 1>&6
-echo "configure:2595: checking for TIFFOpen in -ltiff" >&5
-ac_lib_var=`echo tiff'_'TIFFOpen | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for TIFFOpen in -ltiff34""... $ac_c" 1>&6
+echo "configure:2467: checking for TIFFOpen in -ltiff34" >&5
+ echo $ac_n "checking for TIFFOpen in -ltiff34""... $ac_c" 1>&6
+echo "configure:2595: checking for TIFFOpen in -ltiff34" >&5
+ac_lib_var=`echo tiff34'_'TIFFOpen | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@ -16,20 +24,56 @@
ac_save_LIBS="$LIBS"
-LIBS="-ltiff \
+LIBS="-ltiff34 \
-L/usr/lib -L/lib -L/usr/local/lib -L/usr/X11/lib -L/usr/local/X11/lib \
-L/usr/openwin/lib -lc -lm $LIBS"
-L/usr/lib -L/lib -L/usr/local/lib -L/usr/X11/lib -L/usr/X11R6/lib \
-L/usr/local/X11/lib -L/usr/openwin/lib -lc -lm $LIBS"
cat > conftest.$ac_ext <<EOF
@@ -2500,11 +2500,11 @@
@@ -2627,13 +2628,13 @@
fi
if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
echo "$ac_t""yes" 1>&6
\
-extras="$extras -DBUILTIN_TIFF"; LIBS="$LIBS -lm -ltiff"
+extras="$extras -DBUILTIN_TIFF"; LIBS="$LIBS -lm -ltiff34"
- ac_tr_lib=HAVE_LIB`echo tiff | sed -e 's/[^a-zA-Z0-9_]/_/g' \
+ ac_tr_lib=HAVE_LIB`echo tiff34 | sed -e 's/[^a-zA-Z0-9_]/_/g' \
-e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
cat >> confdefs.h <<EOF
#define $ac_tr_lib 1
EOF
- LIBS="-ltiff $LIBS"
+ LIBS="-ltiff34 $LIBS"
else
echo "$ac_t""no" 1>&6
\
-echo "********** Disabling libtiff support ************"
+echo "********** Disabling libtiff34 support ************"
fi
@@ -2642,7 +2643,7 @@
if test "" != ""; then
enl_lib_subdir=
else
- enl_lib_subdir=tiff
+ enl_lib_subdir=tiff34
fi
enl_cur_var=tiff_TIFFOpen
echo $ac_n "checking for tiffio.h""... $ac_c" 1>&6
@@ -2673,11 +2674,11 @@
fi
echo "$ac_t""$enl_tmp_var" 1>&6
\
-extras="$extras -DBUILTIN_TIFF"; LIBS="$LIBS -lm -ltiff"
+extras="$extras -DBUILTIN_TIFF"; LIBS="$LIBS -lm -ltiff34"
else
echo "$ac_t""no" 1>&6
\
-{ echo "configure: error: ********** Disabling libtiff support ************" 1>&2; exit 1; }
+{ echo "configure: error: ********** Disabling libtiff34 support ************" 1>&2; exit 1; }
fi
echo $ac_n "checking for DGifOpenFileName in -lgif""... $ac_c" 1>&6
@@ -2788,8 +2789,8 @@
if test $GIFTOPPM = "/usr/local/bin/tgatoppm"; then
NETPBM_PATH=/usr/local/bin
fi
-if test $GIFTOPPM = "/usr/openwin/bin/tgatoppm"; then
- NETPBM_PATH=/usr/openwin/bin
+if test $GIFTOPPM = "/usr/X11R6/bin/tgatoppm"; then
+ NETPBM_PATH=/usr/X11R6/bin
fi
if test $DJPEG = "/usr/bin/djpeg"; then
JPEG_PATH=/usr/bin

View file

@ -5,5 +5,5 @@ include/Imlib_private.h
include/Imlib_types.h
lib/libImlib.so
lib/libImlib.so.1
lib/libImlib.so.1.0
lib/libImlib.so.1.1
@dirrm etc/imlib