|
1 ## |
|
2 ## rpm.patch.regen -- Annotated OpenPKG RPM Patch file |
|
3 ## Copyright (c) 2000-2007 OpenPKG Foundation e.V. <http://openpkg.net/> |
|
4 ## Copyright (c) 2000-2007 Ralf S. Engelschall <http://engelschall.com/> |
|
5 ## |
|
6 ## This file assembles changes to existing RPM source files between |
|
7 ## the original RedHat RPM and the OpenPKG RPM variant. It can be |
|
8 ## automatically applied to a vanilla RedHat RPM source tree with the |
|
9 ## 'patch' tool to upgrade those files. Each patch snippet is annotated |
|
10 ## with a short description. |
|
11 ## |
|
12 ## Created on: 13-Sep-2006 |
|
13 ## |
|
14 ## ATTENTION: THIS PATCH FILE WAS AUTO-GENERATED FROM AN OPENPKG |
|
15 ## RPM CVS REPOSITORY, HENCE DO NOT EDIT THIS FILE. |
|
16 ## |
|
17 |
|
18 +--------------------------------------------------------------------------- |
|
19 | Corresponding patches in "config.h.in" script after regeneration from |
|
20 | patched "configure.ac" with "autoheader". |
|
21 +--------------------------------------------------------------------------- |
|
22 Index: config.h.in |
|
23 --- config.h.in 16 Jul 2003 17:17:13 -0000 1.1.1.18 |
|
24 +++ config.h.in 13 Sep 2006 13:41:41 -0000 |
|
25 @@ -108,6 +108,9 @@ |
|
26 /* Define if you have the getmntent() function */ |
|
27 #undef HAVE_GETMNTENT |
|
28 |
|
29 +/* Define as 1 if you have the getmntinfo() function */ |
|
30 +#undef HAVE_GETMNTINFO |
|
31 + |
|
32 /* Define as 1 if you have getmntinfo_r() (only osf?) */ |
|
33 #undef HAVE_GETMNTINFO_R |
|
34 |
|
35 @@ -181,18 +184,12 @@ |
|
36 /* Define to 1 if you have the `port' library (-lport). */ |
|
37 #undef HAVE_LIBPORT |
|
38 |
|
39 -/* Define to 1 if you have the `pthread' library (-lpthread). */ |
|
40 -#undef HAVE_LIBPTHREAD |
|
41 - |
|
42 /* Define to 1 if you have the `rand' library (-lrand). */ |
|
43 #undef HAVE_LIBRAND |
|
44 |
|
45 /* Define to 1 if you have the `socket' library (-lsocket). */ |
|
46 #undef HAVE_LIBSOCKET |
|
47 |
|
48 -/* Define to 1 if you have the `thread' library (-lthread). */ |
|
49 -#undef HAVE_LIBTHREAD |
|
50 - |
|
51 /* Define to 1 if you have the <limits.h> header file. */ |
|
52 #undef HAVE_LIMITS_H |
|
53 |
|
54 @@ -259,9 +256,6 @@ |
|
55 /* Define to 1 if you have the `regcomp' function. */ |
|
56 #undef HAVE_REGCOMP |
|
57 |
|
58 -/* Define to 1 if you have the <semaphore.h> header file. */ |
|
59 -#undef HAVE_SEMAPHORE_H |
|
60 - |
|
61 /* Define to 1 if you have the `setenv' function. */ |
|
62 #undef HAVE_SETENV |
|
63 |
|
64 @@ -323,9 +317,6 @@ |
|
65 /* Define as 1 if you have "struct mnttab" (only sco?) */ |
|
66 #undef HAVE_STRUCT_MNTTAB |
|
67 |
|
68 -/* Define to 1 if you have the <synch.h> header file. */ |
|
69 -#undef HAVE_SYNCH_H |
|
70 - |
|
71 /* Define to 1 if you have the <sys/dir.h> header file, and it defines `DIR'. |
|
72 */ |
|
73 #undef HAVE_SYS_DIR_H |
|
74 @@ -391,9 +382,6 @@ |
|
75 /* Define as 1 if <sys/stat.h> defines S_ISSOCK */ |
|
76 #undef HAVE_S_ISSOCK |
|
77 |
|
78 -/* Define to 1 if you have the <thread.h> header file. */ |
|
79 -#undef HAVE_THREAD_H |
|
80 - |
|
81 /* Define to 1 if you have the `tsearch' function. */ |
|
82 #undef HAVE_TSEARCH |
|
83 |
|
84 @@ -586,6 +574,17 @@ |
|
85 /* Define to `unsigned' if <sys/types.h> does not define. */ |
|
86 #undef size_t |
|
87 |
|
88 +#ifndef HAVE_STDINT_H |
|
89 +/* uint16_t */ |
|
90 +#undef uint16_t |
|
91 + |
|
92 +/* uint32_t */ |
|
93 +#undef uint32_t |
|
94 + |
|
95 +/* uint8_t */ |
|
96 +#undef uint8_t |
|
97 +#endif |
|
98 + |
|
99 /* Define to unsigned long or unsigned long long if <inttypes.h> and |
|
100 <stdint.h> don't define. */ |
|
101 #undef uintmax_t |
|
102 |
|
103 +--------------------------------------------------------------------------- |
|
104 | Corresponding patches in "configure" script after regeneration from |
|
105 | patched "configure.ac" with "autoconf". |
|
106 +--------------------------------------------------------------------------- |
|
107 Index: configure |
|
108 --- configure 16 Jul 2003 17:05:55 -0000 1.1.1.23 |
|
109 +++ configure 13 Sep 2006 13:41:43 -0000 |
|
110 @@ -467,7 +467,7 @@ |
|
111 # include <unistd.h> |
|
112 #endif" |
|
113 |
|
114 -ac_subdirs_all="$ac_subdirs_all popt beecrypt zlib elfutils file db3" |
|
115 +ac_subdirs_all="$ac_subdirs_all popt zlib elfutils file db3" |
|
116 ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE am__leading_dot CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP EGREP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE AS RPMUSER RPMUID RPMGROUP RPMGID CTAGS CSCOPE LDFLAGS_STATIC LDFLAGS_NPTL FIXPERMS MKDIR MKDIR_P U ANSI2KNR LN_S ECHO RANLIB ac_ct_RANLIB LIBTOOL AR ac_ct_AR BZIP2BIN __CAT __CHGRP __CHMOD __CHOWN __CP __CPIO __FILE __GPG __GREP GZIPBIN UNZIPBIN __ID __ID_U __INSTALL __MAKE __MKDIR __MV __PATCH __PERL PGPBIN __PYTHON __RM __RSH __SED __SSH __TAR __LD __NM __OBJCOPY __OBJDUMP __STRIP WITH_ZLIB_SUBDIR WITH_ZLIB_INCLUDE WITH_ZLIB_LIB WITH_ELFUTILS_SUBDIR WITH_LIBELF_INCLUDE WITH_LIBELF_LIB WITH_LIBDWARF_INCLUDE WITH_BEECRYPT_SUBDIR WITH_BEECRYPT_INCLUDE WITH_BEECRYPT_LIB WITH_DB_SUBDIR WITH_INTERNAL_DB DBLIBSRCS DBLIBOBJS libdb3 libdb3a WITH_BZIP2 MKINSTALLDIRS MSGFMT GMSGFMT XGETTEXT MSGMERGE ALLOCA GLIBC21 LIBICONV LTLIBICONV INTLBISON USE_NLS BUILD_INCLUDED_LIBINTL USE_INCLUDED_LIBINTL CATOBJEXT INTLOBJS DATADIRNAME INSTOBJEXT GENCAT INTL_LIBTOOL_SUFFIX_PREFIX INTLLIBS LIBINTL LTLIBINTL POSUB LIBOBJS WITH_PYTHON_SUBDIR WITH_PYTHON_SUBPACKAGE WITH_PYTHON_VERSION __DOXYGEN WITH_APIDOCS_TARGET WITH_APIDOCS __CHOWN_RHF __CHGRP_RHF ROOT_GROUP varprefix tmpdir MARK64 RPMCANONCOLOR autorelocate_path RPMCANONARCH RPMCANONVENDOR RPMCANONOS LOCALEDIR LIBDIR RPMCONFIGDIR SYSCONFIGDIR MACROFILES LIBRPMRC_FILENAME VENDORRPMRC_FILENAME LIBRPMALIAS_FILENAME FINDREQUIRES FINDPROVIDES testdir INCPATH LIBMISC RPM OBJDUMP subdirs LTLIBOBJS' |
|
117 ac_subst_files='' |
|
118 |
|
119 @@ -4040,7 +4040,7 @@ |
|
120 AS=${AS-as} |
|
121 |
|
122 if test "$ac_cv_c_compiler_gnu" = yes; then |
|
123 - CFLAGS="$CFLAGS -D_GNU_SOURCE -D_REENTRANT -Wall -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes -Wno-char-subscripts" |
|
124 + CFLAGS="$CFLAGS -O2 -D_GNU_SOURCE -D_REENTRANT" |
|
125 fi |
|
126 export CFLAGS |
|
127 |
|
128 @@ -4837,16 +4837,13 @@ |
|
129 # just link it dynamically |
|
130 LDFLAGS_STATIC="" |
|
131 fi |
|
132 +LDFLAGS_STATIC="" # OpenPKG wants dynamically linked RPM tools |
|
133 LDFLAGS_STATIC="${LDFLAGS} ${LDFLAGS_STATIC}" # libtool format |
|
134 echo "$as_me:$LINENO: result: $LDFLAGS_STATIC" >&5 |
|
135 echo "${ECHO_T}$LDFLAGS_STATIC" >&6 |
|
136 |
|
137 |
|
138 LDFLAGS_NPTL= |
|
139 -if test -f /usr/lib/nptl/libpthread.a ; then |
|
140 - LDFLAGS_NPTL="-L/usr/lib/nptl" |
|
141 -# INCPATH="$INCPATH -I/usr/include/nptl" |
|
142 -fi |
|
143 |
|
144 |
|
145 echo "$as_me:$LINENO: checking POSIX chmod" >&5 |
|
146 @@ -4937,7 +4934,7 @@ |
|
147 if test X"$MKDIR_P" = X0 ; then |
|
148 echo "$as_me:$LINENO: result: no" >&5 |
|
149 echo "${ECHO_T}no" >&6 |
|
150 - MKDIR_P="`echo ${prefix}/lib/rpm/mkinstalldirs`" |
|
151 + MKDIR_P="@l_prefix@/lib/openpkg/shtool mkdir -f -p -m 755" |
|
152 else |
|
153 echo "$as_me:$LINENO: result: yes" >&5 |
|
154 echo "${ECHO_T}yes" >&6 |
|
155 @@ -5878,6 +5875,7 @@ |
|
156 ;; |
|
157 *) # Darwin 1.3 on |
|
158 lt_cv_file_magic_test_file='/usr/lib/libSystem.dylib' |
|
159 + lt_cv_deplibs_check_method=pass_all |
|
160 ;; |
|
161 esac |
|
162 ;; |
|
163 @@ -5903,7 +5901,7 @@ |
|
164 ;; |
|
165 |
|
166 hpux10.20*|hpux11*) |
|
167 - lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library' |
|
168 + lt_cv_deplibs_check_method='pass_all' |
|
169 lt_cv_file_magic_cmd=/usr/bin/file |
|
170 lt_cv_file_magic_test_file=/usr/lib/libc.sl |
|
171 ;; |
|
172 @@ -5942,11 +5940,7 @@ |
|
173 ;; |
|
174 |
|
175 netbsd*) |
|
176 - if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then |
|
177 - lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$' |
|
178 - else |
|
179 - lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so$' |
|
180 - fi |
|
181 + lt_cv_deplibs_check_method='pass_all' |
|
182 ;; |
|
183 |
|
184 newos6*) |
|
185 @@ -5981,7 +5975,7 @@ |
|
186 lt_cv_file_magic_test_file=/lib/libc.so |
|
187 ;; |
|
188 |
|
189 -sysv5uw[78]* | sysv4*uw2*) |
|
190 +sysv5uw[78]* | sysv4*uw2* | sysv5UnixWare7* ) |
|
191 lt_cv_deplibs_check_method=pass_all |
|
192 ;; |
|
193 |
|
194 @@ -6682,7 +6676,7 @@ |
|
195 case $host in |
|
196 *-*-irix6*) |
|
197 # Find out which ABI we are using. |
|
198 - echo '#line 6685 "configure"' > conftest.$ac_ext |
|
199 + echo '#line 6679 "configure"' > conftest.$ac_ext |
|
200 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 |
|
201 (eval $ac_compile) 2>&5 |
|
202 ac_status=$? |
|
203 @@ -7211,7 +7205,7 @@ |
|
204 save_CFLAGS="$CFLAGS" |
|
205 CFLAGS="$CFLAGS -o out/conftest2.$ac_objext" |
|
206 compiler_c_o=no |
|
207 -if { (eval echo configure:7214: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then |
|
208 +if { (eval echo configure:7208: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then |
|
209 # The compiler can only warn and ignore the option if not recognized |
|
210 # So say no if there are warnings |
|
211 if test -s out/conftest.err; then |
|
212 @@ -8069,7 +8063,7 @@ |
|
213 runpath_var=LD_RUN_PATH |
|
214 ;; |
|
215 |
|
216 - sysv5uw7* | unixware7*) |
|
217 + sysv5uw7* | unixware7* | sysv5UnixWare7* ) |
|
218 no_undefined_flag='${wl}-z ${wl}text' |
|
219 if test "$GCC" = yes; then |
|
220 archive_cmds='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' |
|
221 @@ -8395,7 +8389,7 @@ |
|
222 libsuff= |
|
223 case "$host_cpu" in |
|
224 x86_64*|s390x*) |
|
225 - echo '#line 8398 "configure"' > conftest.$ac_ext |
|
226 + echo '#line 8392 "configure"' > conftest.$ac_ext |
|
227 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 |
|
228 (eval $ac_compile) 2>&5 |
|
229 ac_status=$? |
|
230 @@ -9067,7 +9061,7 @@ |
|
231 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 |
|
232 lt_status=$lt_dlunknown |
|
233 cat > conftest.$ac_ext <<EOF |
|
234 -#line 9070 "configure" |
|
235 +#line 9064 "configure" |
|
236 #include "confdefs.h" |
|
237 |
|
238 #if HAVE_DLFCN_H |
|
239 @@ -9165,7 +9159,7 @@ |
|
240 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 |
|
241 lt_status=$lt_dlunknown |
|
242 cat > conftest.$ac_ext <<EOF |
|
243 -#line 9168 "configure" |
|
244 +#line 9162 "configure" |
|
245 #include "confdefs.h" |
|
246 |
|
247 #if HAVE_DLFCN_H |
|
248 @@ -11266,7 +11260,7 @@ |
|
249 WITH_ZLIB_SUBDIR= |
|
250 WITH_ZLIB_INCLUDE= |
|
251 WITH_ZLIB_LIB= |
|
252 -if test -d zlib ; then |
|
253 +if false; then |
|
254 WITH_ZLIB_SUBDIR=zlib |
|
255 addlib \${top_builddir}/zlib |
|
256 WITH_ZLIB_INCLUDE="-I\${top_srcdir}/${WITH_ZLIB_SUBDIR}" |
|
257 @@ -11284,44 +11278,6 @@ |
|
258 |
|
259 localdone= |
|
260 |
|
261 -dirs=$prefix |
|
262 -if test "$cross_compiling" != "yes"; then |
|
263 - dirs="$dirs /usr/local" |
|
264 -fi |
|
265 -for dir in $dirs |
|
266 -do |
|
267 - case $dir in |
|
268 - NONE|/usr) continue;; |
|
269 - /usr/local) |
|
270 - if test X$localdone != X ; then continue; fi |
|
271 - localdone="$dir" |
|
272 - ;; |
|
273 - esac |
|
274 - |
|
275 - echo "$as_me:$LINENO: checking for $dir/lib in LIBS" >&5 |
|
276 -echo $ECHO_N "checking for $dir/lib in LIBS... $ECHO_C" >&6 |
|
277 - if test -d $dir/lib 2> /dev/null ; then |
|
278 - addlib $dir/lib |
|
279 - echo "$as_me:$LINENO: result: yes" >&5 |
|
280 -echo "${ECHO_T}yes" >&6 |
|
281 - else |
|
282 - echo "$as_me:$LINENO: result: no" >&5 |
|
283 -echo "${ECHO_T}no" >&6 |
|
284 - fi |
|
285 - |
|
286 - echo "$as_me:$LINENO: checking for $dir/include in INCPATH" >&5 |
|
287 -echo $ECHO_N "checking for $dir/include in INCPATH... $ECHO_C" >&6 |
|
288 - if test -d $dir/include 2>/dev/null ; then |
|
289 - if "$dir" != "/usr/local" ; then |
|
290 - INCPATH="$INCPATH -I$dir/include" |
|
291 - fi |
|
292 - echo "$as_me:$LINENO: result: yes" >&5 |
|
293 -echo "${ECHO_T}yes" >&6 |
|
294 - else |
|
295 - echo "$as_me:$LINENO: result: no" >&5 |
|
296 -echo "${ECHO_T}no" >&6 |
|
297 - fi |
|
298 -done |
|
299 |
|
300 echo "$as_me:$LINENO: checking for /usr/ucblib in LIBS" >&5 |
|
301 echo $ECHO_N "checking for /usr/ucblib in LIBS... $ECHO_C" >&6 |
|
302 @@ -12051,7 +12007,7 @@ |
|
303 #define HAVE_LIBBEECRYPT 1 |
|
304 _ACEOF |
|
305 |
|
306 - WITH_BEECRYPT_INCLUDE="-I/usr/include/beecrypt" |
|
307 + WITH_BEECRYPT_INCLUDE="" |
|
308 WITH_BEECRYPT_LIB="-lbeecrypt" |
|
309 |
|
310 fi |
|
311 @@ -12647,287 +12603,13 @@ |
|
312 |
|
313 |
|
314 |
|
315 - |
|
316 - |
|
317 - |
|
318 -for ac_header in thread.h pthread.h synch.h semaphore.h |
|
319 -do |
|
320 -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` |
|
321 -if eval "test \"\${$as_ac_Header+set}\" = set"; then |
|
322 - echo "$as_me:$LINENO: checking for $ac_header" >&5 |
|
323 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 |
|
324 -if eval "test \"\${$as_ac_Header+set}\" = set"; then |
|
325 - echo $ECHO_N "(cached) $ECHO_C" >&6 |
|
326 -fi |
|
327 -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 |
|
328 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 |
|
329 -else |
|
330 - # Is the header compilable? |
|
331 -echo "$as_me:$LINENO: checking $ac_header usability" >&5 |
|
332 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 |
|
333 -cat >conftest.$ac_ext <<_ACEOF |
|
334 -#line $LINENO "configure" |
|
335 -/* confdefs.h. */ |
|
336 -_ACEOF |
|
337 -cat confdefs.h >>conftest.$ac_ext |
|
338 -cat >>conftest.$ac_ext <<_ACEOF |
|
339 -/* end confdefs.h. */ |
|
340 -$ac_includes_default |
|
341 -#include <$ac_header> |
|
342 -_ACEOF |
|
343 -rm -f conftest.$ac_objext |
|
344 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 |
|
345 - (eval $ac_compile) 2>&5 |
|
346 - ac_status=$? |
|
347 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
|
348 - (exit $ac_status); } && |
|
349 - { ac_try='test -s conftest.$ac_objext' |
|
350 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
|
351 - (eval $ac_try) 2>&5 |
|
352 - ac_status=$? |
|
353 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
|
354 - (exit $ac_status); }; }; then |
|
355 - ac_header_compiler=yes |
|
356 -else |
|
357 - echo "$as_me: failed program was:" >&5 |
|
358 -sed 's/^/| /' conftest.$ac_ext >&5 |
|
359 - |
|
360 -ac_header_compiler=no |
|
361 -fi |
|
362 -rm -f conftest.$ac_objext conftest.$ac_ext |
|
363 -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 |
|
364 -echo "${ECHO_T}$ac_header_compiler" >&6 |
|
365 - |
|
366 -# Is the header present? |
|
367 -echo "$as_me:$LINENO: checking $ac_header presence" >&5 |
|
368 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 |
|
369 -cat >conftest.$ac_ext <<_ACEOF |
|
370 -#line $LINENO "configure" |
|
371 -/* confdefs.h. */ |
|
372 -_ACEOF |
|
373 -cat confdefs.h >>conftest.$ac_ext |
|
374 -cat >>conftest.$ac_ext <<_ACEOF |
|
375 -/* end confdefs.h. */ |
|
376 -#include <$ac_header> |
|
377 -_ACEOF |
|
378 -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 |
|
379 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 |
|
380 - ac_status=$? |
|
381 - grep -v '^ *+' conftest.er1 >conftest.err |
|
382 - rm -f conftest.er1 |
|
383 - cat conftest.err >&5 |
|
384 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
|
385 - (exit $ac_status); } >/dev/null; then |
|
386 - if test -s conftest.err; then |
|
387 - ac_cpp_err=$ac_c_preproc_warn_flag |
|
388 - else |
|
389 - ac_cpp_err= |
|
390 - fi |
|
391 -else |
|
392 - ac_cpp_err=yes |
|
393 -fi |
|
394 -if test -z "$ac_cpp_err"; then |
|
395 - ac_header_preproc=yes |
|
396 -else |
|
397 - echo "$as_me: failed program was:" >&5 |
|
398 -sed 's/^/| /' conftest.$ac_ext >&5 |
|
399 - |
|
400 - ac_header_preproc=no |
|
401 -fi |
|
402 -rm -f conftest.err conftest.$ac_ext |
|
403 -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 |
|
404 -echo "${ECHO_T}$ac_header_preproc" >&6 |
|
405 - |
|
406 -# So? What about this header? |
|
407 -case $ac_header_compiler:$ac_header_preproc in |
|
408 - yes:no ) |
|
409 - { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 |
|
410 -echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} |
|
411 - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 |
|
412 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} |
|
413 - ( |
|
414 - cat <<\_ASBOX |
|
415 -## ------------------------------------ ## |
|
416 -## Report this to bug-autoconf@gnu.org. ## |
|
417 -## ------------------------------------ ## |
|
418 -_ASBOX |
|
419 - ) | |
|
420 - sed "s/^/$as_me: WARNING: /" >&2 |
|
421 - ;; |
|
422 - no:yes ) |
|
423 - { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 |
|
424 -echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} |
|
425 - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 |
|
426 -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} |
|
427 - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 |
|
428 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} |
|
429 - ( |
|
430 - cat <<\_ASBOX |
|
431 -## ------------------------------------ ## |
|
432 -## Report this to bug-autoconf@gnu.org. ## |
|
433 -## ------------------------------------ ## |
|
434 -_ASBOX |
|
435 - ) | |
|
436 - sed "s/^/$as_me: WARNING: /" >&2 |
|
437 - ;; |
|
438 -esac |
|
439 -echo "$as_me:$LINENO: checking for $ac_header" >&5 |
|
440 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 |
|
441 -if eval "test \"\${$as_ac_Header+set}\" = set"; then |
|
442 - echo $ECHO_N "(cached) $ECHO_C" >&6 |
|
443 -else |
|
444 - eval "$as_ac_Header=$ac_header_preproc" |
|
445 -fi |
|
446 -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 |
|
447 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 |
|
448 - |
|
449 -fi |
|
450 -if test `eval echo '${'$as_ac_Header'}'` = yes; then |
|
451 - cat >>confdefs.h <<_ACEOF |
|
452 -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 |
|
453 -_ACEOF |
|
454 - |
|
455 -fi |
|
456 - |
|
457 -done |
|
458 - |
|
459 - |
|
460 - |
|
461 -echo "$as_me:$LINENO: checking for pthread_mutex_trylock in -lpthread" >&5 |
|
462 -echo $ECHO_N "checking for pthread_mutex_trylock in -lpthread... $ECHO_C" >&6 |
|
463 -if test "${ac_cv_lib_pthread_pthread_mutex_trylock+set}" = set; then |
|
464 - echo $ECHO_N "(cached) $ECHO_C" >&6 |
|
465 -else |
|
466 - ac_check_lib_save_LIBS=$LIBS |
|
467 -LIBS="-lpthread $LIBS" |
|
468 -cat >conftest.$ac_ext <<_ACEOF |
|
469 -#line $LINENO "configure" |
|
470 -/* confdefs.h. */ |
|
471 -_ACEOF |
|
472 -cat confdefs.h >>conftest.$ac_ext |
|
473 -cat >>conftest.$ac_ext <<_ACEOF |
|
474 -/* end confdefs.h. */ |
|
475 - |
|
476 -/* Override any gcc2 internal prototype to avoid an error. */ |
|
477 -#ifdef __cplusplus |
|
478 -extern "C" |
|
479 -#endif |
|
480 -/* We use char because int might match the return type of a gcc2 |
|
481 - builtin and then its argument prototype would still apply. */ |
|
482 -char pthread_mutex_trylock (); |
|
483 -int |
|
484 -main () |
|
485 -{ |
|
486 -pthread_mutex_trylock (); |
|
487 - ; |
|
488 - return 0; |
|
489 -} |
|
490 -_ACEOF |
|
491 -rm -f conftest.$ac_objext conftest$ac_exeext |
|
492 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 |
|
493 - (eval $ac_link) 2>&5 |
|
494 - ac_status=$? |
|
495 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
|
496 - (exit $ac_status); } && |
|
497 - { ac_try='test -s conftest$ac_exeext' |
|
498 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
|
499 - (eval $ac_try) 2>&5 |
|
500 - ac_status=$? |
|
501 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
|
502 - (exit $ac_status); }; }; then |
|
503 - ac_cv_lib_pthread_pthread_mutex_trylock=yes |
|
504 -else |
|
505 - echo "$as_me: failed program was:" >&5 |
|
506 -sed 's/^/| /' conftest.$ac_ext >&5 |
|
507 - |
|
508 -ac_cv_lib_pthread_pthread_mutex_trylock=no |
|
509 -fi |
|
510 -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext |
|
511 -LIBS=$ac_check_lib_save_LIBS |
|
512 -fi |
|
513 -echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_mutex_trylock" >&5 |
|
514 -echo "${ECHO_T}$ac_cv_lib_pthread_pthread_mutex_trylock" >&6 |
|
515 -if test $ac_cv_lib_pthread_pthread_mutex_trylock = yes; then |
|
516 - cat >>confdefs.h <<_ACEOF |
|
517 -#define HAVE_LIBPTHREAD 1 |
|
518 -_ACEOF |
|
519 - |
|
520 - LIBS="-lpthread $LIBS" |
|
521 - |
|
522 -else |
|
523 - |
|
524 - |
|
525 -echo "$as_me:$LINENO: checking for __pthread_mutex_trylock in -lpthread" >&5 |
|
526 -echo $ECHO_N "checking for __pthread_mutex_trylock in -lpthread... $ECHO_C" >&6 |
|
527 -if test "${ac_cv_lib_pthread___pthread_mutex_trylock+set}" = set; then |
|
528 - echo $ECHO_N "(cached) $ECHO_C" >&6 |
|
529 -else |
|
530 - ac_check_lib_save_LIBS=$LIBS |
|
531 -LIBS="-lpthread $LIBS" |
|
532 -cat >conftest.$ac_ext <<_ACEOF |
|
533 -#line $LINENO "configure" |
|
534 -/* confdefs.h. */ |
|
535 -_ACEOF |
|
536 -cat confdefs.h >>conftest.$ac_ext |
|
537 -cat >>conftest.$ac_ext <<_ACEOF |
|
538 -/* end confdefs.h. */ |
|
539 - |
|
540 -/* Override any gcc2 internal prototype to avoid an error. */ |
|
541 -#ifdef __cplusplus |
|
542 -extern "C" |
|
543 -#endif |
|
544 -/* We use char because int might match the return type of a gcc2 |
|
545 - builtin and then its argument prototype would still apply. */ |
|
546 -char __pthread_mutex_trylock (); |
|
547 -int |
|
548 -main () |
|
549 -{ |
|
550 -__pthread_mutex_trylock (); |
|
551 - ; |
|
552 - return 0; |
|
553 -} |
|
554 -_ACEOF |
|
555 -rm -f conftest.$ac_objext conftest$ac_exeext |
|
556 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 |
|
557 - (eval $ac_link) 2>&5 |
|
558 - ac_status=$? |
|
559 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
|
560 - (exit $ac_status); } && |
|
561 - { ac_try='test -s conftest$ac_exeext' |
|
562 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
|
563 - (eval $ac_try) 2>&5 |
|
564 - ac_status=$? |
|
565 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
|
566 - (exit $ac_status); }; }; then |
|
567 - ac_cv_lib_pthread___pthread_mutex_trylock=yes |
|
568 -else |
|
569 - echo "$as_me: failed program was:" >&5 |
|
570 -sed 's/^/| /' conftest.$ac_ext >&5 |
|
571 - |
|
572 -ac_cv_lib_pthread___pthread_mutex_trylock=no |
|
573 -fi |
|
574 -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext |
|
575 -LIBS=$ac_check_lib_save_LIBS |
|
576 -fi |
|
577 -echo "$as_me:$LINENO: result: $ac_cv_lib_pthread___pthread_mutex_trylock" >&5 |
|
578 -echo "${ECHO_T}$ac_cv_lib_pthread___pthread_mutex_trylock" >&6 |
|
579 -if test $ac_cv_lib_pthread___pthread_mutex_trylock = yes; then |
|
580 - cat >>confdefs.h <<_ACEOF |
|
581 -#define HAVE_LIBPTHREAD 1 |
|
582 -_ACEOF |
|
583 - |
|
584 - LIBS="-lpthread $LIBS" |
|
585 - |
|
586 -else |
|
587 - |
|
588 - |
|
589 -echo "$as_me:$LINENO: checking for mutex_lock in -lthread" >&5 |
|
590 -echo $ECHO_N "checking for mutex_lock in -lthread... $ECHO_C" >&6 |
|
591 -if test "${ac_cv_lib_thread_mutex_lock+set}" = set; then |
|
592 +echo "$as_me:$LINENO: checking for svc_run in -lnsl" >&5 |
|
593 +echo $ECHO_N "checking for svc_run in -lnsl... $ECHO_C" >&6 |
|
594 +if test "${ac_cv_lib_nsl_svc_run+set}" = set; then |
|
595 echo $ECHO_N "(cached) $ECHO_C" >&6 |
|
596 else |
|
597 ac_check_lib_save_LIBS=$LIBS |
|
598 -LIBS="-lthread $LIBS" |
|
599 +LIBS="-lnsl $LIBS" |
|
600 cat >conftest.$ac_ext <<_ACEOF |
|
601 #line $LINENO "configure" |
|
602 /* confdefs.h. */ |
|
603 @@ -12942,11 +12624,11 @@ |
|
604 #endif |
|
605 /* We use char because int might match the return type of a gcc2 |
|
606 builtin and then its argument prototype would still apply. */ |
|
607 -char mutex_lock (); |
|
608 +char svc_run (); |
|
609 int |
|
610 main () |
|
611 { |
|
612 -mutex_lock (); |
|
613 +svc_run (); |
|
614 ; |
|
615 return 0; |
|
616 } |
|
617 @@ -12963,33 +12645,28 @@ |
|
618 ac_status=$? |
|
619 echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
|
620 (exit $ac_status); }; }; then |
|
621 - ac_cv_lib_thread_mutex_lock=yes |
|
622 + ac_cv_lib_nsl_svc_run=yes |
|
623 else |
|
624 echo "$as_me: failed program was:" >&5 |
|
625 sed 's/^/| /' conftest.$ac_ext >&5 |
|
626 |
|
627 -ac_cv_lib_thread_mutex_lock=no |
|
628 +ac_cv_lib_nsl_svc_run=no |
|
629 fi |
|
630 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext |
|
631 LIBS=$ac_check_lib_save_LIBS |
|
632 fi |
|
633 -echo "$as_me:$LINENO: result: $ac_cv_lib_thread_mutex_lock" >&5 |
|
634 -echo "${ECHO_T}$ac_cv_lib_thread_mutex_lock" >&6 |
|
635 -if test $ac_cv_lib_thread_mutex_lock = yes; then |
|
636 +echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_svc_run" >&5 |
|
637 +echo "${ECHO_T}$ac_cv_lib_nsl_svc_run" >&6 |
|
638 +if test $ac_cv_lib_nsl_svc_run = yes; then |
|
639 cat >>confdefs.h <<_ACEOF |
|
640 -#define HAVE_LIBTHREAD 1 |
|
641 +#define HAVE_LIBNSL 1 |
|
642 _ACEOF |
|
643 |
|
644 - LIBS="-lthread $LIBS" |
|
645 - |
|
646 -fi |
|
647 - |
|
648 + LIBS="-lnsl $LIBS" |
|
649 |
|
650 fi |
|
651 |
|
652 |
|
653 -fi |
|
654 - |
|
655 |
|
656 |
|
657 for ac_header in aio.h |
|
658 @@ -22911,6 +22588,86 @@ |
|
659 |
|
660 else |
|
661 |
|
662 + echo "$as_me:$LINENO: checking for getmntinfo" >&5 |
|
663 +echo $ECHO_N "checking for getmntinfo... $ECHO_C" >&6 |
|
664 +if test "${ac_cv_func_getmntinfo+set}" = set; then |
|
665 + echo $ECHO_N "(cached) $ECHO_C" >&6 |
|
666 +else |
|
667 + cat >conftest.$ac_ext <<_ACEOF |
|
668 +#line $LINENO "configure" |
|
669 +/* confdefs.h. */ |
|
670 +_ACEOF |
|
671 +cat confdefs.h >>conftest.$ac_ext |
|
672 +cat >>conftest.$ac_ext <<_ACEOF |
|
673 +/* end confdefs.h. */ |
|
674 +/* System header to define __stub macros and hopefully few prototypes, |
|
675 + which can conflict with char getmntinfo (); below. |
|
676 + Prefer <limits.h> to <assert.h> if __STDC__ is defined, since |
|
677 + <limits.h> exists even on freestanding compilers. */ |
|
678 +#ifdef __STDC__ |
|
679 +# include <limits.h> |
|
680 +#else |
|
681 +# include <assert.h> |
|
682 +#endif |
|
683 +/* Override any gcc2 internal prototype to avoid an error. */ |
|
684 +#ifdef __cplusplus |
|
685 +extern "C" |
|
686 +{ |
|
687 +#endif |
|
688 +/* We use char because int might match the return type of a gcc2 |
|
689 + builtin and then its argument prototype would still apply. */ |
|
690 +char getmntinfo (); |
|
691 +/* The GNU C library defines this for functions which it implements |
|
692 + to always fail with ENOSYS. Some functions are actually named |
|
693 + something starting with __ and the normal name is an alias. */ |
|
694 +#if defined (__stub_getmntinfo) || defined (__stub___getmntinfo) |
|
695 +choke me |
|
696 +#else |
|
697 +char (*f) () = getmntinfo; |
|
698 +#endif |
|
699 +#ifdef __cplusplus |
|
700 +} |
|
701 +#endif |
|
702 + |
|
703 +int |
|
704 +main () |
|
705 +{ |
|
706 +return f != getmntinfo; |
|
707 + ; |
|
708 + return 0; |
|
709 +} |
|
710 +_ACEOF |
|
711 +rm -f conftest.$ac_objext conftest$ac_exeext |
|
712 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 |
|
713 + (eval $ac_link) 2>&5 |
|
714 + ac_status=$? |
|
715 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
|
716 + (exit $ac_status); } && |
|
717 + { ac_try='test -s conftest$ac_exeext' |
|
718 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
|
719 + (eval $ac_try) 2>&5 |
|
720 + ac_status=$? |
|
721 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
|
722 + (exit $ac_status); }; }; then |
|
723 + ac_cv_func_getmntinfo=yes |
|
724 +else |
|
725 + echo "$as_me: failed program was:" >&5 |
|
726 +sed 's/^/| /' conftest.$ac_ext >&5 |
|
727 + |
|
728 +ac_cv_func_getmntinfo=no |
|
729 +fi |
|
730 +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext |
|
731 +fi |
|
732 +echo "$as_me:$LINENO: result: $ac_cv_func_getmntinfo" >&5 |
|
733 +echo "${ECHO_T}$ac_cv_func_getmntinfo" >&6 |
|
734 +if test $ac_cv_func_getmntinfo = yes; then |
|
735 + |
|
736 +cat >>confdefs.h <<\_ACEOF |
|
737 +#define HAVE_GETMNTINFO 1 |
|
738 +_ACEOF |
|
739 + |
|
740 +else |
|
741 + |
|
742 echo "$as_me:$LINENO: checking for mntctl" >&5 |
|
743 echo $ECHO_N "checking for mntctl... $ECHO_C" >&6 |
|
744 if test "${ac_cv_func_mntctl+set}" = set; then |
|
745 @@ -23148,6 +22905,8 @@ |
|
746 |
|
747 fi |
|
748 |
|
749 +fi |
|
750 + |
|
751 |
|
752 echo "$as_me:$LINENO: checking for lchown" >&5 |
|
753 echo $ECHO_N "checking for lchown... $ECHO_C" >&6 |
|
754 @@ -23454,9 +23213,6 @@ |
|
755 fi |
|
756 |
|
757 MARK64= |
|
758 -case "${target_cpu}" in |
|
759 -x86_64*|ppc64*|powerpc64*|sparc64*|s390x*) MARK64=64 ;; |
|
760 -esac |
|
761 |
|
762 |
|
763 autorelocate_path='%{nil}' |
|
764 @@ -23515,7 +23271,7 @@ |
|
765 |
|
766 LIBDIR="`echo $libdir | sed 's-/lib$-/%{_lib}-'`" |
|
767 |
|
768 -RPMCONFIGDIR="`echo ${usrprefix}/lib/rpm`" |
|
769 +RPMCONFIGDIR="@l_prefix@/lib/openpkg" |
|
770 |
|
771 cat >>confdefs.h <<_ACEOF |
|
772 #define RPMCONFIGDIR "$RPMCONFIGDIR" |
|
773 @@ -23523,7 +23279,7 @@ |
|
774 |
|
775 |
|
776 |
|
777 -SYSCONFIGDIR="`echo /etc/rpm`" |
|
778 +SYSCONFIGDIR="@l_prefix@/etc/openpkg" |
|
779 |
|
780 cat >>confdefs.h <<_ACEOF |
|
781 #define SYSCONFIGDIR "$SYSCONFIGDIR" |
|
782 @@ -23539,7 +23295,7 @@ |
|
783 |
|
784 |
|
785 |
|
786 -LIBRPMRC_FILENAME="${RPMCONFIGDIR}/rpmrc" |
|
787 +LIBRPMRC_FILENAME="${SYSCONFIGDIR}/rpmrc" |
|
788 |
|
789 cat >>confdefs.h <<_ACEOF |
|
790 #define LIBRPMRC_FILENAME "$LIBRPMRC_FILENAME" |
|
791 @@ -23547,7 +23303,7 @@ |
|
792 |
|
793 |
|
794 |
|
795 -VENDORRPMRC_FILENAME="${RPMCONFIGDIR}/${RPMCANONVENDOR}/rpmrc" |
|
796 +VENDORRPMRC_FILENAME="${SYSCONFIGDIR}/${RPMCANONVENDOR}/rpmrc" |
|
797 |
|
798 cat >>confdefs.h <<_ACEOF |
|
799 #define VENDORRPMRC_FILENAME "$VENDORRPMRC_FILENAME" |
|
800 @@ -23555,7 +23311,7 @@ |
|
801 |
|
802 |
|
803 |
|
804 -LIBRPMALIAS_FILENAME="${RPMCONFIGDIR}/rpmpopt-${VERSION}" |
|
805 +LIBRPMALIAS_FILENAME="${RPMCONFIGDIR}/rpmpopt" |
|
806 |
|
807 cat >>confdefs.h <<_ACEOF |
|
808 #define LIBRPMALIAS_FILENAME "$LIBRPMALIAS_FILENAME" |
|
809 @@ -23588,9 +23344,202 @@ |
|
810 |
|
811 |
|
812 |
|
813 +echo "$as_me:$LINENO: checking for uint8_t" >&5 |
|
814 +echo $ECHO_N "checking for uint8_t... $ECHO_C" >&6 |
|
815 +if test "${ac_cv_type_uint8_t+set}" = set; then |
|
816 + echo $ECHO_N "(cached) $ECHO_C" >&6 |
|
817 +else |
|
818 + cat >conftest.$ac_ext <<_ACEOF |
|
819 +#line $LINENO "configure" |
|
820 +/* confdefs.h. */ |
|
821 +_ACEOF |
|
822 +cat confdefs.h >>conftest.$ac_ext |
|
823 +cat >>conftest.$ac_ext <<_ACEOF |
|
824 +/* end confdefs.h. */ |
|
825 +#if HAVE_STDINT_H |
|
826 +#include <stdint.h> |
|
827 +#endif |
|
828 +#include <sys/types.h> |
|
829 +#if STDC_HEADERS |
|
830 +#include <stdlib.h> |
|
831 +#include <stddef.h> |
|
832 +#endif |
|
833 +_ACEOF |
|
834 +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | |
|
835 + $EGREP "(^|[^a-zA-Z_0-9])uint8_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then |
|
836 + ac_cv_type_uint8_t=yes |
|
837 +else |
|
838 + ac_cv_type_uint8_t=no |
|
839 +fi |
|
840 +rm -f conftest* |
|
841 + |
|
842 +fi |
|
843 +echo "$as_me:$LINENO: result: $ac_cv_type_uint8_t" >&5 |
|
844 +echo "${ECHO_T}$ac_cv_type_uint8_t" >&6 |
|
845 +if test $ac_cv_type_uint8_t = no; then |
|
846 + |
|
847 +cat >>confdefs.h <<\_ACEOF |
|
848 +#define uint8_t unsigned char |
|
849 +_ACEOF |
|
850 + |
|
851 +fi |
|
852 +echo "$as_me:$LINENO: checking for uint16_t" >&5 |
|
853 +echo $ECHO_N "checking for uint16_t... $ECHO_C" >&6 |
|
854 +if test "${ac_cv_type_uint16_t+set}" = set; then |
|
855 + echo $ECHO_N "(cached) $ECHO_C" >&6 |
|
856 +else |
|
857 + cat >conftest.$ac_ext <<_ACEOF |
|
858 +#line $LINENO "configure" |
|
859 +/* confdefs.h. */ |
|
860 +_ACEOF |
|
861 +cat confdefs.h >>conftest.$ac_ext |
|
862 +cat >>conftest.$ac_ext <<_ACEOF |
|
863 +/* end confdefs.h. */ |
|
864 +#if HAVE_STDINT_H |
|
865 +#include <stdint.h> |
|
866 +#endif |
|
867 +#include <sys/types.h> |
|
868 +#if STDC_HEADERS |
|
869 +#include <stdlib.h> |
|
870 +#include <stddef.h> |
|
871 +#endif |
|
872 +_ACEOF |
|
873 +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | |
|
874 + $EGREP "(^|[^a-zA-Z_0-9])uint16_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then |
|
875 + ac_cv_type_uint16_t=yes |
|
876 +else |
|
877 + ac_cv_type_uint16_t=no |
|
878 +fi |
|
879 +rm -f conftest* |
|
880 + |
|
881 +fi |
|
882 +echo "$as_me:$LINENO: result: $ac_cv_type_uint16_t" >&5 |
|
883 +echo "${ECHO_T}$ac_cv_type_uint16_t" >&6 |
|
884 +if test $ac_cv_type_uint16_t = no; then |
|
885 + |
|
886 +cat >>confdefs.h <<\_ACEOF |
|
887 +#define uint16_t unsigned short |
|
888 +_ACEOF |
|
889 + |
|
890 +fi |
|
891 +echo "$as_me:$LINENO: checking for uint32_t" >&5 |
|
892 +echo $ECHO_N "checking for uint32_t... $ECHO_C" >&6 |
|
893 +if test "${ac_cv_type_uint32_t+set}" = set; then |
|
894 + echo $ECHO_N "(cached) $ECHO_C" >&6 |
|
895 +else |
|
896 + cat >conftest.$ac_ext <<_ACEOF |
|
897 +#line $LINENO "configure" |
|
898 +/* confdefs.h. */ |
|
899 +_ACEOF |
|
900 +cat confdefs.h >>conftest.$ac_ext |
|
901 +cat >>conftest.$ac_ext <<_ACEOF |
|
902 +/* end confdefs.h. */ |
|
903 +#if HAVE_STDINT_H |
|
904 +#include <stdint.h> |
|
905 +#endif |
|
906 +#include <sys/types.h> |
|
907 +#if STDC_HEADERS |
|
908 +#include <stdlib.h> |
|
909 +#include <stddef.h> |
|
910 +#endif |
|
911 +_ACEOF |
|
912 +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | |
|
913 + $EGREP "(^|[^a-zA-Z_0-9])uint32_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then |
|
914 + ac_cv_type_uint32_t=yes |
|
915 +else |
|
916 + ac_cv_type_uint32_t=no |
|
917 +fi |
|
918 +rm -f conftest* |
|
919 + |
|
920 +fi |
|
921 +echo "$as_me:$LINENO: result: $ac_cv_type_uint32_t" >&5 |
|
922 +echo "${ECHO_T}$ac_cv_type_uint32_t" >&6 |
|
923 +if test $ac_cv_type_uint32_t = no; then |
|
924 + |
|
925 +cat >>confdefs.h <<\_ACEOF |
|
926 +#define uint32_t unsigned int |
|
927 +_ACEOF |
|
928 + |
|
929 +fi |
|
930 + |
|
931 +echo "$as_me:$LINENO: checking for madvise" >&5 |
|
932 +echo $ECHO_N "checking for madvise... $ECHO_C" >&6 |
|
933 +if test "${ac_cv_func_madvise+set}" = set; then |
|
934 + echo $ECHO_N "(cached) $ECHO_C" >&6 |
|
935 +else |
|
936 + cat >conftest.$ac_ext <<_ACEOF |
|
937 +#line $LINENO "configure" |
|
938 +/* confdefs.h. */ |
|
939 +_ACEOF |
|
940 +cat confdefs.h >>conftest.$ac_ext |
|
941 +cat >>conftest.$ac_ext <<_ACEOF |
|
942 +/* end confdefs.h. */ |
|
943 +/* System header to define __stub macros and hopefully few prototypes, |
|
944 + which can conflict with char madvise (); below. |
|
945 + Prefer <limits.h> to <assert.h> if __STDC__ is defined, since |
|
946 + <limits.h> exists even on freestanding compilers. */ |
|
947 +#ifdef __STDC__ |
|
948 +# include <limits.h> |
|
949 +#else |
|
950 +# include <assert.h> |
|
951 +#endif |
|
952 +/* Override any gcc2 internal prototype to avoid an error. */ |
|
953 +#ifdef __cplusplus |
|
954 +extern "C" |
|
955 +{ |
|
956 +#endif |
|
957 +/* We use char because int might match the return type of a gcc2 |
|
958 + builtin and then its argument prototype would still apply. */ |
|
959 +char madvise (); |
|
960 +/* The GNU C library defines this for functions which it implements |
|
961 + to always fail with ENOSYS. Some functions are actually named |
|
962 + something starting with __ and the normal name is an alias. */ |
|
963 +#if defined (__stub_madvise) || defined (__stub___madvise) |
|
964 +choke me |
|
965 +#else |
|
966 +char (*f) () = madvise; |
|
967 +#endif |
|
968 +#ifdef __cplusplus |
|
969 +} |
|
970 +#endif |
|
971 + |
|
972 +int |
|
973 +main () |
|
974 +{ |
|
975 +return f != madvise; |
|
976 + ; |
|
977 + return 0; |
|
978 +} |
|
979 +_ACEOF |
|
980 +rm -f conftest.$ac_objext conftest$ac_exeext |
|
981 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 |
|
982 + (eval $ac_link) 2>&5 |
|
983 + ac_status=$? |
|
984 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
|
985 + (exit $ac_status); } && |
|
986 + { ac_try='test -s conftest$ac_exeext' |
|
987 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
|
988 + (eval $ac_try) 2>&5 |
|
989 + ac_status=$? |
|
990 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
|
991 + (exit $ac_status); }; }; then |
|
992 + ac_cv_func_madvise=yes |
|
993 +else |
|
994 + echo "$as_me: failed program was:" >&5 |
|
995 +sed 's/^/| /' conftest.$ac_ext >&5 |
|
996 + |
|
997 +ac_cv_func_madvise=no |
|
998 +fi |
|
999 +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext |
|
1000 +fi |
|
1001 +echo "$as_me:$LINENO: result: $ac_cv_func_madvise" >&5 |
|
1002 +echo "${ECHO_T}$ac_cv_func_madvise" >&6 |
|
1003 + |
|
1004 + |
|
1005 + |
|
1006 |
|
1007 |
|
1008 -subdirs="$subdirs popt beecrypt zlib elfutils file db3" |
|
1009 +subdirs="$subdirs popt zlib elfutils file db3" |
|
1010 |
|
1011 |
|
1012 ac_config_files="$ac_config_files Doxyfile Makefile rpmrc macros platform rpmpopt rpm.spec rpmio/Makefile rpmdb/Makefile lib/Makefile build/Makefile scripts/Makefile scripts/brp-redhat scripts/macros.perl scripts/macros.php scripts/macros.python tools/Makefile tests/Makefile tests/rpmrc tests/macros tests/hello-test/Makefile misc/Makefile intl/Makefile po/Makefile.in doc/Makefile doc/manual/Makefile doc/fr/Makefile doc/ja/Makefile doc/ko/Makefile doc/pl/Makefile doc/ru/Makefile doc/sk/Makefile python/Makefile python/rpmdb/Makefile python/test/Makefile" |
|
1013 @@ -25157,7 +25106,6 @@ |
|
1014 esac |
|
1015 done ;; |
|
1016 default ) echo timestamp > popt/stamp-h.in |
|
1017 - echo timestamp > beecrypt/stamp-h.in |
|
1018 echo timestamp > stamp-h.in |
|
1019 |
|
1020 ;; |
|
1021 |
|
1022 +--------------------------------------------------------------------------- |
|
1023 | Corresponding patches in "configure" script after regeneration from |
|
1024 | patched "configure.ac" with "autoconf". |
|
1025 +--------------------------------------------------------------------------- |
|
1026 Index: popt/configure |
|
1027 --- popt/configure 16 Jul 2003 17:04:51 -0000 1.1.1.16 |
|
1028 +++ popt/configure 12 May 2004 14:34:35 -0000 1.18 |
|
1029 @@ -9359,9 +9359,6 @@ |
|
1030 |
|
1031 |
|
1032 MARK64= |
|
1033 -case "${target_cpu}" in |
|
1034 -x86_64*|powerpc64*|ppc64*|sparc64*|s390x*) MARK64=64 ;; |
|
1035 -esac |
|
1036 |
|
1037 |
|
1038 |