summaryrefslogtreecommitdiff
path: root/graphics/jpeg-mmx
diff options
context:
space:
mode:
authorJustin M. Seger <jseger@FreeBSD.org>2000-07-30 03:32:27 +0000
committerJustin M. Seger <jseger@FreeBSD.org>2000-07-30 03:32:27 +0000
commite949aee3adf5ce3bbbc7aa5cff7cf7ba6988d6da (patch)
tree676da140b86a00b63961a2f7cfdf8afe11bac588 /graphics/jpeg-mmx
parentActivate tkregexp. (diff)
/usr/local/bin/libtool -> ${LIBTOOL}
PR: ports/19450
Notes
Notes: svn path=/head/; revision=31122
Diffstat (limited to 'graphics/jpeg-mmx')
-rw-r--r--graphics/jpeg-mmx/Makefile1
-rw-r--r--graphics/jpeg-mmx/files/patch-ab10
2 files changed, 7 insertions, 4 deletions
diff --git a/graphics/jpeg-mmx/Makefile b/graphics/jpeg-mmx/Makefile
index 7b0ffb0720de..52bf16446aea 100644
--- a/graphics/jpeg-mmx/Makefile
+++ b/graphics/jpeg-mmx/Makefile
@@ -19,6 +19,7 @@ WRKSRC= ${WRKDIR}/jpeg-6b
INSTALLS_SHLIB= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --enable-shared --enable-static
+CONFIGURE_ENV= LIBTOOL=${LIBTOOL}
MAN1= cjpeg.1 djpeg.1 jpegtran.1 rdjpgcom.1 wrjpgcom.1
USE_LIBTOOL= yes
diff --git a/graphics/jpeg-mmx/files/patch-ab b/graphics/jpeg-mmx/files/patch-ab
index ea94fc14123c..091185f0ecfa 100644
--- a/graphics/jpeg-mmx/files/patch-ab
+++ b/graphics/jpeg-mmx/files/patch-ab
@@ -1,15 +1,17 @@
--- configure.orig Sat Mar 21 14:08:57 1998
-+++ configure Wed Mar 22 09:28:33 2000
-@@ -1529,7 +1529,7 @@
++++ configure Sat Jul 29 23:23:09 2000
+@@ -1529,7 +1529,9 @@
if test "x$LTSHARED" != xno -o "x$LTSTATIC" != xno; then
USELIBTOOL="yes"
- LIBTOOL="./libtool"
-+ LIBTOOL="/usr/local/bin/libtool"
++ if test "x$LIBTOOL" == "x"; then
++ LIBTOOL="./libtool"
++ fi
O="lo"
A="la"
LN='$(LIBTOOL) --mode=link $(CC)'
-@@ -1647,7 +1647,7 @@
+@@ -1647,7 +1649,7 @@
# Extract the library version ID from jpeglib.h.
echo $ac_n "checking libjpeg version number""... $ac_c" 1>&6
echo "configure:1650: checking libjpeg version number" >&5