Update handling of string headers.

Update NT port.

diff --git a/configure b/configure
index 00b0737767650b996220c51714cb0fa59b283823..0a412c354b17fa3cbae3c6ca9ad6ba7d7f6d7a7a 100755 (executable)
--- a/configure
+++ b/configure
@@ -5779,10 +5779,6 @@ EOF
 fi
 
 for ac_hdr in \
-       stdarg.h                \
-       stddef.h                \
-       string.h                \
-       strings.h               \
        errno.h                 \
        fcntl.h                 \
        filio.h                 \
@@ -5790,9 +5786,14 @@ for ac_hdr in \
        libutil.h               \
        limits.h                \
        malloc.h                \
+       memory.h                \
        regex.h                 \
        pwd.h                   \
        sgtty.h                 \
+       stdarg.h                \
+       stddef.h                \
+       string.h                \
+       strings.h               \
        sys/file.h              \
        sys/filio.h             \
        sys/errno.h             \
@@ -5810,17 +5811,17 @@ for ac_hdr in \
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:5814: checking for $ac_hdr" >&5
+echo "configure:5815: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 5819 "configure"
+#line 5820 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5824: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5825: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -5848,12 +5849,12 @@ done
 
 
 echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6
-echo "configure:5852: checking for uid_t in sys/types.h" >&5
+echo "configure:5853: checking for uid_t in sys/types.h" >&5
 if eval "test \"`echo '$''{'ac_cv_type_uid_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 5857 "configure"
+#line 5858 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 EOF
@@ -5882,7 +5883,7 @@ EOF
 fi
 
 echo $ac_n "checking type of array argument to getgroups""... $ac_c" 1>&6
-echo "configure:5886: checking type of array argument to getgroups" >&5
+echo "configure:5887: checking type of array argument to getgroups" >&5
 if eval "test \"`echo '$''{'ac_cv_type_getgroups'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -5890,7 +5891,7 @@ else
   ac_cv_type_getgroups=cross
 else
   cat > conftest.$ac_ext <<EOF
-#line 5894 "configure"
+#line 5895 "configure"
 #include "confdefs.h"
 
 /* Thanks to Mike Rendell for this test.  */
@@ -5915,7 +5916,7 @@ main()
 }
 
 EOF
-if { (eval echo configure:5919: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:5920: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
 then
     ac_cv_type_getgroups=gid_t
 else
@@ -5929,7 +5930,7 @@ fi
 
 if test $ac_cv_type_getgroups = cross; then
         cat > conftest.$ac_ext <<EOF
-#line 5933 "configure"
+#line 5934 "configure"
 #include "confdefs.h"
 #include <unistd.h>
 EOF
@@ -5953,12 +5954,12 @@ EOF
 
 
 echo $ac_n "checking for mode_t""... $ac_c" 1>&6
-echo "configure:5957: checking for mode_t" >&5
+echo "configure:5958: checking for mode_t" >&5
 if eval "test \"`echo '$''{'ac_cv_type_mode_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 5962 "configure"
+#line 5963 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -5986,12 +5987,12 @@ EOF
 fi
 
 echo $ac_n "checking for off_t""... $ac_c" 1>&6
-echo "configure:5990: checking for off_t" >&5
+echo "configure:5991: checking for off_t" >&5
 if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 5995 "configure"
+#line 5996 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -6019,12 +6020,12 @@ EOF
 fi
 
 echo $ac_n "checking for pid_t""... $ac_c" 1>&6
-echo "configure:6023: checking for pid_t" >&5
+echo "configure:6024: checking for pid_t" >&5
 if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 6028 "configure"
+#line 6029 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -6052,12 +6053,12 @@ EOF
 fi
 
 echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6
-echo "configure:6056: checking return type of signal handlers" >&5
+echo "configure:6057: checking return type of signal handlers" >&5
 if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 6061 "configure"
+#line 6062 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <signal.h>
@@ -6074,7 +6075,7 @@ int main() {
 int i;
 ; return 0; }
 EOF
-if { (eval echo configure:6078: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:6079: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_type_signal=void
 else
@@ -6093,12 +6094,12 @@ EOF
 
 
 echo $ac_n "checking for size_t""... $ac_c" 1>&6
-echo "configure:6097: checking for size_t" >&5
+echo "configure:6098: checking for size_t" >&5
 if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 6102 "configure"
+#line 6103 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -6126,12 +6127,12 @@ EOF
 fi
 
 echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6
-echo "configure:6130: checking for uid_t in sys/types.h" >&5
+echo "configure:6131: checking for uid_t in sys/types.h" >&5
 if eval "test \"`echo '$''{'ac_cv_type_uid_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 6135 "configure"
+#line 6136 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 EOF
@@ -6160,12 +6161,12 @@ EOF
 fi
 
 echo $ac_n "checking for st_blksize in struct stat""... $ac_c" 1>&6
-echo "configure:6164: checking for st_blksize in struct stat" >&5
+echo "configure:6165: checking for st_blksize in struct stat" >&5
 if eval "test \"`echo '$''{'ac_cv_struct_st_blksize'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 6169 "configure"
+#line 6170 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -6173,7 +6174,7 @@ int main() {
 struct stat s; s.st_blksize;
 ; return 0; }
 EOF
-if { (eval echo configure:6177: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:6178: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_struct_st_blksize=yes
 else
@@ -6194,12 +6195,12 @@ EOF
 fi
 
 echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
-echo "configure:6198: checking whether time.h and sys/time.h may both be included" >&5
+echo "configure:6199: checking whether time.h and sys/time.h may both be included" >&5
 if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 6203 "configure"
+#line 6204 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/time.h>
@@ -6208,7 +6209,7 @@ int main() {
 struct tm *tp;
 ; return 0; }
 EOF
-if { (eval echo configure:6212: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:6213: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_header_time=yes
 else
@@ -6229,12 +6230,12 @@ EOF
 fi
 
 echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&6
-echo "configure:6233: checking whether struct tm is in sys/time.h or time.h" >&5
+echo "configure:6234: checking whether struct tm is in sys/time.h or time.h" >&5
 if eval "test \"`echo '$''{'ac_cv_struct_tm'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 6238 "configure"
+#line 6239 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <time.h>
@@ -6242,7 +6243,7 @@ int main() {
 struct tm *tp; tp->tm_sec;
 ; return 0; }
 EOF
-if { (eval echo configure:6246: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:6247: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_struct_tm=time.h
 else
@@ -6265,7 +6266,7 @@ fi
 
 
 echo $ac_n "checking if toupper() requires islower()""... $ac_c" 1>&6
-echo "configure:6269: checking if toupper() requires islower()" >&5
+echo "configure:6270: checking if toupper() requires islower()" >&5
 if eval "test \"`echo '$''{'ol_cv_c_upper_lower'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -6274,7 +6275,7 @@ else
   ol_cv_c_upper_lower=safe
 else
   cat > conftest.$ac_ext <<EOF
-#line 6278 "configure"
+#line 6279 "configure"
 #include "confdefs.h"
 
 #include <ctype.h>
@@ -6286,7 +6287,7 @@ main()
                exit(1);
 }
 EOF
-if { (eval echo configure:6290: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:6291: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
 then
   ol_cv_c_upper_lower=no
 else
@@ -6309,12 +6310,12 @@ EOF
 fi
 
 echo $ac_n "checking for working const""... $ac_c" 1>&6
-echo "configure:6313: checking for working const" >&5
+echo "configure:6314: checking for working const" >&5
 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 6318 "configure"
+#line 6319 "configure"
 #include "confdefs.h"
 
 int main() {
@@ -6363,7 +6364,7 @@ ccp = (char const *const *) p;
 
 ; return 0; }
 EOF
-if { (eval echo configure:6367: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:6368: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_const=yes
 else
@@ -6386,7 +6387,7 @@ fi
 
 
 echo $ac_n "checking for 8-bit clean memcmp""... $ac_c" 1>&6
-echo "configure:6390: checking for 8-bit clean memcmp" >&5
+echo "configure:6391: checking for 8-bit clean memcmp" >&5
 if eval "test \"`echo '$''{'ac_cv_func_memcmp_clean'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -6394,7 +6395,7 @@ else
   ac_cv_func_memcmp_clean=no
 else
   cat > conftest.$ac_ext <<EOF
-#line 6398 "configure"
+#line 6399 "configure"
 #include "confdefs.h"
 
 main()
@@ -6404,7 +6405,7 @@ main()
 }
 
 EOF
-if { (eval echo configure:6408: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:6409: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
 then
   ac_cv_func_memcmp_clean=yes
 else
@@ -6422,12 +6423,12 @@ echo "$ac_t""$ac_cv_func_memcmp_clean" 1>&6
 test $ac_cv_func_memcmp_clean = no && LIBOBJS="$LIBOBJS memcmp.o"
 
 echo $ac_n "checking for strftime""... $ac_c" 1>&6
-echo "configure:6426: checking for strftime" >&5
+echo "configure:6427: checking for strftime" >&5
 if eval "test \"`echo '$''{'ac_cv_func_strftime'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 6431 "configure"
+#line 6432 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char strftime(); below.  */
@@ -6450,7 +6451,7 @@ strftime();
 
 ; return 0; }
 EOF
-if { (eval echo configure:6454: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:6455: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_strftime=yes"
 else
@@ -6472,7 +6473,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:6476: checking for strftime in -lintl" >&5
+echo "configure:6477: checking for strftime in -lintl" >&5
 ac_lib_var=`echo intl'_'strftime | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -6480,7 +6481,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lintl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 6484 "configure"
+#line 6485 "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
@@ -6491,7 +6492,7 @@ int main() {
 strftime()
 ; return 0; }
 EOF
-if { (eval echo configure:6495: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:6496: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -6518,12 +6519,12 @@ fi
 fi
 
 echo $ac_n "checking for vprintf""... $ac_c" 1>&6
-echo "configure:6522: checking for vprintf" >&5
+echo "configure:6523: checking for vprintf" >&5
 if eval "test \"`echo '$''{'ac_cv_func_vprintf'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 6527 "configure"
+#line 6528 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char vprintf(); below.  */
@@ -6546,7 +6547,7 @@ vprintf();
 
 ; return 0; }
 EOF
-if { (eval echo configure:6550: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:6551: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_vprintf=yes"
 else
@@ -6570,12 +6571,12 @@ fi
 
 if test "$ac_cv_func_vprintf" != yes; then
 echo $ac_n "checking for _doprnt""... $ac_c" 1>&6
-echo "configure:6574: checking for _doprnt" >&5
+echo "configure:6575: checking for _doprnt" >&5
 if eval "test \"`echo '$''{'ac_cv_func__doprnt'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 6579 "configure"
+#line 6580 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char _doprnt(); below.  */
@@ -6598,7 +6599,7 @@ _doprnt();
 
 ; return 0; }
 EOF
-if { (eval echo configure:6602: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:6603: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func__doprnt=yes"
 else
@@ -6627,12 +6628,12 @@ if test $ac_cv_func_vprintf = yes ; then
                for ac_func in vsnprintf
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:6631: checking for $ac_func" >&5
+echo "configure:6632: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 6636 "configure"
+#line 6637 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -6655,7 +6656,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:6659: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:6660: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -6682,7 +6683,7 @@ done
 fi
 
 echo $ac_n "checking for wait3 that fills in rusage""... $ac_c" 1>&6
-echo "configure:6686: checking for wait3 that fills in rusage" >&5
+echo "configure:6687: checking for wait3 that fills in rusage" >&5
 if eval "test \"`echo '$''{'ac_cv_func_wait3_rusage'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -6690,7 +6691,7 @@ else
   ac_cv_func_wait3_rusage=no
 else
   cat > conftest.$ac_ext <<EOF
-#line 6694 "configure"
+#line 6695 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/time.h>
@@ -6721,7 +6722,7 @@ main() {
   }
 }
 EOF
-if { (eval echo configure:6725: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:6726: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
 then
   ac_cv_func_wait3_rusage=yes
 else
@@ -6746,12 +6747,11 @@ fi
 
 for ac_func in \
        bcopy                   \
-       getopt                  \
        flock                   \
-       gethostname             \
-       gettimeofday    \
        getdtablesize   \
+       gethostname             \
        getpwuid                \
+       gettimeofday    \
        lockf                   \
        memcpy                  \
        memmove                 \
@@ -6766,24 +6766,25 @@ for ac_func in \
        snprintf                \
        socket                  \
        strerror                \
-       strstr                  \
+       strpbrk                 \
        strrchr                 \
        strsep                  \
+       strstr                  \
        strtod                  \
+       strtok                  \
        strtol                  \
        strtoul                 \
        sysconf                 \
-       tempnam                 \
        waitpid                 \
 
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:6782: checking for $ac_func" >&5
+echo "configure:6783: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 6787 "configure"
+#line 6788 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -6806,7 +6807,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:6810: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:6811: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -6834,12 +6835,12 @@ done
 for ac_func in getopt strdup tempnam
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:6838: checking for $ac_func" >&5
+echo "configure:6839: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 6843 "configure"
+#line 6844 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -6862,7 +6863,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:6866: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:6867: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -6892,13 +6893,13 @@ done
 # Check Configuration
 
 echo $ac_n "checking declaration of sys_errlist""... $ac_c" 1>&6
-echo "configure:6896: checking declaration of sys_errlist" >&5
+echo "configure:6897: checking declaration of sys_errlist" >&5
 if eval "test \"`echo '$''{'ol_cv_dcl_sys_errlist'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
        cat > conftest.$ac_ext <<EOF
-#line 6902 "configure"
+#line 6903 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -6908,7 +6909,7 @@ int main() {
 char *c = (char *) *sys_errlist
 ; return 0; }
 EOF
-if { (eval echo configure:6912: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:6913: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ol_cv_dcl_sys_errlist=yes
 else
@@ -6929,20 +6930,20 @@ if test $ol_cv_dcl_sys_errlist = no ; then
 EOF
 
        echo $ac_n "checking existence of sys_errlist""... $ac_c" 1>&6
-echo "configure:6933: checking existence of sys_errlist" >&5
+echo "configure:6934: checking existence of sys_errlist" >&5
        if eval "test \"`echo '$''{'ol_cv_have_sys_errlist'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
                cat > conftest.$ac_ext <<EOF
-#line 6939 "configure"
+#line 6940 "configure"
 #include "confdefs.h"
 #include <errno.h>
 int main() {
 char *c = (char *) *sys_errlist
 ; return 0; }
 EOF
-if { (eval echo configure:6946: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:6947: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   ol_cv_have_sys_errlist=yes
 else

diff --git a/configure.in b/configure.in
index 8f2bad527964f4fc27482a65fd1b68525a25d7e4..f93244e656c60ef9e5542eabbcb672c648b99537 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -902,10 +902,6 @@ fi
 AC_HEADER_DIRENT
 AC_HEADER_SYS_WAIT
 AC_CHECK_HEADERS(      \
-       stdarg.h                \
-       stddef.h                \
-       string.h                \
-       strings.h               \
        errno.h                 \
        fcntl.h                 \
        filio.h                 \
@@ -913,9 +909,14 @@ AC_CHECK_HEADERS(  \
        libutil.h               \
        limits.h                \
        malloc.h                \
+       memory.h                \
        regex.h                 \
        pwd.h                   \
        sgtty.h                 \
+       stdarg.h                \
+       stddef.h                \
+       string.h                \
+       strings.h               \
        sys/file.h              \
        sys/filio.h             \
        sys/errno.h             \
@@ -966,12 +967,11 @@ AC_FUNC_WAIT3
 
 AC_CHECK_FUNCS(                \
        bcopy                   \
-       getopt                  \
        flock                   \
-       gethostname             \
-       gettimeofday    \
        getdtablesize   \
+       gethostname             \
        getpwuid                \
+       gettimeofday    \
        lockf                   \
        memcpy                  \
        memmove                 \
@@ -986,17 +986,19 @@ AC_CHECK_FUNCS(           \
        snprintf                \
        socket                  \
        strerror                \
-       strstr                  \
+       strpbrk                 \
        strrchr                 \
        strsep                  \
+       strstr                  \
        strtod                  \
+       strtok                  \
        strtol                  \
        strtoul                 \
        sysconf                 \
-       tempnam                 \
        waitpid                 \
 )
 
+dnl We actually may need to replace more than this.
 AC_REPLACE_FUNCS(getopt strdup tempnam)
 
 dnl ----------------------------------------------------------------

diff --git a/include/ac/stdarg.h b/include/ac/stdarg.h
index 8b805c8abc15c1c56b534c18370e04023ef1d7f6..acd5483c0e9185d4a0f5127c18cfd36ef9810858 100644 (file)
--- a/include/ac/stdarg.h
+++ b/include/ac/stdarg.h
@@ -3,10 +3,15 @@
 #ifndef _AC_STDARG_H
 #define _AC_STDARG_H 1
 
-#if defined( HAVE_STDARG_H ) && \
-       ( defined( __STDC__ ) || defined( _WIN32 ) )
+#if defined( HAVE_STDARG ) || \
+       ( defined( HAVE_STDARG_H ) && defined( __STDC__ ) ) 
+
 #      include <stdarg.h>
-#      define HAVE_STDARG 1
+
+#      ifndef HAVE_STDARG
+#              define HAVE_STDARG 1
+#      endif
+
 #else
 #      include <varargs.h>
 #endif

diff --git a/include/ac/string.h b/include/ac/string.h
index 8df4116cff56846cfe70acc946c353016d09ed35..19efea1b780ea8397f0c987af664e0343f8e5929 100644 (file)
--- a/include/ac/string.h
+++ b/include/ac/string.h
@@ -5,6 +5,7 @@
 
 #ifdef STDC_HEADERS
 #      include <string.h>
+
 #else
 #      ifdef HAVE_STRING_H
 #              include <string.h>
@@ -12,6 +13,14 @@
 #              include <strings.h>
 #      endif
 
+#      ifdef HAVE_MEMORY_H
+#              include <memory.h>
+#      endif
+
+#      ifdef HAVE_MALLOC_H
+#              include <malloc.h>
+#      endif
+
 #      ifndef HAVE_STRCHR
 #              define strchr index
 #              define strrchr rindex
@@ -21,21 +30,14 @@
 #              define memcpy(d, s, n)                  bcopy ((s), (d), (n))
 #              define memmove(d, s, n)                 bcopy ((s), (d), (n))
 #      endif
+#endif
 
-#      if !defined(HAVE_STRING_H) && !defined(HAVE_STRINGS_H)
-       /* define prototypes for string functions */
-       /* this could cause problems on some odd ball systems */
-       char    *strchr(), *strrchr();
-       char    *strcpy(), *strncpy();
-       char    *strcat (), *strncat ();
-       int             strcmp(), strncmp();
-       int             strcasecmp(), strncasecmp();
-       char    *strdup();
-       char    *strtok();
-       char    *strpbrk();
-       int             memcmp();
-#      endif
-
+/*
+ * provide prototypes for missing functions that we replace.
+ * replacements can be found in -llutil
+ */
+#ifndef HAVE_STRDUP
+       char *strdup( const char *s );
 #endif
 
 #ifndef SAFEMEMCPY
@@ -43,8 +45,6 @@
 #              define SAFEMEMCPY( d, s, n )    memmove((d), (s), (n))
 #      elif defined( HAVE_BCOPY )
 #              define SAFEMEMCPY( d, s, n )    bcopy((s), (d), (n))
-#      elif defined( MACOS )
-#              define SAFEMEMCPY( d, s, n )    BlockMoveData((Ptr)(s), (Ptr)(d), (n))
 #      else
                /* nothing left but memcpy() */
 #              define SAFEMEMCPY( d, s, n )    memcpy((d), (s), (n))

diff --git a/include/portable.h.in b/include/portable.h.in
index 8123ab6dc6f6bccd8930d57e3438f3cf6e27a520..fc3ccf669386a626107784cbb5ce912118ab83d7 100644 (file)
--- a/include/portable.h.in
+++ b/include/portable.h.in
@@ -352,6 +352,9 @@ is provided ``as is'' without express or implied warranty.
 /* Define if you have the strerror function.  */
 #undef HAVE_STRERROR
 
+/* Define if you have the strpbrk function.  */
+#undef HAVE_STRPBRK
+
 /* Define if you have the strrchr function.  */
 #undef HAVE_STRRCHR
 
@@ -364,6 +367,9 @@ is provided ``as is'' without express or implied warranty.
 /* Define if you have the strtod function.  */
 #undef HAVE_STRTOD
 
+/* Define if you have the strtok function.  */
+#undef HAVE_STRTOK
+
 /* Define if you have the strtol function.  */
 #undef HAVE_STRTOL
 
@@ -436,6 +442,9 @@ is provided ``as is'' without express or implied warranty.
 /* Define if you have the <malloc.h> header file.  */
 #undef HAVE_MALLOC_H
 
+/* Define if you have the <memory.h> header file.  */
+#undef HAVE_MEMORY_H
+
 /* Define if you have the <ncurses.h> header file.  */
 #undef HAVE_NCURSES_H
 

diff --git a/include/portable.h.nt b/include/portable.h.nt
index ba45d908cd367b3a1742eaa8c6a55429b46c708a..5b1a2f962082fc44cb3b014b34e325de08a1d263 100644 (file)
--- a/include/portable.h.nt
+++ b/include/portable.h.nt
@@ -1,5 +1,5 @@
 /* include/portable.h.nt -- manually updated of MS NT (MS VC5) */
-/* synced with portable.h.in 1.11 */
+/* synced with portable.h.in 1.18 */
 /*
 Copyright 1998 The OpenLDAP Foundation, Redwood City, California, USA
 All rights reserved.
@@ -32,8 +32,9 @@ is provided ``as is'' without express or implied warranty.
 #ifndef _LDAP_PORTABLE_H
 #define _LDAP_PORTABLE_H
 
-/* MSVC5 doesn't define _STDC_, but requires prototypes */
+/* MSVC5 doesn't define _STDC_ but supports _STDC_ features */
 #define __NEED_PROTOTYPES 1
+#define HAVE_STDARG 1
 
 /* we installed Henry Spencer's REGEX */
 #define HAVE_REGEX_H 1
@@ -133,10 +134,13 @@ typedef char * caddr_t;
 #define uid_t long
 
 /* define this if needed to get reentrant functions */
-#undef _REENTRANT
+/* #undef _REENTRANT */
 
 /* define this if needed to get threadsafe functions */
-#undef _THREAD_SAFE
+/* #undef _THREAD_SAFE */
+
+/* define this if needed to get threadsafe functions */
+/* #undef _THREADSAFE */
 
 /* define this if toupper() requires tolower() */
 #define C_UPPER_LOWER
@@ -153,9 +157,6 @@ typedef char * caddr_t;
 /* define if you have crypt */
 /* #undef HAVE_CRYPT */
 
-/* define if you have DCE */
-/* #undef HAVE_DCE */
-
 /* define if you have DSAP */
 /* #undef HAVE_DSAP */
 
@@ -225,18 +226,12 @@ typedef char * caddr_t;
 /* define this to add debugging code */
 #define LDAP_DEBUG 1
 
-/* define this for LDAP DNS support */
-/* #undef LDAP_DNS */
-
 /* define this to remove -lldap cache support */
 /* #undef LDAP_NOCACHE */
 
 /* define this for LDAP process title support */
 /* #undef LDAP_PROCTITLE */
 
-/* define this for LDAP referrals support */
-#define LDAP_REFERRALS 1
-
 /* define this for LDAP User Interface support */
 /* #undef LDAP_LIBUI */
 
@@ -282,6 +277,12 @@ typedef char * caddr_t;
 /* define this to use SLAPD shell backend */
 /* #undef SLAPD_SHELL */
 
+/* These are defined in ldap_features.h */
+/*
+ LDAP_API_FEATURE_X_OPENLDAP_V2_DNS
+ LDAP_API_FEATURE_X_OPENLDAP_V2_REFERRALS
+*/
+
 /* Define if you have the bcopy function.  */
 /* #undef HAVE_BCOPY */
 
@@ -297,6 +298,9 @@ typedef char * caddr_t;
 /* define if you have the getopt function */
 /* #undef HAVE_GETOPT */
 
+/* Define if you have the getpwuid function.  */
+/* #undef HAVE_GETPWUID */
+
 /* Define if you have the gettimeofday function.  */
 /* #undef HAVE_GETTIMEOFDAY */
 
@@ -315,6 +319,24 @@ typedef char * caddr_t;
 /* Define if you have the mktime function.  */
 #define HAVE_MKTIME 1
 
+/* Define if you have the pthread_attr_create function.  */
+/* #undef HAVE_PTHREAD_ATTR_CREATE */
+
+/* Define if you have the pthread_attr_delete function.  */
+/* #undef HAVE_PTHREAD_ATTR_DELETE */
+
+/* Define if you have the pthread_attr_destroy function.  */
+/* #undef HAVE_PTHREAD_ATTR_DESTROY */
+
+/* Define if you have the pthread_attr_init function.  */
+/* #undef HAVE_PTHREAD_ATTR_INIT */
+
+/* Define if you have the pthread_attr_setdetach_np function.  */
+/* #undef HAVE_PTHREAD_ATTR_SETDETACH_NP */
+
+/* Define if you have the pthread_attr_setdetachstate function.  */
+/* #undef HAVE_PTHREAD_ATTR_SETDETACHSTATE */
+
 /* Define if you have the pthread_kill function.  */
 /* #undef HAVE_PTHREAD_KILL */
 
@@ -357,6 +379,9 @@ typedef char * caddr_t;
 /* Define if you have the strerror function.  */
 #define HAVE_STRERROR 1
 
+/* Define if you have the strpbrk function.  */
+#define HAVE_STRPBRK 1
+
 /* Define if you have the strrchr function.  */
 #define HAVE_STRRCHR 1
 
@@ -369,6 +394,9 @@ typedef char * caddr_t;
 /* Define if you have the strtod function.  */
 #define HAVE_STRTOD 1
 
+/* Define if you have the strtok function.  */
+#define HAVE_STRTOK 1
+
 /* Define if you have the strtol function.  */
 #define HAVE_STRTOL 1
 
@@ -453,6 +481,9 @@ typedef char * caddr_t;
 /* Define if you have the <pthread.h> header file.  */
 /* #undef HAVE_PTHREAD_H */
 
+/* Define if you have the <pwd.h> header file.  */
+/* #undef HAVE_PWD_H */
+
 /* Define if you have the <regex.h> header file.  */
 /* #undef HAVE_REGEX_H */
 
@@ -468,6 +499,12 @@ typedef char * caddr_t;
 /* Define if you have the <stddef.h> header file.  */
 #define HAVE_STDDEF_H 1
 
+/* Define if you have the <string.h> header file.  */
+#define HAVE_STRING_H 1
+
+/* Define if you have the <strings.h> header file.  */
+/* #undef HAVE_STRINGS_H */
+
 /* Define if you have the <synch.h> header file.  */
 /* #undef HAVE_SYNCH_H */
 
@@ -492,6 +529,9 @@ typedef char * caddr_t;
 /* Define if you have the <sys/param.h> header file.  */
 /* #undef HAVE_SYS_PARAM_H */
 
+/* Define if you have the <sys/resource.h> header file.  */
+/* #undef HAVE_SYS_RESOURCE_H */
+
 /* Define if you have the <sys/socket.h> header file.  */
 /* #undef HAVE_SYS_SOCKET_H */
 
@@ -548,5 +588,6 @@ typedef char * caddr_t;
 #endif
 
 #include "ldap_cdefs.h"
+#include "ldap_features.h"
 
 #endif /* _LDAP_PORTABLE_H */