85 lines
4.1 KiB
Text
85 lines
4.1 KiB
Text
$NetBSD: patch-am,v 1.5 2011/12/15 18:51:43 dholland Exp $
|
|
|
|
--- configure.orig 2010-02-11 13:21:10.000000000 +0000
|
|
+++ configure
|
|
@@ -1680,7 +1680,7 @@ if test ! "x$platform" = "xwin32"; 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 ${X11BASE}/lib
|
|
x11libdir=$found_dir
|
|
|
|
if test "x$found_lib" = "x" ; then
|
|
@@ -1691,7 +1691,7 @@ if test ! "x$platform" = "xwin32"; 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 ${X11BASE}/include
|
|
|
|
if test "x$found_dir" = "x" ; then
|
|
result "`basename $0`: X11 headers (package x11-devel) MUST be installed"
|
|
@@ -1701,7 +1701,7 @@ if test ! "x$platform" = "xwin32"; then
|
|
check_header "X11/Xft/Xft.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 ${X11BASE}/include
|
|
|
|
if test "x$found_dir" = "x" ; then
|
|
result "`basename $0`: Xft headers (libxft-devel) MUST be installed"
|
|
@@ -1711,7 +1711,7 @@ if test ! "x$platform" = "xwin32"; then
|
|
check_header "X11/extensions/shape.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 ${X11BASE}/include
|
|
|
|
if test "x$found_dir" = "x" ; then
|
|
result "`basename $0`: X11/extensions/shape.h header (xorg-x11-proto-devel) MUST be installed"
|
|
@@ -1721,7 +1721,7 @@ if test ! "x$platform" = "xwin32"; 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 ${X11BASE}/lib
|
|
xpmlib=$found_lib
|
|
xpmlibdir=$found_dir
|
|
|
|
@@ -1733,7 +1733,7 @@ if test ! "x$platform" = "xwin32"; then
|
|
check_library "libXft" "$enable_shared" "" \
|
|
/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 ${X11BASE}/lib
|
|
|
|
if test "x$found_lib" = "x" ; then
|
|
result "`basename $0`: libXft (libxft-devel) MUST be installed"
|
|
@@ -1743,7 +1743,7 @@ if test ! "x$platform" = "xwin32"; then
|
|
check_library "libXext" "$enable_shared" "" \
|
|
/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 ${X11BASE}/lib
|
|
|
|
if test "x$found_lib" = "x" ; then
|
|
result "`basename $0`: libXext (libXext-devel) MUST be installed"
|
|
@@ -2040,7 +2040,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"
|
|
check_header "GL/gl.h" "$openglincdir" $openglincdirs
|
|
openglinc=$found_hdr
|
|
openglincdir=$found_dir
|
|
@@ -2049,7 +2049,7 @@ if test ! "x$enable_opengl" = "xno" && t
|
|
/usr/X11R6/lib /usr/local/lib/X11 /usr/local/X11R6/lib \
|
|
/usr/X11/lib /usr/lib/Mesa /usr/local/lib/Mesa /usr/Mesa/lib \
|
|
/usr/local/Mesa/lib /usr/Mesa /usr/local/Mesa /opt/Mesa \
|
|
- /opt/Mesa/lib /opt/graphics/OpenGL/lib"
|
|
+ /opt/Mesa/lib /opt/graphics/OpenGL/lib ${X11BASE}/lib ${LOCALBASE}/lib"
|
|
|
|
keep=$opengllibdir
|
|
check_library "libGL libMesaGL" "$enable_shared" \
|