161 lines
5.7 KiB
Text
161 lines
5.7 KiB
Text
$NetBSD: patch-ab,v 1.19 2005/09/18 19:16:49 minskim Exp $
|
|
|
|
--- configure.orig 2005-07-24 08:22:34.000000000 -0700
|
|
+++ configure
|
|
@@ -6299,7 +6299,7 @@ else
|
|
# Make sure to not put "make" in the Imakefile rules, since we grep it out.
|
|
cat > Imakefile <<'EOF'
|
|
acfindx:
|
|
- @echo 'ac_x_app_defaults="${XAPPLOADDIR}"'
|
|
+ @echo 'ac_x_app_defaults="${XAPPLOADDIR}"'
|
|
EOF
|
|
if (xmkmf) >/dev/null 2>/dev/null && test -f Makefile; then
|
|
# GNU make sometimes prints "make[1]: Entering...", which'd confuse us.
|
|
@@ -6308,138 +6308,6 @@ EOF
|
|
cd ..
|
|
rm -fr conftestdir
|
|
fi
|
|
- # Look for the directory under a standard set of common directories.
|
|
- # Check X11 before X11Rn because it's often a symlink to the current release.
|
|
- for ac_dir in \
|
|
- /lib/X11/app-defaults \
|
|
- /lib/app-defaults \
|
|
- /lib/X11R6.5.1/app-defaults \
|
|
- /lib/X11R6.5.1/X11/app-defaults \
|
|
- /lib/X11R6.4/app-defaults \
|
|
- /lib/X11R6.4/X11/app-defaults \
|
|
- /lib/X11R6.3/app-defaults \
|
|
- /lib/X11R6.3/X11/app-defaults \
|
|
- /lib/X11R6.2/app-defaults \
|
|
- /lib/X11R6.2/X11/app-defaults \
|
|
- /lib/X11R6.1/app-defaults \
|
|
- /lib/X11R6.1/X11/app-defaults \
|
|
- /lib/X11R6/app-defaults \
|
|
- /lib/X11R6/X11/app-defaults \
|
|
- /lib/X11R5/app-defaults \
|
|
- /lib/X11R5/X11/app-defaults \
|
|
- /lib/X11R4/app-defaults \
|
|
- /lib/X11R4/X11/app-defaults \
|
|
- ; \
|
|
- do
|
|
- found=""
|
|
- if test -d "${prefix}$ac_dir"; then
|
|
- ac_x_app_defaults=\\\$\\\{prefix\\\}$ac_dir
|
|
- found="1"
|
|
- break
|
|
- fi
|
|
- done
|
|
- if test -z "$found"; then
|
|
- for ac_dir in \
|
|
- /usr/X11/lib/app-defaults \
|
|
- /lib/X11R6.5.1/lib/app-defaults \
|
|
- /lib/X11R6.5.1/lib/X11/app-defaults \
|
|
- /lib/X11R6.4/lib/app-defaults \
|
|
- /lib/X11R6.4/lib/X11/app-defaults \
|
|
- /usr/X11R6.3/lib/app-defaults \
|
|
- /usr/X11R6.3/lib/X11/app-defaults \
|
|
- /usr/X11R6.2/lib/app-defaults \
|
|
- /usr/X11R6.2/lib/X11/app-defaults \
|
|
- /usr/X11R6.1/lib/app-defaults \
|
|
- /usr/X11R6.1/lib/X11/app-defaults \
|
|
- /usr/X11R6/lib/app-defaults \
|
|
- /usr/X11R6/lib/X11/app-defaults \
|
|
- /usr/X11R5/lib/app-defaults \
|
|
- /usr/X11R5/lib/X11/app-defaults \
|
|
- /usr/X11R4/lib/app-defaults \
|
|
- /usr/X11R4/lib/X11/app-defaults \
|
|
- \
|
|
- /usr/lib/X11/app-defaults \
|
|
- /usr/lib/X11R6.5.1/app-defaults \
|
|
- /usr/lib/X11R6.4/app-defaults \
|
|
- /usr/lib/X11R6.3/app-defaults \
|
|
- /usr/lib/X11R6.2/app-defaults \
|
|
- /usr/lib/X11R6.1/app-defaults \
|
|
- /usr/lib/X11R6/app-defaults \
|
|
- /usr/lib/X11R5/app-defaults \
|
|
- /usr/lib/X11R4/app-defaults \
|
|
- \
|
|
- /usr/local/X11/lib/app-defaults \
|
|
- /usr/remote/X11/lib/app-defaults \
|
|
- /usr/local/X11R6.5.1/lib/app-defaults \
|
|
- /usr/local/X11R6.5.1/lib/X11/app-defaults \
|
|
- /usr/local/X11R6.4/lib/app-defaults \
|
|
- /usr/local/X11R6.4/lib/X11/app-defaults \
|
|
- /usr/local/X11R6.3/lib/app-defaults \
|
|
- /usr/local/X11R6.3/lib/X11/app-defaults \
|
|
- /usr/local/X11R6.2/lib/app-defaults \
|
|
- /usr/local/X11R6.2/lib/X11/app-defaults \
|
|
- /usr/local/X11R6.1/lib/app-defaults \
|
|
- /usr/local/X11R6.1/lib/X11/app-defaults \
|
|
- /usr/local/X11R6/lib/app-defaults \
|
|
- /usr/local/X11R6/lib/X11/app-defaults \
|
|
- /usr/local/X11R5/lib/app-defaults \
|
|
- /usr/local/X11R5/lib/X11/app-defaults \
|
|
- /usr/local/X11R4/lib/app-defaults \
|
|
- /usr/local/X11R4/lib/X11/app-defaults \
|
|
- \
|
|
- /usr/local/lib/X11/app-defaults \
|
|
- /usr/remote/lib/X11/app-defaults \
|
|
- /usr/local/lib/X11R6.5.1/app-defaults \
|
|
- /usr/local/lib/X11R6.5.1/X11/app-defaults \
|
|
- /usr/local/lib/X11R6.4/app-defaults \
|
|
- /usr/local/lib/X11R6.4/X11/app-defaults \
|
|
- /usr/local/lib/X11R6.3/app-defaults \
|
|
- /usr/local/lib/X11R6.3/X11/app-defaults \
|
|
- /usr/local/lib/X11R6.2/app-defaults \
|
|
- /usr/local/lib/X11R6.2/X11/app-defaults \
|
|
- /usr/local/lib/X11R6.1/app-defaults \
|
|
- /usr/local/lib/X11R6.1/X11/app-defaults \
|
|
- /usr/local/lib/X11R6/app-defaults \
|
|
- /usr/local/lib/X11R6/X11/app-defaults \
|
|
- /usr/local/lib/X11R5/app-defaults \
|
|
- /usr/local/lib/X11R5/X11/app-defaults \
|
|
- /usr/local/lib/X11R4/app-defaults \
|
|
- /usr/local/lib/X11R4/X11/app-defaults \
|
|
- \
|
|
- /usr/X386/lib/X11/app-defaults \
|
|
- /usr/x386/lib/X11/app-defaults \
|
|
- /usr/XFree86/lib/X11/app-defaults \
|
|
- \
|
|
- /usr/lib/X11/app-defaults \
|
|
- /usr/unsupported/lib/X11/app-defaults \
|
|
- /usr/athena/lib/X11/app-defaults \
|
|
- /usr/local/x11r5/lib/X11/app-defaults \
|
|
- /usr/lpp/Xamples/lib/X11/app-defaults \
|
|
- /lib/usr/lib/X11/app-defaults \
|
|
- /usr/local/lib/app-defaults \
|
|
- /usr/remote/lib/app-defaults \
|
|
- \
|
|
- /usr/openwin/lib/app-defaults \
|
|
- /usr/openwin/lib/X11/app-defaults \
|
|
- /usr/openwin/share/lib/app-defaults \
|
|
- /usr/openwin/share/lib/X11/app-defaults \
|
|
- \
|
|
- /X11R6.5.1/lib/app-defaults \
|
|
- /X11R6.4/lib/app-defaults \
|
|
- /X11R6.3/lib/app-defaults \
|
|
- /X11R6.2/lib/app-defaults \
|
|
- /X11R6.1/lib/app-defaults \
|
|
- /X11R6/lib/app-defaults \
|
|
- /X11R5/lib/app-defaults \
|
|
- /X11R4/lib/app-defaults \
|
|
- ; \
|
|
- do
|
|
- if test -d "$ac_dir"; then
|
|
- ac_x_app_defaults=$ac_dir
|
|
- break
|
|
- fi
|
|
- done
|
|
- fi
|
|
|
|
if test x"$ac_x_app_defaults" = x; then
|
|
ac_cv_x_app_defaults="/usr/lib/X11/app-defaults"
|
|
@@ -8364,7 +8232,7 @@ else
|
|
#define USE_GL 1
|
|
_ACEOF
|
|
|
|
- XLOCKLIBS="${XLOCKLIBS} -lMesaGL -lMesaGLU"
|
|
+ XLOCKLIBS="${XLOCKLIBS} -lGL -lGLU"
|
|
test "x$mesa_includes" = xNONE && mesa_includes=$ac_mesa_includes
|
|
test "x$mesa_libraries" = xNONE && mesa_libraries=$ac_mesa_libraries
|
|
case "${canonical}" in
|