blob: f4c57afc835c6198bcf996daa36fb3710b130fba (
plain) (
blame)
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
|
$FreeBSD$
--- configure.orig Fri Apr 26 12:27:40 2002
+++ configure Fri Apr 26 12:30:02 2002
@@ -5586,6 +5586,7 @@
# This can be used to rebuild libtool when needed
LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
# Always use our own libtool.
LIBTOOL='$(SHELL) $(top_builddir)/libtool'
@@ -9131,8 +9132,8 @@
done
fi
-echo $ac_n "checking for bzCompressInit in -lbz2""... $ac_c" 1>&6
-echo "configure:9136: checking for bzCompressInit in -lbz2" >&5
+echo $ac_n "checking for BZ2_bzCompressInit in -lbz2""... $ac_c" 1>&6
+echo "configure:9136: checking for BZ2_bzCompressInit in -lbz2" >&5
ac_lib_var=`echo bz2'_'bzCompressInit | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -9145,10 +9146,10 @@
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
builtin and then its argument prototype would still apply. */
-char bzCompressInit();
+char BZ2_bzCompressInit();
int main() {
-bzCompressInit()
+BZ2_bzCompressInit()
; return 0; }
EOF
if { (eval echo configure:9155: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
@@ -9421,7 +9422,7 @@
echo $ac_n "(cached) $ac_c" 1>&6
else
- LDFLAGS="$LDFLAGS -L$with_openssl_libs -lssl -lcrypto -ldl"
+ LDFLAGS="$LDFLAGS -L$with_openssl_libs -lssl -lcryptofoo -ldl"
cat > conftest.$ac_ext <<EOF
#line 9427 "configure"
#include "confdefs.h"
@@ -9456,9 +9457,9 @@
msg_openssl="yes"
if test x$with_openssl_libs != x/usr/lib; then
- OPENSSL_LIBS="-L$with_openssl_libs -lssl -lcrypto"
+ OPENSSL_LIBS="-L$with_openssl_libs -lssl -lcryptofoo"
else
- OPENSSL_LIBS="-lssl -lcrypto"
+ OPENSSL_LIBS="-lssl -lcryptofoo"
fi
@@ -10059,7 +10060,7 @@
s%@ORBIT_IDL@%$ORBIT_IDL%g
s%@BONOBO_IDLDIR@%$BONOBO_IDLDIR%g
s%@WARN_CFLAGS@%$WARN_CFLAGS%g
-s%@PTHREAD_LIB@%$PTHREAD_LIB%g
+s%@PTHREAD_LIB@%$BSD_PTHREAD_LIB%g
s%@GETTEXT_PACKAGE@%$GETTEXT_PACKAGE%g
s%@ALLOCA@%$ALLOCA%g
s%@USE_NLS@%$USE_NLS%g
|
