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,
7 +AC_CHECK_LIB(dl, dlopen, [
8 +EXTRA_TEST_LIBS="$EXTRA_TEST_LIBS -ldl"
9 +LIBGCJGC_EXTRA_LDFLAGS="-ldl"
11 +AC_SUBST(EXTRA_TEST_LIBS)
13 INCLUDES=-I${srcdir}/include
18 + LIBGCJGC_EXTRA_LDFLAGS=
22 @@ -105,6 +112,7 @@ case "$THREADS" in
26 + LIBGCJGC_EXTRA_LDFLAGS=
30 @@ -116,9 +124,7 @@ case "$THREADS" in
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)
39 target_all=libgcjgc.la
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}" =
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
53 + ac_save_LIBS="$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. */
67 +if { (eval echo configure:2654: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
69 + eval "ac_cv_lib_$ac_lib_var=yes"
71 + echo "configure: failed program was:" >&5
72 + cat conftest.$ac_ext >&5
74 + eval "ac_cv_lib_$ac_lib_var=no"
80 +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
81 + echo "$ac_t""yes" 1>&6
83 +EXTRA_TEST_LIBS="$EXTRA_TEST_LIBS -ldl"
84 +LIBGCJGC_EXTRA_LDFLAGS="-ldl"
87 + echo "$ac_t""no" 1>&6
92 INCLUDES=-I${srcdir}/include
97 + LIBGCJGC_EXTRA_LDFLAGS=
101 @@ -2736,6 +2782,7 @@ EOF
105 + LIBGCJGC_EXTRA_LDFLAGS=
109 @@ -2758,48 +2805,6 @@ EOF
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
119 - ac_save_LIBS="$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. */
133 -if { (eval echo configure:2782: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
135 - eval "ac_cv_lib_$ac_lib_var=yes"
137 - echo "configure: failed program was:" >&5
138 - cat conftest.$ac_ext >&5
140 - eval "ac_cv_lib_$ac_lib_var=no"
143 -LIBS="$ac_save_LIBS"
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"
150 - echo "$ac_t""no" 1>&6
155 target_all=libgcjgc.la
158 @@ -3215,8 +3220,9 @@ s%@OBJEXT@%$OBJEXT%g
160 s%@LIBTOOL@%$LIBTOOL%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)
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)
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