blob: 04c98570fad36fd175d82bfb37a7b0ad01b113c0 (
plain)
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
|
$NetBSD: patch-ac,v 1.6 1999/09/15 18:26:03 tron Exp $
--- configure.orig Sat Sep 11 17:38:35 1999
+++ configure Wed Sep 15 17:04:37 1999
@@ -513,9 +513,9 @@
# 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/etc/config.site"
fi
fi
for ac_site_file in $CONFIG_SITE; do
@@ -2005,6 +2005,7 @@
CC=$CXX
CFLAGS="$CXXFLAGS"
# Always use our own libtool.
+if false; then
LIBTOOL='$(SHELL) $(top_builddir)/libtool --silent'
@@ -2237,6 +2238,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.
@@ -4087,37 +4089,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/kde/doc/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/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='\$(libexecdir)/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'
@@ -4210,7 +4212,7 @@
echo $ac_n "checking for KDE libraries installed""... $ac_c" 1>&6
echo "configure:4213: checking for KDE libraries installed" >&5
-ac_link='/bin/sh ./libtool --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -lkdecore $LIBQT $KDE_TEST_RPATH 1>&5'
+ac_link='${LIBTOOL} --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -lkdecore $LIBQT $KDE_TEST_RPATH 1>&5'
if { (eval echo configure:4216: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
echo "$ac_t""yes" 1>&6
|
