regen

diff --git a/configure b/configure
index 61adb40be9f137cc51852841d13312b075d13689..60ee99b330d0ef4e8e338c35337d02512956fa4e 100755 (executable)
--- a/configure
+++ b/configure
@@ -14,7 +14,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 #
-# $Id: configure,v 1.428 2008/05/06 01:31:11 each Exp $
+# $Id: configure,v 1.429 2008/06/17 03:58:27 marka Exp $
 #
 # Portions Copyright (C) 1996-2001  Nominum, Inc.
 #
@@ -30516,6 +30516,8 @@ else
 fi
 
 
+mysql_include=""
+mysql_lib=""
 if test "$use_dlz_mysql" = "yes"
 then
        # User did not specify a path - guess it
@@ -30525,9 +30527,49 @@ then
                if test -f $d/include/mysql/mysql.h
                then
                        use_dlz_mysql=$d
+                       mysql_include=$d/include/mysql
+                       if test -d $d/lib/mysql
+                       then
+                               mysql_lib=$d/lib/mysql
+                       else
+                               mysql_lib=$d/lib
+                       fi
+                       break
+               elif test -f $d/include/mysql.h
+               then
+                       use_dlz_mysql=$d
+                       mysql_include=$d/include
+                       if test -d $d/lib/mysql
+                       then
+                               mysql_lib=$d/lib/mysql
+                       else
+                               mysql_lib=$d/lib
+                       fi
                        break
                fi
        done
+elif test "$use_dlz_mysql" != "no"
+then
+       d = $use_dlz_mysql
+       if test -f $d/include/mysql/mysql.h
+       then
+               mysql_include=$d/include/mysql
+               if test -d $d/lib/mysql
+               then
+                       mysql_lib=$d/lib/mysql
+               else
+                       mysql_lib=$d/lib
+               fi
+       elif test -f $d/include/mysql.h
+       then
+               mysql_include=$d/include
+               if test -d $d/lib/mysql
+               then
+                       mysql_lib=$d/lib/mysql
+               else
+                       mysql_lib=$d/lib
+               fi
+       fi
 fi
 
 if test "$use_dlz_mysql" = "yes"
@@ -30552,18 +30594,18 @@ echo "${ECHO_T}no" >&6; }
                DLZ_DRIVER_SRCS="$DLZ_DRIVER_SRCS $dlzdir/$i.c"
                DLZ_DRIVER_OBJS="$DLZ_DRIVER_OBJS $i.$O"
        done
-       if test -n "-I$use_dlz_mysql/include/mysql"
+       if test -n "-I${mysql_include}"
        then
-               DLZ_DRIVER_INCLUDES="$DLZ_DRIVER_INCLUDES -I$use_dlz_mysql/include/mysql"
+               DLZ_DRIVER_INCLUDES="$DLZ_DRIVER_INCLUDES -I${mysql_include}"
        fi
-       if test -n "-L$use_dlz_mysql/lib/mysql -lmysqlclient -lz -lcrypt -lm"
+       if test -n "-L${mysql_lib} -lmysqlclient -lz -lcrypt -lm"
        then
-               DLZ_DRIVER_LIBS="$DLZ_DRIVER_LIBS -L$use_dlz_mysql/lib/mysql -lmysqlclient -lz -lcrypt -lm"
+               DLZ_DRIVER_LIBS="$DLZ_DRIVER_LIBS -L${mysql_lib} -lmysqlclient -lz -lcrypt -lm"
        fi
 
 
-               { echo "$as_me:$LINENO: result: using mysql from $use_dlz_mysql/lib/mysql and $use_dlz_mysql/include/mysql" >&5
-echo "${ECHO_T}using mysql from $use_dlz_mysql/lib/mysql and $use_dlz_mysql/include/mysql" >&6; }
+               { echo "$as_me:$LINENO: result: using mysql from ${mysql_lib} and ${mysql_include}" >&5
+echo "${ECHO_T}using mysql from ${mysql_lib} and ${mysql_include}" >&6; }
                ;;
 esac