Don't do initdb, as we don't know what dbapi to use.

Remove -lpthread, new glibc has problems.

CVS patchset: 3719
CVS date: 2000/05/02 19:37:01

diff --git a/configure.in b/configure.in
index 872c749..6b32d3d 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -309,10 +309,11 @@ dnl will fail.
 AC_CHECK_LIB(port, writev)
 
 DBLIBOBJS=""
+PTHREAD=""
 dnl Check for Berkeley db3 API.
 AC_CHECK_FUNC(db_create, [DBLIBOBJS="$DBLIBOBJS db3.c"],
-  AC_CHECK_LIB(db, db_create, [LIBS="$LIBS -ldb -lpthread"; DBLIBOBJS="$DBLIBOBJS db3.c"],
-    AC_CHECK_LIB(db-3.0, db_create, [LIBS="$LIBS -lpthread"; DBLIBOBJS="$DBLIBOBJS db3.c"],,-lpthread))
+  AC_CHECK_LIB(db, db_create, [LIBS="$LIBS -ldb $PTHREAD"; DBLIBOBJS="$DBLIBOBJS db3.c"],
+    AC_CHECK_LIB(db-3.0, db_create, [LIBS="$LIBS $PTHREAD"; DBLIBOBJS="$DBLIBOBJS db3.c"],,$PTHREAD))
 )
 dnl Check for Berkeley db2 API.
 dnl AC_CHECK_FUNC(db_open, [DBLIBOBJS="$DBLIBOBJS db2.c"],

diff --git a/rpm.spec b/rpm.spec
index 230ff26..810c636 100644 (file)
--- a/rpm.spec
+++ b/rpm.spec
@@ -112,12 +112,13 @@ mkdir -p $RPM_BUILD_ROOT/etc/rpm
 rm -rf $RPM_BUILD_ROOT
 
 %post
-/bin/rpm --initdb
 %ifos linux
 if [ ! -e /etc/rpm/macros -a -e /etc/rpmrc -a -f /usr/lib/rpm/convertrpmrc.sh ] 
 then
        sh /usr/lib/rpm/convertrpmrc.sh > /dev/null 2>&1
 fi
+%else
+/bin/rpm --initdb
 %endif
 
 %ifos linux