--- configure.orig	2024-03-02 09:02:14 UTC
+++ configure
@@ -19020,20 +19020,7 @@ fi
   printf "%s\n" "#define HAVE_SQL_H 1" >>confdefs.h
 
 fi
-ac_fn_c_check_header_compile "$LINENO" "odbcss.h" "ac_cv_header_odbcss_h" "#ifdef HAVE_WINDOWS_H
-# include <windows.h>
-#endif
-#ifdef HAVE_SQL_H
-# include <sql.h>
-#endif
 
-"
-if test "x$ac_cv_header_odbcss_h" = xyes
-then :
-  printf "%s\n" "#define HAVE_ODBCSS_H 1" >>confdefs.h
-
-fi
-
  if test "$ac_cv_header_odbcss_h" = "yes"; then
   HAVE_ODBCSS_H_TRUE=
   HAVE_ODBCSS_H_FALSE='#'
@@ -21382,8 +21369,8 @@ elif test "x$with_iodbc" != "x" -a "x$with_iodbc" != "
 	fi
 	CPPFLAGS="$CPPFLAGS -DIODBC"
 	ODBC_INC="$with_iodbc/include"
-	test -r "$ODBC_INC/isql.h" || as_fn_error $? "isql.h not found" "$LINENO" 5
-	test -r "$ODBC_INC/isqlext.h" || as_fn_error $? "isqlext.h not found" "$LINENO" 5
+	test -r "$ODBC_INC/libiodbc/isql.h" || as_fn_error $? "isql.h not found" "$LINENO" 5
+	test -r "$ODBC_INC/libiodbc/isqlext.h" || as_fn_error $? "isqlext.h not found" "$LINENO" 5
 	ODBC_INC="-I$ODBC_INC"
 	ODBC_LDFLAGS="-L$with_iodbc/lib -liodbc"
 	odbc=true
@@ -21983,14 +21970,14 @@ fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$GNUTLS_PKG_ERRORS" >&5
 
-	CPPFLAGS="$CPPFLAGS `libgnutls-config --cflags`"
-		NETWORK_LIBS="$NETWORK_LIBS `libgnutls-config --libs`"
+	CPPFLAGS="$CPPFLAGS `pkg-config gnutls --cflags`"
+		NETWORK_LIBS="$NETWORK_LIBS `pkg-config gnutls --libs`"
 
 elif test $pkg_failed = untried; then
      	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
 printf "%s\n" "no" >&6; }
-	CPPFLAGS="$CPPFLAGS `libgnutls-config --cflags`"
-		NETWORK_LIBS="$NETWORK_LIBS `libgnutls-config --libs`"
+	CPPFLAGS="$CPPFLAGS `pkg-config gnutls --cflags`"
+		NETWORK_LIBS="$NETWORK_LIBS `pkg-config gnutls --libs`"
 
 else
 	GNUTLS_CFLAGS=$pkg_cv_GNUTLS_CFLAGS
@@ -26085,5 +26072,3 @@ fi
   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
 printf "%s\n" "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
 fi
-
-