1.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
1.2 +++ b/openpkg/rpm.patch.regen Tue Jan 06 23:40:39 2009 +0100
1.3 @@ -0,0 +1,1038 @@
1.4 +##
1.5 +## rpm.patch.regen -- Annotated OpenPKG RPM Patch file
1.6 +## Copyright (c) 2000-2007 OpenPKG Foundation e.V. <http://openpkg.net/>
1.7 +## Copyright (c) 2000-2007 Ralf S. Engelschall <http://engelschall.com/>
1.8 +##
1.9 +## This file assembles changes to existing RPM source files between
1.10 +## the original RedHat RPM and the OpenPKG RPM variant. It can be
1.11 +## automatically applied to a vanilla RedHat RPM source tree with the
1.12 +## 'patch' tool to upgrade those files. Each patch snippet is annotated
1.13 +## with a short description.
1.14 +##
1.15 +## Created on: 13-Sep-2006
1.16 +##
1.17 +## ATTENTION: THIS PATCH FILE WAS AUTO-GENERATED FROM AN OPENPKG
1.18 +## RPM CVS REPOSITORY, HENCE DO NOT EDIT THIS FILE.
1.19 +##
1.20 +
1.21 ++---------------------------------------------------------------------------
1.22 +| Corresponding patches in "config.h.in" script after regeneration from
1.23 +| patched "configure.ac" with "autoheader".
1.24 ++---------------------------------------------------------------------------
1.25 +Index: config.h.in
1.26 +--- config.h.in 16 Jul 2003 17:17:13 -0000 1.1.1.18
1.27 ++++ config.h.in 13 Sep 2006 13:41:41 -0000
1.28 +@@ -108,6 +108,9 @@
1.29 + /* Define if you have the getmntent() function */
1.30 + #undef HAVE_GETMNTENT
1.31 +
1.32 ++/* Define as 1 if you have the getmntinfo() function */
1.33 ++#undef HAVE_GETMNTINFO
1.34 ++
1.35 + /* Define as 1 if you have getmntinfo_r() (only osf?) */
1.36 + #undef HAVE_GETMNTINFO_R
1.37 +
1.38 +@@ -181,18 +184,12 @@
1.39 + /* Define to 1 if you have the `port' library (-lport). */
1.40 + #undef HAVE_LIBPORT
1.41 +
1.42 +-/* Define to 1 if you have the `pthread' library (-lpthread). */
1.43 +-#undef HAVE_LIBPTHREAD
1.44 +-
1.45 + /* Define to 1 if you have the `rand' library (-lrand). */
1.46 + #undef HAVE_LIBRAND
1.47 +
1.48 + /* Define to 1 if you have the `socket' library (-lsocket). */
1.49 + #undef HAVE_LIBSOCKET
1.50 +
1.51 +-/* Define to 1 if you have the `thread' library (-lthread). */
1.52 +-#undef HAVE_LIBTHREAD
1.53 +-
1.54 + /* Define to 1 if you have the <limits.h> header file. */
1.55 + #undef HAVE_LIMITS_H
1.56 +
1.57 +@@ -259,9 +256,6 @@
1.58 + /* Define to 1 if you have the `regcomp' function. */
1.59 + #undef HAVE_REGCOMP
1.60 +
1.61 +-/* Define to 1 if you have the <semaphore.h> header file. */
1.62 +-#undef HAVE_SEMAPHORE_H
1.63 +-
1.64 + /* Define to 1 if you have the `setenv' function. */
1.65 + #undef HAVE_SETENV
1.66 +
1.67 +@@ -323,9 +317,6 @@
1.68 + /* Define as 1 if you have "struct mnttab" (only sco?) */
1.69 + #undef HAVE_STRUCT_MNTTAB
1.70 +
1.71 +-/* Define to 1 if you have the <synch.h> header file. */
1.72 +-#undef HAVE_SYNCH_H
1.73 +-
1.74 + /* Define to 1 if you have the <sys/dir.h> header file, and it defines `DIR'.
1.75 + */
1.76 + #undef HAVE_SYS_DIR_H
1.77 +@@ -391,9 +382,6 @@
1.78 + /* Define as 1 if <sys/stat.h> defines S_ISSOCK */
1.79 + #undef HAVE_S_ISSOCK
1.80 +
1.81 +-/* Define to 1 if you have the <thread.h> header file. */
1.82 +-#undef HAVE_THREAD_H
1.83 +-
1.84 + /* Define to 1 if you have the `tsearch' function. */
1.85 + #undef HAVE_TSEARCH
1.86 +
1.87 +@@ -586,6 +574,17 @@
1.88 + /* Define to `unsigned' if <sys/types.h> does not define. */
1.89 + #undef size_t
1.90 +
1.91 ++#ifndef HAVE_STDINT_H
1.92 ++/* uint16_t */
1.93 ++#undef uint16_t
1.94 ++
1.95 ++/* uint32_t */
1.96 ++#undef uint32_t
1.97 ++
1.98 ++/* uint8_t */
1.99 ++#undef uint8_t
1.100 ++#endif
1.101 ++
1.102 + /* Define to unsigned long or unsigned long long if <inttypes.h> and
1.103 + <stdint.h> don't define. */
1.104 + #undef uintmax_t
1.105 +
1.106 ++---------------------------------------------------------------------------
1.107 +| Corresponding patches in "configure" script after regeneration from
1.108 +| patched "configure.ac" with "autoconf".
1.109 ++---------------------------------------------------------------------------
1.110 +Index: configure
1.111 +--- configure 16 Jul 2003 17:05:55 -0000 1.1.1.23
1.112 ++++ configure 13 Sep 2006 13:41:43 -0000
1.113 +@@ -467,7 +467,7 @@
1.114 + # include <unistd.h>
1.115 + #endif"
1.116 +
1.117 +-ac_subdirs_all="$ac_subdirs_all popt beecrypt zlib elfutils file db3"
1.118 ++ac_subdirs_all="$ac_subdirs_all popt zlib elfutils file db3"
1.119 + 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'
1.120 + ac_subst_files=''
1.121 +
1.122 +@@ -4040,7 +4040,7 @@
1.123 + AS=${AS-as}
1.124 +
1.125 + if test "$ac_cv_c_compiler_gnu" = yes; then
1.126 +- CFLAGS="$CFLAGS -D_GNU_SOURCE -D_REENTRANT -Wall -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes -Wno-char-subscripts"
1.127 ++ CFLAGS="$CFLAGS -O2 -D_GNU_SOURCE -D_REENTRANT"
1.128 + fi
1.129 + export CFLAGS
1.130 +
1.131 +@@ -4837,16 +4837,13 @@
1.132 + # just link it dynamically
1.133 + LDFLAGS_STATIC=""
1.134 + fi
1.135 ++LDFLAGS_STATIC="" # OpenPKG wants dynamically linked RPM tools
1.136 + LDFLAGS_STATIC="${LDFLAGS} ${LDFLAGS_STATIC}" # libtool format
1.137 + echo "$as_me:$LINENO: result: $LDFLAGS_STATIC" >&5
1.138 + echo "${ECHO_T}$LDFLAGS_STATIC" >&6
1.139 +
1.140 +
1.141 + LDFLAGS_NPTL=
1.142 +-if test -f /usr/lib/nptl/libpthread.a ; then
1.143 +- LDFLAGS_NPTL="-L/usr/lib/nptl"
1.144 +-# INCPATH="$INCPATH -I/usr/include/nptl"
1.145 +-fi
1.146 +
1.147 +
1.148 + echo "$as_me:$LINENO: checking POSIX chmod" >&5
1.149 +@@ -4937,7 +4934,7 @@
1.150 + if test X"$MKDIR_P" = X0 ; then
1.151 + echo "$as_me:$LINENO: result: no" >&5
1.152 + echo "${ECHO_T}no" >&6
1.153 +- MKDIR_P="`echo ${prefix}/lib/rpm/mkinstalldirs`"
1.154 ++ MKDIR_P="@l_prefix@/lib/openpkg/shtool mkdir -f -p -m 755"
1.155 + else
1.156 + echo "$as_me:$LINENO: result: yes" >&5
1.157 + echo "${ECHO_T}yes" >&6
1.158 +@@ -5878,6 +5875,7 @@
1.159 + ;;
1.160 + *) # Darwin 1.3 on
1.161 + lt_cv_file_magic_test_file='/usr/lib/libSystem.dylib'
1.162 ++ lt_cv_deplibs_check_method=pass_all
1.163 + ;;
1.164 + esac
1.165 + ;;
1.166 +@@ -5903,7 +5901,7 @@
1.167 + ;;
1.168 +
1.169 + hpux10.20*|hpux11*)
1.170 +- lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library'
1.171 ++ lt_cv_deplibs_check_method='pass_all'
1.172 + lt_cv_file_magic_cmd=/usr/bin/file
1.173 + lt_cv_file_magic_test_file=/usr/lib/libc.sl
1.174 + ;;
1.175 +@@ -5942,11 +5940,7 @@
1.176 + ;;
1.177 +
1.178 + netbsd*)
1.179 +- if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
1.180 +- lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$'
1.181 +- else
1.182 +- lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so$'
1.183 +- fi
1.184 ++ lt_cv_deplibs_check_method='pass_all'
1.185 + ;;
1.186 +
1.187 + newos6*)
1.188 +@@ -5981,7 +5975,7 @@
1.189 + lt_cv_file_magic_test_file=/lib/libc.so
1.190 + ;;
1.191 +
1.192 +-sysv5uw[78]* | sysv4*uw2*)
1.193 ++sysv5uw[78]* | sysv4*uw2* | sysv5UnixWare7* )
1.194 + lt_cv_deplibs_check_method=pass_all
1.195 + ;;
1.196 +
1.197 +@@ -6682,7 +6676,7 @@
1.198 + case $host in
1.199 + *-*-irix6*)
1.200 + # Find out which ABI we are using.
1.201 +- echo '#line 6685 "configure"' > conftest.$ac_ext
1.202 ++ echo '#line 6679 "configure"' > conftest.$ac_ext
1.203 + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
1.204 + (eval $ac_compile) 2>&5
1.205 + ac_status=$?
1.206 +@@ -7211,7 +7205,7 @@
1.207 + save_CFLAGS="$CFLAGS"
1.208 + CFLAGS="$CFLAGS -o out/conftest2.$ac_objext"
1.209 + compiler_c_o=no
1.210 +-if { (eval echo configure:7214: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then
1.211 ++if { (eval echo configure:7208: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then
1.212 + # The compiler can only warn and ignore the option if not recognized
1.213 + # So say no if there are warnings
1.214 + if test -s out/conftest.err; then
1.215 +@@ -8069,7 +8063,7 @@
1.216 + runpath_var=LD_RUN_PATH
1.217 + ;;
1.218 +
1.219 +- sysv5uw7* | unixware7*)
1.220 ++ sysv5uw7* | unixware7* | sysv5UnixWare7* )
1.221 + no_undefined_flag='${wl}-z ${wl}text'
1.222 + if test "$GCC" = yes; then
1.223 + archive_cmds='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
1.224 +@@ -8395,7 +8389,7 @@
1.225 + libsuff=
1.226 + case "$host_cpu" in
1.227 + x86_64*|s390x*)
1.228 +- echo '#line 8398 "configure"' > conftest.$ac_ext
1.229 ++ echo '#line 8392 "configure"' > conftest.$ac_ext
1.230 + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
1.231 + (eval $ac_compile) 2>&5
1.232 + ac_status=$?
1.233 +@@ -9067,7 +9061,7 @@
1.234 + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
1.235 + lt_status=$lt_dlunknown
1.236 + cat > conftest.$ac_ext <<EOF
1.237 +-#line 9070 "configure"
1.238 ++#line 9064 "configure"
1.239 + #include "confdefs.h"
1.240 +
1.241 + #if HAVE_DLFCN_H
1.242 +@@ -9165,7 +9159,7 @@
1.243 + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
1.244 + lt_status=$lt_dlunknown
1.245 + cat > conftest.$ac_ext <<EOF
1.246 +-#line 9168 "configure"
1.247 ++#line 9162 "configure"
1.248 + #include "confdefs.h"
1.249 +
1.250 + #if HAVE_DLFCN_H
1.251 +@@ -11266,7 +11260,7 @@
1.252 + WITH_ZLIB_SUBDIR=
1.253 + WITH_ZLIB_INCLUDE=
1.254 + WITH_ZLIB_LIB=
1.255 +-if test -d zlib ; then
1.256 ++if false; then
1.257 + WITH_ZLIB_SUBDIR=zlib
1.258 + addlib \${top_builddir}/zlib
1.259 + WITH_ZLIB_INCLUDE="-I\${top_srcdir}/${WITH_ZLIB_SUBDIR}"
1.260 +@@ -11284,44 +11278,6 @@
1.261 +
1.262 + localdone=
1.263 +
1.264 +-dirs=$prefix
1.265 +-if test "$cross_compiling" != "yes"; then
1.266 +- dirs="$dirs /usr/local"
1.267 +-fi
1.268 +-for dir in $dirs
1.269 +-do
1.270 +- case $dir in
1.271 +- NONE|/usr) continue;;
1.272 +- /usr/local)
1.273 +- if test X$localdone != X ; then continue; fi
1.274 +- localdone="$dir"
1.275 +- ;;
1.276 +- esac
1.277 +-
1.278 +- echo "$as_me:$LINENO: checking for $dir/lib in LIBS" >&5
1.279 +-echo $ECHO_N "checking for $dir/lib in LIBS... $ECHO_C" >&6
1.280 +- if test -d $dir/lib 2> /dev/null ; then
1.281 +- addlib $dir/lib
1.282 +- echo "$as_me:$LINENO: result: yes" >&5
1.283 +-echo "${ECHO_T}yes" >&6
1.284 +- else
1.285 +- echo "$as_me:$LINENO: result: no" >&5
1.286 +-echo "${ECHO_T}no" >&6
1.287 +- fi
1.288 +-
1.289 +- echo "$as_me:$LINENO: checking for $dir/include in INCPATH" >&5
1.290 +-echo $ECHO_N "checking for $dir/include in INCPATH... $ECHO_C" >&6
1.291 +- if test -d $dir/include 2>/dev/null ; then
1.292 +- if "$dir" != "/usr/local" ; then
1.293 +- INCPATH="$INCPATH -I$dir/include"
1.294 +- fi
1.295 +- echo "$as_me:$LINENO: result: yes" >&5
1.296 +-echo "${ECHO_T}yes" >&6
1.297 +- else
1.298 +- echo "$as_me:$LINENO: result: no" >&5
1.299 +-echo "${ECHO_T}no" >&6
1.300 +- fi
1.301 +-done
1.302 +
1.303 + echo "$as_me:$LINENO: checking for /usr/ucblib in LIBS" >&5
1.304 + echo $ECHO_N "checking for /usr/ucblib in LIBS... $ECHO_C" >&6
1.305 +@@ -12051,7 +12007,7 @@
1.306 + #define HAVE_LIBBEECRYPT 1
1.307 + _ACEOF
1.308 +
1.309 +- WITH_BEECRYPT_INCLUDE="-I/usr/include/beecrypt"
1.310 ++ WITH_BEECRYPT_INCLUDE=""
1.311 + WITH_BEECRYPT_LIB="-lbeecrypt"
1.312 +
1.313 + fi
1.314 +@@ -12647,287 +12603,13 @@
1.315 +
1.316 +
1.317 +
1.318 +-
1.319 +-
1.320 +-
1.321 +-for ac_header in thread.h pthread.h synch.h semaphore.h
1.322 +-do
1.323 +-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
1.324 +-if eval "test \"\${$as_ac_Header+set}\" = set"; then
1.325 +- echo "$as_me:$LINENO: checking for $ac_header" >&5
1.326 +-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
1.327 +-if eval "test \"\${$as_ac_Header+set}\" = set"; then
1.328 +- echo $ECHO_N "(cached) $ECHO_C" >&6
1.329 +-fi
1.330 +-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
1.331 +-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
1.332 +-else
1.333 +- # Is the header compilable?
1.334 +-echo "$as_me:$LINENO: checking $ac_header usability" >&5
1.335 +-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
1.336 +-cat >conftest.$ac_ext <<_ACEOF
1.337 +-#line $LINENO "configure"
1.338 +-/* confdefs.h. */
1.339 +-_ACEOF
1.340 +-cat confdefs.h >>conftest.$ac_ext
1.341 +-cat >>conftest.$ac_ext <<_ACEOF
1.342 +-/* end confdefs.h. */
1.343 +-$ac_includes_default
1.344 +-#include <$ac_header>
1.345 +-_ACEOF
1.346 +-rm -f conftest.$ac_objext
1.347 +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
1.348 +- (eval $ac_compile) 2>&5
1.349 +- ac_status=$?
1.350 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.351 +- (exit $ac_status); } &&
1.352 +- { ac_try='test -s conftest.$ac_objext'
1.353 +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
1.354 +- (eval $ac_try) 2>&5
1.355 +- ac_status=$?
1.356 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.357 +- (exit $ac_status); }; }; then
1.358 +- ac_header_compiler=yes
1.359 +-else
1.360 +- echo "$as_me: failed program was:" >&5
1.361 +-sed 's/^/| /' conftest.$ac_ext >&5
1.362 +-
1.363 +-ac_header_compiler=no
1.364 +-fi
1.365 +-rm -f conftest.$ac_objext conftest.$ac_ext
1.366 +-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
1.367 +-echo "${ECHO_T}$ac_header_compiler" >&6
1.368 +-
1.369 +-# Is the header present?
1.370 +-echo "$as_me:$LINENO: checking $ac_header presence" >&5
1.371 +-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
1.372 +-cat >conftest.$ac_ext <<_ACEOF
1.373 +-#line $LINENO "configure"
1.374 +-/* confdefs.h. */
1.375 +-_ACEOF
1.376 +-cat confdefs.h >>conftest.$ac_ext
1.377 +-cat >>conftest.$ac_ext <<_ACEOF
1.378 +-/* end confdefs.h. */
1.379 +-#include <$ac_header>
1.380 +-_ACEOF
1.381 +-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
1.382 +- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
1.383 +- ac_status=$?
1.384 +- grep -v '^ *+' conftest.er1 >conftest.err
1.385 +- rm -f conftest.er1
1.386 +- cat conftest.err >&5
1.387 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.388 +- (exit $ac_status); } >/dev/null; then
1.389 +- if test -s conftest.err; then
1.390 +- ac_cpp_err=$ac_c_preproc_warn_flag
1.391 +- else
1.392 +- ac_cpp_err=
1.393 +- fi
1.394 +-else
1.395 +- ac_cpp_err=yes
1.396 +-fi
1.397 +-if test -z "$ac_cpp_err"; then
1.398 +- ac_header_preproc=yes
1.399 +-else
1.400 +- echo "$as_me: failed program was:" >&5
1.401 +-sed 's/^/| /' conftest.$ac_ext >&5
1.402 +-
1.403 +- ac_header_preproc=no
1.404 +-fi
1.405 +-rm -f conftest.err conftest.$ac_ext
1.406 +-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
1.407 +-echo "${ECHO_T}$ac_header_preproc" >&6
1.408 +-
1.409 +-# So? What about this header?
1.410 +-case $ac_header_compiler:$ac_header_preproc in
1.411 +- yes:no )
1.412 +- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
1.413 +-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
1.414 +- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
1.415 +-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
1.416 +- (
1.417 +- cat <<\_ASBOX
1.418 +-## ------------------------------------ ##
1.419 +-## Report this to bug-autoconf@gnu.org. ##
1.420 +-## ------------------------------------ ##
1.421 +-_ASBOX
1.422 +- ) |
1.423 +- sed "s/^/$as_me: WARNING: /" >&2
1.424 +- ;;
1.425 +- no:yes )
1.426 +- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
1.427 +-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
1.428 +- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
1.429 +-echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
1.430 +- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
1.431 +-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
1.432 +- (
1.433 +- cat <<\_ASBOX
1.434 +-## ------------------------------------ ##
1.435 +-## Report this to bug-autoconf@gnu.org. ##
1.436 +-## ------------------------------------ ##
1.437 +-_ASBOX
1.438 +- ) |
1.439 +- sed "s/^/$as_me: WARNING: /" >&2
1.440 +- ;;
1.441 +-esac
1.442 +-echo "$as_me:$LINENO: checking for $ac_header" >&5
1.443 +-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
1.444 +-if eval "test \"\${$as_ac_Header+set}\" = set"; then
1.445 +- echo $ECHO_N "(cached) $ECHO_C" >&6
1.446 +-else
1.447 +- eval "$as_ac_Header=$ac_header_preproc"
1.448 +-fi
1.449 +-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
1.450 +-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
1.451 +-
1.452 +-fi
1.453 +-if test `eval echo '${'$as_ac_Header'}'` = yes; then
1.454 +- cat >>confdefs.h <<_ACEOF
1.455 +-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
1.456 +-_ACEOF
1.457 +-
1.458 +-fi
1.459 +-
1.460 +-done
1.461 +-
1.462 +-
1.463 +-
1.464 +-echo "$as_me:$LINENO: checking for pthread_mutex_trylock in -lpthread" >&5
1.465 +-echo $ECHO_N "checking for pthread_mutex_trylock in -lpthread... $ECHO_C" >&6
1.466 +-if test "${ac_cv_lib_pthread_pthread_mutex_trylock+set}" = set; then
1.467 +- echo $ECHO_N "(cached) $ECHO_C" >&6
1.468 +-else
1.469 +- ac_check_lib_save_LIBS=$LIBS
1.470 +-LIBS="-lpthread $LIBS"
1.471 +-cat >conftest.$ac_ext <<_ACEOF
1.472 +-#line $LINENO "configure"
1.473 +-/* confdefs.h. */
1.474 +-_ACEOF
1.475 +-cat confdefs.h >>conftest.$ac_ext
1.476 +-cat >>conftest.$ac_ext <<_ACEOF
1.477 +-/* end confdefs.h. */
1.478 +-
1.479 +-/* Override any gcc2 internal prototype to avoid an error. */
1.480 +-#ifdef __cplusplus
1.481 +-extern "C"
1.482 +-#endif
1.483 +-/* We use char because int might match the return type of a gcc2
1.484 +- builtin and then its argument prototype would still apply. */
1.485 +-char pthread_mutex_trylock ();
1.486 +-int
1.487 +-main ()
1.488 +-{
1.489 +-pthread_mutex_trylock ();
1.490 +- ;
1.491 +- return 0;
1.492 +-}
1.493 +-_ACEOF
1.494 +-rm -f conftest.$ac_objext conftest$ac_exeext
1.495 +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
1.496 +- (eval $ac_link) 2>&5
1.497 +- ac_status=$?
1.498 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.499 +- (exit $ac_status); } &&
1.500 +- { ac_try='test -s conftest$ac_exeext'
1.501 +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
1.502 +- (eval $ac_try) 2>&5
1.503 +- ac_status=$?
1.504 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.505 +- (exit $ac_status); }; }; then
1.506 +- ac_cv_lib_pthread_pthread_mutex_trylock=yes
1.507 +-else
1.508 +- echo "$as_me: failed program was:" >&5
1.509 +-sed 's/^/| /' conftest.$ac_ext >&5
1.510 +-
1.511 +-ac_cv_lib_pthread_pthread_mutex_trylock=no
1.512 +-fi
1.513 +-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
1.514 +-LIBS=$ac_check_lib_save_LIBS
1.515 +-fi
1.516 +-echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_mutex_trylock" >&5
1.517 +-echo "${ECHO_T}$ac_cv_lib_pthread_pthread_mutex_trylock" >&6
1.518 +-if test $ac_cv_lib_pthread_pthread_mutex_trylock = yes; then
1.519 +- cat >>confdefs.h <<_ACEOF
1.520 +-#define HAVE_LIBPTHREAD 1
1.521 +-_ACEOF
1.522 +-
1.523 +- LIBS="-lpthread $LIBS"
1.524 +-
1.525 +-else
1.526 +-
1.527 +-
1.528 +-echo "$as_me:$LINENO: checking for __pthread_mutex_trylock in -lpthread" >&5
1.529 +-echo $ECHO_N "checking for __pthread_mutex_trylock in -lpthread... $ECHO_C" >&6
1.530 +-if test "${ac_cv_lib_pthread___pthread_mutex_trylock+set}" = set; then
1.531 +- echo $ECHO_N "(cached) $ECHO_C" >&6
1.532 +-else
1.533 +- ac_check_lib_save_LIBS=$LIBS
1.534 +-LIBS="-lpthread $LIBS"
1.535 +-cat >conftest.$ac_ext <<_ACEOF
1.536 +-#line $LINENO "configure"
1.537 +-/* confdefs.h. */
1.538 +-_ACEOF
1.539 +-cat confdefs.h >>conftest.$ac_ext
1.540 +-cat >>conftest.$ac_ext <<_ACEOF
1.541 +-/* end confdefs.h. */
1.542 +-
1.543 +-/* Override any gcc2 internal prototype to avoid an error. */
1.544 +-#ifdef __cplusplus
1.545 +-extern "C"
1.546 +-#endif
1.547 +-/* We use char because int might match the return type of a gcc2
1.548 +- builtin and then its argument prototype would still apply. */
1.549 +-char __pthread_mutex_trylock ();
1.550 +-int
1.551 +-main ()
1.552 +-{
1.553 +-__pthread_mutex_trylock ();
1.554 +- ;
1.555 +- return 0;
1.556 +-}
1.557 +-_ACEOF
1.558 +-rm -f conftest.$ac_objext conftest$ac_exeext
1.559 +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
1.560 +- (eval $ac_link) 2>&5
1.561 +- ac_status=$?
1.562 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.563 +- (exit $ac_status); } &&
1.564 +- { ac_try='test -s conftest$ac_exeext'
1.565 +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
1.566 +- (eval $ac_try) 2>&5
1.567 +- ac_status=$?
1.568 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.569 +- (exit $ac_status); }; }; then
1.570 +- ac_cv_lib_pthread___pthread_mutex_trylock=yes
1.571 +-else
1.572 +- echo "$as_me: failed program was:" >&5
1.573 +-sed 's/^/| /' conftest.$ac_ext >&5
1.574 +-
1.575 +-ac_cv_lib_pthread___pthread_mutex_trylock=no
1.576 +-fi
1.577 +-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
1.578 +-LIBS=$ac_check_lib_save_LIBS
1.579 +-fi
1.580 +-echo "$as_me:$LINENO: result: $ac_cv_lib_pthread___pthread_mutex_trylock" >&5
1.581 +-echo "${ECHO_T}$ac_cv_lib_pthread___pthread_mutex_trylock" >&6
1.582 +-if test $ac_cv_lib_pthread___pthread_mutex_trylock = yes; then
1.583 +- cat >>confdefs.h <<_ACEOF
1.584 +-#define HAVE_LIBPTHREAD 1
1.585 +-_ACEOF
1.586 +-
1.587 +- LIBS="-lpthread $LIBS"
1.588 +-
1.589 +-else
1.590 +-
1.591 +-
1.592 +-echo "$as_me:$LINENO: checking for mutex_lock in -lthread" >&5
1.593 +-echo $ECHO_N "checking for mutex_lock in -lthread... $ECHO_C" >&6
1.594 +-if test "${ac_cv_lib_thread_mutex_lock+set}" = set; then
1.595 ++echo "$as_me:$LINENO: checking for svc_run in -lnsl" >&5
1.596 ++echo $ECHO_N "checking for svc_run in -lnsl... $ECHO_C" >&6
1.597 ++if test "${ac_cv_lib_nsl_svc_run+set}" = set; then
1.598 + echo $ECHO_N "(cached) $ECHO_C" >&6
1.599 + else
1.600 + ac_check_lib_save_LIBS=$LIBS
1.601 +-LIBS="-lthread $LIBS"
1.602 ++LIBS="-lnsl $LIBS"
1.603 + cat >conftest.$ac_ext <<_ACEOF
1.604 + #line $LINENO "configure"
1.605 + /* confdefs.h. */
1.606 +@@ -12942,11 +12624,11 @@
1.607 + #endif
1.608 + /* We use char because int might match the return type of a gcc2
1.609 + builtin and then its argument prototype would still apply. */
1.610 +-char mutex_lock ();
1.611 ++char svc_run ();
1.612 + int
1.613 + main ()
1.614 + {
1.615 +-mutex_lock ();
1.616 ++svc_run ();
1.617 + ;
1.618 + return 0;
1.619 + }
1.620 +@@ -12963,33 +12645,28 @@
1.621 + ac_status=$?
1.622 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.623 + (exit $ac_status); }; }; then
1.624 +- ac_cv_lib_thread_mutex_lock=yes
1.625 ++ ac_cv_lib_nsl_svc_run=yes
1.626 + else
1.627 + echo "$as_me: failed program was:" >&5
1.628 + sed 's/^/| /' conftest.$ac_ext >&5
1.629 +
1.630 +-ac_cv_lib_thread_mutex_lock=no
1.631 ++ac_cv_lib_nsl_svc_run=no
1.632 + fi
1.633 + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
1.634 + LIBS=$ac_check_lib_save_LIBS
1.635 + fi
1.636 +-echo "$as_me:$LINENO: result: $ac_cv_lib_thread_mutex_lock" >&5
1.637 +-echo "${ECHO_T}$ac_cv_lib_thread_mutex_lock" >&6
1.638 +-if test $ac_cv_lib_thread_mutex_lock = yes; then
1.639 ++echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_svc_run" >&5
1.640 ++echo "${ECHO_T}$ac_cv_lib_nsl_svc_run" >&6
1.641 ++if test $ac_cv_lib_nsl_svc_run = yes; then
1.642 + cat >>confdefs.h <<_ACEOF
1.643 +-#define HAVE_LIBTHREAD 1
1.644 ++#define HAVE_LIBNSL 1
1.645 + _ACEOF
1.646 +
1.647 +- LIBS="-lthread $LIBS"
1.648 +-
1.649 +-fi
1.650 +-
1.651 ++ LIBS="-lnsl $LIBS"
1.652 +
1.653 + fi
1.654 +
1.655 +
1.656 +-fi
1.657 +-
1.658 +
1.659 +
1.660 + for ac_header in aio.h
1.661 +@@ -22911,6 +22588,86 @@
1.662 +
1.663 + else
1.664 +
1.665 ++ echo "$as_me:$LINENO: checking for getmntinfo" >&5
1.666 ++echo $ECHO_N "checking for getmntinfo... $ECHO_C" >&6
1.667 ++if test "${ac_cv_func_getmntinfo+set}" = set; then
1.668 ++ echo $ECHO_N "(cached) $ECHO_C" >&6
1.669 ++else
1.670 ++ cat >conftest.$ac_ext <<_ACEOF
1.671 ++#line $LINENO "configure"
1.672 ++/* confdefs.h. */
1.673 ++_ACEOF
1.674 ++cat confdefs.h >>conftest.$ac_ext
1.675 ++cat >>conftest.$ac_ext <<_ACEOF
1.676 ++/* end confdefs.h. */
1.677 ++/* System header to define __stub macros and hopefully few prototypes,
1.678 ++ which can conflict with char getmntinfo (); below.
1.679 ++ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
1.680 ++ <limits.h> exists even on freestanding compilers. */
1.681 ++#ifdef __STDC__
1.682 ++# include <limits.h>
1.683 ++#else
1.684 ++# include <assert.h>
1.685 ++#endif
1.686 ++/* Override any gcc2 internal prototype to avoid an error. */
1.687 ++#ifdef __cplusplus
1.688 ++extern "C"
1.689 ++{
1.690 ++#endif
1.691 ++/* We use char because int might match the return type of a gcc2
1.692 ++ builtin and then its argument prototype would still apply. */
1.693 ++char getmntinfo ();
1.694 ++/* The GNU C library defines this for functions which it implements
1.695 ++ to always fail with ENOSYS. Some functions are actually named
1.696 ++ something starting with __ and the normal name is an alias. */
1.697 ++#if defined (__stub_getmntinfo) || defined (__stub___getmntinfo)
1.698 ++choke me
1.699 ++#else
1.700 ++char (*f) () = getmntinfo;
1.701 ++#endif
1.702 ++#ifdef __cplusplus
1.703 ++}
1.704 ++#endif
1.705 ++
1.706 ++int
1.707 ++main ()
1.708 ++{
1.709 ++return f != getmntinfo;
1.710 ++ ;
1.711 ++ return 0;
1.712 ++}
1.713 ++_ACEOF
1.714 ++rm -f conftest.$ac_objext conftest$ac_exeext
1.715 ++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
1.716 ++ (eval $ac_link) 2>&5
1.717 ++ ac_status=$?
1.718 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.719 ++ (exit $ac_status); } &&
1.720 ++ { ac_try='test -s conftest$ac_exeext'
1.721 ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
1.722 ++ (eval $ac_try) 2>&5
1.723 ++ ac_status=$?
1.724 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.725 ++ (exit $ac_status); }; }; then
1.726 ++ ac_cv_func_getmntinfo=yes
1.727 ++else
1.728 ++ echo "$as_me: failed program was:" >&5
1.729 ++sed 's/^/| /' conftest.$ac_ext >&5
1.730 ++
1.731 ++ac_cv_func_getmntinfo=no
1.732 ++fi
1.733 ++rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
1.734 ++fi
1.735 ++echo "$as_me:$LINENO: result: $ac_cv_func_getmntinfo" >&5
1.736 ++echo "${ECHO_T}$ac_cv_func_getmntinfo" >&6
1.737 ++if test $ac_cv_func_getmntinfo = yes; then
1.738 ++
1.739 ++cat >>confdefs.h <<\_ACEOF
1.740 ++#define HAVE_GETMNTINFO 1
1.741 ++_ACEOF
1.742 ++
1.743 ++else
1.744 ++
1.745 + echo "$as_me:$LINENO: checking for mntctl" >&5
1.746 + echo $ECHO_N "checking for mntctl... $ECHO_C" >&6
1.747 + if test "${ac_cv_func_mntctl+set}" = set; then
1.748 +@@ -23148,6 +22905,8 @@
1.749 +
1.750 + fi
1.751 +
1.752 ++fi
1.753 ++
1.754 +
1.755 + echo "$as_me:$LINENO: checking for lchown" >&5
1.756 + echo $ECHO_N "checking for lchown... $ECHO_C" >&6
1.757 +@@ -23454,9 +23213,6 @@
1.758 + fi
1.759 +
1.760 + MARK64=
1.761 +-case "${target_cpu}" in
1.762 +-x86_64*|ppc64*|powerpc64*|sparc64*|s390x*) MARK64=64 ;;
1.763 +-esac
1.764 +
1.765 +
1.766 + autorelocate_path='%{nil}'
1.767 +@@ -23515,7 +23271,7 @@
1.768 +
1.769 + LIBDIR="`echo $libdir | sed 's-/lib$-/%{_lib}-'`"
1.770 +
1.771 +-RPMCONFIGDIR="`echo ${usrprefix}/lib/rpm`"
1.772 ++RPMCONFIGDIR="@l_prefix@/lib/openpkg"
1.773 +
1.774 + cat >>confdefs.h <<_ACEOF
1.775 + #define RPMCONFIGDIR "$RPMCONFIGDIR"
1.776 +@@ -23523,7 +23279,7 @@
1.777 +
1.778 +
1.779 +
1.780 +-SYSCONFIGDIR="`echo /etc/rpm`"
1.781 ++SYSCONFIGDIR="@l_prefix@/etc/openpkg"
1.782 +
1.783 + cat >>confdefs.h <<_ACEOF
1.784 + #define SYSCONFIGDIR "$SYSCONFIGDIR"
1.785 +@@ -23539,7 +23295,7 @@
1.786 +
1.787 +
1.788 +
1.789 +-LIBRPMRC_FILENAME="${RPMCONFIGDIR}/rpmrc"
1.790 ++LIBRPMRC_FILENAME="${SYSCONFIGDIR}/rpmrc"
1.791 +
1.792 + cat >>confdefs.h <<_ACEOF
1.793 + #define LIBRPMRC_FILENAME "$LIBRPMRC_FILENAME"
1.794 +@@ -23547,7 +23303,7 @@
1.795 +
1.796 +
1.797 +
1.798 +-VENDORRPMRC_FILENAME="${RPMCONFIGDIR}/${RPMCANONVENDOR}/rpmrc"
1.799 ++VENDORRPMRC_FILENAME="${SYSCONFIGDIR}/${RPMCANONVENDOR}/rpmrc"
1.800 +
1.801 + cat >>confdefs.h <<_ACEOF
1.802 + #define VENDORRPMRC_FILENAME "$VENDORRPMRC_FILENAME"
1.803 +@@ -23555,7 +23311,7 @@
1.804 +
1.805 +
1.806 +
1.807 +-LIBRPMALIAS_FILENAME="${RPMCONFIGDIR}/rpmpopt-${VERSION}"
1.808 ++LIBRPMALIAS_FILENAME="${RPMCONFIGDIR}/rpmpopt"
1.809 +
1.810 + cat >>confdefs.h <<_ACEOF
1.811 + #define LIBRPMALIAS_FILENAME "$LIBRPMALIAS_FILENAME"
1.812 +@@ -23588,9 +23344,202 @@
1.813 +
1.814 +
1.815 +
1.816 ++echo "$as_me:$LINENO: checking for uint8_t" >&5
1.817 ++echo $ECHO_N "checking for uint8_t... $ECHO_C" >&6
1.818 ++if test "${ac_cv_type_uint8_t+set}" = set; then
1.819 ++ echo $ECHO_N "(cached) $ECHO_C" >&6
1.820 ++else
1.821 ++ cat >conftest.$ac_ext <<_ACEOF
1.822 ++#line $LINENO "configure"
1.823 ++/* confdefs.h. */
1.824 ++_ACEOF
1.825 ++cat confdefs.h >>conftest.$ac_ext
1.826 ++cat >>conftest.$ac_ext <<_ACEOF
1.827 ++/* end confdefs.h. */
1.828 ++#if HAVE_STDINT_H
1.829 ++#include <stdint.h>
1.830 ++#endif
1.831 ++#include <sys/types.h>
1.832 ++#if STDC_HEADERS
1.833 ++#include <stdlib.h>
1.834 ++#include <stddef.h>
1.835 ++#endif
1.836 ++_ACEOF
1.837 ++if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
1.838 ++ $EGREP "(^|[^a-zA-Z_0-9])uint8_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
1.839 ++ ac_cv_type_uint8_t=yes
1.840 ++else
1.841 ++ ac_cv_type_uint8_t=no
1.842 ++fi
1.843 ++rm -f conftest*
1.844 ++
1.845 ++fi
1.846 ++echo "$as_me:$LINENO: result: $ac_cv_type_uint8_t" >&5
1.847 ++echo "${ECHO_T}$ac_cv_type_uint8_t" >&6
1.848 ++if test $ac_cv_type_uint8_t = no; then
1.849 ++
1.850 ++cat >>confdefs.h <<\_ACEOF
1.851 ++#define uint8_t unsigned char
1.852 ++_ACEOF
1.853 ++
1.854 ++fi
1.855 ++echo "$as_me:$LINENO: checking for uint16_t" >&5
1.856 ++echo $ECHO_N "checking for uint16_t... $ECHO_C" >&6
1.857 ++if test "${ac_cv_type_uint16_t+set}" = set; then
1.858 ++ echo $ECHO_N "(cached) $ECHO_C" >&6
1.859 ++else
1.860 ++ cat >conftest.$ac_ext <<_ACEOF
1.861 ++#line $LINENO "configure"
1.862 ++/* confdefs.h. */
1.863 ++_ACEOF
1.864 ++cat confdefs.h >>conftest.$ac_ext
1.865 ++cat >>conftest.$ac_ext <<_ACEOF
1.866 ++/* end confdefs.h. */
1.867 ++#if HAVE_STDINT_H
1.868 ++#include <stdint.h>
1.869 ++#endif
1.870 ++#include <sys/types.h>
1.871 ++#if STDC_HEADERS
1.872 ++#include <stdlib.h>
1.873 ++#include <stddef.h>
1.874 ++#endif
1.875 ++_ACEOF
1.876 ++if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
1.877 ++ $EGREP "(^|[^a-zA-Z_0-9])uint16_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
1.878 ++ ac_cv_type_uint16_t=yes
1.879 ++else
1.880 ++ ac_cv_type_uint16_t=no
1.881 ++fi
1.882 ++rm -f conftest*
1.883 ++
1.884 ++fi
1.885 ++echo "$as_me:$LINENO: result: $ac_cv_type_uint16_t" >&5
1.886 ++echo "${ECHO_T}$ac_cv_type_uint16_t" >&6
1.887 ++if test $ac_cv_type_uint16_t = no; then
1.888 ++
1.889 ++cat >>confdefs.h <<\_ACEOF
1.890 ++#define uint16_t unsigned short
1.891 ++_ACEOF
1.892 ++
1.893 ++fi
1.894 ++echo "$as_me:$LINENO: checking for uint32_t" >&5
1.895 ++echo $ECHO_N "checking for uint32_t... $ECHO_C" >&6
1.896 ++if test "${ac_cv_type_uint32_t+set}" = set; then
1.897 ++ echo $ECHO_N "(cached) $ECHO_C" >&6
1.898 ++else
1.899 ++ cat >conftest.$ac_ext <<_ACEOF
1.900 ++#line $LINENO "configure"
1.901 ++/* confdefs.h. */
1.902 ++_ACEOF
1.903 ++cat confdefs.h >>conftest.$ac_ext
1.904 ++cat >>conftest.$ac_ext <<_ACEOF
1.905 ++/* end confdefs.h. */
1.906 ++#if HAVE_STDINT_H
1.907 ++#include <stdint.h>
1.908 ++#endif
1.909 ++#include <sys/types.h>
1.910 ++#if STDC_HEADERS
1.911 ++#include <stdlib.h>
1.912 ++#include <stddef.h>
1.913 ++#endif
1.914 ++_ACEOF
1.915 ++if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
1.916 ++ $EGREP "(^|[^a-zA-Z_0-9])uint32_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
1.917 ++ ac_cv_type_uint32_t=yes
1.918 ++else
1.919 ++ ac_cv_type_uint32_t=no
1.920 ++fi
1.921 ++rm -f conftest*
1.922 ++
1.923 ++fi
1.924 ++echo "$as_me:$LINENO: result: $ac_cv_type_uint32_t" >&5
1.925 ++echo "${ECHO_T}$ac_cv_type_uint32_t" >&6
1.926 ++if test $ac_cv_type_uint32_t = no; then
1.927 ++
1.928 ++cat >>confdefs.h <<\_ACEOF
1.929 ++#define uint32_t unsigned int
1.930 ++_ACEOF
1.931 ++
1.932 ++fi
1.933 ++
1.934 ++echo "$as_me:$LINENO: checking for madvise" >&5
1.935 ++echo $ECHO_N "checking for madvise... $ECHO_C" >&6
1.936 ++if test "${ac_cv_func_madvise+set}" = set; then
1.937 ++ echo $ECHO_N "(cached) $ECHO_C" >&6
1.938 ++else
1.939 ++ cat >conftest.$ac_ext <<_ACEOF
1.940 ++#line $LINENO "configure"
1.941 ++/* confdefs.h. */
1.942 ++_ACEOF
1.943 ++cat confdefs.h >>conftest.$ac_ext
1.944 ++cat >>conftest.$ac_ext <<_ACEOF
1.945 ++/* end confdefs.h. */
1.946 ++/* System header to define __stub macros and hopefully few prototypes,
1.947 ++ which can conflict with char madvise (); below.
1.948 ++ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
1.949 ++ <limits.h> exists even on freestanding compilers. */
1.950 ++#ifdef __STDC__
1.951 ++# include <limits.h>
1.952 ++#else
1.953 ++# include <assert.h>
1.954 ++#endif
1.955 ++/* Override any gcc2 internal prototype to avoid an error. */
1.956 ++#ifdef __cplusplus
1.957 ++extern "C"
1.958 ++{
1.959 ++#endif
1.960 ++/* We use char because int might match the return type of a gcc2
1.961 ++ builtin and then its argument prototype would still apply. */
1.962 ++char madvise ();
1.963 ++/* The GNU C library defines this for functions which it implements
1.964 ++ to always fail with ENOSYS. Some functions are actually named
1.965 ++ something starting with __ and the normal name is an alias. */
1.966 ++#if defined (__stub_madvise) || defined (__stub___madvise)
1.967 ++choke me
1.968 ++#else
1.969 ++char (*f) () = madvise;
1.970 ++#endif
1.971 ++#ifdef __cplusplus
1.972 ++}
1.973 ++#endif
1.974 ++
1.975 ++int
1.976 ++main ()
1.977 ++{
1.978 ++return f != madvise;
1.979 ++ ;
1.980 ++ return 0;
1.981 ++}
1.982 ++_ACEOF
1.983 ++rm -f conftest.$ac_objext conftest$ac_exeext
1.984 ++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
1.985 ++ (eval $ac_link) 2>&5
1.986 ++ ac_status=$?
1.987 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.988 ++ (exit $ac_status); } &&
1.989 ++ { ac_try='test -s conftest$ac_exeext'
1.990 ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
1.991 ++ (eval $ac_try) 2>&5
1.992 ++ ac_status=$?
1.993 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.994 ++ (exit $ac_status); }; }; then
1.995 ++ ac_cv_func_madvise=yes
1.996 ++else
1.997 ++ echo "$as_me: failed program was:" >&5
1.998 ++sed 's/^/| /' conftest.$ac_ext >&5
1.999 ++
1.1000 ++ac_cv_func_madvise=no
1.1001 ++fi
1.1002 ++rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
1.1003 ++fi
1.1004 ++echo "$as_me:$LINENO: result: $ac_cv_func_madvise" >&5
1.1005 ++echo "${ECHO_T}$ac_cv_func_madvise" >&6
1.1006 ++
1.1007 ++
1.1008 ++
1.1009 +
1.1010 +
1.1011 +-subdirs="$subdirs popt beecrypt zlib elfutils file db3"
1.1012 ++subdirs="$subdirs popt zlib elfutils file db3"
1.1013 +
1.1014 +
1.1015 + 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"
1.1016 +@@ -25157,7 +25106,6 @@
1.1017 + esac
1.1018 + done ;;
1.1019 + default ) echo timestamp > popt/stamp-h.in
1.1020 +- echo timestamp > beecrypt/stamp-h.in
1.1021 + echo timestamp > stamp-h.in
1.1022 +
1.1023 + ;;
1.1024 +
1.1025 ++---------------------------------------------------------------------------
1.1026 +| Corresponding patches in "configure" script after regeneration from
1.1027 +| patched "configure.ac" with "autoconf".
1.1028 ++---------------------------------------------------------------------------
1.1029 +Index: popt/configure
1.1030 +--- popt/configure 16 Jul 2003 17:04:51 -0000 1.1.1.16
1.1031 ++++ popt/configure 12 May 2004 14:34:35 -0000 1.18
1.1032 +@@ -9359,9 +9359,6 @@
1.1033 +
1.1034 +
1.1035 + MARK64=
1.1036 +-case "${target_cpu}" in
1.1037 +-x86_64*|powerpc64*|ppc64*|sparc64*|s390x*) MARK64=64 ;;
1.1038 +-esac
1.1039 +
1.1040 +
1.1041 +
