--- configure.orig	Thu Feb 12 17:46:01 1998
+++ configure	Fri May  7 16:25:18 1999
@@ -1721,36 +1721,6 @@
 CF_EOF
 fi
 fi
-case "$cf_form" in
-compress)
-cat >>man/edit_man.sh <<CF_EOF
-	if test \$verb = installing ; then
-	if ( compress -f \$TMP )
-	then
-		mv \$TMP.Z \$TMP
-	fi
-	fi
-	target="\$target.Z"
-CF_EOF
-  ;;
-gzip)
-cat >>man/edit_man.sh <<CF_EOF
-	if test \$verb = installing ; then
-	if ( gzip -f \$TMP )
-	then
-		mv \$TMP.gz \$TMP
-	fi
-	fi
-	target="\$target.gz"
-CF_EOF
-  ;;
-BSDI)
-cat >>man/edit_man.sh <<CF_EOF
-	# BSDI installs only .0 suffixes in the cat directories
-	target="\`echo \$target|sed -e 's/\.[1-9]\+.\?/.0/'\`"
-CF_EOF
-  ;;
-esac
 cat >>man/edit_man.sh <<CF_EOF
 	echo \$verb \$target
 	if test \$verb = installing ; then
@@ -2108,8 +2078,14 @@
 	profile) DFT_DEP_SUFFIX='_p.a' ;;
 	shared)
 		case $cf_cv_system_name in
-		openbsd*|netbsd*|freebsd*)
+		openbsd*|netbsd*)
 			DFT_DEP_SUFFIX='.so.$(REL_VERSION)' ;;
+		freebsd*)
+			if [ `test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` = elf ]; then
+				DFT_DEP_SUFFIX='.so'
+			else
+				DFT_DEP_SUFFIX='.so.$(REL_VERSION)'
+			fi ;;
 		hpux*)	DFT_DEP_SUFFIX='.sl'  ;;
 		*)	DFT_DEP_SUFFIX='.so'  ;;
 		esac
@@ -2224,10 +2200,19 @@
 		fi
 		cf_cv_do_symlinks=yes
 		;;
-	openbsd*|netbsd*|freebsd*)
+	openbsd*|netbsd*)
 		CC_SHARED_OPTS='-fpic -DPIC'
 		MK_SHARED_LIB='$(LD) -Bshareable -o $@'
 		;;
+	freebsd*)
+		CC_SHARED_OPTS='-fpic -DPIC'
+		if [ `test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` = elf ]; then
+			MK_SHARED_LIB='$(LD) -Bshareable -soname ${@:T}.$(ABI_VERSION) -o $@.$(ABI_VERSION)'
+			cf_cv_do_symlinks=yes
+		else
+			MK_SHARED_LIB='$(LD) -Bshareable -o $@'
+		fi
+		;;
 	osf*|mls+*)
 		# tested with OSF/1 V3.2 and 'cc'
 		# tested with OSF/1 V3.2 and gcc 2.6.3 (but the c++ demo didn't
@@ -5371,7 +5356,7 @@
 	SRC_SUBDIRS="$SRC_SUBDIRS $cf_dir"
 done
 SRC_SUBDIRS="$SRC_SUBDIRS misc test"
-test $cf_cxx_library != no && SRC_SUBDIRS="$SRC_SUBDIRS c++"
+test $cf_with_cxx != no && SRC_SUBDIRS="$SRC_SUBDIRS c++"
 
 ADA_SUBDIRS=
 if test "$ac_cv_prog_gnat_correct" = yes && test -d $srcdir/Ada95; then
@@ -5893,8 +5878,14 @@
 	profile) cf_suffix='_p.a' ;;
 	shared)
 		case $cf_cv_system_name in
-		openbsd*|netbsd*|freebsd*)
+		openbsd*|netbsd*)
 			cf_suffix='.so.$(REL_VERSION)' ;;
+		freebsd*)
+			if [ `test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` = elf ]; then
+				cf_suffix='.so'
+			else
+				cf_suffix='.so.$(REL_VERSION)'
+			fi ;;
 		hpux*)	cf_suffix='.sl'  ;;
 		*)	cf_suffix='.so'  ;;
 		esac
@@ -5936,8 +5927,14 @@
 	profile) cf_suffix='_p.a' ;;
 	shared)
 		case $cf_cv_system_name in
-		openbsd*|netbsd*|freebsd*)
+		openbsd*|netbsd*)
 			cf_suffix='.so.$(REL_VERSION)' ;;
+		freebsd*)
+			if [ `test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` = elf ]; then
+				cf_suffix='.so'
+			else
+				cf_suffix='.so.$(REL_VERSION)'
+			fi ;;
 		hpux*)	cf_suffix='.sl'  ;;
 		*)	cf_suffix='.so'  ;;
 		esac
