Skip to content
Snippets Groups Projects
Commit 6abba139 authored by Kurt Zeilenga's avatar Kurt Zeilenga
Browse files

Hide if SIZEOF_WCHAR_T < 4.

parent 6b410330
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
build/openldap.m4
+ 1
− 0
View file @ 6abba139
......@@ -76,6 +76,7 @@ AC_MSG_CHECKING(size of $1)
AC_CACHE_VAL(AC_CV_NAME,
[for ac_size in 4 8 1 2 16 $2 ; do # List sizes in rough order of prevalence.
AC_TRY_COMPILE([#include "confdefs.h"
#include <stdlib.h>
#include <sys/types.h>
$2
], [switch (0) case 0: case (sizeof ($1) == $ac_size):;], AC_CV_NAME=$ac_size)
......
configure
+ 102
− 59
View file @ 6abba139
#! /bin/sh
# $OpenLDAP$
# from OpenLDAP: pkg/ldap/configure.in,v 1.527 2004/04/08 04:10:20 hyc Exp
# from OpenLDAP: pkg/ldap/configure.in,v 1.528 2004/04/08 04:23:10 hyc Exp
 
# This work is part of OpenLDAP Software <http://www.openldap.org/>.
#
......@@ -22066,6 +22066,7 @@ else
#line 22067 "configure"
#include "confdefs.h"
#include "confdefs.h"
#include <stdlib.h>
#include <sys/types.h>
 
......@@ -22073,7 +22074,7 @@ int main() {
switch (0) case 0: case (sizeof (short) == $ac_size):;
; return 0; }
EOF
if { (eval echo configure:22077: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
if { (eval echo configure:22078: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_sizeof_short=$ac_size
else
......@@ -22096,15 +22097,16 @@ EOF
echo $ac_n "checking size of int""... $ac_c" 1>&6
echo "configure:22100: checking size of int" >&5
echo "configure:22101: checking size of int" >&5
if eval "test \"\${ac_cv_sizeof_int+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
for ac_size in 4 8 1 2 16 ; do # List sizes in rough order of prevalence.
cat > conftest.$ac_ext <<EOF
#line 22106 "configure"
#line 22107 "configure"
#include "confdefs.h"
#include "confdefs.h"
#include <stdlib.h>
#include <sys/types.h>
 
......@@ -22112,7 +22114,7 @@ int main() {
switch (0) case 0: case (sizeof (int) == $ac_size):;
; return 0; }
EOF
if { (eval echo configure:22116: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
if { (eval echo configure:22118: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_sizeof_int=$ac_size
else
......@@ -22135,15 +22137,16 @@ EOF
echo $ac_n "checking size of long""... $ac_c" 1>&6
echo "configure:22139: checking size of long" >&5
echo "configure:22141: checking size of long" >&5
if eval "test \"\${ac_cv_sizeof_long+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
for ac_size in 4 8 1 2 16 ; do # List sizes in rough order of prevalence.
cat > conftest.$ac_ext <<EOF
#line 22145 "configure"
#line 22147 "configure"
#include "confdefs.h"
#include "confdefs.h"
#include <stdlib.h>
#include <sys/types.h>
 
......@@ -22151,7 +22154,7 @@ int main() {
switch (0) case 0: case (sizeof (long) == $ac_size):;
; return 0; }
EOF
if { (eval echo configure:22155: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
if { (eval echo configure:22158: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_sizeof_long=$ac_size
else
......@@ -22173,6 +22176,46 @@ cat >> confdefs.h <<EOF
EOF
 
echo $ac_n "checking size of wchar_t""... $ac_c" 1>&6
echo "configure:22181: checking size of wchar_t" >&5
if eval "test \"\${ac_cv_sizeof_wchar_t+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
for ac_size in 4 8 1 2 16 ; do # List sizes in rough order of prevalence.
cat > conftest.$ac_ext <<EOF
#line 22187 "configure"
#include "confdefs.h"
#include "confdefs.h"
#include <stdlib.h>
#include <sys/types.h>
int main() {
switch (0) case 0: case (sizeof (wchar_t) == $ac_size):;
; return 0; }
EOF
if { (eval echo configure:22198: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_sizeof_wchar_t=$ac_size
else
echo "configure: failed program was:" >&5
cat conftest.$ac_ext >&5
fi
rm -f conftest*
if test x$ac_cv_sizeof_wchar_t != x ; then break; fi
done
fi
if test x$ac_cv_sizeof_wchar_t = x ; then
{ echo "configure: error: cannot determine a size for wchar_t" 1>&2; exit 1; }
fi
echo "$ac_t""$ac_cv_sizeof_wchar_t" 1>&6
cat >> confdefs.h <<EOF
#define SIZEOF_WCHAR_T $ac_cv_sizeof_wchar_t
EOF
 
if test "$ac_cv_sizeof_int" -lt 4 ; then
echo "configure: warning: OpenLDAP requires 'int' to be 32 bits or greater." 1>&2
......@@ -22202,7 +22245,7 @@ EOF
 
 
echo $ac_n "checking for 8-bit clean memcmp""... $ac_c" 1>&6
echo "configure:22206: checking for 8-bit clean memcmp" >&5
echo "configure:22249: checking for 8-bit clean memcmp" >&5
if eval "test \"\${ac_cv_func_memcmp_clean+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
......@@ -22210,7 +22253,7 @@ else
ac_cv_func_memcmp_clean=no
else
cat > conftest.$ac_ext <<EOF
#line 22214 "configure"
#line 22257 "configure"
#include "confdefs.h"
 
main()
......@@ -22220,7 +22263,7 @@ main()
}
 
EOF
if { (eval echo configure:22224: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
if { (eval echo configure:22267: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_func_memcmp_clean=yes
else
......@@ -22238,12 +22281,12 @@ echo "$ac_t""$ac_cv_func_memcmp_clean" 1>&6
test $ac_cv_func_memcmp_clean = no && LIBOBJS="$LIBOBJS memcmp.${ac_objext}"
 
echo $ac_n "checking for strftime""... $ac_c" 1>&6
echo "configure:22242: checking for strftime" >&5
echo "configure:22285: checking for strftime" >&5
if eval "test \"\${ac_cv_func_strftime+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
#line 22247 "configure"
#line 22290 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char strftime(); below. */
......@@ -22267,7 +22310,7 @@ f = strftime;
 
; return 0; }
EOF
if { (eval echo configure:22271: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
if { (eval echo configure:22314: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_strftime=yes"
else
......@@ -22289,7 +22332,7 @@ else
echo "$ac_t""no" 1>&6
# strftime is in -lintl on SCO UNIX.
echo $ac_n "checking for strftime in -lintl""... $ac_c" 1>&6
echo "configure:22293: checking for strftime in -lintl" >&5
echo "configure:22336: checking for strftime in -lintl" >&5
ac_lib_var=`echo intl'_'strftime | sed 'y%./+-:%__p__%'`
if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
......@@ -22297,7 +22340,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lintl $LIBS"
cat > conftest.$ac_ext <<EOF
#line 22301 "configure"
#line 22344 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
......@@ -22308,7 +22351,7 @@ int main() {
strftime()
; return 0; }
EOF
if { (eval echo configure:22312: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
if { (eval echo configure:22355: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
......@@ -22336,12 +22379,12 @@ fi
 
 
echo $ac_n "checking for inet_aton()""... $ac_c" 1>&6
echo "configure:22340: checking for inet_aton()" >&5
echo "configure:22383: checking for inet_aton()" >&5
if eval "test \"\${ol_cv_func_inet_aton+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
#line 22345 "configure"
#line 22388 "configure"
#include "confdefs.h"
 
#ifdef HAVE_SYS_TYPES_H
......@@ -22363,7 +22406,7 @@ struct in_addr in;
int rc = inet_aton( "255.255.255.255", &in );
; return 0; }
EOF
if { (eval echo configure:22367: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
if { (eval echo configure:22410: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
ol_cv_func_inet_aton=yes
else
......@@ -22385,12 +22428,12 @@ EOF
 
echo $ac_n "checking for _spawnlp""... $ac_c" 1>&6
echo "configure:22389: checking for _spawnlp" >&5
echo "configure:22432: checking for _spawnlp" >&5
if eval "test \"\${ac_cv_func__spawnlp+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
#line 22394 "configure"
#line 22437 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char _spawnlp(); below. */
......@@ -22414,7 +22457,7 @@ f = _spawnlp;
 
; return 0; }
EOF
if { (eval echo configure:22418: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
if { (eval echo configure:22461: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func__spawnlp=yes"
else
......@@ -22438,12 +22481,12 @@ fi
 
 
echo $ac_n "checking for _snprintf""... $ac_c" 1>&6
echo "configure:22442: checking for _snprintf" >&5
echo "configure:22485: checking for _snprintf" >&5
if eval "test \"\${ac_cv_func__snprintf+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
#line 22447 "configure"
#line 22490 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char _snprintf(); below. */
......@@ -22467,7 +22510,7 @@ f = _snprintf;
 
; return 0; }
EOF
if { (eval echo configure:22471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
if { (eval echo configure:22514: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func__snprintf=yes"
else
......@@ -22493,12 +22536,12 @@ fi
 
 
echo $ac_n "checking for _vsnprintf""... $ac_c" 1>&6
echo "configure:22497: checking for _vsnprintf" >&5
echo "configure:22540: checking for _vsnprintf" >&5
if eval "test \"\${ac_cv_func__vsnprintf+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
#line 22502 "configure"
#line 22545 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char _vsnprintf(); below. */
......@@ -22522,7 +22565,7 @@ f = _vsnprintf;
 
; return 0; }
EOF
if { (eval echo configure:22526: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
if { (eval echo configure:22569: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func__vsnprintf=yes"
else
......@@ -22548,12 +22591,12 @@ fi
 
 
echo $ac_n "checking for vprintf""... $ac_c" 1>&6
echo "configure:22552: checking for vprintf" >&5
echo "configure:22595: checking for vprintf" >&5
if eval "test \"\${ac_cv_func_vprintf+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
#line 22557 "configure"
#line 22600 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char vprintf(); below. */
......@@ -22577,7 +22620,7 @@ f = vprintf;
 
; return 0; }
EOF
if { (eval echo configure:22581: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
if { (eval echo configure:22624: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_vprintf=yes"
else
......@@ -22601,12 +22644,12 @@ fi
 
if test "$ac_cv_func_vprintf" != yes; then
echo $ac_n "checking for _doprnt""... $ac_c" 1>&6
echo "configure:22605: checking for _doprnt" >&5
echo "configure:22648: checking for _doprnt" >&5
if eval "test \"\${ac_cv_func__doprnt+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
#line 22610 "configure"
#line 22653 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char _doprnt(); below. */
......@@ -22630,7 +22673,7 @@ f = _doprnt;
 
; return 0; }
EOF
if { (eval echo configure:22634: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
if { (eval echo configure:22677: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func__doprnt=yes"
else
......@@ -22659,12 +22702,12 @@ if test $ac_cv_func_vprintf = yes ; then
for ac_func in snprintf vsnprintf
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
echo "configure:22663: checking for $ac_func" >&5
echo "configure:22706: checking for $ac_func" >&5
if eval "test \"\${ac_cv_func_$ac_func+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
#line 22668 "configure"
#line 22711 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
......@@ -22688,7 +22731,7 @@ f = $ac_func;
 
; return 0; }
EOF
if { (eval echo configure:22692: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
if { (eval echo configure:22735: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
......@@ -22774,12 +22817,12 @@ for ac_func in \
 
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
echo "configure:22778: checking for $ac_func" >&5
echo "configure:22821: checking for $ac_func" >&5
if eval "test \"\${ac_cv_func_$ac_func+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
#line 22783 "configure"
#line 22826 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
......@@ -22803,7 +22846,7 @@ f = $ac_func;
 
; return 0; }
EOF
if { (eval echo configure:22807: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
if { (eval echo configure:22850: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
......@@ -22831,12 +22874,12 @@ done
for ac_func in getopt getpeereid
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
echo "configure:22835: checking for $ac_func" >&5
echo "configure:22878: checking for $ac_func" >&5
if eval "test \"\${ac_cv_func_$ac_func+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
#line 22840 "configure"
#line 22883 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
......@@ -22860,7 +22903,7 @@ f = $ac_func;
 
; return 0; }
EOF
if { (eval echo configure:22864: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
if { (eval echo configure:22907: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
......@@ -22892,19 +22935,19 @@ if test "$ac_cv_func_getopt" != yes; then
fi
if test "$ac_cv_func_getpeereid" != yes; then
echo $ac_n "checking for msg_accrights in msghdr""... $ac_c" 1>&6
echo "configure:22896: checking for msg_accrights in msghdr" >&5
echo "configure:22939: checking for msg_accrights in msghdr" >&5
if eval "test \"\${ol_cv_msghdr_msg_accrights+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
#line 22901 "configure"
#line 22944 "configure"
#include "confdefs.h"
#include <sys/socket.h>
int main() {
struct msghdr m; m.msg_accrightslen=0
; return 0; }
EOF
if { (eval echo configure:22908: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
if { (eval echo configure:22951: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ol_cv_msghdr_msg_accrights=yes
else
......@@ -22944,13 +22987,13 @@ fi
 
# Check Configuration
echo $ac_n "checking declaration of sys_errlist""... $ac_c" 1>&6
echo "configure:22948: checking declaration of sys_errlist" >&5
echo "configure:22991: checking declaration of sys_errlist" >&5
if eval "test \"\${ol_cv_dcl_sys_errlist+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
#line 22954 "configure"
#line 22997 "configure"
#include "confdefs.h"
 
#include <stdio.h>
......@@ -22963,7 +23006,7 @@ int main() {
char *c = (char *) *sys_errlist
; return 0; }
EOF
if { (eval echo configure:22967: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
if { (eval echo configure:23010: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ol_cv_dcl_sys_errlist=yes
ol_cv_have_sys_errlist=yes
......@@ -22986,20 +23029,20 @@ EOF
 
 
echo $ac_n "checking existence of sys_errlist""... $ac_c" 1>&6
echo "configure:22990: checking existence of sys_errlist" >&5
echo "configure:23033: checking existence of sys_errlist" >&5
if eval "test \"\${ol_cv_have_sys_errlist+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
#line 22996 "configure"
#line 23039 "configure"
#include "confdefs.h"
#include <errno.h>
int main() {
char *c = (char *) *sys_errlist
; return 0; }
EOF
if { (eval echo configure:23003: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
if { (eval echo configure:23046: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
ol_cv_have_sys_errlist=yes
else
......@@ -23027,17 +23070,17 @@ if test "$ol_enable_slapi" != no ; then
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
echo "configure:23031: checking for $ac_hdr" >&5
echo "configure:23074: checking for $ac_hdr" >&5
if eval "test \"\${ac_cv_header_$ac_safe+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
#line 23036 "configure"
#line 23079 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:23041: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
{ (eval echo configure:23084: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
......@@ -23068,7 +23111,7 @@ done
{ echo "configure: error: could not locate <ltdl.h>" 1>&2; exit 1; }
fi
echo $ac_n "checking for lt_dlinit in -lltdl""... $ac_c" 1>&6
echo "configure:23072: checking for lt_dlinit in -lltdl" >&5
echo "configure:23115: checking for lt_dlinit in -lltdl" >&5
ac_lib_var=`echo ltdl'_'lt_dlinit | sed 'y%./+-:%__p__%'`
if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
......@@ -23076,7 +23119,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lltdl $LIBS"
cat > conftest.$ac_ext <<EOF
#line 23080 "configure"
#line 23123 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
......@@ -23087,7 +23130,7 @@ int main() {
lt_dlinit()
; return 0; }
EOF
if { (eval echo configure:23091: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
if { (eval echo configure:23134: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
......
configure.in
+ 1
− 0
View file @ 6abba139
......@@ -2219,6 +2219,7 @@ fi
AC_COMPILE_CHECK_SIZEOF(short)
AC_COMPILE_CHECK_SIZEOF(int)
AC_COMPILE_CHECK_SIZEOF(long)
AC_COMPILE_CHECK_SIZEOF(wchar_t)
if test "$ac_cv_sizeof_int" -lt 4 ; then
AC_MSG_WARN([OpenLDAP requires 'int' to be 32 bits or greater.])
......
include/portable.h.in
+ 3
− 0
View file @ 6abba139
......@@ -866,6 +866,9 @@
/* The number of bytes in type long */
#undef SIZEOF_LONG
/* The number of bytes in type wchar_t */
#undef SIZEOF_WCHAR_T
/* define to you inet_aton(3) is available */
#undef HAVE_INET_ATON
......
libraries/libldap/utf-8-conv.c
+ 5
− 0
View file @ 6abba139
......@@ -40,6 +40,9 @@
#include "portable.h"
#if SIZEOF_WCHAR_T >= 4
/* These routines assume ( sizeof(wchar_t) >= 4 ) */
#include <stdio.h>
#include <ac/stdlib.h> /* For wctomb, wcstombs, mbtowc, mbstowcs */
#include <ac/string.h>
......@@ -472,3 +475,5 @@ ldap_x_mbs_to_utf8s ( char *utf8str, const char *mbstr, size_t count,
return n;
}
#endif
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment