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
|
--- ./acinclude.m4
+++ ./acinclude.m4
@@ -4937,31 +4937,11 @@ AC_DEFUN([KDE_SET_PREFIX],
AC_PREFIX_DEFAULT(${KDEDIR:-the kde prefix})
KDE_SET_DEFAULT_BINDIRS
- if test "x$prefix" = "xNONE"; then
- dnl no prefix given: look for kde-config in the PATH and deduce the prefix from it
- KDE_FIND_PATH(kde-config, KDECONFIG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kde-config)], [], prepend)
- else
- dnl prefix given: look for kde-config, preferrably in prefix, otherwise in PATH
- kde_save_PATH="$PATH"
- PATH="$exec_prefix/bin:$prefix/bin:$PATH"
- KDE_FIND_PATH(kde-config, KDECONFIG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kde-config)], [], prepend)
- PATH="$kde_save_PATH"
- fi
-
- kde_libs_prefix=`$KDECONFIG --prefix`
- if test -z "$kde_libs_prefix" || test ! -x "$kde_libs_prefix"; then
- AC_MSG_ERROR([$KDECONFIG --prefix outputed the non existant prefix '$kde_libs_prefix' for kdelibs.
- This means it has been moved since you installed it.
- This won't work. Please recompile kdelibs for the new prefix.
- ])
- fi
- kde_libs_htmldir=`$KDECONFIG --install html --expandvars`
- kde_libs_suffix=`$KDECONFIG --libsuffix`
AC_MSG_CHECKING([where to install])
if test "x$prefix" = "xNONE"; then
prefix=$kde_libs_prefix
- AC_MSG_RESULT([$prefix (as returned by kde-config)])
+ AC_MSG_RESULT([$prefix (as NOT returned by kde-config)])
else
dnl --prefix was given. Compare prefixes and warn (in configure.in.bot.end) if different
given_prefix=$prefix
@@ -4973,7 +4953,6 @@ AC_DEFUN([KDE_SET_PREFIX],
exec_prefix=`echo "$exec_prefix" | sed 's,//*,/,g' | sed -e 's,/$,,'`
given_prefix=`echo "$given_prefix" | sed 's,//*,/,g' | sed -e 's,/$,,'`
- AC_SUBST(KDECONFIG)
AC_SUBST(kde_libs_prefix)
AC_SUBST(kde_libs_htmldir)
|
