mirror of
https://git.openldap.org/openldap/openldap.git
synced 2025-12-30 03:29:35 -05:00
Add (not yet used) ICU detection
This commit is contained in:
parent
a9c95d36be
commit
a956f75924
3 changed files with 46 additions and 10 deletions
|
|
@ -233,6 +233,32 @@ OL_RESOLVER_TRY(ol_cv_resolver_bind,[-lbind])
|
|||
])
|
||||
dnl
|
||||
dnl ====================================================================
|
||||
dnl International Components for Unicode (ICU)
|
||||
AC_DEFUN([OL_ICU],
|
||||
[ol_icu=no
|
||||
AC_CHECK_HEADERS( unicode/utypes.h )
|
||||
if test $ac_cv_header_unicode_utypes_h = yes ; then
|
||||
ICULIBS="-licui18n -licuuc -licudata"
|
||||
|
||||
AC_CACHE_CHECK([for ICU libraries], [ol_cv_lib_icu], [
|
||||
ol_LIBS="$LIBS"
|
||||
LIBS="$ICULIBS $LIBS"
|
||||
AC_LINK_IFELSE([AC_LANG_PROGRAM([[
|
||||
#include <unicode/utypes.h>
|
||||
]], [[
|
||||
(void) u_errorName(0);
|
||||
]])],[ol_cv_lib_icu=yes],[ol_cv_lib_icu=no])
|
||||
LIBS="$ol_LIBS"
|
||||
])
|
||||
|
||||
if test $ol_cv_lib_icu != no ; then
|
||||
ol_icu="$ICULIBS"
|
||||
AC_DEFINE(HAVE_ICU,1,[define if you actually have ICU])
|
||||
fi
|
||||
fi
|
||||
])
|
||||
dnl
|
||||
dnl ====================================================================
|
||||
dnl Berkeley DB macros
|
||||
dnl
|
||||
dnl --------------------------------------------------------------------
|
||||
|
|
|
|||
21
configure
vendored
21
configure
vendored
|
|
@ -1,5 +1,5 @@
|
|||
#! /bin/sh
|
||||
# From configure.in OpenLDAP: pkg/ldap/configure.in,v 1.603 2005/11/13 21:26:59 ando Exp .
|
||||
# From configure.in OpenLDAP: pkg/ldap/configure.in,v 1.604 2005/11/14 17:32:34 kurt Exp .
|
||||
# Guess values for system-dependent variables and create Makefiles.
|
||||
# Generated by GNU Autoconf 2.59.
|
||||
#
|
||||
|
|
@ -1551,6 +1551,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
|
|||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
ac_aux_dir=
|
||||
|
|
@ -5686,7 +5687,7 @@ ia64-*-hpux*)
|
|||
;;
|
||||
*-*-irix6*)
|
||||
# Find out which ABI we are using.
|
||||
echo '#line 5689 "configure"' > conftest.$ac_ext
|
||||
echo '#line 5690 "configure"' > conftest.$ac_ext
|
||||
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
||||
(eval $ac_compile) 2>&5
|
||||
ac_status=$?
|
||||
|
|
@ -7666,11 +7667,11 @@ else
|
|||
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:7669: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:7670: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>conftest.err)
|
||||
ac_status=$?
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:7673: \$? = $ac_status" >&5
|
||||
echo "$as_me:7674: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s "$ac_outfile"; then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
# So say no if there are warnings other than the usual output.
|
||||
|
|
@ -7928,11 +7929,11 @@ else
|
|||
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:7931: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:7932: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>conftest.err)
|
||||
ac_status=$?
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:7935: \$? = $ac_status" >&5
|
||||
echo "$as_me:7936: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s "$ac_outfile"; then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
# So say no if there are warnings other than the usual output.
|
||||
|
|
@ -7990,11 +7991,11 @@ else
|
|||
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:7993: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:7994: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>out/conftest.err)
|
||||
ac_status=$?
|
||||
cat out/conftest.err >&5
|
||||
echo "$as_me:7997: \$? = $ac_status" >&5
|
||||
echo "$as_me:7998: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s out/conftest2.$ac_objext
|
||||
then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
|
|
@ -10238,7 +10239,7 @@ else
|
|||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 10241 "configure"
|
||||
#line 10242 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
|
|
@ -10336,7 +10337,7 @@ else
|
|||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 10339 "configure"
|
||||
#line 10340 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
|
|
|
|||
|
|
@ -1009,6 +1009,15 @@ dnl ----------------------------------------------------------------
|
|||
# strerror checks
|
||||
OL_STRERROR
|
||||
|
||||
dnl ----------------------------------------------------------------
|
||||
dnl International Components for Unicode
|
||||
dnl don't use yet
|
||||
dnl OL_ICU
|
||||
dnl if test "$ol_icu" = no ; then
|
||||
dnl AC_MSG_ERROR([ICU not available])
|
||||
dnl else
|
||||
dnl LIBS="$LIBS $ol_icu"
|
||||
dnl fi
|
||||
dnl ----------------------------------------------------------------
|
||||
dnl require POSIX regex
|
||||
AC_CHECK_HEADERS( regex.h )
|
||||
|
|
|
|||
Loading…
Reference in a new issue