blob: 64cfa2e1ca2c783de56fd30a6a1c25a3b865b0f9 (
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
68
69
70
71
72
73
74
|
--- configure.orig 2012-11-08 21:22:27.000000000 +0100
+++ configure 2013-02-07 12:28:12.000000000 +0100
@@ -7585,11 +7585,6 @@
-# This can be used to rebuild libtool when needed
-LIBTOOL_DEPS="$ltmain"
-
-# Always use our own libtool.
-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
@@ -11464,29 +11459,9 @@
# Only expand once:
-#
-# libtool stuff
-#
-if test -z "${LTFLAGS}"; then
- LTFLAGS="--silent"
-fi
-
-LIBTOOL_SCRIPT="`pwd`/libtool"
-LIBTOOL="${LIBTOOL_SCRIPT} ${LTFLAGS}"
-libtoolversion=`${SHELL} ${LIBTOOL_SCRIPT} --version`
-case $libtoolversion in
- *1.4*)
- SH_LIBTOOL="${LIBTOOL_SCRIPT}"
- SHLTCFLAGS="-prefer-pic"
- LTCFLAGS="-prefer-non-pic -static"
- ;;
- *)
- SH_LIBTOOL="${SHELL} ${LIBTOOL_SCRIPT} ${LTFLAGS}"
- SHLTCFLAGS=""
- LTCFLAGS=""
- ;;
-esac
-
+SH_LIBTOOL="${SHELL} ${LIBTOOL}"
+SHLTCFLAGS=""
+LTCFLAGS=""
@@ -12271,26 +12246,6 @@
*freebsd*)
PROXY_LIBS='-lpthread'
jni_os=freebsd
-
- tmp=`ldd $JAVA_HOME/bin/java | sed 's/.*=>//' | grep -c libc_r`
- tmp=$tmp `ldd $JAVA_HOME/bin/java | sed 's/.*=>//' | grep -c libpthread`
- tmp=$tmp `ldd $JAVA_HOME/bin/java | sed 's/.*=>//' | grep -c libthr`
-
- case "$tmp" in
- 100)
- PROXY_LIBS='-lc_r';
- ;;
- 010)
- PROXY_LIBS='-lpthread';
- ;;
- 001)
- PROXY_LIBS='-lthr';
- ;;
- *)
- PROXY_LIBS='-lpthread'
- echo "Using -lpthread as default"
- ;;
- esac
;;
*darwin*)
|
