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