| blob | 38d83d1562304d00bb0d929e40d520ef05e00a0e |
1 --- misc/db-4.7.25.NC/dist/Makefile.in 2008-05-06 12:03:36.000000000 +0900
2 +++ misc/build/db-4.7.25.NC/dist/Makefile.in 2009-07-11 13:38:07.419875000 +0900
3 @@ -44,7 +44,7 @@
4 SOLINK= @MAKEFILE_SOLINK@ @CFLAGS@
5 SOFLAGS= @SOFLAGS@
6 LIBMAJOR= @DB_VERSION_MAJOR@
7 -LIBVERSION= @DB_VERSION_MAJOR@.@DB_VERSION_MINOR@
8 +LIBVERSION= @DB_VERSION_MAJOR@@DB_VERSION_MINOR@
10 CPPFLAGS= -I$(builddir) -I$(srcdir) @CPPFLAGS@
12 @@ -62,18 +62,18 @@
14 libdb_base= libdb
15 libdb= $(libdb_base).a
16 -libdb_version= $(libdb_base)-$(LIBVERSION).a
17 -libso= $(libdb_base)-$(LIBVERSION)@SOSUFFIX@
18 -libso_target= $(libdb_base)-$(LIBVERSION).la
19 +libdb_version= $(libdb_base)$(LIBVERSION).a
20 +libso= $(libdb_base)$(LIBVERSION)@SOSUFFIX@
21 +libso_target= $(libdb_base)$(LIBVERSION).la
22 libso_default= $(libdb_base)@SOSUFFIX@
23 -libso_major= $(libdb_base)-$(LIBMAJOR)@SOSUFFIX@
24 +libso_major= $(libdb_base)$(LIBMAJOR)@SOSUFFIX@
26 ##################################################
27 # C++ API.
28 #
29 # C++ support is optional, and can be built with static or shared libraries.
30 ##################################################
31 -CXXFLAGS= -c $(CPPFLAGS) @CXXFLAGS@
32 +CXXFLAGS= -c $(SOLARINC) $(CPPFLAGS) -DGXX_INCLUDE_PATH=$(GXX_INCLUDE_PATH) @CXXFLAGS@
33 CXX= @MAKEFILE_CXX@
34 CXXLINK= @MAKEFILE_CXXLINK@ @CXXFLAGS@
35 XSOLINK= @MAKEFILE_XSOLINK@ @CXXFLAGS@
36 @@ -81,11 +81,11 @@
38 libcxx_base= libdb_cxx
39 libcxx= $(libcxx_base).a
40 -libcxx_version= $(libcxx_base)-$(LIBVERSION).a
41 -libxso= $(libcxx_base)-$(LIBVERSION)@SOSUFFIX@
42 -libxso_target= $(libcxx_base)-$(LIBVERSION).la
43 +libcxx_version= $(libcxx_base)$(LIBVERSION).a
44 +libxso= $(libcxx_base)$(LIBVERSION)@SOSUFFIX@
45 +libxso_target= $(libcxx_base)$(LIBVERSION).la
46 libxso_default= $(libcxx_base)@SOSUFFIX@
47 -libxso_major= $(libcxx_base)-$(LIBMAJOR)@SOSUFFIX@
48 +libxso_major= $(libcxx_base)$(LIBMAJOR)@SOSUFFIX@
50 ##################################################
51 # Java API.
52 @@ -108,12 +108,12 @@
53 libj_jarfile= db.jar
54 libj_exjarfile= dbexamples.jar
55 libjso_base= libdb_java
56 -libjso= $(libjso_base)-$(LIBVERSION)@JMODSUFFIX@
57 -libjso_static= $(libjso_base)-$(LIBVERSION).a
58 -libjso_target= $(libjso_base)-$(LIBVERSION).la
59 +libjso= $(libjso_base)$(LIBVERSION)@JMODSUFFIX@
60 +libjso_static= $(libjso_base)$(LIBVERSION).a
61 +libjso_target= $(libjso_base)$(LIBVERSION).la
62 libjso_default= $(libjso_base)@JMODSUFFIX@
63 -libjso_major= $(libjso_base)-$(LIBMAJOR)@JMODSUFFIX@
64 -libjso_g= $(libjso_base)-$(LIBVERSION)_g@JMODSUFFIX@
65 +libjso_major= $(libjso_base)$(LIBMAJOR)@JMODSUFFIX@
66 +libjso_g= $(libjso_base)$(LIBVERSION)_g@JMODSUFFIX@
68 ##################################################
69 # TCL API.
70 @@ -123,11 +123,11 @@
71 TCL_INCLUDE_SPEC= @TCL_INCLUDE_SPEC@
72 LIBTSO_LIBS= @LIBTSO_LIBS@ @LIBSO_LIBS@
73 libtso_base= libdb_tcl
74 -libtso= $(libtso_base)-$(LIBVERSION)@MODSUFFIX@
75 -libtso_static= $(libtso_base)-$(LIBVERSION).a
76 -libtso_target= $(libtso_base)-$(LIBVERSION).la
77 +libtso= $(libtso_base)$(LIBVERSION)@MODSUFFIX@
78 +libtso_static= $(libtso_base)$(LIBVERSION).a
79 +libtso_target= $(libtso_base)$(LIBVERSION).la
80 libtso_default= $(libtso_base)@MODSUFFIX@
81 -libtso_major= $(libtso_base)-$(LIBMAJOR)@MODSUFFIX@
82 +libtso_major= $(libtso_base)$(LIBMAJOR)@MODSUFFIX@
84 ##################################################
85 # db_dump185 UTILITY
86 @@ -756,7 +756,7 @@
88 # Shared Java library.
89 $(libjso_target): $(JAVA_OBJS) $(C_OBJS)
90 - $(SOLINK) -shrext @JMODSUFFIX@ $(SOFLAGS) $(LDFLAGS) \
91 + $(SOLINK) -shrext @JMODSUFFIX@ -add-underscore $(SOFLAGS) $(LDFLAGS) \
92 -o $@ $(JAVA_OBJS) $(C_OBJS) $(LIBJSO_LIBS)
94 # Shared Tcl library.
95 --- misc/db-4.7.25.NC/dist/configure 2008-05-16 06:12:41.000000000 +0900
96 +++ misc/build/db-4.7.25.NC/dist/configure 2009-07-11 16:00:39.255625000 +0900
97 @@ -9488,7 +9488,7 @@
98 export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
100 if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
101 - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
102 + archive_cmds='$DLLTOOL $add_underscore --export-all-symbols --dllname $soname --output-lib $lib --output-exp $output_objdir/$soname.exp $libobjs; $CC -shared $output_objdir/$soname.exp $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base ${wl}--image-base=0x10000000'
103 # If the export-symbols file already is a .def file (1st line
104 # is EXPORTS), use it as is; otherwise, prepend...
105 archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
106 @@ -9497,7 +9497,7 @@
107 echo EXPORTS > $output_objdir/$soname.def;
108 cat $export_symbols >> $output_objdir/$soname.def;
109 fi~
110 - $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
111 + $DLLTOOL $add_underscore --dllname $soname --output-lib $lib --output-exp $output_objdir/$soname.exp --input-def $output_objdir/$soname.def; $CC -shared $output_objdir/$soname.exp $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base ${wl}--image-base=0x10000000'
112 else
113 ld_shlibs=no
114 fi
115 @@ -13680,15 +13680,15 @@
117 if test "$pre_test_object_deps_done" = no; then
118 if test -z "$predep_objects_CXX"; then
119 - predep_objects_CXX="$p"
120 + predep_objects_CXX=`cygpath -m "$p"`
121 else
122 - predep_objects_CXX="$predep_objects_CXX $p"
123 + predep_objects_CXX="$predep_objects_CXX "`cygpath -m "$p"`
124 fi
125 else
126 if test -z "$postdep_objects_CXX"; then
127 - postdep_objects_CXX="$p"
128 + postdep_objects_CXX=`cygpath -m "$p"`
129 else
130 - postdep_objects_CXX="$postdep_objects_CXX $p"
131 + postdep_objects_CXX="$postdep_objects_CXX "`cygpath -m "$p"`
132 fi
133 fi
134 ;;
135 @@ -22371,6 +22371,154 @@
139 +case "$host_os" in
140 +mingw*)
141 +for ac_header in execinfo.h sys/time.h
142 +do
143 +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
144 +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
145 + { echo "$as_me:$LINENO: checking for $ac_header" >&5
146 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
147 +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
148 + echo $ECHO_N "(cached) $ECHO_C" >&6
149 +fi
150 +ac_res=`eval echo '${'$as_ac_Header'}'`
151 + { echo "$as_me:$LINENO: result: $ac_res" >&5
152 +echo "${ECHO_T}$ac_res" >&6; }
153 +else
154 + # Is the header compilable?
155 +{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
156 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
157 +cat >conftest.$ac_ext <<_ACEOF
158 +/* confdefs.h. */
159 +_ACEOF
160 +cat confdefs.h >>conftest.$ac_ext
161 +cat >>conftest.$ac_ext <<_ACEOF
162 +/* end confdefs.h. */
163 +$ac_includes_default
164 +#include <$ac_header>
165 +_ACEOF
166 +rm -f conftest.$ac_objext
167 +if { (ac_try="$ac_compile"
168 +case "(($ac_try" in
169 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
170 + *) ac_try_echo=$ac_try;;
171 +esac
172 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
173 + (eval "$ac_compile") 2>conftest.er1
174 + ac_status=$?
175 + grep -v '^ *+' conftest.er1 >conftest.err
176 + rm -f conftest.er1
177 + cat conftest.err >&5
178 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
179 + (exit $ac_status); } && {
180 + test -z "$ac_c_werror_flag" ||
181 + test ! -s conftest.err
182 + } && test -s conftest.$ac_objext; then
183 + ac_header_compiler=yes
184 +else
185 + echo "$as_me: failed program was:" >&5
186 +sed 's/^/| /' conftest.$ac_ext >&5
187 +
188 + ac_header_compiler=no
189 +fi
190 +
191 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
192 +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
193 +echo "${ECHO_T}$ac_header_compiler" >&6; }
194 +
195 +# Is the header present?
196 +{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
197 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
198 +cat >conftest.$ac_ext <<_ACEOF
199 +/* confdefs.h. */
200 +_ACEOF
201 +cat confdefs.h >>conftest.$ac_ext
202 +cat >>conftest.$ac_ext <<_ACEOF
203 +/* end confdefs.h. */
204 +#include <$ac_header>
205 +_ACEOF
206 +if { (ac_try="$ac_cpp conftest.$ac_ext"
207 +case "(($ac_try" in
208 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
209 + *) ac_try_echo=$ac_try;;
210 +esac
211 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
212 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
213 + ac_status=$?
214 + grep -v '^ *+' conftest.er1 >conftest.err
215 + rm -f conftest.er1
216 + cat conftest.err >&5
217 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
218 + (exit $ac_status); } >/dev/null && {
219 + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
220 + test ! -s conftest.err
221 + }; then
222 + ac_header_preproc=yes
223 +else
224 + echo "$as_me: failed program was:" >&5
225 +sed 's/^/| /' conftest.$ac_ext >&5
226 +
227 + ac_header_preproc=no
228 +fi
229 +
230 +rm -f conftest.err conftest.$ac_ext
231 +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
232 +echo "${ECHO_T}$ac_header_preproc" >&6; }
233 +
234 +# So? What about this header?
235 +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
236 + yes:no: )
237 + { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
238 +echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
239 + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
240 +echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
241 + ac_header_preproc=yes
242 + ;;
243 + no:yes:* )
244 + { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
245 +echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
246 + { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
247 +echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
248 + { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
249 +echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
250 + { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
251 +echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
252 + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
253 +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
254 + { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
255 +echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
256 + ( cat <<\_ASBOX
257 +## ---------------------------------------------------------- ##
258 +## Report this to Oracle Technology Network Berkeley DB forum ##
259 +## ---------------------------------------------------------- ##
260 +_ASBOX
261 + ) | sed "s/^/$as_me: WARNING: /" >&2
262 + ;;
263 +esac
264 +{ echo "$as_me:$LINENO: checking for $ac_header" >&5
265 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
266 +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
267 + echo $ECHO_N "(cached) $ECHO_C" >&6
268 +else
269 + eval "$as_ac_Header=\$ac_header_preproc"
270 +fi
271 +ac_res=`eval echo '${'$as_ac_Header'}'`
272 + { echo "$as_me:$LINENO: result: $ac_res" >&5
273 +echo "${ECHO_T}$ac_res" >&6; }
274 +
275 +fi
276 +if test `eval echo '${'$as_ac_Header'}'` = yes; then
277 + cat >>confdefs.h <<_ACEOF
278 +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
279 +_ACEOF
280 +
281 +fi
282 +
283 +done
284 +
285 +;;
286 +*)
287 for ac_header in execinfo.h sys/select.h sys/socket.h sys/time.h
288 do
289 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
290 @@ -22515,6 +22663,8 @@
292 done
294 +;;
295 +esac
296 { echo "$as_me:$LINENO: checking for struct stat.st_blksize" >&5
297 echo $ECHO_N "checking for struct stat.st_blksize... $ECHO_C" >&6; }
298 if test "${ac_cv_member_struct_stat_st_blksize+set}" = set; then
299 @@ -27697,6 +27847,18 @@
303 +ac_cv_sizeof_char_p=`echo $ac_cv_sizeof_char_p | tr -d '\015'`
304 +ac_cv_sizeof_unsigned_int=`echo $ac_cv_sizeof_unsigned_int | tr -d '\015'`
305 +ac_cv_sizeof_unsigned_char=`echo $ac_cv_sizeof_unsigned_char | tr -d '\015'`
306 +ac_cv_sizeof_unsigned_short=`echo $ac_cv_sizeof_unsigned_short | tr -d '\015'`
307 +ac_cv_sizeof_unsigned_long=`echo $ac_cv_sizeof_unsigned_long | tr -d '\015'`
308 +ac_cv_sizeof_unsigned_long_long=`echo $ac_cv_sizeof_unsigned_long_long | tr -d '\015'`
309 +ac_cv_sizeof_int=`echo $ac_cv_sizeof_int | tr -d '\015'`
310 +ac_cv_sizeof_char=`echo $ac_cv_sizeof_char | tr -d '\015'`
311 +ac_cv_sizeof_short=`echo $ac_cv_sizeof_short | tr -d '\015'`
312 +ac_cv_sizeof_long=`echo $ac_cv_sizeof_long | tr -d '\015'`
313 +ac_cv_sizeof_long_long=`echo $ac_cv_sizeof_long_long | tr -d '\015'`
314 +
315 # We look for u_char, u_short, u_int, u_long -- if we can't find them,
316 # we create our own.
318 --- misc/db-4.7.25.NC/dist/ltmain.sh 2006-06-27 10:03:33.000000000 +0900
319 +++ misc/build/db-4.7.25.NC/dist/ltmain.sh 2009-07-11 13:38:07.388625000 +0900
320 @@ -1103,6 +1103,7 @@
321 lib_search_path=`pwd`
322 inst_prefix_dir=
324 + add_underscore=
325 avoid_version=no
326 dlfiles=
327 dlprefiles=
328 @@ -1435,6 +1436,11 @@
329 prevarg="$arg"
331 case $arg in
332 + -add-underscore)
333 + add_underscore="--add-underscore"
334 + continue
335 + ;;
336 +
337 -all-static)
338 if test -n "$link_static_flag"; then
339 compile_command="$compile_command $link_static_flag"
340 @@ -4869,7 +4875,7 @@
341 esac
342 # test for cygwin because mv fails w/o .exe extensions
343 case $host in
344 - *cygwin*)
345 + *cygwin* | *mingw*)
346 exeext=.exe
347 outputname=`$echo $outputname|${SED} 's,.exe$,,'` ;;
348 *) exeext= ;;