mirror of
https://git.openldap.org/openldap/openldap.git
synced 2025-04-06 15:00:40 +08:00
Relocate headers checks to above libraries such that their results can
be used during library and function checks.
This commit is contained in:
Kurt Zeilenga
parent
79e28bda6f
commit
2967e3c9ef
163
configure.in
163
configure.in
@ -527,6 +527,64 @@ else
|
||||
ol_with_tcl_module=static
|
||||
fi
|
||||
|
||||
dnl ----------------------------------------------------------------
|
||||
dnl Checks for header files.
|
||||
OL_HEADER_STDC
|
||||
|
||||
if test $ol_cv_header_stdc != yes; then
|
||||
AC_MSG_WARN([could not locate Standard C compliant headers])
|
||||
fi
|
||||
|
||||
AC_HEADER_DIRENT
|
||||
AC_HEADER_SYS_WAIT
|
||||
AM_HEADER_TIOCGWINSZ_NEEDS_SYS_IOCTL
|
||||
if test $am_cv_sys_posix_termios = yes ; then
|
||||
AC_DEFINE(HAVE_POSIX_TERMIOS,1,
|
||||
[define if you have POSIX termios])
|
||||
fi
|
||||
|
||||
AC_CHECK_HEADERS( \
|
||||
arpa/inet.h \
|
||||
arpa/nameser.h \
|
||||
assert.h \
|
||||
crypt.h \
|
||||
errno.h \
|
||||
fcntl.h \
|
||||
filio.h \
|
||||
getopt.h \
|
||||
grp.h \
|
||||
libutil.h \
|
||||
limits.h \
|
||||
locale.h \
|
||||
netinet/tcp.h \
|
||||
malloc.h \
|
||||
memory.h \
|
||||
psap.h \
|
||||
pwd.h \
|
||||
resolv.h \
|
||||
sgtty.h \
|
||||
shadow.h \
|
||||
stdarg.h \
|
||||
stddef.h \
|
||||
string.h \
|
||||
strings.h \
|
||||
sysexits.h \
|
||||
sys/file.h \
|
||||
sys/filio.h \
|
||||
sys/errno.h \
|
||||
sys/ioctl.h \
|
||||
sys/param.h \
|
||||
sys/resource.h \
|
||||
sys/select.h \
|
||||
sys/socket.h \
|
||||
sys/syslog.h \
|
||||
sys/time.h \
|
||||
sys/types.h \
|
||||
syslog.h \
|
||||
termios.h \
|
||||
unistd.h \
|
||||
)
|
||||
|
||||
dnl ----------------------------------------------------------------
|
||||
dnl Checks for libraries
|
||||
|
||||
@ -548,6 +606,31 @@ dnl
|
||||
AC_CHECK_LIB(gen, main)
|
||||
])
|
||||
|
||||
AC_CHECK_FUNC(select, :, AC_MSG_ERROR([select() required.]))
|
||||
|
||||
dnl Select arg types
|
||||
dnl (if this detection becomes permenent, it and the select() detection
|
||||
dnl should be done before the yielding select test)
|
||||
AC_FUNC_SELECT_ARGTYPES
|
||||
|
||||
|
||||
AC_CHECK_HEADERS( regex.h )
|
||||
if test "$ac_cv_header_regex_h" != yes ; then
|
||||
AC_MSG_ERROR([POSIX regex.h required.])
|
||||
fi
|
||||
AC_CHECK_FUNC(regfree, :, AC_MSG_ERROR([POSIX regex required.]))
|
||||
|
||||
OL_POSIX_REGEX
|
||||
if test "$ol_cv_c_posix_regex" = no ; then
|
||||
AC_MSG_ERROR([broken POSIX regex!])
|
||||
fi
|
||||
|
||||
|
||||
dnl HP-UX requires -lV3
|
||||
AC_CHECK_LIB(V3, sigset)
|
||||
|
||||
|
||||
# find res_search
|
||||
if test $ol_enable_dns != no ; then
|
||||
dnl Check for resolver routines
|
||||
AC_CHECK_FUNC(res_search,:)
|
||||
@ -570,26 +653,6 @@ if test $ol_enable_dns != no ; then
|
||||
fi
|
||||
fi
|
||||
|
||||
dnl HP-UX requires -lV3
|
||||
AC_CHECK_LIB(V3, sigset)
|
||||
|
||||
AC_CHECK_HEADERS( regex.h )
|
||||
if test "$ac_cv_header_regex_h" != yes ; then
|
||||
AC_MSG_ERROR([POSIX regex.h required.])
|
||||
fi
|
||||
AC_CHECK_FUNC(regfree, :, AC_MSG_ERROR([POSIX regex required.]))
|
||||
|
||||
OL_POSIX_REGEX
|
||||
if test "$ol_cv_c_posix_regex" = no ; then
|
||||
AC_MSG_ERROR([broken POSIX regex!])
|
||||
fi
|
||||
|
||||
AC_CHECK_FUNC(select, :, AC_MSG_ERROR([select() required.]))
|
||||
|
||||
dnl Select arg types
|
||||
dnl (if this detection becomes permenent, it and the select() detection
|
||||
dnl should be done before the yielding select test)
|
||||
AC_FUNC_SELECT_ARGTYPES
|
||||
|
||||
# ISODE tests
|
||||
ol_link_isode=no
|
||||
@ -875,8 +938,6 @@ int main(argc, argv)
|
||||
status = pthread_detach( t );
|
||||
#endif
|
||||
|
||||
if( status ) return status;
|
||||
|
||||
return status;
|
||||
}
|
||||
],
|
||||
@ -1635,64 +1696,6 @@ if test $ol_enable_proctitle != no ; then
|
||||
fi
|
||||
fi
|
||||
|
||||
dnl ----------------------------------------------------------------
|
||||
dnl Checks for header files.
|
||||
OL_HEADER_STDC
|
||||
|
||||
if test $ol_cv_header_stdc != yes; then
|
||||
AC_MSG_WARN([could not locate Standard C compliant headers])
|
||||
fi
|
||||
|
||||
AC_HEADER_DIRENT
|
||||
AC_HEADER_SYS_WAIT
|
||||
AM_HEADER_TIOCGWINSZ_NEEDS_SYS_IOCTL
|
||||
if test $am_cv_sys_posix_termios = yes ; then
|
||||
AC_DEFINE(HAVE_POSIX_TERMIOS,1,
|
||||
[define if you have POSIX termios])
|
||||
fi
|
||||
|
||||
AC_CHECK_HEADERS( \
|
||||
arpa/inet.h \
|
||||
arpa/nameser.h \
|
||||
assert.h \
|
||||
crypt.h \
|
||||
errno.h \
|
||||
fcntl.h \
|
||||
filio.h \
|
||||
getopt.h \
|
||||
grp.h \
|
||||
libutil.h \
|
||||
limits.h \
|
||||
locale.h \
|
||||
netinet/tcp.h \
|
||||
malloc.h \
|
||||
memory.h \
|
||||
psap.h \
|
||||
pwd.h \
|
||||
resolv.h \
|
||||
sgtty.h \
|
||||
shadow.h \
|
||||
stdarg.h \
|
||||
stddef.h \
|
||||
string.h \
|
||||
strings.h \
|
||||
sysexits.h \
|
||||
sys/file.h \
|
||||
sys/filio.h \
|
||||
sys/errno.h \
|
||||
sys/ioctl.h \
|
||||
sys/param.h \
|
||||
sys/resource.h \
|
||||
sys/select.h \
|
||||
sys/socket.h \
|
||||
sys/syslog.h \
|
||||
sys/time.h \
|
||||
sys/types.h \
|
||||
syslog.h \
|
||||
termios.h \
|
||||
unistd.h \
|
||||
)
|
||||
|
||||
dnl ----------------------------------------------------------------
|
||||
dnl Checks for typedefs, structures, and compiler characteristics.
|
||||
AC_TYPE_GETGROUPS dnl requires AC_TYPE_UID_T
|
||||
|
||||
@ -576,6 +576,15 @@
|
||||
/* defined to be the EXE extension */
|
||||
#undef EXEEXT
|
||||
|
||||
/* define if system uses EBCDIC instead of ASCII */
|
||||
#undef HAVE_EBCDIC
|
||||
|
||||
/* Define if TIOCGWINSZ requires sys/ioctl.h */
|
||||
#undef GWINSZ_IN_SYS_IOCTL
|
||||
|
||||
/* define if you have POSIX termios */
|
||||
#undef HAVE_POSIX_TERMIOS
|
||||
|
||||
/* define if you have res_search() */
|
||||
#undef HAVE_RES_SEARCH
|
||||
|
||||
@ -699,15 +708,6 @@
|
||||
/* define if setproctitle(3) is available */
|
||||
#undef HAVE_SETPROCTITLE
|
||||
|
||||
/* define if system uses EBCDIC instead of ASCII */
|
||||
#undef HAVE_EBCDIC
|
||||
|
||||
/* Define if TIOCGWINSZ requires sys/ioctl.h */
|
||||
#undef GWINSZ_IN_SYS_IOCTL
|
||||
|
||||
/* define if you have POSIX termios */
|
||||
#undef HAVE_POSIX_TERMIOS
|
||||
|
||||
/* Define if system has ptrdiff_t type */
|
||||
#undef HAVE_PTRDIFF_T
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user