upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-12-20 22:59:34 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

ITS#9144 Remove unused ICU detection and linking

Browse source 
This reverts commits a956f75924 ("Add (not
yet used) ICU detection") and 1cf5838e08
("detect ICU and link it into slapd(8)").
This commit is contained in:
Ryan Tandy 2019-12-19 14:34:58 -08:00 committed by Quanah Gibson-Mount
parent f6ad222e41
commit f8427a9b58
4 changed files with 1 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
build/openldap.m4
View file

@ -243,34 +243,6 @@ OL_RESOLVER_TRY(ol_cv_resolver_none)
OL_RESOLVER_TRY(ol_cv_resolver_resolv,[-lresolv])
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
dnl OL_ICULIBS="-licui18n -licuuc -licudata"
OL_ICULIBS="-licuuc -licudata"
AC_CACHE_CHECK([for ICU libraries], [ol_cv_lib_icu], [
ol_LIBS="$LIBS"
LIBS="$OL_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="$OL_ICULIBS"
AC_DEFINE(HAVE_ICU,1,[define if you actually have ICU])
fi
fi
])
dnl
dnl ====================================================================
dnl Check POSIX Thread version

3
build/top.mk
View file

@ -192,7 +192,6 @@ SASL_LIBS = @SASL_LIBS@
TLS_LIBS = @TLS_LIBS@
AUTH_LIBS = @AUTH_LIBS@
SECURITY_LIBS = $(SASL_LIBS) $(KRB_LIBS) $(TLS_LIBS) $(AUTH_LIBS)
ICU_LIBS = @ICU_LIBS@
MODULES_CPPFLAGS = @SLAPD_MODULES_CPPFLAGS@
MODULES_LDFLAGS = @SLAPD_MODULES_LDFLAGS@
@ -203,7 +202,7 @@ SLAPD_SQL_LDFLAGS = @SLAPD_SQL_LDFLAGS@
SLAPD_SQL_INCLUDES = @SLAPD_SQL_INCLUDES@
SLAPD_SQL_LIBS = @SLAPD_SQL_LIBS@
SLAPD_LIBS = @SLAPD_LIBS@ @SLAPD_PERL_LDFLAGS@ @SLAPD_SQL_LDFLAGS@ @SLAPD_SQL_LIBS@ @SLAPD_SLP_LIBS@ @SLAPD_GMP_LIBS@ $(ICU_LIBS)
SLAPD_LIBS = @SLAPD_LIBS@ @SLAPD_PERL_LDFLAGS@ @SLAPD_SQL_LDFLAGS@ @SLAPD_SQL_LIBS@ @SLAPD_SLP_LIBS@ @SLAPD_GMP_LIBS@
# Our Defaults
CC = $(AC_CC)

10
configure.in
View file

@ -606,7 +606,6 @@ MODULES_LIBS=
SLAPI_LIBS=
LIBSLAPI=
AUTH_LIBS=
ICU_LIBS=
SLAPD_SLP_LIBS=
SLAPD_GMP_LIBS=
@ -2044,14 +2043,6 @@ if test $ol_enable_wt != no ; then
ol_link_wt=yes
fi
dnl ----------------------------------------------------------------
dnl International Components for Unicode
OL_ICU
if test "$ol_icu" = no ; then
AC_MSG_WARN([ICU not available])
else
ICU_LIBS="$ol_icu"
fi
dnl ----------------------------------------------------------------
dnl
dnl Check for Cyrus SASL
@ -3147,7 +3138,6 @@ AC_SUBST(MODULES_LIBS)
AC_SUBST(SLAPI_LIBS)
AC_SUBST(LIBSLAPI)
AC_SUBST(AUTH_LIBS)
AC_SUBST(ICU_LIBS)
AC_SUBST(SLAPD_SLP_LIBS)
AC_SUBST(SLAPD_GMP_LIBS)

6
include/portable.hin
View file

@ -250,9 +250,6 @@
/* Define to 1 if you have the `hstrerror' function. */
#undef HAVE_HSTRERROR
/* define if you actually have ICU */
#undef HAVE_ICU
/* define to you inet_aton(3) is available */
#undef HAVE_INET_ATON
@ -750,9 +747,6 @@
/* define if you have TLS */
#undef HAVE_TLS
/* Define to 1 if you have the <unicode/utypes.h> header file. */
#undef HAVE_UNICODE_UTYPES_H
/* Define to 1 if you have the <unistd.h> header file. */
#undef HAVE_UNISTD_H