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
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
|
$NetBSD: patch-aa,v 1.14 1999/12/06 20:44:59 bouyer Exp $
--- configure.old Tue Sep 7 17:21:06 1999
+++ configure Fri Dec 3 18:56:37 1999
@@ -517,9 +517,10 @@
# Prefer explicitly selected file to automatically selected ones.
if test -z "$CONFIG_SITE"; then
if test "x$prefix" != xNONE; then
- CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
+ CONFIG_SITE="$prefix/share/kde/config.site $prefix/etc/config.site"
else
- CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
+ CONFIG_SITE="$ac_default_prefix/share/kde/config.site $ac_default_prefix/e
+tc/config.site"
fi
fi
for ac_site_file in $CONFIG_SITE; do
@@ -3994,37 +3995,37 @@
if test "$ac_use_path_checking" = "default"; then
if test -z "$kde_htmldir"; then
- kde_htmldir='\$(prefix)/share/doc/HTML'
+ kde_htmldir='\$(prefix)/share/doc/kde/HTML'
fi
if test -z "$kde_appsdir"; then
- kde_appsdir='\$(prefix)/share/applnk'
+ kde_appsdir='\$(prefix)/share/kde/applnk'
fi
if test -z "$kde_icondir"; then
- kde_icondir='\$(prefix)/share/icons'
+ kde_icondir='\$(prefix)/share/kde/kde/icons'
fi
if test -z "$kde_sounddir"; then
- kde_sounddir='\$(prefix)/share/sounds'
+ kde_sounddir='\$(prefix)/share/kde/sounds'
fi
if test -z "$kde_datadir"; then
- kde_datadir='\$(prefix)/share/apps'
+ kde_datadir='\$(prefix)/share/kde/apps'
fi
if test -z "$kde_locale"; then
- kde_locale='\$(prefix)/share/locale'
+ kde_locale='\$(prefix)/share/kde/locale'
fi
if test -z "$kde_cgidir"; then
- kde_cgidir='\$(exec_prefix)/cgi-bin'
+ kde_cgidir='\$(exec_prefix)/kde-cgi-bin'
fi
if test -z "$kde_confdir"; then
- kde_confdir='\$(prefix)/share/config'
+ kde_confdir='\$(prefix)/share/kde/config'
fi
if test -z "$kde_mimedir"; then
- kde_mimedir='\$(prefix)/share/mimelnk'
+ kde_mimedir='\$(prefix)/share/kde/mimelnk'
fi
if test -z "$kde_toolbardir"; then
- kde_toolbardir='\$(prefix)/share/toolbar'
+ kde_toolbardir='\$(prefix)/share/kde/toolbar'
fi
if test -z "$kde_wallpaperdir"; then
- kde_wallpaperdir='\$(prefix)/share/wallpapers'
+ kde_wallpaperdir='\$(prefix)/share/kde/wallpapers'
fi
if test -z "$kde_bindir"; then
kde_bindir='\$(exec_prefix)/bin'
@@ -4823,7 +4824,7 @@
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_save_LIBS="$LIBS"
-LIBS="-lpam -ldl $LIBS"
+LIBS="-lpam $LIBS"
cat > conftest.$ac_ext <<EOF
#line 4829 "configure"
#include "confdefs.h"
@@ -4847,7 +4848,7 @@
fi
if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
echo "$ac_t""yes" 1>&6
- PASSWDLIB="-lpam -ldl"
+ PASSWDLIB="-lpam"
cat >> confdefs.h <<EOF
#define HAVE_PAM_LIB 1
EOF
@@ -5124,7 +5125,7 @@
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_save_LIBS="$LIBS"
-LIBS="$all_libraries -lgif -lX11 $LIBSOCKET"
+LIBS="$all_libraries -lungif -lX11 $LIBSOCKET"
cat > conftest.$ac_ext <<EOF
#line 5130 "configure"
#include "confdefs.h"
@@ -6166,6 +6167,46 @@
+echo $ac_n "checking for main in -lossaudio""... $ac_c" 1>&6
+echo "configure:6171: checking for main in -lossaudio" >&5
+ac_lib_var=`echo ossaudio'_'main | sed 'y%./+-%__p_%'`
+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ ac_save_LIBS="$LIBS"
+LIBS="-lossaudio $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 6179 "configure"
+#include "confdefs.h"
+
+int main() {
+main()
+; return 0; }
+EOF
+if { (eval echo configure:6186: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ eval "ac_cv_lib_$ac_lib_var=yes"
+else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ eval "ac_cv_lib_$ac_lib_var=no"
+fi
+rm -f conftest*
+LIBS="$ac_save_LIBS"
+
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
+ LIBOSSAUDIO=-lossaudio
+else
+ echo "$ac_t""no" 1>&6
+LIBOSSAUDIO=''
+fi
+
+
+
+
if test "$kde_have_setupterm" = "yes"; then
cat >> confdefs.h <<EOF
#define HAVE_SETUPTERM 1
@@ -7420,6 +7461,7 @@
s%@XPMLIB@%$XPMLIB%g
s%@XPM_SAVERS@%$XPM_SAVERS%g
s%@LIBCURSES@%$LIBCURSES%g
+s%@LIBOSSAUDIO@%$LIBOSSAUDIO%g
s%@LIBVOLMGT@%$LIBVOLMGT%g
s%@topdir@%$topdir%g
s%@RUN_KAPPFINDER@%$RUN_KAPPFINDER%g
|
