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
|
diff --git a/configure b/configure
index 573677a..a19c050 100755
--- a/configure
+++ b/configure
@@ -18435,7 +18435,7 @@ _ACEOF
*) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;;
esac
case $ac_im_usrlibdir in
- /usr/lib | /usr/lib64 | /lib | /lib64) ;;
+ /usr/lib | /usr/lib | /lib | /lib) ;;
*) test -d "$ac_im_usrlibdir" && ac_x_libraries=$ac_im_usrlibdir ;;
esac
fi
@@ -23366,7 +23366,7 @@ fi
;;
linux*)
if test x"$host_cpu" = "xx86_64"; then
- VICEDIR="$PREFIX/lib64/vice"
+ VICEDIR="$PREFIX/lib/vice"
if false; then
ALTERNATE_DOCDIR_TRUE=
ALTERNATE_DOCDIR_FALSE='#'
diff --git a/configure.ac b/configure.ac
index b2bc09e..38bdcab 100755
--- a/configure.ac
+++ b/configure.ac
@@ -2548,12 +2548,7 @@ if test x"$enable_lame" != "xno" ; then
fi
-AC_PATH_PROGS(FCCACHE, fc-cache, false)
-if test x"$FCCACHE" = "xfalse"; then
- AM_CONDITIONAL(HAVE_FC_CACHE, false)
-else
- AM_CONDITIONAL(HAVE_FC_CACHE, true)
-fi
+AM_CONDITIONAL(HAVE_FC_CACHE, false)
if test x"$is_amigaos4" = "xyes"; then
if test x"$enable_sdlui" != "xyes" -a x"$enable_sdlui2" != "xyes"; then
@@ -4061,7 +4056,7 @@ case "$host_os" in
;;
linux*)
if test x"$host_cpu" = "xx86_64"; then
- VICEDIR="$PREFIX/lib64/vice"
+ VICEDIR="$PREFIX/lib/vice"
AM_CONDITIONAL(ALTERNATE_DOCDIR, false)
else
VICEDIR="$PREFIX/lib/vice"
diff --git a/configure.proto b/configure.proto
index b2bc09e..38bdcab 100755
--- a/configure.proto
+++ b/configure.proto
@@ -2548,12 +2548,7 @@ if test x"$enable_lame" != "xno" ; then
fi
-AC_PATH_PROGS(FCCACHE, fc-cache, false)
-if test x"$FCCACHE" = "xfalse"; then
- AM_CONDITIONAL(HAVE_FC_CACHE, false)
-else
- AM_CONDITIONAL(HAVE_FC_CACHE, true)
-fi
+AM_CONDITIONAL(HAVE_FC_CACHE, false)
if test x"$is_amigaos4" = "xyes"; then
if test x"$enable_sdlui" != "xyes" -a x"$enable_sdlui2" != "xyes"; then
@@ -4061,7 +4056,7 @@ case "$host_os" in
;;
linux*)
if test x"$host_cpu" = "xx86_64"; then
- VICEDIR="$PREFIX/lib64/vice"
+ VICEDIR="$PREFIX/lib/vice"
AM_CONDITIONAL(ALTERNATE_DOCDIR, false)
else
VICEDIR="$PREFIX/lib/vice"
|