Apply ldbm bind() change to bdb2 code.

[openldap] / build / ltconfig

diff --git a/build/ltconfig b/build/ltconfig
index b746287cd2f19c2bf5954ad00fb0b3845a922151..440d305141b7cc49e95cb87df05d9dc206fc45fb 100755 (executable)
--- a/build/ltconfig
+++ b/build/ltconfig
@@ -541,7 +541,7 @@ if test -n "$pic_flag"; then
   # Check to make sure the pic_flag actually works.
   echo $ac_n "checking if $compiler PIC flag $pic_flag works... $ac_c" 1>&6
   $rm conftest*
-  echo > conftest.c
+  echo "int __my_integer = 0" \; > conftest.c
   save_CFLAGS="$CFLAGS"
   CFLAGS="$CFLAGS $pic_flag -DPIC"
   echo "$progname:547: checking if $compiler PIC flag $pic_flag works" >&5
@@ -776,8 +776,13 @@ else
     hardcode_shlibpath_var=no
     ;;
 
-  # FreeBSD 3, at last, uses gcc -shared to do shared libraries.
-  freebsd3*)
+  freebsd1*)
+    ld_shlibs=no
+    can_build_shared=no
+    ;;
+
+  # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
+  freebsd* )
     archive_cmds='$CC -shared -o $lib$libobjs'
     hardcode_libdir_flag_spec='-R$libdir'
     hardcode_direct=yes
@@ -1130,11 +1135,16 @@ freebsd2*)
   shlibpath_var=LD_LIBRARY_PATH
   ;;
 
-freebsd3*)
+freebsd1*)
+  dynamic_linker=no
+  ;;
+
+freebsd*)
   version_type=freebsd
   library_names_spec='${libname}${release}.so.$versuffix $libname.so'
-  if [ $PORTOBJFORMAT = elf ]; then
-  finish_cmds='PATH="$PATH:/sbin" OBJFORMAT="$PORTOBJFORMAT" ldconfig -m $libdir'
+  if [ -x `/usr/bin/objformat` ]; then
+  OBJFORMAT=`/usr/bin/objformat`
+  finish_cmds='PATH="$PATH:/sbin" OBJFORMAT="$OBJFORMAT" ldconfig -m $libdir'
   else
   finish_cmds='PATH="$PATH:/sbin" ldconfig -m $libdir'
   fi