mirror of
https://git.openldap.org/openldap/openldap.git
synced 2025-01-30 13:30:57 +08:00
Revert libtool update
configure.in and build/*.m4 have to be updated first to latest autoconf (ugh)
This commit is contained in:
parent
99e2e5d886
commit
34d1b107c9
34
aclocal.m4
vendored
34
aclocal.m4
vendored
@ -10,10 +10,6 @@ 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 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
|
||||
@ -770,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"],
|
||||
@ -787,6 +785,7 @@ else
|
||||
])
|
||||
])
|
||||
])
|
||||
])
|
||||
;;
|
||||
esac
|
||||
|
||||
@ -1044,6 +1043,10 @@ 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.
|
||||
@ -1784,6 +1787,12 @@ 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
|
||||
@ -2321,6 +2330,17 @@ openbsd*)
|
||||
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
|
||||
@ -3499,6 +3519,10 @@ 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'
|
||||
|
3452
build/ltmain.sh
3452
build/ltmain.sh
File diff suppressed because it is too large
Load Diff
@ -70,8 +70,7 @@ MKDEP_CFLAGS = @OL_MKDEP_FLAGS@
|
||||
|
||||
MKVERSION = $(top_srcdir)/build/mkversion -v "$(VERSION)"
|
||||
|
||||
# libtool 1.5+ requires "--tag=CC"
|
||||
LIBTOOL = @LIBTOOL@ --tag=CC
|
||||
LIBTOOL = @LIBTOOL@
|
||||
LIBRELEASE = @OPENLDAP_LIBRELEASE@
|
||||
LIBVERSION = @OPENLDAP_LIBVERSION@
|
||||
LTVERSION = -release $(LIBRELEASE) -version-info $(LIBVERSION)
|
||||
|
Loading…
Reference in New Issue
Block a user