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
91
92
93
94
95
96
97
|
$NetBSD: patch-aa,v 1.5 2001/09/28 21:19:16 jlam Exp $
--- configure.orig Tue Mar 20 12:02:28 2001
+++ configure
@@ -4460,7 +4460,7 @@
for dir in $kde_use_extra_libs; do
kde_extra_libs="$kde_extra_libs $dir"
KDE_EXTRA_RPATH="$KDE_EXTRA_RPATH -R $dir"
- USER_LDFLAGS="$USER_LDFLAGS -L$dir"
+ #USER_LDFLAGS="$USER_LDFLAGS -L$dir" # buildlink.mk
done
IFS=$ac_save_ifs
kde_use_extra_libs="added"
@@ -5654,7 +5654,7 @@
if test "$qt_libraries" = "$x_libraries" || test -z "$qt_libraries"; then
QT_LDFLAGS=""
else
- QT_LDFLAGS="-L$qt_libraries"
+ QT_LDFLAGS="-L${QTDIR}/lib" # buildlink.mk
all_libraries="$all_libraries $QT_LDFLAGS"
fi
@@ -5981,11 +5981,11 @@
if test "$kde_includes" = "$x_includes" || test "$kde_includes" = "$qt_includes" ; then
KDE_INCLUDES=""
else
- KDE_INCLUDES="-I$kde_includes"
+ KDE_INCLUDES="-I${BUILDLINK_DIR}/include" # buildlink.mk
all_includes="$KDE_INCLUDES $all_includes"
fi
-KDE_LDFLAGS="-L$kde_libraries"
+KDE_LDFLAGS="-L${BUILDLINK_DIR}/lib" # buildlink.mk
if test ! "$kde_libraries" = "$x_libraries" && test ! "$kde_libraries" = "$qt_libraries" ; then
all_libraries="$all_libraries $KDE_LDFLAGS"
fi
@@ -9944,7 +9944,9 @@
-for ac_func in getsecretkey getloadavg getusershell login_getclass auth_timeok
+ac_save_LIBS="$LIBS"
+LIBS="$LIBS -lutil"
+for ac_func in getsecretkey getloadavg getusershell login_getclass auth_timeok setusercontext
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
echo "configure:9951: checking for $ac_func" >&5
@@ -10001,6 +10003,7 @@
echo "$ac_t""no" 1>&6
fi
done
+LIBS="$ac_save_LIBS"
# Extract the first word of "X", so it can be a program name with args.
@@ -11113,7 +11116,7 @@
ac_save_ldflags="$LDFLAGS"
ac_save_cflags="$CFLAGS"
- LDFLAGS="$LDFLAGS $GL_LDFLAGS $X_LDFLAGS $all_libraries -lMesaGL -lMesaGLU -lX11 -lXext -lm $LIBSOCKET"
+ LDFLAGS="$LDFLAGS $GL_LDFLAGS $X_LDFLAGS $all_libraries -lGL -lGLU -lX11 -lXext -lm $LIBSOCKET"
CFLAGS="$CFLAGS $X_INCLUDES"
test -n "$GL_INCLUDE" && CFLAGS="-I$GL_INCLUDE $CFLAGS"
cat > conftest.$ac_ext <<EOF
@@ -11178,13 +11181,13 @@
if test "$GL_LDFLAGS" = ""; then
if test "$ac_cv_have_gl" = "mesa"; then
- GLLIB='-lMesaGL -lMesaGLU $(LIB_X11)'
+ GLLIB='-lGL -lGLU $(LIB_X11)'
else
GLLIB='-lGL -lGLU $(LIB_X11)'
fi
else
if test "$ac_cv_have_gl" = "mesa"; then
- GLLIB="$GL_LDFLAGS -lMesaGL -lMesaGLU "'$(LIB_X11)'
+ GLLIB="$GL_LDFLAGS -lGL -lGLU "'$(LIB_X11)'
else
GLLIB="$GL_LDFLAGS -lGL -lGLU "'$(LIB_X11)'
fi
@@ -11198,7 +11201,7 @@
GL_SAVERS="kmorph3d.kss kspace.kss kpipes.kss"
ac_save_CPPFLAGS="$CPPFLAGS"
-CPPFLAGS="-I$GL_INCLUDE $CPPFLAGS $X_INCLUDES"
+CPPFLAGS="$GLINC $CPPFLAGS $X_INCLUDES"
for ac_hdr in GL/xmesa.h GL/glut.h memory.h
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
@@ -11581,6 +11584,7 @@
case "$host" in
*-*-linux*) ksysguardd_compile=yes; UNAME='Linux' ;;
*-*-freebsd*) ksysguardd_compile=yes; UNAME='FreeBSD' ;;
+ *-*-netbsd*) ksysguardd_compile=yes; UNAME='FreeBSD' ;;
# *-*-solaris*) ksysguardd_compile=yes; UNAME='Solaris' ;;
*) ksysguard_compile=no; UNAME='' ;;
esac
|
