actually define HAVE_SYS_ERRLIST if we have it, if not then declare it locally in...

diff --git a/build/openldap.m4 b/build/openldap.m4
index 2093f0fa9b64686a1fe21521ab2187d13545bfac..23ad78bc639fd6fb12d8d82ef2b6a7984ed095e7 100644 (file)
--- a/build/openldap.m4
+++ b/build/openldap.m4
@@ -395,6 +395,10 @@ if test $ol_cv_dcl_sys_errlist = no ; then
                        [ol_cv_have_sys_errlist=no])])
        AC_MSG_RESULT($ol_cv_have_sys_errlist)
 fi
+if test $ol_cv_have_sys_errlist = yes ; then
+       AC_DEFINE(HAVE_SYS_ERRLIST,1,
+               [define if you actually have sys_errlist in your libs])
+fi
 ])dnl
 
 dnl ====================================================================

diff --git a/configure b/configure
index 4f3ebd599871350cc786ef506aabc3cabfadc267..26175cba15a90edc11098029f0c0683f9f5c4af4 100755 (executable)
--- a/configure
+++ b/configure
@@ -10011,6 +10011,12 @@ fi
 
        echo "$ac_t""$ol_cv_have_sys_errlist" 1>&6
 fi
+if test $ol_cv_have_sys_errlist = yes ; then
+       cat >> confdefs.h <<\EOF
+#define HAVE_SYS_ERRLIST 1
+EOF
+
+fi
 
 
 
@@ -10325,6 +10331,7 @@ servers/slapd/tools/Makefile:build/top.mk:servers/slapd/tools/Makefile.in \
 servers/slurpd/Makefile:build/top.mk:servers/slurpd/Makefile.in:build/srv.mk \
 tests/Makefile:build/top.mk:tests/Makefile.in:build/dir.mk \
 tests/progs/Makefile:build/top.mk:tests/progs/Makefile.in:build/rules.mk \
+contrib/Makefile:build/top.mk:contrib/Makefile.in:build/dir.mk \
 contrib/saucer/Makefile:build/top.mk:contrib/saucer/Makefile.in:build/rules.mk \
  include/portable.h include/ldap_features.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
 EOF
@@ -10494,6 +10501,7 @@ servers/slapd/tools/Makefile:build/top.mk:servers/slapd/tools/Makefile.in \
 servers/slurpd/Makefile:build/top.mk:servers/slurpd/Makefile.in:build/srv.mk \
 tests/Makefile:build/top.mk:tests/Makefile.in:build/dir.mk \
 tests/progs/Makefile:build/top.mk:tests/progs/Makefile.in:build/rules.mk \
+contrib/Makefile:build/top.mk:contrib/Makefile.in:build/dir.mk \
 contrib/saucer/Makefile:build/top.mk:contrib/saucer/Makefile.in:build/rules.mk \
 "}
 EOF

diff --git a/include/ac/errno.h b/include/ac/errno.h
index 49e03fb757882bb6e8ed44474a6102b303ff0e4d..009c0f463938142c0375078b4c99eaa320587a6b 100644 (file)
--- a/include/ac/errno.h
+++ b/include/ac/errno.h
@@ -19,9 +19,14 @@
 #endif
 
 #ifdef DECL_SYS_ERRLIST 
+#ifndef HAVE_SYS_ERRLIST
+int             sys_nerr;
+char            **sys_errlist;
+#else
 extern int      sys_nerr;
 extern char     *sys_errlist[];
 #endif
+#endif
     
 /* use _POSIX_VERSION for POSIX.1 code */
 

diff --git a/include/portable.h.in b/include/portable.h.in
index f4efee43515cac203fa998a0e9b5eda9311c62ef..43a0c5ae7d2e487a5fb6c456d3f3a37d79f792e4 100644 (file)
--- a/include/portable.h.in
+++ b/include/portable.h.in
@@ -666,6 +666,9 @@
 /* define if sys_errlist is declared in stdio.h or errno.h */
 #undef DECL_SYS_ERRLIST
 
+/* define if you actually have sys_errlist in your libs */
+#undef HAVE_SYS_ERRLIST
+
 /* begin of postamble */
 
 #ifdef HAVE_STDDEF_H