Sync with HEAD

diff --git a/build/mkversion b/build/mkversion
new file mode 100755 (executable)
index 0000000..052a962
--- /dev/null
+++ b/build/mkversion
@@ -0,0 +1,61 @@
+#! /bin/sh
+# $OpenLDAP$
+## Copyright 1998-2003 The OpenLDAP Foundation
+## COPYING RESTRICTIONS APPLY.  See COPYRIGHT File in top level directory
+## of this package for details.
+#
+# Create a version.c file
+#
+PACKAGE=OpenLDAP
+VERSION=unknown
+SYMBOL=__Version
+static=static
+const=const
+while :
+       do case "$1" in
+               -p)
+                       PACKAGE=$2
+                       shift; shift ;;
+               -v)
+                       VERSION=$2
+                       shift; shift ;;
+
+               -c)
+                       const=
+                       shift ;;
+               -n)
+                       SYMBOL=$2
+                       shift; shift ;;
+               -s)
+                       static=
+                       shift ;;
+
+#              -*) shift ;;
+               *)
+                       break ;;
+       esac
+done
+
+if test $# != 1 ; then
+       echo 'usage: mkversion [-c] [-s] [-p package] [-v version] application'
+       exit 1
+fi
+
+APPLICATION=$1
+WHEN=`date`
+WHOWHERE="$USER@`uname -n`:`pwd`"
+
+cat << __EOF__
+/*
+ * Copyright 1998-2003 The OpenLDAP Foundation
+ * COPYING RESTRICTIONS APPLY.  See COPYRIGHT file in top level directory
+ * of this package for details.
+ */
+static const char copyright[] =
+"Copyright 1998-2003 The OpenLDAP Foundation\n"
+"COPYING RESTRICTIONS APPLY\n";
+
+$static $const char $SYMBOL[] =
+"@(#) \$$PACKAGE: $APPLICATION $VERSION ($WHEN) \$\n\t$WHOWHERE\n";
+
+__EOF__

diff --git a/build/openldap.m4 b/build/openldap.m4
index 48d0c2bd038eab08b781e3ba325467d835eb8b29..7ca3534aa31d9d5572935376c62ad3e044092834 100644 (file)
--- a/build/openldap.m4
+++ b/build/openldap.m4
@@ -1,6 +1,6 @@
 dnl $OpenLDAP$
 dnl
-dnl Copyright 1998-2002 The OpenLDAP Foundation, Redwood City, California, USA
+dnl Copyright 1998-2003 The OpenLDAP Foundation, Redwood City, California, USA
 dnl All rights reserved.
 dnl 
 dnl Redistribution and use in source and binary forms, with or without
@@ -254,7 +254,7 @@ AC_DEFUN([OL_BERKELEY_DB_TRY],
 [
        ol_DB_LIB=ifelse($2,,,$2)
        ol_LIBS=$LIBS
-       LIBS="$ol_DB_LIB $LIBS"
+       LIBS="$ol_DB_LIB $LTHREAD_LIBS $LIBS"
 
        AC_TRY_LINK([
 #ifdef HAVE_DB_185_H
@@ -330,8 +330,9 @@ dnl Check if Berkeley DB supports DB_THREAD
 AC_DEFUN([OL_BERKELEY_DB_THREAD],
 [AC_CACHE_CHECK([for Berkeley DB thread support], [ol_cv_berkeley_db_thread], [
        ol_LIBS="$LIBS"
+       LIBS="$LTHREAD_LIBS $LIBS"
        if test $ol_cv_lib_db != yes ; then
-               LIBS="$ol_cv_lib_db"
+               LIBS="$ol_cv_lib_db $LIBS"
        fi
 
        AC_TRY_RUN([

diff --git a/build/top.mk b/build/top.mk
index d0fa2b6bdec37cc915c4dab82c445235690371f1..32de10d5a22eb9b26af385eaec87ed63b4494882 100644 (file)
--- a/build/top.mk
+++ b/build/top.mk
@@ -1,5 +1,5 @@
 # $OpenLDAP$
-## Copyright 1998-2002 The OpenLDAP Foundation, Redwood City, California, USA
+## Copyright 1998-2003 The OpenLDAP Foundation, Redwood City, California, USA
 ## All rights reserved.
 ##
 ## Redistribution and use in source and binary forms, with or without
@@ -91,8 +91,10 @@ LTFLAGS_MOD = $(@PLAT@_LTFLAGS_MOD)
 # LINK_LIBS referenced in library and module link commands.
 LINK_LIBS = $(@PLAT@_LINK_LIBS)
 
+LTSTATIC = @LTSTATIC@
+
 LTLINK   = $(LIBTOOL) --mode=link \
-       $(CC) -static $(LT_CFLAGS) $(LDFLAGS) $(LTFLAGS)
+       $(CC) $(LTSTATIC) $(LT_CFLAGS) $(LDFLAGS) $(LTFLAGS)
 
 LTCOMPILE_LIB = $(LIBTOOL) $(LTONLY_LIB) --mode=compile \
        $(CC) $(LT_CFLAGS) $(LT_CPPFLAGS) $(LIB_DEFS) -c
@@ -111,7 +113,6 @@ LTFINISH = $(LIBTOOL) --mode=finish
 
 # Misc UNIX commands used in build environment
 AR = @AR@
-AWK = @AWK@
 BASENAME = basename
 CAT = cat
 CHMOD = chmod
@@ -128,10 +129,6 @@ RANLIB = @RANLIB@
 RM = rm -f
 SED = sed
 
-# Misc UNIX commands used in programs
-EDITOR = @EDITOR@
-SENDMAIL = @SENDMAIL@
-
 # For manual pages
 # MANCOMPRESS=@MANCOMPRESS@
 # MANCOMPRESSSUFFIX=@MANCOMPRESSSUFFIX@

diff --git a/build/version.sh b/build/version.sh
index 6d06efd38e9f09a963afcff706da765cc7c0ed69..2308efee2e30b0350e503091481dfff1e6e22a11 100755 (executable)
--- a/build/version.sh
+++ b/build/version.sh
@@ -1,15 +1,16 @@
 #! /bin/sh
 # $OpenLDAP$
-## Copyright 2000-2002 The OpenLDAP Foundation
+## Copyright 2000-2003 The OpenLDAP Foundation
 ## COPYING RESTRICTIONS APPLY.  See COPYRIGHT File in top level directory
 ## of this package for details.
 #
 ol_package=OpenLDAP
 ol_major=2
-ol_minor=1
+ol_minor=X
 ol_patch=X
-ol_api_inc=20111
-ol_api_lib=2:111:0
+ol_api_inc=000000
+ol_api_lib=0:0:0
+ol_release_date="00/00/0000"
 
 if test $ol_patch != X ; then
        ol_version=${ol_major}.${ol_minor}.${ol_patch}
@@ -34,3 +35,4 @@ echo OL_API_LIB=$ol_api_lib
 echo OL_VERSION=$ol_version
 echo OL_TYPE=$ol_type
 echo OL_STRING=\"${ol_string}\"
+echo OL_RELEASE_DATE=\"${ol_release_date}\"