summaryrefslogtreecommitdiff
path: root/editors/abiword/patches/patch-ae
blob: fab27468e0c08e2cd58367d5efc6a7d39a213486 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
$NetBSD: patch-ae,v 1.2 2000/02/29 18:31:30 jlam Exp $

--- src/config/require/unix/Makefile.orig	Tue Feb  1 18:55:24 2000
+++ src/config/require/unix/Makefile	Tue Feb 29 12:05:03 2000
@@ -74,7 +74,9 @@
 
 _ZLIB_:
 	@if [    -r /usr/lib/libz.a				\
+	      -o -r ${LOCALBASE}/lib/libz.a			\
 	      -o -r /usr/local/lib/libz.a			\
+	      -o -r ${X11BASE}/lib/libz.a			\
 	      -o -r /usr/X11R6/lib/libz.a			\
 	    ]; then						\
 		echo Found zlib in system directories;		\
@@ -90,7 +92,9 @@
 
 _LIBPNG_:
 	@if [    -r /usr/lib/libpng.a				\
+	      -o -r ${LOCALBASE}/lib/libpng.a			\
 	      -o -r /usr/local/lib/libpng.a			\
+	      -o -r ${X11BASE}/lib/libpng.a			\
 	      -o -r /usr/X11R6/lib/libpng.a			\
 	    ]; then						\
 		echo Found libpng in system directories;	\
@@ -155,7 +159,7 @@
 # was something you installed yourself.  
 
 _LIBICONV_:
-	@if [ ! -r /usr/include/iconv.h -a ! -r /usr/local/include/iconv.h ]; then	\
+	@if true; then	\
 		if [ -d $(ABI_ROOT)/../libiconv ]; then                        	\
 			echo Found libiconv in peer directory;                  \
 			if [ ! -r $(ABI_ROOT)/../libiconv/src/config.h ]; then  \