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
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)
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
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)
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 @@
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
40 + ac_save_LIBS="$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. */
54 +if { (eval echo configure:2654: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
56 + eval "ac_cv_lib_$ac_lib_var=yes"
58 + echo "configure: failed program was:" >&5
59 + cat conftest.$ac_ext >&5
61 + eval "ac_cv_lib_$ac_lib_var=no"
67 +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
68 + echo "$ac_t""yes" 1>&6
70 +EXTRA_TEST_LIBS="$EXTRA_TEST_LIBS -ldl"
71 +LIBGCJGC_EXTRA_LDFLAGS="-ldl"
74 + echo "$ac_t""no" 1>&6
79 INCLUDES=-I${srcdir}/include
84 + LIBGCJGC_EXTRA_LDFLAGS=
92 + LIBGCJGC_EXTRA_LDFLAGS=
96 @@ -2834,48 +2881,6 @@
100 -echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
101 -echo "configure:2839: checking for dlopen in -ldl" >&5
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
106 - ac_save_LIBS="$LIBS"
108 -cat > conftest.$ac_ext <<EOF
109 -#line 2847 "configure"
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. */
120 -if { (eval echo configure:2858: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
122 - eval "ac_cv_lib_$ac_lib_var=yes"
124 - echo "configure: failed program was:" >&5
125 - cat conftest.$ac_ext >&5
127 - eval "ac_cv_lib_$ac_lib_var=no"
130 -LIBS="$ac_save_LIBS"
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"
137 - echo "$ac_t""no" 1>&6
142 target_all=libgcjgc.la
145 @@ -3295,8 +3300,9 @@
147 s%@LIBTOOL@%$LIBTOOL%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
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
163 +AC_CHECK_LIB(dl, dlopen, [
164 +EXTRA_TEST_LIBS="$EXTRA_TEST_LIBS -ldl"
165 +LIBGCJGC_EXTRA_LDFLAGS="-ldl"
167 +AC_SUBST(EXTRA_TEST_LIBS)
169 INCLUDES=-I${srcdir}/include
174 + LIBGCJGC_EXTRA_LDFLAGS=
182 + LIBGCJGC_EXTRA_LDFLAGS=
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)
195 target_all=libgcjgc.la