X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=aclocal.m4;h=cae9f7c8a32539c9b3ac1209297c3bc7a6d9dec8;hb=b15a72caecd6750ce76b8b6296dd481c6235de33;hp=0036516721ac1057be4015a3be29b0573135e75f;hpb=340393fe1ab759b2cbeb05eb2574f94ad6649dc9;p=openldap

diff --git a/aclocal.m4 b/aclocal.m4
index 0036516721..cae9f7c8a3 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -10,7 +10,11 @@ dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
 dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 dnl PARTICULAR PURPOSE.
 
-dnl Copyright 1998-2004 The OpenLDAP Foundation.
+dnl OpenLDAP Autoconf Macros
+dnl $OpenLDAP$
+dnl This work is part of OpenLDAP Software <http://www.openldap.org/>.
+dnl
+dnl Copyright 1998-2005 The OpenLDAP Foundation.
 dnl All rights reserved.
 dnl
 dnl Redistribution and use in source and binary forms, with or without
@@ -766,9 +770,7 @@ else
    ;;
 
   *)
-    AC_CHECK_FUNC([dllload],
-    	[lt_cv_dlopen="dllload"],
-    [AC_CHECK_FUNC([shl_load],
+    AC_CHECK_FUNC([shl_load],
           [lt_cv_dlopen="shl_load"],
       [AC_CHECK_LIB([dld], [shl_load],
             [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"],
@@ -785,7 +787,6 @@ else
 	  ])
 	])
       ])
-    ])
     ;;
   esac
 
@@ -1043,10 +1044,6 @@ AC_CACHE_VAL(lt_cv_prog_cc_pic,
       lt_cv_prog_cc_pic='-KPIC'
       lt_cv_prog_cc_static='-Bstatic'
       ;;
-    
-    openedition)
-      # XPLINK code is PIC by default
-      ;;
 
     osf3* | osf4* | osf5*)
       # All OSF/1 code is PIC.
@@ -1787,12 +1784,6 @@ else
     fi
     ;;
 
-  openedition*)
-    archive_cmds="\$CC -Wl,DLL \$libobjs \$deplibs \$compiler_flags -o \$lib &&
-	cp \$linknames \$output_objdir && linknames=''"
-    export_dynamic_flag_spec="-Wl,DLL"
-    ;;
-
   os2*)
     hardcode_libdir_flag_spec='-L$libdir'
     hardcode_minus_L=yes
@@ -2330,16 +2321,6 @@ openbsd*)
   shlibpath_var=LD_LIBRARY_PATH
   ;;
 
-openedition*)
-  need_lib_prefix=no
-  need_version=no
-  shlibpath_var=LIBPATH
-  postinstall_cmds="rm \$destdir/\$linkname; cp \$linkname \$destdir"
-  # the library's exports are in libname.x; this is the file that must
-  # actually be linked with to use a DLL.
-  library_names_spec="\${libname}\${release}.so\$versuffix \${libname}.x"
-  ;;
-
 os2*)
   libname_spec='$name'
   need_lib_prefix=no
@@ -3518,10 +3499,6 @@ openbsd*)
   fi
   ;;
 
-openedition*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
 osf3* | osf4* | osf5*)
   # this will be overridden with pass_all, but let us keep it just in case
   lt_cv_deplibs_check_method='file_magic COFF format alpha shared library'