mirror of
https://git.openldap.org/openldap/openldap.git
synced 2025-12-18 21:26:29 -05:00
ITS#10391 - Regenerate configure
This commit is contained in:
Quanah Gibson-Mount
parent
eec5edd984
commit
b38a17b850
1 changed files with 224 additions and 4 deletions
228
configure
vendored
228
configure
vendored
|
|
@ -1,5 +1,5 @@
|
|||
#! /bin/sh
|
||||
# From configure.ac Id: a506cb1e7fa760d148c33a7dff103dde096031b8 .
|
||||
# From configure.ac Id: be79344c88df9c1cdb7fd7f22c066092258afdce .
|
||||
# Guess values for system-dependent variables and create Makefiles.
|
||||
# Generated by GNU Autoconf 2.71.
|
||||
#
|
||||
|
|
@ -724,6 +724,7 @@ LTSTATIC
|
|||
OL_MKDEP_FLAGS
|
||||
OL_MKDEP
|
||||
RC
|
||||
OS_WINDOWS
|
||||
CPP
|
||||
PERLBIN
|
||||
LT_SYS_LIBRARY_PATH
|
||||
|
|
@ -14742,11 +14743,24 @@ fi
|
|||
printf "%s\n" "$ol_cv_msvc" >&6; }
|
||||
|
||||
case $host_os in
|
||||
*mingw32* ) ac_cv_mingw32=yes ;;
|
||||
*cygwin* ) ac_cv_cygwin=yes ;;
|
||||
*interix* ) ac_cv_interix=yes ;;
|
||||
*mingw32* )
|
||||
ac_cv_mingw32=yes
|
||||
OS_WINDOWS=yes
|
||||
;;
|
||||
*cygwin* )
|
||||
ac_cv_cygwin=yes
|
||||
OS_WINDOWS=yes
|
||||
;;
|
||||
*interix* )
|
||||
ac_cv_interix=yes
|
||||
OS_WINDOWS=yes
|
||||
;;
|
||||
* )
|
||||
OS_WINDOWS=no
|
||||
;;
|
||||
esac
|
||||
|
||||
|
||||
if test -n "$ac_tool_prefix"; then
|
||||
# Extract the first word of "${ac_tool_prefix}windres", so it can be a program name with args.
|
||||
set dummy ${ac_tool_prefix}windres; ac_word=$2
|
||||
|
|
@ -18876,6 +18890,212 @@ printf "%s\n" "$ol_cv_pthread_create" >&6; }
|
|||
ol_link_pthreads=""
|
||||
fi
|
||||
|
||||
# Pthread try link: -mt (ol_cv_pthread_mt)
|
||||
if test "$ol_link_threads" = no ; then
|
||||
# try -mt
|
||||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for pthread link with -mt" >&5
|
||||
printf %s "checking for pthread link with -mt... " >&6; }
|
||||
if test ${ol_cv_pthread_mt+y}
|
||||
then :
|
||||
printf %s "(cached) " >&6
|
||||
else $as_nop
|
||||
|
||||
# save the flags
|
||||
ol_LIBS="$LIBS"
|
||||
LIBS="-mt $LIBS"
|
||||
|
||||
if test "$cross_compiling" = yes
|
||||
then :
|
||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||
/* end confdefs.h. */
|
||||
|
||||
/* pthread test headers */
|
||||
#include <pthread.h>
|
||||
#if HAVE_PTHREADS < 7
|
||||
#include <errno.h>
|
||||
#endif
|
||||
#ifndef NULL
|
||||
#define NULL (void*)0
|
||||
#endif
|
||||
|
||||
#ifdef __STDC__
|
||||
static void *task(void *p)
|
||||
#else
|
||||
static void *task(p)
|
||||
void *p;
|
||||
#endif
|
||||
{
|
||||
return (void *) (p == NULL);
|
||||
}
|
||||
|
||||
int
|
||||
main (void)
|
||||
{
|
||||
|
||||
/* pthread test function */
|
||||
#ifndef PTHREAD_CREATE_DETACHED
|
||||
#define PTHREAD_CREATE_DETACHED 1
|
||||
#endif
|
||||
pthread_t t;
|
||||
int status;
|
||||
int detach = PTHREAD_CREATE_DETACHED;
|
||||
|
||||
#if HAVE_PTHREADS > 4
|
||||
/* Final pthreads */
|
||||
pthread_attr_t attr;
|
||||
|
||||
status = pthread_attr_init(&attr);
|
||||
if( status ) return status;
|
||||
|
||||
#if HAVE_PTHREADS < 7
|
||||
status = pthread_attr_setdetachstate(&attr, &detach);
|
||||
if( status < 0 ) status = errno;
|
||||
#else
|
||||
status = pthread_attr_setdetachstate(&attr, detach);
|
||||
#endif
|
||||
if( status ) return status;
|
||||
status = pthread_create( &t, &attr, task, NULL );
|
||||
#if HAVE_PTHREADS < 7
|
||||
if( status < 0 ) status = errno;
|
||||
#endif
|
||||
if( status ) return status;
|
||||
#else
|
||||
/* Draft 4 pthreads */
|
||||
status = pthread_create( &t, pthread_attr_default, task, NULL );
|
||||
if( status ) return errno;
|
||||
|
||||
/* give thread a chance to complete */
|
||||
/* it should remain joinable and hence detachable */
|
||||
sleep( 1 );
|
||||
|
||||
status = pthread_detach( &t );
|
||||
if( status ) return errno;
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_LINUX_THREADS
|
||||
pthread_kill_other_threads_np();
|
||||
#endif
|
||||
|
||||
return 0;
|
||||
|
||||
;
|
||||
return 0;
|
||||
}
|
||||
_ACEOF
|
||||
if ac_fn_c_try_link "$LINENO"
|
||||
then :
|
||||
ol_cv_pthread_mt=yes
|
||||
else $as_nop
|
||||
ol_cv_pthread_mt=no
|
||||
fi
|
||||
rm -f core conftest.err conftest.$ac_objext conftest.beam \
|
||||
conftest$ac_exeext conftest.$ac_ext
|
||||
else $as_nop
|
||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||
/* end confdefs.h. */
|
||||
|
||||
/* pthread test headers */
|
||||
#include <pthread.h>
|
||||
#if HAVE_PTHREADS < 7
|
||||
#include <errno.h>
|
||||
#endif
|
||||
#ifndef NULL
|
||||
#define NULL (void*)0
|
||||
#endif
|
||||
|
||||
#ifdef __STDC__
|
||||
static void *task(void *p)
|
||||
#else
|
||||
static void *task(p)
|
||||
void *p;
|
||||
#endif
|
||||
{
|
||||
return (void *) (p == NULL);
|
||||
}
|
||||
|
||||
|
||||
#ifdef __STDC__
|
||||
int main(int argc, char **argv)
|
||||
#else
|
||||
int main(argc, argv)
|
||||
int argc;
|
||||
char **argv;
|
||||
#endif
|
||||
{
|
||||
|
||||
/* pthread test function */
|
||||
#ifndef PTHREAD_CREATE_DETACHED
|
||||
#define PTHREAD_CREATE_DETACHED 1
|
||||
#endif
|
||||
pthread_t t;
|
||||
int status;
|
||||
int detach = PTHREAD_CREATE_DETACHED;
|
||||
|
||||
#if HAVE_PTHREADS > 4
|
||||
/* Final pthreads */
|
||||
pthread_attr_t attr;
|
||||
|
||||
status = pthread_attr_init(&attr);
|
||||
if( status ) return status;
|
||||
|
||||
#if HAVE_PTHREADS < 7
|
||||
status = pthread_attr_setdetachstate(&attr, &detach);
|
||||
if( status < 0 ) status = errno;
|
||||
#else
|
||||
status = pthread_attr_setdetachstate(&attr, detach);
|
||||
#endif
|
||||
if( status ) return status;
|
||||
status = pthread_create( &t, &attr, task, NULL );
|
||||
#if HAVE_PTHREADS < 7
|
||||
if( status < 0 ) status = errno;
|
||||
#endif
|
||||
if( status ) return status;
|
||||
#else
|
||||
/* Draft 4 pthreads */
|
||||
status = pthread_create( &t, pthread_attr_default, task, NULL );
|
||||
if( status ) return errno;
|
||||
|
||||
/* give thread a chance to complete */
|
||||
/* it should remain joinable and hence detachable */
|
||||
sleep( 1 );
|
||||
|
||||
status = pthread_detach( &t );
|
||||
if( status ) return errno;
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_LINUX_THREADS
|
||||
pthread_kill_other_threads_np();
|
||||
#endif
|
||||
|
||||
return 0;
|
||||
|
||||
}
|
||||
|
||||
_ACEOF
|
||||
if ac_fn_c_try_run "$LINENO"
|
||||
then :
|
||||
ol_cv_pthread_mt=yes
|
||||
else $as_nop
|
||||
ol_cv_pthread_mt=no
|
||||
fi
|
||||
rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
|
||||
conftest.$ac_objext conftest.beam conftest.$ac_ext
|
||||
fi
|
||||
|
||||
|
||||
# restore the LIBS
|
||||
LIBS="$ol_LIBS"
|
||||
|
||||
fi
|
||||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ol_cv_pthread_mt" >&5
|
||||
printf "%s\n" "$ol_cv_pthread_mt" >&6; }
|
||||
|
||||
if test $ol_cv_pthread_mt = yes ; then
|
||||
ol_link_pthreads="-mt"
|
||||
ol_link_threads=posix
|
||||
fi
|
||||
fi
|
||||
|
||||
# Pthread try link: -kthread (ol_cv_pthread_kthread)
|
||||
if test "$ol_link_threads" = no ; then
|
||||
# try -kthread
|
||||
|
|
|
|||
Loading…
Reference in a new issue