Add checks for SQL headers in configure.in (need to rerun autoheader

and autoconf); #include "ac/string.h" instead of <string.h>

diff --git a/configure.in b/configure.in
index 381ee80a56cfce6f57781f4fdb4b1e1d82697cd4..346865f0c2a66e03d6eb26c2f178c55bfee31e90 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -2090,6 +2090,10 @@ dnl ----------------------------------------------------------------
 dnl SQL
 ol_link_sql=no
 if test $ol_enable_sql != no ; then
+       AC_CHECK_HEADERS(sql.h sqlext.h,[],[
+               AC_MSG_ERROR([could not locate SQL headers])
+       ])
+
        AC_CHECK_LIB(iodbc,SQLDriverConnect,[have_iodbc=yes],[have_iodbc=no])
        if test $have_iodbc = yes ; then
                ol_link_sql="-liodbc"

diff --git a/servers/slapd/back-sql/config.c b/servers/slapd/back-sql/config.c
index e26c6b94891fedcce8947c83f2c6bd96c302c64b..4508bef971ccc5afe81e018f154bd6d30584908a 100644 (file)
--- a/servers/slapd/back-sql/config.c
+++ b/servers/slapd/back-sql/config.c
@@ -12,7 +12,7 @@
 #ifdef SLAPD_SQL
 
 #include <stdio.h>
-#include <string.h>
+#include "ac/string.h"
 #include <sys/types.h>
 #include "slap.h"
 #include "back-sql.h"

diff --git a/servers/slapd/back-sql/modify.c b/servers/slapd/back-sql/modify.c
index d83eec1837cea07556d54141f443ecb2da0307a1..3511ce9240e04de0f51efcaf41c3f179616a7aee 100644 (file)
--- a/servers/slapd/back-sql/modify.c
+++ b/servers/slapd/back-sql/modify.c
@@ -13,7 +13,7 @@
 
 #include <stdio.h>
 #include <sys/types.h>
-#include <string.h>
+#include "ac/string.h"
 #include "slap.h"
 #include "ldap_pvt.h"
 #include "back-sql.h"

diff --git a/servers/slapd/back-sql/schema-map.c b/servers/slapd/back-sql/schema-map.c
index 2f9fd207b7dda662605da60624465aab586f3b25..c78620445fae533d66c6fe37b99678619729fb3e 100644 (file)
--- a/servers/slapd/back-sql/schema-map.c
+++ b/servers/slapd/back-sql/schema-map.c
@@ -13,7 +13,7 @@
 
 #include <stdio.h>
 #include <sys/types.h>
-#include <string.h>
+#include "ac/string.h"
 #include "slap.h"
 #include "lber_pvt.h"
 #include "ldap_pvt.h"