implement hook; cleanup

[openldap] / aclocal.m4

diff --git a/aclocal.m4 b/aclocal.m4
index 6037d6f402646709b2f214ce5b6ccc9514975d15..72c05bfe23843e7f930c049b926b799e16ee8103 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -10,7 +10,7 @@ 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 even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 dnl PARTICULAR PURPOSE.
 

-dnl Copyright 1998-2004 The OpenLDAP Foundation.
+dnl Copyright 1998-2005 The OpenLDAP Foundation.

 dnl All rights reserved.
 dnl
 dnl Redistribution and use in source and binary forms, with or without
 dnl All rights reserved.
 dnl
 dnl Redistribution and use in source and binary forms, with or without


@@ -766,7 +766,9 @@ else
    ;;
 
   *)
    ;;
 
   *)

-    AC_CHECK_FUNC([shl_load],
+    AC_CHECK_FUNC([dllload],
+       [lt_cv_dlopen="dllload"],
+    [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"],
           [lt_cv_dlopen="shl_load"],
       [AC_CHECK_LIB([dld], [shl_load],
             [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"],


@@ -783,6 +785,7 @@ else
          ])
        ])
       ])
          ])
        ])
       ])

+    ])

     ;;
   esac
 
     ;;
   esac
 


@@ -1040,6 +1043,10 @@ AC_CACHE_VAL(lt_cv_prog_cc_pic,
       lt_cv_prog_cc_pic='-KPIC'
       lt_cv_prog_cc_static='-Bstatic'
       ;;
       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.
 
     osf3* | osf4* | osf5*)
       # All OSF/1 code is PIC.


@@ -1780,6 +1787,12 @@ else
     fi
     ;;
 
     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
   os2*)
     hardcode_libdir_flag_spec='-L$libdir'
     hardcode_minus_L=yes


@@ -2317,6 +2330,17 @@ openbsd*)
   shlibpath_var=LD_LIBRARY_PATH
   ;;
 
   shlibpath_var=LD_LIBRARY_PATH
   ;;
 

+openedition*)
+  need_lib_prefix=no
+  need_version=no
+  shlibpath_overrides_runpath=yes
+  shlibpath_var=LIBPATH
+  postinstall_cmds="rm \$destdir/\$linkname; cp \$linkname \$destdir; chmod a+x \$lib"
+  # 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
 os2*)
   libname_spec='$name'
   need_lib_prefix=no


@@ -3495,6 +3519,10 @@ openbsd*)
   fi
   ;;
 
   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'
 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'