]>
Commit | Line | Data |
---|---|---|
666331db AM |
1 | diff -urN boehm-gc.org/Makefile.am boehm-gc/Makefile.am |
2 | --- boehm-gc.org/Makefile.am Sat Oct 18 12:32:07 2003 | |
3 | +++ boehm-gc/Makefile.am Sat Oct 18 12:32:55 2003 | |
4 | @@ -39,7 +39,8 @@ | |
5 | # linuxthread semaphore functions get linked: | |
6 | libgcjgc_la_LIBADD = @addobjs@ $(THREADLIBS) | |
7 | libgcjgc_la_DEPENDENCIES = @addobjs@ | |
8 | -libgcjgc_la_LDFLAGS = -version-info 1:1:0 -rpath $(toolexeclibdir) | |
9 | +libgcjgc_la_LDFLAGS = @LIBGCJGC_EXTRA_LDFLAGS@ -version-info 1:1:0 \ | |
10 | + -rpath $(toolexeclibdir) | |
5384b728 | 11 | |
666331db AM |
12 | libgcjgc_convenience_la_LIBADD = @addobjs@ |
13 | libgcjgc_convenience_la_DEPENDENCIES = @addobjs@ | |
14 | diff -urN boehm-gc.org/Makefile.in boehm-gc/Makefile.in | |
15 | --- boehm-gc.org/Makefile.in Thu Oct 16 22:10:48 2003 | |
16 | +++ boehm-gc/Makefile.in Sat Oct 18 12:32:55 2003 | |
17 | @@ -133,7 +133,8 @@ | |
18 | # linuxthread semaphore functions get linked: | |
19 | libgcjgc_la_LIBADD = @addobjs@ $(THREADLIBS) | |
20 | libgcjgc_la_DEPENDENCIES = @addobjs@ | |
21 | -libgcjgc_la_LDFLAGS = -version-info 1:1:0 -rpath $(toolexeclibdir) | |
22 | +libgcjgc_la_LDFLAGS = @LIBGCJGC_EXTRA_LDFLAGS@ -version-info 1:1:0 \ | |
23 | + -rpath $(toolexeclibdir) | |
5384b728 | 24 | |
666331db AM |
25 | libgcjgc_convenience_la_LIBADD = @addobjs@ |
26 | libgcjgc_convenience_la_DEPENDENCIES = @addobjs@ | |
27 | diff -urN boehm-gc.org/configure boehm-gc/configure | |
28 | --- boehm-gc.org/configure Sat Oct 18 12:32:07 2003 | |
29 | +++ boehm-gc/configure Sat Oct 18 12:33:48 2003 | |
30 | @@ -2717,11 +2717,57 @@ | |
5384b728 | 31 | fi |
32 | ||
33 | ||
34 | +echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 | |
35 | +echo "configure:2635: checking for dlopen in -ldl" >&5 | |
36 | +ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'` | |
37 | +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then | |
38 | + echo $ac_n "(cached) $ac_c" 1>&6 | |
39 | +else | |
40 | + ac_save_LIBS="$LIBS" | |
41 | +LIBS="-ldl $LIBS" | |
42 | +cat > conftest.$ac_ext <<EOF | |
43 | +#line 2643 "configure" | |
44 | +#include "confdefs.h" | |
45 | +/* Override any gcc2 internal prototype to avoid an error. */ | |
46 | +/* We use char because int might match the return type of a gcc2 | |
47 | + builtin and then its argument prototype would still apply. */ | |
48 | +char dlopen(); | |
49 | + | |
50 | +int main() { | |
51 | +dlopen() | |
52 | +; return 0; } | |
53 | +EOF | |
54 | +if { (eval echo configure:2654: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | |
55 | + rm -rf conftest* | |
56 | + eval "ac_cv_lib_$ac_lib_var=yes" | |
57 | +else | |
58 | + echo "configure: failed program was:" >&5 | |
59 | + cat conftest.$ac_ext >&5 | |
60 | + rm -rf conftest* | |
61 | + eval "ac_cv_lib_$ac_lib_var=no" | |
62 | +fi | |
63 | +rm -f conftest* | |
64 | +LIBS="$ac_save_LIBS" | |
65 | + | |
66 | +fi | |
67 | +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then | |
68 | + echo "$ac_t""yes" 1>&6 | |
69 | + | |
70 | +EXTRA_TEST_LIBS="$EXTRA_TEST_LIBS -ldl" | |
71 | +LIBGCJGC_EXTRA_LDFLAGS="-ldl" | |
72 | + | |
73 | +else | |
74 | + echo "$ac_t""no" 1>&6 | |
75 | +fi | |
76 | + | |
77 | + | |
78 | + | |
79 | INCLUDES=-I${srcdir}/include | |
80 | THREADLIBS= | |
81 | case "$THREADS" in | |
82 | no | none | single) | |
83 | THREADS=none | |
84 | + LIBGCJGC_EXTRA_LDFLAGS= | |
85 | ;; | |
86 | posix | pthreads) | |
87 | THREADS=posix | |
666331db | 88 | @@ -2806,6 +2852,7 @@ |
5384b728 | 89 | ;; |
90 | *-*-cygwin*) | |
91 | THREADLIBS= | |
92 | + LIBGCJGC_EXTRA_LDFLAGS= | |
93 | ;; | |
94 | esac | |
95 | ;; | |
666331db | 96 | @@ -2834,48 +2881,6 @@ |
5384b728 | 97 | esac |
98 | ||
99 | ||
100 | -echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 | |
666331db | 101 | -echo "configure:2839: checking for dlopen in -ldl" >&5 |
5384b728 | 102 | -ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'` |
103 | -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then | |
104 | - echo $ac_n "(cached) $ac_c" 1>&6 | |
105 | -else | |
106 | - ac_save_LIBS="$LIBS" | |
107 | -LIBS="-ldl $LIBS" | |
108 | -cat > conftest.$ac_ext <<EOF | |
666331db | 109 | -#line 2847 "configure" |
5384b728 | 110 | -#include "confdefs.h" |
111 | -/* Override any gcc2 internal prototype to avoid an error. */ | |
112 | -/* We use char because int might match the return type of a gcc2 | |
113 | - builtin and then its argument prototype would still apply. */ | |
114 | -char dlopen(); | |
115 | - | |
116 | -int main() { | |
117 | -dlopen() | |
118 | -; return 0; } | |
119 | -EOF | |
666331db | 120 | -if { (eval echo configure:2858: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then |
5384b728 | 121 | - rm -rf conftest* |
122 | - eval "ac_cv_lib_$ac_lib_var=yes" | |
123 | -else | |
124 | - echo "configure: failed program was:" >&5 | |
125 | - cat conftest.$ac_ext >&5 | |
126 | - rm -rf conftest* | |
127 | - eval "ac_cv_lib_$ac_lib_var=no" | |
128 | -fi | |
129 | -rm -f conftest* | |
130 | -LIBS="$ac_save_LIBS" | |
131 | - | |
132 | -fi | |
133 | -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then | |
134 | - echo "$ac_t""yes" 1>&6 | |
135 | - EXTRA_TEST_LIBS="$EXTRA_TEST_LIBS -ldl" | |
136 | -else | |
137 | - echo "$ac_t""no" 1>&6 | |
138 | -fi | |
139 | - | |
140 | - | |
141 | - | |
142 | target_all=libgcjgc.la | |
143 | ||
144 | ||
666331db | 145 | @@ -3295,8 +3300,9 @@ |
5384b728 | 146 | s%@STRIP@%$STRIP%g |
147 | s%@LIBTOOL@%$LIBTOOL%g | |
148 | s%@CXXCPP@%$CXXCPP%g | |
149 | -s%@THREADLIBS@%$THREADLIBS%g | |
150 | s%@EXTRA_TEST_LIBS@%$EXTRA_TEST_LIBS%g | |
151 | +s%@THREADLIBS@%$THREADLIBS%g | |
152 | +s%@LIBGCJGC_EXTRA_LDFLAGS@%$LIBGCJGC_EXTRA_LDFLAGS%g | |
153 | s%@target_all@%$target_all%g | |
154 | s%@INCLUDES@%$INCLUDES%g | |
155 | s%@CXXINCLUDES@%$CXXINCLUDES%g | |
666331db AM |
156 | diff -urN boehm-gc.org/configure.in boehm-gc/configure.in |
157 | --- boehm-gc.org/configure.in Sat Oct 18 12:32:07 2003 | |
158 | +++ boehm-gc/configure.in Sat Oct 18 12:32:55 2003 | |
159 | @@ -63,11 +63,18 @@ | |
160 | esac] | |
161 | ) | |
5384b728 | 162 | |
666331db AM |
163 | +AC_CHECK_LIB(dl, dlopen, [ |
164 | +EXTRA_TEST_LIBS="$EXTRA_TEST_LIBS -ldl" | |
165 | +LIBGCJGC_EXTRA_LDFLAGS="-ldl" | |
166 | +]) | |
167 | +AC_SUBST(EXTRA_TEST_LIBS) | |
168 | + | |
169 | INCLUDES=-I${srcdir}/include | |
170 | THREADLIBS= | |
171 | case "$THREADS" in | |
172 | no | none | single) | |
173 | THREADS=none | |
174 | + LIBGCJGC_EXTRA_LDFLAGS= | |
175 | ;; | |
176 | posix | pthreads) | |
177 | THREADS=posix | |
178 | @@ -110,6 +117,7 @@ | |
179 | ;; | |
180 | *-*-cygwin*) | |
181 | THREADLIBS= | |
182 | + LIBGCJGC_EXTRA_LDFLAGS= | |
183 | ;; | |
184 | esac | |
185 | ;; | |
186 | @@ -128,9 +136,7 @@ | |
187 | ;; | |
188 | esac | |
189 | AC_SUBST(THREADLIBS) | |
190 | - | |
191 | -AC_CHECK_LIB(dl, dlopen, EXTRA_TEST_LIBS="$EXTRA_TEST_LIBS -ldl") | |
192 | -AC_SUBST(EXTRA_TEST_LIBS) | |
193 | +AC_SUBST(LIBGCJGC_EXTRA_LDFLAGS) | |
5384b728 | 194 | |
666331db AM |
195 | target_all=libgcjgc.la |
196 | AC_SUBST(target_all) |