aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjseger <jseger@FreeBSD.org>2000-07-30 11:32:27 +0800
committerjseger <jseger@FreeBSD.org>2000-07-30 11:32:27 +0800
commitb8abd7b13f7f26c74596ccdb8ee0a5905b73bf6a (patch)
tree97dbe469710af01dc90eb5ba4ab2493bd12e989c
parent05468d1ab2a17f57fbbf4281c07b22e9c9a30126 (diff)
downloadfreebsd-ports-graphics-b8abd7b13f7f26c74596ccdb8ee0a5905b73bf6a.tar.gz
freebsd-ports-graphics-b8abd7b13f7f26c74596ccdb8ee0a5905b73bf6a.tar.zst
freebsd-ports-graphics-b8abd7b13f7f26c74596ccdb8ee0a5905b73bf6a.zip
/usr/local/bin/libtool -> ${LIBTOOL}
PR: ports/19450
-rw-r--r--graphics/jpeg-mmx/Makefile1
-rw-r--r--graphics/jpeg-mmx/files/patch-ab10
-rw-r--r--graphics/jpeg/Makefile1
-rw-r--r--graphics/jpeg/files/patch-ab10
4 files changed, 14 insertions, 8 deletions
diff --git a/graphics/jpeg-mmx/Makefile b/graphics/jpeg-mmx/Makefile
index 7b0ffb0720d..52bf16446ae 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 ea94fc14123..091185f0ecf 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
diff --git a/graphics/jpeg/Makefile b/graphics/jpeg/Makefile
index 7b0ffb0720d..52bf16446ae 100644
--- a/graphics/jpeg/Makefile
+++ b/graphics/jpeg/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/files/patch-ab b/graphics/jpeg/files/patch-ab
index ea94fc14123..091185f0ecf 100644
--- a/graphics/jpeg/files/patch-ab
+++ b/graphics/jpeg/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