summaryrefslogtreecommitdiff
path: root/misc/root/patches/patch-am
blob: 6c1ce5f98efaaa096038bced0d2f4c05e015d9d1 (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
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
$NetBSD: patch-am,v 1.3 2007/08/09 20:13:17 drochner Exp $

--- configure.orig	2006-03-02 09:41:46.000000000 +0100
+++ configure
@@ -1174,7 +1174,7 @@ if test ! "$platform" = "win32"; then
     check_library "libX11" "yes" "$x11libdir" \
 	/usr/lib /usr/X11R6/lib /usr/lib/X11 /usr/openwin/lib \
 	/usr/local/lib /usr/local/lib/X11 /usr/local/X11R6/lib \
-	/usr/X11/lib /usr/lib/X11R5
+	/usr/X11/lib /usr/lib/X11R5 ${LOCALBASE}/lib
     x11libdir=$found_dir
 
     if test "x$found_lib" = "x" ; then
@@ -1185,7 +1185,7 @@ if test ! "$platform" = "win32"; then
     check_header "X11/Xlib.h" "" \
 	/usr/include /usr/X11R6/include /usr/include/X11 /usr/openwin/include \
 	/usr/local/include /usr/local/include/X11 /usr/local/X11R6/include \
-	/usr/X11/include /usr/include/X11R5
+	/usr/X11/include /usr/include/X11R5 ${LOCALBASE}/include
 
     if test "x$found_dir" = "x" ; then
 	result "`basename $0`: X11 headers (package x11-devel) MUST be installed"
@@ -1195,7 +1195,7 @@ if test ! "$platform" = "win32"; then
     check_library "libXpm" "$enable_shared" "$xpmlibdir" \
 	$XPM $XPM/lib /usr/local/lib /usr/lib /usr/lib/X11 \
 	/usr/local/lib/X11 /usr/X11R6/lib /usr/local/X11R6/lib \
-	/usr/X11/lib
+	/usr/X11/lib ${LOCALBASE}/lib
     xpmlib=$found_lib
     xpmlibdir=$found_dir
 
@@ -1352,7 +1352,7 @@ if test ! "x$enable_opengl" = "xno" && t
 	/usr/local/X11R6/include /usr/local/include \
 	/usr/include/Mesa /usr/local/include/Mesa /usr/Mesa/include \
 	/usr/local/Mesa/include /usr/Mesa /usr/local/Mesa /opt/Mesa \
-	/opt/Mesa/include /opt/graphics/OpenGL/include
+	/opt/Mesa/include /opt/graphics/OpenGL/include ${LOCALBASE}/include
     openglinc=$found_hdr
     openglincdir=$found_dir
 
@@ -1364,12 +1364,12 @@ if test ! "x$enable_opengl" = "xno" && t
 
     keep=$opengllibdir
     check_library "libGL libMesaGL" "$enable_shared" \
-	"$opengllibdir" $opengllibdirs
+	"$opengllibdir" $opengllibdirs ${LOCALBASE}/lib
     opengllib=$found_lib
     opengllibdir=$found_dir
 
     check_library "libGLU libMesaGLU" "$enable_shared" \
-	"$keep" $opengllibdirs
+	"$keep" $opengllibdirs ${LOCALBASE}/lib
     openglulib=$found_lib
     openglulibdir=$found_dir
 
@@ -1982,21 +1982,20 @@ if test ! "x$enable_asimage" = "xno" ; t
     # for a system library, then see if we have various headers needed.
     if test "x$enable_builtin_afterimage" = "xyes" ; then
        check_header "jpeglib.h" "" $ASIMAGE $ASIMAGE/include \
-          /usr/local/include /usr/include /opt/include
+          ${LOCALBASE}/include
        asjpegincdir=$found_dir
        check_header "png.h" "" $ASIMAGE $ASIMAGE/include \
-          /usr/local/include /usr/include /usr/local/include/libpng \
-          /opt/include
+          ${LOCALBASE}/include
        aspngincdir=$found_dir
        if test ! "x$enable_astiff" = "xno" ; then
            check_header "tiffio.h" "" $ASIMAGE $ASIMAGE/include \
-               /usr/local/include /usr/include /opt/include
+               ${LOCALBASE}/include
            astiffincdir=$found_dir
        else
            astiffincdir="--with-tiff=no"
        fi
        check_header "gif_lib.h" "" $ASIMAGE $ASIMAGE/include \
-          /usr/local/include /usr/include /opt/include
+          ${LOCALBASE}/include
        asgifincdir=$found_dir
 
        asextralib=""
@@ -2014,7 +2013,7 @@ if test ! "x$enable_asimage" = "xno" ; t
        fi
        for k in $aslibs ; do
            check_library $k "$enable_shared" "" \
-             $ASIMAGE $ASIMAGE/lib /usr/local/lib /usr/lib /opt/lib
+             $ASIMAGE $ASIMAGE/lib ${LOCALBASE}/lib /usr/lib
            if test "x$k" = "xlibz" ; then
                found_libz=$found_lib
                found_dirz=$found_dir