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
|
--- configure.orig 2011-12-02 15:54:03.000000000 +0100
+++ configure 2014-03-28 12:32:41.264513620 +0100
@@ -955,7 +955,7 @@
psdir='${docdir}'
libdir='${exec_prefix}/lib'
localedir='${datarootdir}/locale'
-mandir='${datarootdir}/man'
+mandir='${prefix}/man'
ac_prev=
ac_dashdash=
@@ -7939,19 +7939,6 @@
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if building on FreeBSD" >&5
-$as_echo_n "checking if building on FreeBSD... " >&6; }
-
-if test `uname -s` = "FreeBSD" ; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
- CPPFLAGS="$CFLAGS -I/usr/local/include"
- LDFLAGS="$LDFLAGS -L/usr/local/lib"
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if building on NetBSD" >&5
$as_echo_n "checking if building on NetBSD... " >&6; }
@@ -15803,7 +15790,7 @@
$as_echo_n "checking if more special flags are required for pthreads... " >&6; }
flag=no
case "${host_cpu}-${host_os}" in
- *-aix* | *-freebsd* | *-darwin*) flag="-D_THREAD_SAFE";;
+ *-aix* | *-darwin*) flag="-D_THREAD_SAFE";;
*solaris* | *-osf* | *-hpux*) flag="-D_REENTRANT";;
esac
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${flag}" >&5
@@ -16399,7 +16386,7 @@
if test "$enable_libical" = "yes"; then
- ICAL_LIBS="$ICAL_LIBS -lpthread -lical"
+ ICAL_LIBS="$ICAL_LIBS -pthread -lical"
OLD_CFLAGS="$CFLAGS"
OLD_LIBS="$LIBS"
LIBS="$LIBS $ICAL_LIBS"
@@ -16716,7 +16703,7 @@
$as_echo "#define HAVE_BLUETOOTH_BLUEZ /**/" >>confdefs.h
USE_BLUETOOTH="yes"
- BLUETOOTH_LIBS="-lbluetooth"
+ BLUETOOTH_LIBS="-lsdp -lbluetooth"
fi
fi
@@ -16849,7 +16836,7 @@
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-lbluetooth $LIBS"
+LIBS="-lsdp -lbluetooth $LIBS"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -16880,7 +16867,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bluetooth_bt_aton" >&5
$as_echo "$ac_cv_lib_bluetooth_bt_aton" >&6; }
if test "x$ac_cv_lib_bluetooth_bt_aton" = xyes; then :
- BLUETOOTH_LIBS="-lbluetooth" ac_cv_have_bt_lib=yes
+ BLUETOOTH_LIBS="-lsdp -lbluetooth" ac_cv_have_bt_lib=yes
else
ac_cv_have_bt_lib=no
fi
@@ -16977,7 +16964,7 @@
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-lbluetooth $LIBS"
+LIBS="-lsdp -lbluetooth $LIBS"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -17008,7 +16995,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bluetooth_bt_aton" >&5
$as_echo "$ac_cv_lib_bluetooth_bt_aton" >&6; }
if test "x$ac_cv_lib_bluetooth_bt_aton" = xyes; then :
- BLUETOOTH_LIBS="-lbluetooth" ac_cv_have_bt_lib=yes
+ BLUETOOTH_LIBS="-lsdp -lbluetooth" ac_cv_have_bt_lib=yes
else
ac_cv_have_bt_lib=no
fi
@@ -17488,8 +17475,7 @@
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-lXpm $XLIBS -lX11
- $LIBS"
+LIBS="-lXpm $XLIBS -lX11 $LIBS"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -17521,7 +17507,7 @@
$as_echo "$ac_cv_lib_Xpm_XpmWriteFileFromXpmImage" >&6; }
if test "x$ac_cv_lib_Xpm_XpmWriteFileFromXpmImage" = xyes; then :
XPM_CFLAGS="$XINCL"
- XPM_LIBS="$XLIBS -lXpm -lX11"
+ XPM_LIBS="$XLIBS -lXpm -lX11 -lroken -lcrypt"
$as_echo "#define XPM 1" >>confdefs.h
@@ -17556,7 +17542,7 @@
fi
fi
- if test "x$_support" = "xyes"; then
+ if test "x$x_support" = "xyes"; then
XGNOKII_TRUE=
XGNOKII_FALSE='#'
else
|
