diff --git a/src/modules/Odbc/configure.in b/src/modules/Odbc/configure.in
index 846ea26866bb77afe82551aef3dfb4351777389f..c6647137e2205f8ac4febcb5e25fa1c17a82e1be 100644
--- a/src/modules/Odbc/configure.in
+++ b/src/modules/Odbc/configure.in
@@ -1,5 +1,5 @@
 #
-# $Id: configure.in,v 1.2 1997/03/22 23:04:20 grubba Exp $
+# $Id: configure.in,v 1.3 1997/04/22 10:29:39 hubbe Exp $
 #
 # Configure script for the odbc-module
 #
@@ -23,7 +23,17 @@ if test x$with_odbc = xyes; then
   AC_MSG_CHECKING(Checking for ODBC library-directory)
 
   AC_CACHE_VAL(pike_cv_odbc_lib_dir, [
-    for pike_cv_odbc_lib_dir in ${INFORMIXDIR:+$INFORMIXDIR/cli/dlls} /opt/ISLIodbc/*/lib /usr/opt/ISLIodbc/*/lib /usr/local/lib /usr/local/odbc/lib /usr/local/lib/odbc /usr/odbc/lib /usr/lib/odbc /usr/lib /lib/odbc /lib no; do
+
+    # ${INFORMIXDIR:+$INFORMIXDIR/cli/dlls} does not work with stupid sh
+    # /Hubbe
+
+    if test "x$INFORMIXDIR" = "x" ; then 
+      foodir=''
+    else
+      foodir=$INFORMIXDIR/cli/dlls
+    fi
+
+    for pike_cv_odbc_lib_dir in $foodir /opt/ISLIodbc/*/lib /usr/opt/ISLIodbc/*/lib /usr/local/lib /usr/local/odbc/lib /usr/local/lib/odbc /usr/odbc/lib /usr/lib/odbc /usr/lib /lib/odbc /lib no; do
       if test -d $pike_cv_odbc_lib_dir/.; then
         if ls $pike_cv_odbc_lib_dir/*odbc* >/dev/null 2>&1 ; then
 	  break
@@ -46,7 +56,13 @@ if test x$with_odbc = xyes; then
   AC_MSG_CHECKING(Checking for the ODBC include-directory)
 
   AC_CACHE_VAL(pike_cv_odbc_include_dir, [
-    for pike_cv_odbc_include_dir in ${INFORMIXDIR:+$INFORMIXDIR/cli/include} /opt/ISLIodbc/*/include /usr/local/include /usr/local/odbc/include /usr/local/include/odbc /usr/odbc/include /usr/include/odbc /usr/include /include/odbc /include no; do
+    if test "x$INFORMIXDIR" = "x" ; then 
+      foodir=''
+    else
+      foodir=$INFORMIXDIR/cli/include
+    fi
+
+    for pike_cv_odbc_include_dir in $foodir /opt/ISLIodbc/*/include /usr/local/include /usr/local/odbc/include /usr/local/include/odbc /usr/odbc/include /usr/include/odbc /usr/include /include/odbc /include no; do
       if test -d $pike_cv_odbc_include_dir/.; then
         if ls $pike_cv_odbc_include_dir/qeodbc.h >/dev/null 2>&1; then
           break