From: Kurt Zeilenga <kurt@openldap.org>
Date: Mon, 21 Dec 1998 23:08:06 +0000 (+0000)
Subject: Still wasn't working exactly write on FreeBSD3.  Need to
X-Git-Tag: OPENLDAP_SLAPD_BACK_LDAP~898
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=77cb308d5a463f7065978658b982e381fae2ed55;p=openldap

Still wasn't working exactly write on FreeBSD3.  Need to
check for $OBJFORMAT and if not available set to output of
/usr/bin/objformat (if available).   Otherwise assume not elf.
---

diff --git a/build/ltconfig b/build/ltconfig
index 729792ddb5..e4ecdbd7ec 100755
--- a/build/ltconfig
+++ b/build/ltconfig
@@ -1134,7 +1134,8 @@ freebsd3*)
   version_type=freebsd
   library_names_spec='${libname}${release}.so.$versuffix $libname.so'
   if [ -x `/usr/bin/objformat` ]; then
-  finish_cmds='PATH="$PATH:/sbin" OBJFORMAT=`objformat` ldconfig -m $libdir'
+  OBJFORMAT=`/usr/bin/objformat`
+  finish_cmds='PATH="$PATH:/sbin" OBJFORMAT="$OBJFORMAT" ldconfig -m $libdir'
   else
   finish_cmds='PATH="$PATH:/sbin" ldconfig -m $libdir'
   fi
diff --git a/build/ltmain.sh b/build/ltmain.sh
index ffacb3dfd6..b66dcc0d9a 100755
--- a/build/ltmain.sh
+++ b/build/ltmain.sh
@@ -970,10 +970,17 @@ if test -z "$show_help"; then
       freebsd)
         version_vars="$version_vars major versuffix"
         major="$current"
-	if [ $PORTOBJFORMAT = elf ]; then
-        versuffix="$current";
+		
+	if [ X"$OBJFORMAT" = X ]; then
+		if [ -x /usr/bin/objformat ]; then
+			OBJECTFORMAT=`objformat`
+		fi
+	fi
+		
+	if [ "$OBJFORMAT" = elf ]; then
+		versuffix="$current";
 	else
-        versuffix="$current.$revision";
+		versuffix="$current.$revision";
 	fi
         ;;