OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 28-Oct-2003 16:59:21
Branch: HEAD Handle: 2003102815592000
Modified files:
openpkg-src/openpkg HISTORY rpm.patch.bugfix rpm.patch.feature
rpm.patch.porting rpm.patch.regen
Log:
remove problematic INCPATH stuff in RPM configure which picks up
external stuff
Summary:
Revision Changes Path
1.82 +1 -0 openpkg-src/openpkg/HISTORY
1.35 +13 -15 openpkg-src/openpkg/rpm.patch.bugfix
1.36 +84 -4 openpkg-src/openpkg/rpm.patch.feature
1.44 +4 -20 openpkg-src/openpkg/rpm.patch.porting
1.34 +303 -119 openpkg-src/openpkg/rpm.patch.regen
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/HISTORY
============================================================================
$ cvs diff -u -r1.81 -r1.82 HISTORY
--- openpkg-src/openpkg/HISTORY 28 Oct 2003 09:37:34 -0000 1.81
+++ openpkg-src/openpkg/HISTORY 28 Oct 2003 15:59:20 -0000 1.82
@@ -2,6 +2,7 @@
2003
====
+20031028 remove problematic INCPATH stuff in RPM configure which picks up external
stuff
20031028 upgrade to latest OSSP platform script for Darwin 6.6 and Solaris 10
support
20031027 port RPM to OpenDarwin 6.6.2
20031027 try to cleanup glob(3) replacement hacks in RPM
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rpm.patch.bugfix
============================================================================
$ cvs diff -u -r1.34 -r1.35 rpm.patch.bugfix
--- openpkg-src/openpkg/rpm.patch.bugfix 27 Oct 2003 15:32:30 -0000 1.34
+++ openpkg-src/openpkg/rpm.patch.bugfix 28 Oct 2003 15:59:20 -0000 1.35
@@ -10,7 +10,7 @@
## 'patch' tool to upgrade those files. Each patch snippet is annotated
## with a short description.
##
-## Created on: 27-Oct-2003
+## Created on: 28-Oct-2003
##
## ATTENTION: THIS PATCH FILE WAS AUTO-GENERATED FROM AN OPENPKG
## RPM CVS REPOSITORY, HENCE DO NOT EDIT THIS FILE.
@@ -43,22 +43,20 @@
}
+---------------------------------------------------------------------------
-| Fix INCPATH checks by replacing an incorrect (because unescaped)
-| "[...]" construct with the usual m4 workaround using an explicit
-| "test" construct.
+| Do not pick of the vendor BeeCrypt package on RedHat Linux.
+---------------------------------------------------------------------------
Index: configure.ac
--- configure.ac 2 Jul 2003 19:20:52 -0000 1.1.1.4
-+++ configure.ac 19 Oct 2003 19:08:19 -0000
-@@ -348,7 +349,7 @@
-
- AC_MSG_CHECKING(for $dir/include in INCPATH)
- if test -d $dir/include 2>/dev/null ; then
-- if [ "$dir" != "/usr/local" ] ; then
-+ if test "$dir" != "/usr/local"; then
- INCPATH="$INCPATH -I$dir/include"
- fi
- AC_MSG_RESULT(yes)
++++ configure.ac 28 Oct 2003 15:31:33 -0000
+@@ -416,7 +417,7 @@
+ AC_CHECK_HEADER([beecrypt/beecrypt.h], [
+ AC_CHECK_LIB(beecrypt, mpfprintln, [
+ AC_DEFINE(HAVE_LIBBEECRYPT, 1, [Define to 1 if you have the `beecrypt'
library (-lbeecrypt).])
+- WITH_BEECRYPT_INCLUDE="-I/usr/include/beecrypt"
++ WITH_BEECRYPT_INCLUDE=""
+ WITH_BEECRYPT_LIB="-lbeecrypt"
+ ])
+ ], [
+---------------------------------------------------------------------------
| Remove access to not-existing beecrypt/ subdirectory
@@ -66,7 +64,7 @@
+---------------------------------------------------------------------------
Index: configure.ac
--- configure.ac 2 Jul 2003 19:20:52 -0000 1.1.1.4
-+++ configure.ac 19 Oct 2003 19:08:19 -0000
++++ configure.ac 28 Oct 2003 15:31:33 -0000
@@ -1274,7 +1302,6 @@
python/rpmdb/Makefile
python/test/Makefile
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rpm.patch.feature
============================================================================
$ cvs diff -u -r1.35 -r1.36 rpm.patch.feature
--- openpkg-src/openpkg/rpm.patch.feature 27 Oct 2003 20:18:45 -0000 1.35
+++ openpkg-src/openpkg/rpm.patch.feature 28 Oct 2003 15:59:20 -0000 1.36
@@ -10,7 +10,7 @@
## 'patch' tool to upgrade those files. Each patch snippet is annotated
## with a short description.
##
-## Created on: 27-Oct-2003
+## Created on: 28-Oct-2003
##
## ATTENTION: THIS PATCH FILE WAS AUTO-GENERATED FROM AN OPENPKG
## RPM CVS REPOSITORY, HENCE DO NOT EDIT THIS FILE.
@@ -684,7 +684,7 @@
+---------------------------------------------------------------------------
Index: configure.ac
--- configure.ac 2 Jul 2003 19:20:52 -0000 1.1.1.4
-+++ configure.ac 19 Oct 2003 19:08:19 -0000
++++ configure.ac 28 Oct 2003 15:31:33 -0000
@@ -53,7 +53,7 @@
AS=${AS-as}
AC_SUBST(AS)
@@ -718,7 +718,7 @@
+---------------------------------------------------------------------------
Index: configure.ac
--- configure.ac 2 Jul 2003 19:20:52 -0000 1.1.1.4
-+++ configure.ac 19 Oct 2003 19:08:19 -0000
++++ configure.ac 28 Oct 2003 15:31:33 -0000
@@ -310,7 +311,7 @@
WITH_ZLIB_SUBDIR=
WITH_ZLIB_INCLUDE=
@@ -730,11 +730,91 @@
WITH_ZLIB_INCLUDE="-I\${top_srcdir}/${WITH_ZLIB_SUBDIR}"
+---------------------------------------------------------------------------
+| Disable unnecessary INCPATH checks, because in OpenPKG the
+| externally used libraries are all explicitly given. And they just
+| would make RPM pick up things which we do not want to be picked up.
++---------------------------------------------------------------------------
+Index: configure.ac
+--- configure.ac 2 Jul 2003 19:20:52 -0000 1.1.1.4
++++ configure.ac 28 Oct 2003 15:31:33 -0000
+@@ -324,38 +325,38 @@
+
+ localdone=
+
+-dirs=$prefix
+-if test "$cross_compiling" != "yes"; then
+- dirs="$dirs /usr/local"
+-fi
+-for dir in $dirs
+-do
+- case $dir in
+- NONE|/usr) continue;;
+- /usr/local)
+- if test X$localdone != X ; then continue; fi
+- localdone="$dir"
+- ;;
+- esac
+-
+- AC_MSG_CHECKING(for $dir/lib in LIBS)
+- if test -d $dir/lib 2> /dev/null ; then
+- addlib $dir/lib
+- AC_MSG_RESULT(yes)
+- else
+- AC_MSG_RESULT(no)
+- fi
+-
+- AC_MSG_CHECKING(for $dir/include in INCPATH)
+- if test -d $dir/include 2>/dev/null ; then
+- if [ "$dir" != "/usr/local" ] ; then
+- INCPATH="$INCPATH -I$dir/include"
+- fi
+- AC_MSG_RESULT(yes)
+- else
+- AC_MSG_RESULT(no)
+- fi
+-done
++dnl dirs=$prefix
++dnl if test "$cross_compiling" != "yes"; then
++dnl dirs="$dirs /usr/local"
++dnl fi
++dnl for dir in $dirs
++dnl do
++dnl case $dir in
++dnl NONE|/usr) continue;;
++dnl /usr/local)
++dnl if test X$localdone != X ; then continue; fi
++dnl localdone="$dir"
++dnl ;;
++dnl esac
++dnl
++dnl AC_MSG_CHECKING(for $dir/lib in LIBS)
++dnl if test -d $dir/lib 2> /dev/null ; then
++dnl addlib $dir/lib
++dnl AC_MSG_RESULT(yes)
++dnl else
++dnl AC_MSG_RESULT(no)
++dnl fi
++dnl
++dnl AC_MSG_CHECKING(for $dir/include in INCPATH)
++dnl if test -d $dir/include 2>/dev/null ; then
++dnl if test "$dir" != "/usr/local"; then
++dnl INCPATH="$INCPATH -I$dir/include"
++dnl fi
++dnl AC_MSG_RESULT(yes)
++dnl else
++dnl AC_MSG_RESULT(no)
++dnl fi
++dnl done
+
+ AC_MSG_CHECKING(for /usr/ucblib in LIBS)
+ if test -d /usr/ucblib ; then
+
++---------------------------------------------------------------------------
| Adjust paths for OpenPKG filesystem layout.
+---------------------------------------------------------------------------
Index: configure.ac
--- configure.ac 2 Jul 2003 19:20:52 -0000 1.1.1.4
-+++ configure.ac 19 Oct 2003 19:08:19 -0000
++++ configure.ac 28 Oct 2003 15:31:33 -0000
@@ -1200,12 +1202,12 @@
AC_SUBST(LOCALEDIR)
LIBDIR="`echo $libdir | sed 's-/lib$-/%{_lib}-'`"
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rpm.patch.porting
============================================================================
$ cvs diff -u -r1.43 -r1.44 rpm.patch.porting
--- openpkg-src/openpkg/rpm.patch.porting 28 Oct 2003 06:08:07 -0000 1.43
+++ openpkg-src/openpkg/rpm.patch.porting 28 Oct 2003 15:59:20 -0000 1.44
@@ -10,35 +10,19 @@
## 'patch' tool to upgrade those files. Each patch snippet is annotated
## with a short description.
##
-## Created on: 27-Oct-2003
+## Created on: 28-Oct-2003
##
## ATTENTION: THIS PATCH FILE WAS AUTO-GENERATED FROM AN OPENPKG
## RPM CVS REPOSITORY, HENCE DO NOT EDIT THIS FILE.
##
+---------------------------------------------------------------------------
-| Do not pick of the vendor BeeCrypt package on RedHat Linux.
-+---------------------------------------------------------------------------
-Index: configure.ac
---- configure.ac 2 Jul 2003 19:20:52 -0000 1.1.1.4
-+++ configure.ac 19 Oct 2003 19:08:19 -0000
-@@ -416,7 +417,7 @@
- AC_CHECK_HEADER([beecrypt/beecrypt.h], [
- AC_CHECK_LIB(beecrypt, mpfprintln, [
- AC_DEFINE(HAVE_LIBBEECRYPT, 1, [Define to 1 if you have the `beecrypt'
library (-lbeecrypt).])
-- WITH_BEECRYPT_INCLUDE="-I/usr/include/beecrypt"
-+ WITH_BEECRYPT_INCLUDE=""
- WITH_BEECRYPT_LIB="-lbeecrypt"
- ])
- ], [
-
-+---------------------------------------------------------------------------
| Disable any POSIX Pthread stuff because in OpenPKG we use
| non-Pthread mutexes in Berkeley-DB.
+---------------------------------------------------------------------------
Index: configure.ac
--- configure.ac 2 Jul 2003 19:20:52 -0000 1.1.1.4
-+++ configure.ac 19 Oct 2003 19:08:19 -0000
++++ configure.ac 28 Oct 2003 15:31:33 -0000
@@ -446,14 +447,14 @@
AC_CHECK_LIB(socket, socket)
])
@@ -68,7 +52,7 @@
+---------------------------------------------------------------------------
Index: configure.ac
--- configure.ac 2 Jul 2003 19:20:52 -0000 1.1.1.4
-+++ configure.ac 19 Oct 2003 19:08:19 -0000
++++ configure.ac 28 Oct 2003 15:31:33 -0000
@@ -963,12 +964,13 @@
AC_CHECK_FUNCS(getpassphrase)
@@ -95,7 +79,7 @@
+---------------------------------------------------------------------------
Index: configure.ac
--- configure.ac 2 Jul 2003 19:20:52 -0000 1.1.1.4
-+++ configure.ac 19 Oct 2003 19:08:19 -0000
++++ configure.ac 28 Oct 2003 15:31:33 -0000
@@ -1249,11 +1251,37 @@
AC_SUBST(OBJDUMP)
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rpm.patch.regen
============================================================================
$ cvs diff -u -r1.33 -r1.34 rpm.patch.regen
--- openpkg-src/openpkg/rpm.patch.regen 27 Oct 2003 20:18:45 -0000 1.33
+++ openpkg-src/openpkg/rpm.patch.regen 28 Oct 2003 15:59:20 -0000 1.34
@@ -10,7 +10,7 @@
## 'patch' tool to upgrade those files. Each patch snippet is annotated
## with a short description.
##
-## Created on: 27-Oct-2003
+## Created on: 28-Oct-2003
##
## ATTENTION: THIS PATCH FILE WAS AUTO-GENERATED FROM AN OPENPKG
## RPM CVS REPOSITORY, HENCE DO NOT EDIT THIS FILE.
@@ -105,7 +105,7 @@
+---------------------------------------------------------------------------
Index: configure
--- configure 16 Jul 2003 17:05:55 -0000 1.1.1.23
-+++ configure 27 Oct 2003 20:15:57 -0000
++++ configure 28 Oct 2003 15:31:43 -0000
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
@@ -238,16 +238,52 @@
WITH_ZLIB_SUBDIR=zlib
addlib \${top_builddir}/zlib
WITH_ZLIB_INCLUDE="-I\${top_srcdir}/${WITH_ZLIB_SUBDIR}"
-@@ -11312,7 +11314,7 @@
- echo "$as_me:$LINENO: checking for $dir/include in INCPATH" >&5
- echo $ECHO_N "checking for $dir/include in INCPATH... $ECHO_C" >&6
- if test -d $dir/include 2>/dev/null ; then
+@@ -11284,44 +11286,6 @@
+
+ localdone=
+
+-dirs=$prefix
+-if test "$cross_compiling" != "yes"; then
+- dirs="$dirs /usr/local"
+-fi
+-for dir in $dirs
+-do
+- case $dir in
+- NONE|/usr) continue;;
+- /usr/local)
+- if test X$localdone != X ; then continue; fi
+- localdone="$dir"
+- ;;
+- esac
+-
+- echo "$as_me:$LINENO: checking for $dir/lib in LIBS" >&5
+-echo $ECHO_N "checking for $dir/lib in LIBS... $ECHO_C" >&6
+- if test -d $dir/lib 2> /dev/null ; then
+- addlib $dir/lib
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
+- else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
+- fi
+-
+- echo "$as_me:$LINENO: checking for $dir/include in INCPATH" >&5
+-echo $ECHO_N "checking for $dir/include in INCPATH... $ECHO_C" >&6
+- if test -d $dir/include 2>/dev/null ; then
- if "$dir" != "/usr/local" ; then
-+ if test "$dir" != "/usr/local"; then
- INCPATH="$INCPATH -I$dir/include"
- fi
- echo "$as_me:$LINENO: result: yes" >&5
-@@ -12051,7 +12053,7 @@
+- INCPATH="$INCPATH -I$dir/include"
+- fi
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
+- else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
+- fi
+-done
+
+ echo "$as_me:$LINENO: checking for /usr/ucblib in LIBS" >&5
+ echo $ECHO_N "checking for /usr/ucblib in LIBS... $ECHO_C" >&6
+@@ -12051,7 +12015,7 @@
#define HAVE_LIBBEECRYPT 1
_ACEOF
@@ -256,10 +292,143 @@
WITH_BEECRYPT_LIB="-lbeecrypt"
fi
-@@ -12648,350 +12650,6 @@
-
-
-
+@@ -12515,374 +12479,38 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+ /* System header to define __stub macros and hopefully few prototypes,
+- which can conflict with char socket (); below.
+- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+- <limits.h> exists even on freestanding compilers. */
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
+-/* Override any gcc2 internal prototype to avoid an error. */
+-#ifdef __cplusplus
+-extern "C"
+-{
+-#endif
+-/* We use char because int might match the return type of a gcc2
+- builtin and then its argument prototype would still apply. */
+-char socket ();
+-/* The GNU C library defines this for functions which it implements
+- to always fail with ENOSYS. Some functions are actually named
+- something starting with __ and the normal name is an alias. */
+-#if defined (__stub_socket) || defined (__stub___socket)
+-choke me
+-#else
+-char (*f) () = socket;
+-#endif
+-#ifdef __cplusplus
+-}
+-#endif
+-
+-int
+-main ()
+-{
+-return f != socket;
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+- ac_cv_func_socket=yes
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-ac_cv_func_socket=no
+-fi
+-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_func_socket" >&5
+-echo "${ECHO_T}$ac_cv_func_socket" >&6
+-if test $ac_cv_func_socket = yes; then
+- :
+-else
+-
+-
+-echo "$as_me:$LINENO: checking for socket in -lsocket" >&5
+-echo $ECHO_N "checking for socket in -lsocket... $ECHO_C" >&6
+-if test "${ac_cv_lib_socket_socket+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lsocket $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-
+-/* Override any gcc2 internal prototype to avoid an error. */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-/* We use char because int might match the return type of a gcc2
+- builtin and then its argument prototype would still apply. */
+-char socket ();
+-int
+-main ()
+-{
+-socket ();
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+- ac_cv_lib_socket_socket=yes
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-ac_cv_lib_socket_socket=no
+-fi
+-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+-LIBS=$ac_check_lib_save_LIBS
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_socket_socket" >&5
+-echo "${ECHO_T}$ac_cv_lib_socket_socket" >&6
+-if test $ac_cv_lib_socket_socket = yes; then
+- cat >>confdefs.h <<_ACEOF
+-#define HAVE_LIBSOCKET 1
+-_ACEOF
+-
+- LIBS="-lsocket $LIBS"
+-
+-fi
+-
+-
+-fi
+-
+-
+-
+-
-
-
-for ac_header in thread.h pthread.h synch.h semaphore.h
@@ -484,43 +653,59 @@
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
--/* Override any gcc2 internal prototype to avoid an error. */
--#ifdef __cplusplus
--extern "C"
--#endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
++ which can conflict with char socket (); below.
++ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++ <limits.h> exists even on freestanding compilers. */
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
+ /* Override any gcc2 internal prototype to avoid an error. */
+ #ifdef __cplusplus
+ extern "C"
++{
+ #endif
+ /* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
-char __pthread_mutex_trylock ();
--int
--main ()
--{
++char socket ();
++/* The GNU C library defines this for functions which it implements
++ to always fail with ENOSYS. Some functions are actually named
++ something starting with __ and the normal name is an alias. */
++#if defined (__stub_socket) || defined (__stub___socket)
++choke me
++#else
++char (*f) () = socket;
++#endif
++#ifdef __cplusplus
++}
++#endif
++
+ int
+ main ()
+ {
-__pthread_mutex_trylock ();
-- ;
-- return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
++return f != socket;
+ ;
+ return 0;
+ }
+@@ -12899,35 +12527,29 @@
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
- ac_cv_lib_pthread___pthread_mutex_trylock=yes
--else
-- echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
++ ac_cv_func_socket=yes
+ else
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
-ac_cv_lib_pthread___pthread_mutex_trylock=no
--fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
++ac_cv_func_socket=no
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
--fi
+ fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_pthread___pthread_mutex_trylock" >&5
-echo "${ECHO_T}$ac_cv_lib_pthread___pthread_mutex_trylock" >&6
-if test $ac_cv_lib_pthread___pthread_mutex_trylock = yes; then
@@ -530,84 +715,83 @@
-
- LIBS="-lpthread $LIBS"
-
--else
--
--
++echo "$as_me:$LINENO: result: $ac_cv_func_socket" >&5
++echo "${ECHO_T}$ac_cv_func_socket" >&6
++if test $ac_cv_func_socket = yes; then
++ :
+ else
+
+
-echo "$as_me:$LINENO: checking for mutex_lock in -lthread" >&5
-echo $ECHO_N "checking for mutex_lock in -lthread... $ECHO_C" >&6
-if test "${ac_cv_lib_thread_mutex_lock+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
--else
-- ac_check_lib_save_LIBS=$LIBS
++echo "$as_me:$LINENO: checking for socket in -lsocket" >&5
++echo $ECHO_N "checking for socket in -lsocket... $ECHO_C" >&6
++if test "${ac_cv_lib_socket_socket+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
-LIBS="-lthread $LIBS"
--cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--
--/* Override any gcc2 internal prototype to avoid an error. */
--#ifdef __cplusplus
--extern "C"
--#endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
++LIBS="-lsocket $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+ /* confdefs.h. */
+@@ -12942,11 +12564,11 @@
+ #endif
+ /* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
-char mutex_lock ();
--int
--main ()
--{
++char socket ();
+ int
+ main ()
+ {
-mutex_lock ();
-- ;
-- return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
++socket ();
+ ;
+ return 0;
+ }
+@@ -12963,24 +12585,24 @@
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
- ac_cv_lib_thread_mutex_lock=yes
--else
-- echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
++ ac_cv_lib_socket_socket=yes
+ else
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
-ac_cv_lib_thread_mutex_lock=no
--fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
--LIBS=$ac_check_lib_save_LIBS
--fi
++ac_cv_lib_socket_socket=no
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_thread_mutex_lock" >&5
-echo "${ECHO_T}$ac_cv_lib_thread_mutex_lock" >&6
-if test $ac_cv_lib_thread_mutex_lock = yes; then
-- cat >>confdefs.h <<_ACEOF
++echo "$as_me:$LINENO: result: $ac_cv_lib_socket_socket" >&5
++echo "${ECHO_T}$ac_cv_lib_socket_socket" >&6
++if test $ac_cv_lib_socket_socket = yes; then
+ cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBTHREAD 1
--_ACEOF
--
++#define HAVE_LIBSOCKET 1
+ _ACEOF
+
- LIBS="-lthread $LIBS"
--
--fi
--
--
--fi
--
--
++ LIBS="-lsocket $LIBS"
+
+ fi
+
+@@ -12988,8 +12610,6 @@
+ fi
+
+
-fi
-
--
--
+
+
for ac_header in aio.h
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-@@ -22911,6 +22569,86 @@
+@@ -22911,6 +22531,86 @@
else
@@ -694,7 +878,7 @@
echo "$as_me:$LINENO: checking for mntctl" >&5
echo $ECHO_N "checking for mntctl... $ECHO_C" >&6
if test "${ac_cv_func_mntctl+set}" = set; then
-@@ -23148,6 +22886,8 @@
+@@ -23148,6 +22848,8 @@
fi
@@ -703,7 +887,7 @@
echo "$as_me:$LINENO: checking for lchown" >&5
echo $ECHO_N "checking for lchown... $ECHO_C" >&6
-@@ -23515,7 +23255,7 @@
+@@ -23515,7 +23217,7 @@
LIBDIR="`echo $libdir | sed 's-/lib$-/%{_lib}-'`"
@@ -712,7 +896,7 @@
cat >>confdefs.h <<_ACEOF
#define RPMCONFIGDIR "$RPMCONFIGDIR"
-@@ -23523,7 +23263,7 @@
+@@ -23523,7 +23225,7 @@
@@ -721,7 +905,7 @@
cat >>confdefs.h <<_ACEOF
#define SYSCONFIGDIR "$SYSCONFIGDIR"
-@@ -23539,7 +23279,7 @@
+@@ -23539,7 +23241,7 @@
@@ -730,7 +914,7 @@
cat >>confdefs.h <<_ACEOF
#define LIBRPMRC_FILENAME "$LIBRPMRC_FILENAME"
-@@ -23547,7 +23287,7 @@
+@@ -23547,7 +23249,7 @@
@@ -739,7 +923,7 @@
cat >>confdefs.h <<_ACEOF
#define VENDORRPMRC_FILENAME "$VENDORRPMRC_FILENAME"
-@@ -23555,7 +23295,7 @@
+@@ -23555,7 +23257,7 @@
@@ -748,7 +932,7 @@
cat >>confdefs.h <<_ACEOF
#define LIBRPMALIAS_FILENAME "$LIBRPMALIAS_FILENAME"
-@@ -23588,9 +23328,193 @@
+@@ -23588,9 +23290,193 @@
@@ -943,7 +1127,7 @@
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"
-@@ -23977,7 +23901,7 @@
+@@ -23977,7 +23863,7 @@
cat >&5 <<_CSEOF
This file was extended by $as_me, which was
@@ -952,7 +1136,7 @@
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
-@@ -24040,7 +23964,7 @@
+@@ -24040,7 +23926,7 @@
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
config.status
@@ -961,7 +1145,7 @@
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
-@@ -25157,7 +25081,6 @@
+@@ -25157,7 +25043,6 @@
esac
done ;;
default ) echo timestamp > popt/stamp-h.in
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
