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
|
$NetBSD: patch-ac,v 1.12 2004/05/11 13:34:20 wiz Exp $
--- configure.orig 2004-02-27 02:37:55.000000000 +0100
+++ configure
@@ -2594,6 +2594,9 @@ echo "${ECHO_T}Turning on SGI compiler w
esac
fi
+# Disable c89 options, since these trigger more errors than expected and
+# cause build failures.
+if false; then
if test -n "$GCC"; then
if test -n "$GCC"; then
echo "$as_me:$LINENO: checking whether gcc accepts -std" >&5
@@ -2640,6 +2643,7 @@ echo "${ECHO_T}Disabling C++ comments in
CC="$CC -Wp,-lang-c89"
fi
fi
+fi
if test -n "$GCC"; then
if test -n "$GCC"; then
@@ -11780,7 +11784,7 @@ if test "${ac_cv_lib_krb4_krb_get_tf_rea
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-lkrb4 $LIBS"
+LIBS="-lkrb -lcrypto -lroken -lcom_err $LIBS"
cat >conftest.$ac_ext <<_ACEOF
#line $LINENO "configure"
/* confdefs.h. */
@@ -11860,7 +11864,7 @@ echo "$as_me: WARNING: Cannot find compa
# from Matt Knopp <mhat@infocalypse.netlag.com>
# (who got it from amu@mit.edu)
- PASSWD_LIBS="$PASSWD_LIBS -lkrb4 -ldes425 -lkrb5 -lk5crypto -lcom_err"
+ PASSWD_LIBS="$PASSWD_LIBS -lkrb5 -lasn1 -lkrb -lcrypto -lroken -lcom_err"
# jwz: MacOS X uses -lkrb5, but not -lcrypt
@@ -13907,19 +13911,7 @@ fi
fi
- GNOME_DATADIR=""
- if test "$have_gtk" = yes; then
- if test -n "$pkg_config"; then
- if test "$have_gtk2" = yes; then
- GNOME_DATADIR=`$pkg_config --variable=prefix gtk+-2.0`
- else
- GNOME_DATADIR=`$pkg_config --variable=prefix gtk+`
- fi
- else
- GNOME_DATADIR=`$gtk_config --prefix`
- fi
- GNOME_DATADIR="$GNOME_DATADIR/share"
- fi
+ GNOME_DATADIR="$datadir"
# .desktop files go in different places in Gnome 1.x and Gnome 2.x...
if test "$have_gtk2" = yes; then
|
