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
|
$NetBSD: patch-aa,v 1.3 2000/04/05 20:46:14 tron Exp $
--- configure.orig Thu Feb 25 20:29:00 1999
+++ configure Wed Apr 5 22:43:57 2000
@@ -1620,6 +1620,7 @@
fi
# Always use our own libtool.
+if false; then
LIBTOOL='$(SHELL) $(top_builddir)/libtool'
# Check for any special flags to pass to ltconfig.
@@ -1851,6 +1852,7 @@
${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
$libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \
|| { echo "configure: error: libtool configure failed" 1>&2; exit 1; }
+fi
# Redirect the config.log output again, so that the ltconfig log is not
# clobbered by the next message.
@@ -2241,7 +2243,7 @@
echo $ac_n "checking Mesa""... $ac_c" 1>&6
echo "configure:2244: checking Mesa" >&5
-LIBS="$saved_LIBS $GTK_LIBS $GL_LDOPTS -lMesaGL"
+LIBS="$saved_LIBS $GTK_LIBS $GL_LDOPTS -lGL"
cat > conftest.$ac_ext <<EOF
#line 2247 "configure"
#include "confdefs.h"
@@ -2265,7 +2267,7 @@
if test "x$have_MesaGL" = "xno"; then
echo $ac_n "checking Mesa with pthreads""... $ac_c" 1>&6
echo "configure:2268: checking Mesa with pthreads" >&5
- LIBS="$saved_LIBS $GTK_LIBS $GL_LDOPTS -lMesaGL -lpthread"
+ LIBS="$saved_LIBS $GTK_LIBS $GL_LDOPTS -lGL -lpthread"
cat > conftest.$ac_ext <<EOF
#line 2271 "configure"
#include "confdefs.h"
@@ -2301,9 +2303,9 @@
elif test "x$with_lib_MesaGL" = "xyes"; then
if test "x$have_MesaGL" = "xyes"; then
- GL_LIBS="$GL_LDOPTS -lMesaGLU -lMesaGL"
+ GL_LIBS="$GL_LDOPTS -lGLU -lGL"
elif test "x$have_MesaGL_pthread" = "xyes"; then
- GL_LIBS="$GL_LDOPTS -lMesaGLU -lMesaGL -lpthread"
+ GL_LIBS="$GL_LDOPTS -lGLU -lGL -lpthread"
else
{ echo "configure: error: Missing MesaGL library" 1>&2; exit 1; }
fi
@@ -2313,9 +2315,9 @@
if test "x$have_GL" = "xyes"; then
GL_LIBS="$GL_LDOPTS -lGLU -lGL"
elif test "x$have_MesaGL" = "xyes"; then
- GL_LIBS="$GL_LDOPTS -lMesaGLU -lMesaGL"
+ GL_LIBS="$GL_LDOPTS -lGLU -lGL"
elif test "x$have_MesaGL_pthread" = "xyes"; then
- GL_LIBS="$GL_LDOPTS -lMesaGLU -lMesaGL -lpthread"
+ GL_LIBS="$GL_LDOPTS -lGLU -lGL -lpthread"
else
{ echo "configure: error: You need GL or MesaGL libraries" 1>&2; exit 1; }
fi
|
