Updated configure

configure

@@ -623,6 +623,7 @@ CXXCPP
 ac_ct_CXX
 CXXFLAGS
 CXX
+ODBC
 OPENSSL_LDFLAGS
 OPENSSL_LIBS
 OPENSSL_INCLUDES
@@ -3982,10 +3983,55 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \
 echo "OpenSSL: ${OPENSSL_INCLUDES}"
 
 ## Setup ODBC
-PKG_CHECK_MODULES(ODBC, odbc,
-ODBC_CFLAGS=""
-ODBC_LIBS="-lodbc"
-)
+# Extract the first word of "odbc_config", so it can be a program name with args.
+set dummy odbc_config; ac_word=$2
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_ODBC+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  if test -n "$ODBC"; then
+  ac_cv_prog_ODBC="$ODBC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ODBC="yes"
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ODBC=$ac_cv_prog_ODBC
+if test -n "$ODBC"; then
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ODBC" >&5
+printf "%s\n" "$ODBC" >&6; }
+else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+fi
+
+
+if test x"${ODBC}" == x"yes" ; then
+    ODBC_CFLAGS = `odbc_config --cflags`
+    ODBC_LIBS = `odbc_config --libs`
+else
+    ODBC_CFLAGS = ""
+    ODBC_LIBS = "-lodbc"
+fi
 
 
 ## Setup RBin

configure.ac

@@ -46,10 +46,14 @@ fi
 echo "OpenSSL: ${OPENSSL_INCLUDES}"
 
 ## Setup ODBC
-PKG_CHECK_MODULES([ODBC], [odbc], [
-ODBC_CFLAGS=""
-ODBC_LIBS="-lodbc"
-])
+AC_CHECK_PROG(ODBC,odbc_config,yes)
+if test x"${ODBC}" == x"yes" ; then
+    ODBC_CFLAGS = `odbc_config --cflags`
+    ODBC_LIBS = `odbc_config --libs`
+else
+    ODBC_CFLAGS = ""
+    ODBC_LIBS = "-lodbc"
+fi
 
 
 ## Setup RBin