Set -static when doing build from CVS

build/top.mk

@@ -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

configure.in

@@ -63,7 +63,12 @@ dnl AC_SUBST(SHTOOL)dnl
 TB="`$SHTOOL echo -e '%B' 2>/dev/null`"
 TN="`$SHTOOL echo -e '%b' 2>/dev/null`"
 
-echo "Configuring ${TB}${OL_STRING}${TN} ..."
+OPENLDAP_CVS=""
+if test -d $ac_aux_dir/CVS; then
+	OPENLDAP_CVS="(from CVS sources) "
+fi
+
+echo "Configuring ${TB}${OL_STRING}${TN} ${OPENLDAP_CVS}..."
 
 dnl Determine host platform
 dnl		we try not to use this for much
@@ -641,6 +646,12 @@ AC_LIBTOOL_WIN32_DLL
 AC_LIBTOOL_DLOPEN
 AC_PROG_LIBTOOL
 
+LTSTATIC=""
+if test "${OPENLDAP_CVS}"; then
+	LTSTATIC="-static"
+fi
+AC_SUBST(LTSTATIC)dnl
+
 OL_PROG_LN_H
 AC_PROG_LN_S