upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2026-02-18 18:18:06 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update build environment based on devel changes.

Browse source
This commit is contained in:
Kurt Zeilenga 1998-12-05 03:22:16 +00:00
parent 8cf66c4a94
commit 495b893fb8
5 changed files with 397 additions and 307 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
build/ltconfig
View file

@ -1123,13 +1123,24 @@ amigaos*)
finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "(cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a)"; (cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a) || exit 1; done'
;;
freebsd2* | freebsd3*)
freebsd2*)
version_type=sunos
library_names_spec='${libname}${release}.so.$versuffix $libname.so'
finish_cmds='PATH="$PATH:/sbin" ldconfig -m $libdir'
shlibpath_var=LD_LIBRARY_PATH
;;
freebsd3*)
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'
else
finish_cmds='PATH="$PATH:/sbin" ldconfig -m $libdir'
fi
shlibpath_var=LD_LIBRARY_PATH
;;
gnu*)
version_type=sunos
library_names_spec='${libname}${release}.so.$versuffix'

10
build/ltmain.sh
View file

@ -967,6 +967,16 @@ if test -z "$show_help"; then
versuffix="$current.$revision"
;;
freebsd)
version_vars="$version_vars major versuffix"
major="$current"
if [ $PORTOBJFORMAT = elf ]; then
versuffix="$current";
else
versuffix="$current.$revision";
fi
;;
*)
$echo "$modename: unknown library version type \`$version_type'" 1>&2
echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2

8
build/openldap.m4
View file

@ -295,19 +295,19 @@ dnl should be tested separately.
dnl
AC_DEFUN([OL_POSIX_THREAD_VERSION],
[AC_CACHE_CHECK([POSIX thread version],[ol_cv_pthread_version],[
AC_EGREP_CPP(final,[
AC_EGREP_CPP(pthread_version_final,[
# include <pthread.h>
/* this check could be improved */
# ifdef PTHREAD_ONCE_INIT
final
pthread_version_final
# endif
], ol_pthread_final=yes, ol_pthread_final=no)
AC_EGREP_CPP(draft4,[
AC_EGREP_CPP(pthread_version_draft4,[
# include <pthread.h>
/* this check could be improved */
# ifdef pthread_once_init
draft4
pthread_version_draft4
# endif
], ol_pthread_draft4=yes, ol_pthread_draft4=no)

631
configure vendored
View file

File diff suppressed because it is too large Load diff

42
configure.in
View file

@ -341,7 +341,9 @@ if test $ol_with_kerberos = auto -o $ol_with_kerberos = k4 ; then
fi
ol_link_threads=no
if test $ol_with_threads = auto -o $ol_with_threads = posix ; then
if test $ol_with_threads = auto -o $ol_with_threads = yes \
-o $ol_with_threads = posix ; then
AC_CHECK_HEADERS(pthread.h sched.h)
if test $ac_cv_header_pthread_h = yes ; then
@ -389,6 +391,26 @@ if test $ol_with_threads = auto -o $ol_with_threads = posix ; then
fi
fi
if test $ol_link_threads = no ; then
dnl try -pthreads
AC_CACHE_CHECK([for pthread_create with -pthreads],
[ol_cv_pthreads_flag], [
dnl save the flags
save_LIBS="$LIBS"
LIBS="-pthreads $LIBS"
AC_TRY_LINK([char pthread();],[
pthread_create();
], ol_cv_pthreads_flag=yes, ol_cv_pthreads_flag=no)
dnl restore the LIBS
LIBS="$save_LIBS"
])
if test $ol_cv_pthreads_flag = yes ; then
LTHREAD_LIBS="$LTHREAD_LIBS -pthreads"
ol_link_threads=posix
fi
fi
if test $ol_link_threads = no ; then
dnl try -thread
AC_CACHE_CHECK([for pthread_create with -thread],
@ -642,7 +664,9 @@ dnl )
fi
fi
if test $ol_with_threads = auto -o $ol_with_threads = mach ; then
if test $ol_with_threads = auto -o $ol_with_threads = yes \
-o $ol_with_threads = mach ; then
dnl check for Mach CThreads
AC_CHECK_HEADERS(mach/cthreads.h)
if test $ac_cv_header_mach_cthreads_h = yes ; then
@ -685,7 +709,9 @@ if test $ol_with_threads = auto -o $ol_with_threads = mach ; then
fi
fi
if test $ol_with_threads = auto -o $ol_with_threads = lwp ; then
if test $ol_with_threads = auto -o $ol_with_threads = yes \
-o $ol_with_threads = lwp ; then
dnl check for SunOS5 LWP
AC_CHECK_HEADERS(thread.h synch.h)
if test $ac_cv_header_thread_h = yes -a $ac_cv_header_synch_h = yes ; then
@ -738,7 +764,7 @@ if test $ol_with_threads = manual ; then
AC_CHECK_HEADERS(thread.h synch.h)
fi
if test $ol_with_threads != no ; then
if test $ol_link_threads != no ; then
dnl needed to get reentrant/threadsafe versions
dnl
AC_DEFINE(REENTRANT,1)
@ -855,14 +881,12 @@ if test $ol_with_ldbm_api = auto -o $ol_with_ldbm_api = gdbm ; then
fi
fi
if test $ol_with_ldbm_api = auto -o $ol_with_ldbm_api = ndbm ; then
if test $ol_with_ldbm_api = auto ; then
AC_MSG_WARN([skipping automatic checking for NDBM, must be manually enabled.])
elif test $ol_with_ldbm_api = ndbm ; then
OL_NDBM
if test $ol_cv_ndbm = yes ; then
if test $ol_with_ldbm_api = auto ; then
AC_MSG_WARN([Attempting to use NDBM. Functionality will be limited.])
fi
ol_link_ldbm=ndbm
ol_with_ldbm_api=ndbm