michael@13: ##
michael@13: ## rpm.patch.regen -- Annotated OpenPKG RPM Patch file
michael@13: ## Copyright (c) 2000-2007 OpenPKG Foundation e.V.
michael@13: ## Copyright (c) 2000-2007 Ralf S. Engelschall
michael@13: ##
michael@13: ## This file assembles changes to existing RPM source files between
michael@13: ## the original RedHat RPM and the OpenPKG RPM variant. It can be
michael@13: ## automatically applied to a vanilla RedHat RPM source tree with the
michael@13: ## 'patch' tool to upgrade those files. Each patch snippet is annotated
michael@13: ## with a short description.
michael@13: ##
michael@13: ## Created on: 13-Sep-2006
michael@13: ##
michael@13: ## ATTENTION: THIS PATCH FILE WAS AUTO-GENERATED FROM AN OPENPKG
michael@13: ## RPM CVS REPOSITORY, HENCE DO NOT EDIT THIS FILE.
michael@13: ##
michael@13:
michael@13: +---------------------------------------------------------------------------
michael@13: | Corresponding patches in "config.h.in" script after regeneration from
michael@13: | patched "configure.ac" with "autoheader".
michael@13: +---------------------------------------------------------------------------
michael@13: Index: config.h.in
michael@13: --- config.h.in 16 Jul 2003 17:17:13 -0000 1.1.1.18
michael@13: +++ config.h.in 13 Sep 2006 13:41:41 -0000
michael@13: @@ -108,6 +108,9 @@
michael@13: /* Define if you have the getmntent() function */
michael@13: #undef HAVE_GETMNTENT
michael@13:
michael@13: +/* Define as 1 if you have the getmntinfo() function */
michael@13: +#undef HAVE_GETMNTINFO
michael@13: +
michael@13: /* Define as 1 if you have getmntinfo_r() (only osf?) */
michael@13: #undef HAVE_GETMNTINFO_R
michael@13:
michael@13: @@ -181,18 +184,12 @@
michael@13: /* Define to 1 if you have the `port' library (-lport). */
michael@13: #undef HAVE_LIBPORT
michael@13:
michael@13: -/* Define to 1 if you have the `pthread' library (-lpthread). */
michael@13: -#undef HAVE_LIBPTHREAD
michael@13: -
michael@13: /* Define to 1 if you have the `rand' library (-lrand). */
michael@13: #undef HAVE_LIBRAND
michael@13:
michael@13: /* Define to 1 if you have the `socket' library (-lsocket). */
michael@13: #undef HAVE_LIBSOCKET
michael@13:
michael@13: -/* Define to 1 if you have the `thread' library (-lthread). */
michael@13: -#undef HAVE_LIBTHREAD
michael@13: -
michael@13: /* Define to 1 if you have the header file. */
michael@13: #undef HAVE_LIMITS_H
michael@13:
michael@13: @@ -259,9 +256,6 @@
michael@13: /* Define to 1 if you have the `regcomp' function. */
michael@13: #undef HAVE_REGCOMP
michael@13:
michael@13: -/* Define to 1 if you have the header file. */
michael@13: -#undef HAVE_SEMAPHORE_H
michael@13: -
michael@13: /* Define to 1 if you have the `setenv' function. */
michael@13: #undef HAVE_SETENV
michael@13:
michael@13: @@ -323,9 +317,6 @@
michael@13: /* Define as 1 if you have "struct mnttab" (only sco?) */
michael@13: #undef HAVE_STRUCT_MNTTAB
michael@13:
michael@13: -/* Define to 1 if you have the header file. */
michael@13: -#undef HAVE_SYNCH_H
michael@13: -
michael@13: /* Define to 1 if you have the header file, and it defines `DIR'.
michael@13: */
michael@13: #undef HAVE_SYS_DIR_H
michael@13: @@ -391,9 +382,6 @@
michael@13: /* Define as 1 if defines S_ISSOCK */
michael@13: #undef HAVE_S_ISSOCK
michael@13:
michael@13: -/* Define to 1 if you have the header file. */
michael@13: -#undef HAVE_THREAD_H
michael@13: -
michael@13: /* Define to 1 if you have the `tsearch' function. */
michael@13: #undef HAVE_TSEARCH
michael@13:
michael@13: @@ -586,6 +574,17 @@
michael@13: /* Define to `unsigned' if does not define. */
michael@13: #undef size_t
michael@13:
michael@13: +#ifndef HAVE_STDINT_H
michael@13: +/* uint16_t */
michael@13: +#undef uint16_t
michael@13: +
michael@13: +/* uint32_t */
michael@13: +#undef uint32_t
michael@13: +
michael@13: +/* uint8_t */
michael@13: +#undef uint8_t
michael@13: +#endif
michael@13: +
michael@13: /* Define to unsigned long or unsigned long long if and
michael@13: don't define. */
michael@13: #undef uintmax_t
michael@13:
michael@13: +---------------------------------------------------------------------------
michael@13: | Corresponding patches in "configure" script after regeneration from
michael@13: | patched "configure.ac" with "autoconf".
michael@13: +---------------------------------------------------------------------------
michael@13: Index: configure
michael@13: --- configure 16 Jul 2003 17:05:55 -0000 1.1.1.23
michael@13: +++ configure 13 Sep 2006 13:41:43 -0000
michael@13: @@ -467,7 +467,7 @@
michael@13: # include
michael@13: #endif"
michael@13:
michael@13: -ac_subdirs_all="$ac_subdirs_all popt beecrypt zlib elfutils file db3"
michael@13: +ac_subdirs_all="$ac_subdirs_all popt zlib elfutils file db3"
michael@13: 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'
michael@13: ac_subst_files=''
michael@13:
michael@13: @@ -4040,7 +4040,7 @@
michael@13: AS=${AS-as}
michael@13:
michael@13: if test "$ac_cv_c_compiler_gnu" = yes; then
michael@13: - CFLAGS="$CFLAGS -D_GNU_SOURCE -D_REENTRANT -Wall -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes -Wno-char-subscripts"
michael@13: + CFLAGS="$CFLAGS -O2 -D_GNU_SOURCE -D_REENTRANT"
michael@13: fi
michael@13: export CFLAGS
michael@13:
michael@13: @@ -4837,16 +4837,13 @@
michael@13: # just link it dynamically
michael@13: LDFLAGS_STATIC=""
michael@13: fi
michael@13: +LDFLAGS_STATIC="" # OpenPKG wants dynamically linked RPM tools
michael@13: LDFLAGS_STATIC="${LDFLAGS} ${LDFLAGS_STATIC}" # libtool format
michael@13: echo "$as_me:$LINENO: result: $LDFLAGS_STATIC" >&5
michael@13: echo "${ECHO_T}$LDFLAGS_STATIC" >&6
michael@13:
michael@13:
michael@13: LDFLAGS_NPTL=
michael@13: -if test -f /usr/lib/nptl/libpthread.a ; then
michael@13: - LDFLAGS_NPTL="-L/usr/lib/nptl"
michael@13: -# INCPATH="$INCPATH -I/usr/include/nptl"
michael@13: -fi
michael@13:
michael@13:
michael@13: echo "$as_me:$LINENO: checking POSIX chmod" >&5
michael@13: @@ -4937,7 +4934,7 @@
michael@13: if test X"$MKDIR_P" = X0 ; then
michael@13: echo "$as_me:$LINENO: result: no" >&5
michael@13: echo "${ECHO_T}no" >&6
michael@13: - MKDIR_P="`echo ${prefix}/lib/rpm/mkinstalldirs`"
michael@13: + MKDIR_P="@l_prefix@/lib/openpkg/shtool mkdir -f -p -m 755"
michael@13: else
michael@13: echo "$as_me:$LINENO: result: yes" >&5
michael@13: echo "${ECHO_T}yes" >&6
michael@13: @@ -5878,6 +5875,7 @@
michael@13: ;;
michael@13: *) # Darwin 1.3 on
michael@13: lt_cv_file_magic_test_file='/usr/lib/libSystem.dylib'
michael@13: + lt_cv_deplibs_check_method=pass_all
michael@13: ;;
michael@13: esac
michael@13: ;;
michael@13: @@ -5903,7 +5901,7 @@
michael@13: ;;
michael@13:
michael@13: hpux10.20*|hpux11*)
michael@13: - lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library'
michael@13: + lt_cv_deplibs_check_method='pass_all'
michael@13: lt_cv_file_magic_cmd=/usr/bin/file
michael@13: lt_cv_file_magic_test_file=/usr/lib/libc.sl
michael@13: ;;
michael@13: @@ -5942,11 +5940,7 @@
michael@13: ;;
michael@13:
michael@13: netbsd*)
michael@13: - if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
michael@13: - lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$'
michael@13: - else
michael@13: - lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so$'
michael@13: - fi
michael@13: + lt_cv_deplibs_check_method='pass_all'
michael@13: ;;
michael@13:
michael@13: newos6*)
michael@13: @@ -5981,7 +5975,7 @@
michael@13: lt_cv_file_magic_test_file=/lib/libc.so
michael@13: ;;
michael@13:
michael@13: -sysv5uw[78]* | sysv4*uw2*)
michael@13: +sysv5uw[78]* | sysv4*uw2* | sysv5UnixWare7* )
michael@13: lt_cv_deplibs_check_method=pass_all
michael@13: ;;
michael@13:
michael@13: @@ -6682,7 +6676,7 @@
michael@13: case $host in
michael@13: *-*-irix6*)
michael@13: # Find out which ABI we are using.
michael@13: - echo '#line 6685 "configure"' > conftest.$ac_ext
michael@13: + echo '#line 6679 "configure"' > conftest.$ac_ext
michael@13: if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
michael@13: (eval $ac_compile) 2>&5
michael@13: ac_status=$?
michael@13: @@ -7211,7 +7205,7 @@
michael@13: save_CFLAGS="$CFLAGS"
michael@13: CFLAGS="$CFLAGS -o out/conftest2.$ac_objext"
michael@13: compiler_c_o=no
michael@13: -if { (eval echo configure:7214: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then
michael@13: +if { (eval echo configure:7208: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then
michael@13: # The compiler can only warn and ignore the option if not recognized
michael@13: # So say no if there are warnings
michael@13: if test -s out/conftest.err; then
michael@13: @@ -8069,7 +8063,7 @@
michael@13: runpath_var=LD_RUN_PATH
michael@13: ;;
michael@13:
michael@13: - sysv5uw7* | unixware7*)
michael@13: + sysv5uw7* | unixware7* | sysv5UnixWare7* )
michael@13: no_undefined_flag='${wl}-z ${wl}text'
michael@13: if test "$GCC" = yes; then
michael@13: archive_cmds='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
michael@13: @@ -8395,7 +8389,7 @@
michael@13: libsuff=
michael@13: case "$host_cpu" in
michael@13: x86_64*|s390x*)
michael@13: - echo '#line 8398 "configure"' > conftest.$ac_ext
michael@13: + echo '#line 8392 "configure"' > conftest.$ac_ext
michael@13: if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
michael@13: (eval $ac_compile) 2>&5
michael@13: ac_status=$?
michael@13: @@ -9067,7 +9061,7 @@
michael@13: lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
michael@13: lt_status=$lt_dlunknown
michael@13: cat > conftest.$ac_ext < conftest.$ac_ext <&5
michael@13: -echo $ECHO_N "checking for $dir/lib in LIBS... $ECHO_C" >&6
michael@13: - if test -d $dir/lib 2> /dev/null ; then
michael@13: - addlib $dir/lib
michael@13: - echo "$as_me:$LINENO: result: yes" >&5
michael@13: -echo "${ECHO_T}yes" >&6
michael@13: - else
michael@13: - echo "$as_me:$LINENO: result: no" >&5
michael@13: -echo "${ECHO_T}no" >&6
michael@13: - fi
michael@13: -
michael@13: - echo "$as_me:$LINENO: checking for $dir/include in INCPATH" >&5
michael@13: -echo $ECHO_N "checking for $dir/include in INCPATH... $ECHO_C" >&6
michael@13: - if test -d $dir/include 2>/dev/null ; then
michael@13: - if "$dir" != "/usr/local" ; then
michael@13: - INCPATH="$INCPATH -I$dir/include"
michael@13: - fi
michael@13: - echo "$as_me:$LINENO: result: yes" >&5
michael@13: -echo "${ECHO_T}yes" >&6
michael@13: - else
michael@13: - echo "$as_me:$LINENO: result: no" >&5
michael@13: -echo "${ECHO_T}no" >&6
michael@13: - fi
michael@13: -done
michael@13:
michael@13: echo "$as_me:$LINENO: checking for /usr/ucblib in LIBS" >&5
michael@13: echo $ECHO_N "checking for /usr/ucblib in LIBS... $ECHO_C" >&6
michael@13: @@ -12051,7 +12007,7 @@
michael@13: #define HAVE_LIBBEECRYPT 1
michael@13: _ACEOF
michael@13:
michael@13: - WITH_BEECRYPT_INCLUDE="-I/usr/include/beecrypt"
michael@13: + WITH_BEECRYPT_INCLUDE=""
michael@13: WITH_BEECRYPT_LIB="-lbeecrypt"
michael@13:
michael@13: fi
michael@13: @@ -12647,287 +12603,13 @@
michael@13:
michael@13:
michael@13:
michael@13: -
michael@13: -
michael@13: -
michael@13: -for ac_header in thread.h pthread.h synch.h semaphore.h
michael@13: -do
michael@13: -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
michael@13: -if eval "test \"\${$as_ac_Header+set}\" = set"; then
michael@13: - echo "$as_me:$LINENO: checking for $ac_header" >&5
michael@13: -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
michael@13: -if eval "test \"\${$as_ac_Header+set}\" = set"; then
michael@13: - echo $ECHO_N "(cached) $ECHO_C" >&6
michael@13: -fi
michael@13: -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
michael@13: -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
michael@13: -else
michael@13: - # Is the header compilable?
michael@13: -echo "$as_me:$LINENO: checking $ac_header usability" >&5
michael@13: -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
michael@13: -cat >conftest.$ac_ext <<_ACEOF
michael@13: -#line $LINENO "configure"
michael@13: -/* confdefs.h. */
michael@13: -_ACEOF
michael@13: -cat confdefs.h >>conftest.$ac_ext
michael@13: -cat >>conftest.$ac_ext <<_ACEOF
michael@13: -/* end confdefs.h. */
michael@13: -$ac_includes_default
michael@13: -#include <$ac_header>
michael@13: -_ACEOF
michael@13: -rm -f conftest.$ac_objext
michael@13: -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
michael@13: - (eval $ac_compile) 2>&5
michael@13: - ac_status=$?
michael@13: - echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@13: - (exit $ac_status); } &&
michael@13: - { ac_try='test -s conftest.$ac_objext'
michael@13: - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
michael@13: - (eval $ac_try) 2>&5
michael@13: - ac_status=$?
michael@13: - echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@13: - (exit $ac_status); }; }; then
michael@13: - ac_header_compiler=yes
michael@13: -else
michael@13: - echo "$as_me: failed program was:" >&5
michael@13: -sed 's/^/| /' conftest.$ac_ext >&5
michael@13: -
michael@13: -ac_header_compiler=no
michael@13: -fi
michael@13: -rm -f conftest.$ac_objext conftest.$ac_ext
michael@13: -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
michael@13: -echo "${ECHO_T}$ac_header_compiler" >&6
michael@13: -
michael@13: -# Is the header present?
michael@13: -echo "$as_me:$LINENO: checking $ac_header presence" >&5
michael@13: -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
michael@13: -cat >conftest.$ac_ext <<_ACEOF
michael@13: -#line $LINENO "configure"
michael@13: -/* confdefs.h. */
michael@13: -_ACEOF
michael@13: -cat confdefs.h >>conftest.$ac_ext
michael@13: -cat >>conftest.$ac_ext <<_ACEOF
michael@13: -/* end confdefs.h. */
michael@13: -#include <$ac_header>
michael@13: -_ACEOF
michael@13: -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
michael@13: - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
michael@13: - ac_status=$?
michael@13: - grep -v '^ *+' conftest.er1 >conftest.err
michael@13: - rm -f conftest.er1
michael@13: - cat conftest.err >&5
michael@13: - echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@13: - (exit $ac_status); } >/dev/null; then
michael@13: - if test -s conftest.err; then
michael@13: - ac_cpp_err=$ac_c_preproc_warn_flag
michael@13: - else
michael@13: - ac_cpp_err=
michael@13: - fi
michael@13: -else
michael@13: - ac_cpp_err=yes
michael@13: -fi
michael@13: -if test -z "$ac_cpp_err"; then
michael@13: - ac_header_preproc=yes
michael@13: -else
michael@13: - echo "$as_me: failed program was:" >&5
michael@13: -sed 's/^/| /' conftest.$ac_ext >&5
michael@13: -
michael@13: - ac_header_preproc=no
michael@13: -fi
michael@13: -rm -f conftest.err conftest.$ac_ext
michael@13: -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
michael@13: -echo "${ECHO_T}$ac_header_preproc" >&6
michael@13: -
michael@13: -# So? What about this header?
michael@13: -case $ac_header_compiler:$ac_header_preproc in
michael@13: - yes:no )
michael@13: - { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
michael@13: -echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
michael@13: - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
michael@13: -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
michael@13: - (
michael@13: - cat <<\_ASBOX
michael@13: -## ------------------------------------ ##
michael@13: -## Report this to bug-autoconf@gnu.org. ##
michael@13: -## ------------------------------------ ##
michael@13: -_ASBOX
michael@13: - ) |
michael@13: - sed "s/^/$as_me: WARNING: /" >&2
michael@13: - ;;
michael@13: - no:yes )
michael@13: - { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
michael@13: -echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
michael@13: - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
michael@13: -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
michael@13: - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
michael@13: -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
michael@13: - (
michael@13: - cat <<\_ASBOX
michael@13: -## ------------------------------------ ##
michael@13: -## Report this to bug-autoconf@gnu.org. ##
michael@13: -## ------------------------------------ ##
michael@13: -_ASBOX
michael@13: - ) |
michael@13: - sed "s/^/$as_me: WARNING: /" >&2
michael@13: - ;;
michael@13: -esac
michael@13: -echo "$as_me:$LINENO: checking for $ac_header" >&5
michael@13: -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
michael@13: -if eval "test \"\${$as_ac_Header+set}\" = set"; then
michael@13: - echo $ECHO_N "(cached) $ECHO_C" >&6
michael@13: -else
michael@13: - eval "$as_ac_Header=$ac_header_preproc"
michael@13: -fi
michael@13: -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
michael@13: -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
michael@13: -
michael@13: -fi
michael@13: -if test `eval echo '${'$as_ac_Header'}'` = yes; then
michael@13: - cat >>confdefs.h <<_ACEOF
michael@13: -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
michael@13: -_ACEOF
michael@13: -
michael@13: -fi
michael@13: -
michael@13: -done
michael@13: -
michael@13: -
michael@13: -
michael@13: -echo "$as_me:$LINENO: checking for pthread_mutex_trylock in -lpthread" >&5
michael@13: -echo $ECHO_N "checking for pthread_mutex_trylock in -lpthread... $ECHO_C" >&6
michael@13: -if test "${ac_cv_lib_pthread_pthread_mutex_trylock+set}" = set; then
michael@13: - echo $ECHO_N "(cached) $ECHO_C" >&6
michael@13: -else
michael@13: - ac_check_lib_save_LIBS=$LIBS
michael@13: -LIBS="-lpthread $LIBS"
michael@13: -cat >conftest.$ac_ext <<_ACEOF
michael@13: -#line $LINENO "configure"
michael@13: -/* confdefs.h. */
michael@13: -_ACEOF
michael@13: -cat confdefs.h >>conftest.$ac_ext
michael@13: -cat >>conftest.$ac_ext <<_ACEOF
michael@13: -/* end confdefs.h. */
michael@13: -
michael@13: -/* Override any gcc2 internal prototype to avoid an error. */
michael@13: -#ifdef __cplusplus
michael@13: -extern "C"
michael@13: -#endif
michael@13: -/* We use char because int might match the return type of a gcc2
michael@13: - builtin and then its argument prototype would still apply. */
michael@13: -char pthread_mutex_trylock ();
michael@13: -int
michael@13: -main ()
michael@13: -{
michael@13: -pthread_mutex_trylock ();
michael@13: - ;
michael@13: - return 0;
michael@13: -}
michael@13: -_ACEOF
michael@13: -rm -f conftest.$ac_objext conftest$ac_exeext
michael@13: -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
michael@13: - (eval $ac_link) 2>&5
michael@13: - ac_status=$?
michael@13: - echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@13: - (exit $ac_status); } &&
michael@13: - { ac_try='test -s conftest$ac_exeext'
michael@13: - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
michael@13: - (eval $ac_try) 2>&5
michael@13: - ac_status=$?
michael@13: - echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@13: - (exit $ac_status); }; }; then
michael@13: - ac_cv_lib_pthread_pthread_mutex_trylock=yes
michael@13: -else
michael@13: - echo "$as_me: failed program was:" >&5
michael@13: -sed 's/^/| /' conftest.$ac_ext >&5
michael@13: -
michael@13: -ac_cv_lib_pthread_pthread_mutex_trylock=no
michael@13: -fi
michael@13: -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
michael@13: -LIBS=$ac_check_lib_save_LIBS
michael@13: -fi
michael@13: -echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_mutex_trylock" >&5
michael@13: -echo "${ECHO_T}$ac_cv_lib_pthread_pthread_mutex_trylock" >&6
michael@13: -if test $ac_cv_lib_pthread_pthread_mutex_trylock = yes; then
michael@13: - cat >>confdefs.h <<_ACEOF
michael@13: -#define HAVE_LIBPTHREAD 1
michael@13: -_ACEOF
michael@13: -
michael@13: - LIBS="-lpthread $LIBS"
michael@13: -
michael@13: -else
michael@13: -
michael@13: -
michael@13: -echo "$as_me:$LINENO: checking for __pthread_mutex_trylock in -lpthread" >&5
michael@13: -echo $ECHO_N "checking for __pthread_mutex_trylock in -lpthread... $ECHO_C" >&6
michael@13: -if test "${ac_cv_lib_pthread___pthread_mutex_trylock+set}" = set; then
michael@13: - echo $ECHO_N "(cached) $ECHO_C" >&6
michael@13: -else
michael@13: - ac_check_lib_save_LIBS=$LIBS
michael@13: -LIBS="-lpthread $LIBS"
michael@13: -cat >conftest.$ac_ext <<_ACEOF
michael@13: -#line $LINENO "configure"
michael@13: -/* confdefs.h. */
michael@13: -_ACEOF
michael@13: -cat confdefs.h >>conftest.$ac_ext
michael@13: -cat >>conftest.$ac_ext <<_ACEOF
michael@13: -/* end confdefs.h. */
michael@13: -
michael@13: -/* Override any gcc2 internal prototype to avoid an error. */
michael@13: -#ifdef __cplusplus
michael@13: -extern "C"
michael@13: -#endif
michael@13: -/* We use char because int might match the return type of a gcc2
michael@13: - builtin and then its argument prototype would still apply. */
michael@13: -char __pthread_mutex_trylock ();
michael@13: -int
michael@13: -main ()
michael@13: -{
michael@13: -__pthread_mutex_trylock ();
michael@13: - ;
michael@13: - return 0;
michael@13: -}
michael@13: -_ACEOF
michael@13: -rm -f conftest.$ac_objext conftest$ac_exeext
michael@13: -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
michael@13: - (eval $ac_link) 2>&5
michael@13: - ac_status=$?
michael@13: - echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@13: - (exit $ac_status); } &&
michael@13: - { ac_try='test -s conftest$ac_exeext'
michael@13: - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
michael@13: - (eval $ac_try) 2>&5
michael@13: - ac_status=$?
michael@13: - echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@13: - (exit $ac_status); }; }; then
michael@13: - ac_cv_lib_pthread___pthread_mutex_trylock=yes
michael@13: -else
michael@13: - echo "$as_me: failed program was:" >&5
michael@13: -sed 's/^/| /' conftest.$ac_ext >&5
michael@13: -
michael@13: -ac_cv_lib_pthread___pthread_mutex_trylock=no
michael@13: -fi
michael@13: -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
michael@13: -LIBS=$ac_check_lib_save_LIBS
michael@13: -fi
michael@13: -echo "$as_me:$LINENO: result: $ac_cv_lib_pthread___pthread_mutex_trylock" >&5
michael@13: -echo "${ECHO_T}$ac_cv_lib_pthread___pthread_mutex_trylock" >&6
michael@13: -if test $ac_cv_lib_pthread___pthread_mutex_trylock = yes; then
michael@13: - cat >>confdefs.h <<_ACEOF
michael@13: -#define HAVE_LIBPTHREAD 1
michael@13: -_ACEOF
michael@13: -
michael@13: - LIBS="-lpthread $LIBS"
michael@13: -
michael@13: -else
michael@13: -
michael@13: -
michael@13: -echo "$as_me:$LINENO: checking for mutex_lock in -lthread" >&5
michael@13: -echo $ECHO_N "checking for mutex_lock in -lthread... $ECHO_C" >&6
michael@13: -if test "${ac_cv_lib_thread_mutex_lock+set}" = set; then
michael@13: +echo "$as_me:$LINENO: checking for svc_run in -lnsl" >&5
michael@13: +echo $ECHO_N "checking for svc_run in -lnsl... $ECHO_C" >&6
michael@13: +if test "${ac_cv_lib_nsl_svc_run+set}" = set; then
michael@13: echo $ECHO_N "(cached) $ECHO_C" >&6
michael@13: else
michael@13: ac_check_lib_save_LIBS=$LIBS
michael@13: -LIBS="-lthread $LIBS"
michael@13: +LIBS="-lnsl $LIBS"
michael@13: cat >conftest.$ac_ext <<_ACEOF
michael@13: #line $LINENO "configure"
michael@13: /* confdefs.h. */
michael@13: @@ -12942,11 +12624,11 @@
michael@13: #endif
michael@13: /* We use char because int might match the return type of a gcc2
michael@13: builtin and then its argument prototype would still apply. */
michael@13: -char mutex_lock ();
michael@13: +char svc_run ();
michael@13: int
michael@13: main ()
michael@13: {
michael@13: -mutex_lock ();
michael@13: +svc_run ();
michael@13: ;
michael@13: return 0;
michael@13: }
michael@13: @@ -12963,33 +12645,28 @@
michael@13: ac_status=$?
michael@13: echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@13: (exit $ac_status); }; }; then
michael@13: - ac_cv_lib_thread_mutex_lock=yes
michael@13: + ac_cv_lib_nsl_svc_run=yes
michael@13: else
michael@13: echo "$as_me: failed program was:" >&5
michael@13: sed 's/^/| /' conftest.$ac_ext >&5
michael@13:
michael@13: -ac_cv_lib_thread_mutex_lock=no
michael@13: +ac_cv_lib_nsl_svc_run=no
michael@13: fi
michael@13: rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
michael@13: LIBS=$ac_check_lib_save_LIBS
michael@13: fi
michael@13: -echo "$as_me:$LINENO: result: $ac_cv_lib_thread_mutex_lock" >&5
michael@13: -echo "${ECHO_T}$ac_cv_lib_thread_mutex_lock" >&6
michael@13: -if test $ac_cv_lib_thread_mutex_lock = yes; then
michael@13: +echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_svc_run" >&5
michael@13: +echo "${ECHO_T}$ac_cv_lib_nsl_svc_run" >&6
michael@13: +if test $ac_cv_lib_nsl_svc_run = yes; then
michael@13: cat >>confdefs.h <<_ACEOF
michael@13: -#define HAVE_LIBTHREAD 1
michael@13: +#define HAVE_LIBNSL 1
michael@13: _ACEOF
michael@13:
michael@13: - LIBS="-lthread $LIBS"
michael@13: -
michael@13: -fi
michael@13: -
michael@13: + LIBS="-lnsl $LIBS"
michael@13:
michael@13: fi
michael@13:
michael@13:
michael@13: -fi
michael@13: -
michael@13:
michael@13:
michael@13: for ac_header in aio.h
michael@13: @@ -22911,6 +22588,86 @@
michael@13:
michael@13: else
michael@13:
michael@13: + echo "$as_me:$LINENO: checking for getmntinfo" >&5
michael@13: +echo $ECHO_N "checking for getmntinfo... $ECHO_C" >&6
michael@13: +if test "${ac_cv_func_getmntinfo+set}" = set; then
michael@13: + echo $ECHO_N "(cached) $ECHO_C" >&6
michael@13: +else
michael@13: + cat >conftest.$ac_ext <<_ACEOF
michael@13: +#line $LINENO "configure"
michael@13: +/* confdefs.h. */
michael@13: +_ACEOF
michael@13: +cat confdefs.h >>conftest.$ac_ext
michael@13: +cat >>conftest.$ac_ext <<_ACEOF
michael@13: +/* end confdefs.h. */
michael@13: +/* System header to define __stub macros and hopefully few prototypes,
michael@13: + which can conflict with char getmntinfo (); below.
michael@13: + Prefer to if __STDC__ is defined, since
michael@13: + exists even on freestanding compilers. */
michael@13: +#ifdef __STDC__
michael@13: +# include
michael@13: +#else
michael@13: +# include
michael@13: +#endif
michael@13: +/* Override any gcc2 internal prototype to avoid an error. */
michael@13: +#ifdef __cplusplus
michael@13: +extern "C"
michael@13: +{
michael@13: +#endif
michael@13: +/* We use char because int might match the return type of a gcc2
michael@13: + builtin and then its argument prototype would still apply. */
michael@13: +char getmntinfo ();
michael@13: +/* The GNU C library defines this for functions which it implements
michael@13: + to always fail with ENOSYS. Some functions are actually named
michael@13: + something starting with __ and the normal name is an alias. */
michael@13: +#if defined (__stub_getmntinfo) || defined (__stub___getmntinfo)
michael@13: +choke me
michael@13: +#else
michael@13: +char (*f) () = getmntinfo;
michael@13: +#endif
michael@13: +#ifdef __cplusplus
michael@13: +}
michael@13: +#endif
michael@13: +
michael@13: +int
michael@13: +main ()
michael@13: +{
michael@13: +return f != getmntinfo;
michael@13: + ;
michael@13: + return 0;
michael@13: +}
michael@13: +_ACEOF
michael@13: +rm -f conftest.$ac_objext conftest$ac_exeext
michael@13: +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
michael@13: + (eval $ac_link) 2>&5
michael@13: + ac_status=$?
michael@13: + echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@13: + (exit $ac_status); } &&
michael@13: + { ac_try='test -s conftest$ac_exeext'
michael@13: + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
michael@13: + (eval $ac_try) 2>&5
michael@13: + ac_status=$?
michael@13: + echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@13: + (exit $ac_status); }; }; then
michael@13: + ac_cv_func_getmntinfo=yes
michael@13: +else
michael@13: + echo "$as_me: failed program was:" >&5
michael@13: +sed 's/^/| /' conftest.$ac_ext >&5
michael@13: +
michael@13: +ac_cv_func_getmntinfo=no
michael@13: +fi
michael@13: +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
michael@13: +fi
michael@13: +echo "$as_me:$LINENO: result: $ac_cv_func_getmntinfo" >&5
michael@13: +echo "${ECHO_T}$ac_cv_func_getmntinfo" >&6
michael@13: +if test $ac_cv_func_getmntinfo = yes; then
michael@13: +
michael@13: +cat >>confdefs.h <<\_ACEOF
michael@13: +#define HAVE_GETMNTINFO 1
michael@13: +_ACEOF
michael@13: +
michael@13: +else
michael@13: +
michael@13: echo "$as_me:$LINENO: checking for mntctl" >&5
michael@13: echo $ECHO_N "checking for mntctl... $ECHO_C" >&6
michael@13: if test "${ac_cv_func_mntctl+set}" = set; then
michael@13: @@ -23148,6 +22905,8 @@
michael@13:
michael@13: fi
michael@13:
michael@13: +fi
michael@13: +
michael@13:
michael@13: echo "$as_me:$LINENO: checking for lchown" >&5
michael@13: echo $ECHO_N "checking for lchown... $ECHO_C" >&6
michael@13: @@ -23454,9 +23213,6 @@
michael@13: fi
michael@13:
michael@13: MARK64=
michael@13: -case "${target_cpu}" in
michael@13: -x86_64*|ppc64*|powerpc64*|sparc64*|s390x*) MARK64=64 ;;
michael@13: -esac
michael@13:
michael@13:
michael@13: autorelocate_path='%{nil}'
michael@13: @@ -23515,7 +23271,7 @@
michael@13:
michael@13: LIBDIR="`echo $libdir | sed 's-/lib$-/%{_lib}-'`"
michael@13:
michael@13: -RPMCONFIGDIR="`echo ${usrprefix}/lib/rpm`"
michael@13: +RPMCONFIGDIR="@l_prefix@/lib/openpkg"
michael@13:
michael@13: cat >>confdefs.h <<_ACEOF
michael@13: #define RPMCONFIGDIR "$RPMCONFIGDIR"
michael@13: @@ -23523,7 +23279,7 @@
michael@13:
michael@13:
michael@13:
michael@13: -SYSCONFIGDIR="`echo /etc/rpm`"
michael@13: +SYSCONFIGDIR="@l_prefix@/etc/openpkg"
michael@13:
michael@13: cat >>confdefs.h <<_ACEOF
michael@13: #define SYSCONFIGDIR "$SYSCONFIGDIR"
michael@13: @@ -23539,7 +23295,7 @@
michael@13:
michael@13:
michael@13:
michael@13: -LIBRPMRC_FILENAME="${RPMCONFIGDIR}/rpmrc"
michael@13: +LIBRPMRC_FILENAME="${SYSCONFIGDIR}/rpmrc"
michael@13:
michael@13: cat >>confdefs.h <<_ACEOF
michael@13: #define LIBRPMRC_FILENAME "$LIBRPMRC_FILENAME"
michael@13: @@ -23547,7 +23303,7 @@
michael@13:
michael@13:
michael@13:
michael@13: -VENDORRPMRC_FILENAME="${RPMCONFIGDIR}/${RPMCANONVENDOR}/rpmrc"
michael@13: +VENDORRPMRC_FILENAME="${SYSCONFIGDIR}/${RPMCANONVENDOR}/rpmrc"
michael@13:
michael@13: cat >>confdefs.h <<_ACEOF
michael@13: #define VENDORRPMRC_FILENAME "$VENDORRPMRC_FILENAME"
michael@13: @@ -23555,7 +23311,7 @@
michael@13:
michael@13:
michael@13:
michael@13: -LIBRPMALIAS_FILENAME="${RPMCONFIGDIR}/rpmpopt-${VERSION}"
michael@13: +LIBRPMALIAS_FILENAME="${RPMCONFIGDIR}/rpmpopt"
michael@13:
michael@13: cat >>confdefs.h <<_ACEOF
michael@13: #define LIBRPMALIAS_FILENAME "$LIBRPMALIAS_FILENAME"
michael@13: @@ -23588,9 +23344,202 @@
michael@13:
michael@13:
michael@13:
michael@13: +echo "$as_me:$LINENO: checking for uint8_t" >&5
michael@13: +echo $ECHO_N "checking for uint8_t... $ECHO_C" >&6
michael@13: +if test "${ac_cv_type_uint8_t+set}" = set; then
michael@13: + echo $ECHO_N "(cached) $ECHO_C" >&6
michael@13: +else
michael@13: + cat >conftest.$ac_ext <<_ACEOF
michael@13: +#line $LINENO "configure"
michael@13: +/* confdefs.h. */
michael@13: +_ACEOF
michael@13: +cat confdefs.h >>conftest.$ac_ext
michael@13: +cat >>conftest.$ac_ext <<_ACEOF
michael@13: +/* end confdefs.h. */
michael@13: +#if HAVE_STDINT_H
michael@13: +#include
michael@13: +#endif
michael@13: +#include
michael@13: +#if STDC_HEADERS
michael@13: +#include
michael@13: +#include
michael@13: +#endif
michael@13: +_ACEOF
michael@13: +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
michael@13: + $EGREP "(^|[^a-zA-Z_0-9])uint8_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
michael@13: + ac_cv_type_uint8_t=yes
michael@13: +else
michael@13: + ac_cv_type_uint8_t=no
michael@13: +fi
michael@13: +rm -f conftest*
michael@13: +
michael@13: +fi
michael@13: +echo "$as_me:$LINENO: result: $ac_cv_type_uint8_t" >&5
michael@13: +echo "${ECHO_T}$ac_cv_type_uint8_t" >&6
michael@13: +if test $ac_cv_type_uint8_t = no; then
michael@13: +
michael@13: +cat >>confdefs.h <<\_ACEOF
michael@13: +#define uint8_t unsigned char
michael@13: +_ACEOF
michael@13: +
michael@13: +fi
michael@13: +echo "$as_me:$LINENO: checking for uint16_t" >&5
michael@13: +echo $ECHO_N "checking for uint16_t... $ECHO_C" >&6
michael@13: +if test "${ac_cv_type_uint16_t+set}" = set; then
michael@13: + echo $ECHO_N "(cached) $ECHO_C" >&6
michael@13: +else
michael@13: + cat >conftest.$ac_ext <<_ACEOF
michael@13: +#line $LINENO "configure"
michael@13: +/* confdefs.h. */
michael@13: +_ACEOF
michael@13: +cat confdefs.h >>conftest.$ac_ext
michael@13: +cat >>conftest.$ac_ext <<_ACEOF
michael@13: +/* end confdefs.h. */
michael@13: +#if HAVE_STDINT_H
michael@13: +#include
michael@13: +#endif
michael@13: +#include
michael@13: +#if STDC_HEADERS
michael@13: +#include
michael@13: +#include
michael@13: +#endif
michael@13: +_ACEOF
michael@13: +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
michael@13: + $EGREP "(^|[^a-zA-Z_0-9])uint16_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
michael@13: + ac_cv_type_uint16_t=yes
michael@13: +else
michael@13: + ac_cv_type_uint16_t=no
michael@13: +fi
michael@13: +rm -f conftest*
michael@13: +
michael@13: +fi
michael@13: +echo "$as_me:$LINENO: result: $ac_cv_type_uint16_t" >&5
michael@13: +echo "${ECHO_T}$ac_cv_type_uint16_t" >&6
michael@13: +if test $ac_cv_type_uint16_t = no; then
michael@13: +
michael@13: +cat >>confdefs.h <<\_ACEOF
michael@13: +#define uint16_t unsigned short
michael@13: +_ACEOF
michael@13: +
michael@13: +fi
michael@13: +echo "$as_me:$LINENO: checking for uint32_t" >&5
michael@13: +echo $ECHO_N "checking for uint32_t... $ECHO_C" >&6
michael@13: +if test "${ac_cv_type_uint32_t+set}" = set; then
michael@13: + echo $ECHO_N "(cached) $ECHO_C" >&6
michael@13: +else
michael@13: + cat >conftest.$ac_ext <<_ACEOF
michael@13: +#line $LINENO "configure"
michael@13: +/* confdefs.h. */
michael@13: +_ACEOF
michael@13: +cat confdefs.h >>conftest.$ac_ext
michael@13: +cat >>conftest.$ac_ext <<_ACEOF
michael@13: +/* end confdefs.h. */
michael@13: +#if HAVE_STDINT_H
michael@13: +#include
michael@13: +#endif
michael@13: +#include
michael@13: +#if STDC_HEADERS
michael@13: +#include
michael@13: +#include
michael@13: +#endif
michael@13: +_ACEOF
michael@13: +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
michael@13: + $EGREP "(^|[^a-zA-Z_0-9])uint32_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
michael@13: + ac_cv_type_uint32_t=yes
michael@13: +else
michael@13: + ac_cv_type_uint32_t=no
michael@13: +fi
michael@13: +rm -f conftest*
michael@13: +
michael@13: +fi
michael@13: +echo "$as_me:$LINENO: result: $ac_cv_type_uint32_t" >&5
michael@13: +echo "${ECHO_T}$ac_cv_type_uint32_t" >&6
michael@13: +if test $ac_cv_type_uint32_t = no; then
michael@13: +
michael@13: +cat >>confdefs.h <<\_ACEOF
michael@13: +#define uint32_t unsigned int
michael@13: +_ACEOF
michael@13: +
michael@13: +fi
michael@13: +
michael@13: +echo "$as_me:$LINENO: checking for madvise" >&5
michael@13: +echo $ECHO_N "checking for madvise... $ECHO_C" >&6
michael@13: +if test "${ac_cv_func_madvise+set}" = set; then
michael@13: + echo $ECHO_N "(cached) $ECHO_C" >&6
michael@13: +else
michael@13: + cat >conftest.$ac_ext <<_ACEOF
michael@13: +#line $LINENO "configure"
michael@13: +/* confdefs.h. */
michael@13: +_ACEOF
michael@13: +cat confdefs.h >>conftest.$ac_ext
michael@13: +cat >>conftest.$ac_ext <<_ACEOF
michael@13: +/* end confdefs.h. */
michael@13: +/* System header to define __stub macros and hopefully few prototypes,
michael@13: + which can conflict with char madvise (); below.
michael@13: + Prefer to if __STDC__ is defined, since
michael@13: + exists even on freestanding compilers. */
michael@13: +#ifdef __STDC__
michael@13: +# include
michael@13: +#else
michael@13: +# include
michael@13: +#endif
michael@13: +/* Override any gcc2 internal prototype to avoid an error. */
michael@13: +#ifdef __cplusplus
michael@13: +extern "C"
michael@13: +{
michael@13: +#endif
michael@13: +/* We use char because int might match the return type of a gcc2
michael@13: + builtin and then its argument prototype would still apply. */
michael@13: +char madvise ();
michael@13: +/* The GNU C library defines this for functions which it implements
michael@13: + to always fail with ENOSYS. Some functions are actually named
michael@13: + something starting with __ and the normal name is an alias. */
michael@13: +#if defined (__stub_madvise) || defined (__stub___madvise)
michael@13: +choke me
michael@13: +#else
michael@13: +char (*f) () = madvise;
michael@13: +#endif
michael@13: +#ifdef __cplusplus
michael@13: +}
michael@13: +#endif
michael@13: +
michael@13: +int
michael@13: +main ()
michael@13: +{
michael@13: +return f != madvise;
michael@13: + ;
michael@13: + return 0;
michael@13: +}
michael@13: +_ACEOF
michael@13: +rm -f conftest.$ac_objext conftest$ac_exeext
michael@13: +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
michael@13: + (eval $ac_link) 2>&5
michael@13: + ac_status=$?
michael@13: + echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@13: + (exit $ac_status); } &&
michael@13: + { ac_try='test -s conftest$ac_exeext'
michael@13: + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
michael@13: + (eval $ac_try) 2>&5
michael@13: + ac_status=$?
michael@13: + echo "$as_me:$LINENO: \$? = $ac_status" >&5
michael@13: + (exit $ac_status); }; }; then
michael@13: + ac_cv_func_madvise=yes
michael@13: +else
michael@13: + echo "$as_me: failed program was:" >&5
michael@13: +sed 's/^/| /' conftest.$ac_ext >&5
michael@13: +
michael@13: +ac_cv_func_madvise=no
michael@13: +fi
michael@13: +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
michael@13: +fi
michael@13: +echo "$as_me:$LINENO: result: $ac_cv_func_madvise" >&5
michael@13: +echo "${ECHO_T}$ac_cv_func_madvise" >&6
michael@13: +
michael@13: +
michael@13: +
michael@13:
michael@13:
michael@13: -subdirs="$subdirs popt beecrypt zlib elfutils file db3"
michael@13: +subdirs="$subdirs popt zlib elfutils file db3"
michael@13:
michael@13:
michael@13: 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"
michael@13: @@ -25157,7 +25106,6 @@
michael@13: esac
michael@13: done ;;
michael@13: default ) echo timestamp > popt/stamp-h.in
michael@13: - echo timestamp > beecrypt/stamp-h.in
michael@13: echo timestamp > stamp-h.in
michael@13:
michael@13: ;;
michael@13:
michael@13: +---------------------------------------------------------------------------
michael@13: | Corresponding patches in "configure" script after regeneration from
michael@13: | patched "configure.ac" with "autoconf".
michael@13: +---------------------------------------------------------------------------
michael@13: Index: popt/configure
michael@13: --- popt/configure 16 Jul 2003 17:04:51 -0000 1.1.1.16
michael@13: +++ popt/configure 12 May 2004 14:34:35 -0000 1.18
michael@13: @@ -9359,9 +9359,6 @@
michael@13:
michael@13:
michael@13: MARK64=
michael@13: -case "${target_cpu}" in
michael@13: -x86_64*|powerpc64*|ppc64*|sparc64*|s390x*) MARK64=64 ;;
michael@13: -esac
michael@13:
michael@13:
michael@13: