From 7e2be326d1ebb0975ee704c98100d9458944584c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Grubbstr=C3=B6m=20=28Grubba=29?= <grubba@grubba.org> Date: Sun, 7 Feb 1999 23:36:50 +0100 Subject: [PATCH] Now allows specification of the Mysql installation directory with the --with-mysql option. Rev: src/modules/Mysql/configure.in:1.9 --- src/modules/Mysql/configure.in | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/src/modules/Mysql/configure.in b/src/modules/Mysql/configure.in index 1a811f9102..158a40c36e 100644 --- a/src/modules/Mysql/configure.in +++ b/src/modules/Mysql/configure.in @@ -1,5 +1,5 @@ # -# $Id: configure.in,v 1.8 1998/10/20 20:29:08 grubba Exp $ +# $Id: configure.in,v 1.9 1999/02/07 22:36:50 grubba Exp $ # # Configure script for the mysql-module # @@ -34,8 +34,18 @@ if test x$with_mysql = xno; then else AC_MSG_CHECKING(for Mysql lib-directory) + libdirs="/usr/local/lib/mysql /usr/local/mysql/lib/mysql /usr/gnu/lib/mysql /usr/lib/mysql /lib/mysql /usr/local/mysql/lib /usr/local/mysql/mach-lib-thread no" + incdirs="/usr/local/include/mysql /usr/local/mysql/include/mysql /usr/gnu/include/mysql /usr/include/mysql /include/mysql /usr/local/mysql/include no" + + if test x$with_mysql = xyes; then :; else + # Mysql installation directory specified. + + libdirs="$with_mysql/lib/mysql $with_mysql/lib $libdirs" + incdirs="$with_mysql/include/mysql $with_mysql/include $incdirs" + fi + AC_CACHE_VAL(pike_cv_mysql_lib_dir, [ - for pike_cv_mysql_lib_dir in /usr/local/lib/mysql /usr/local/mysql/lib/mysql /usr/gnu/lib/mysql /usr/lib/mysql /lib/mysql /usr/local/mysql/lib /usr/local/mysql/mach-lib-thread no; do + for pike_cv_mysql_lib_dir in $libdirs; do if test -d $pike_cv_mysql_lib_dir/.; then break else @@ -54,7 +64,7 @@ else AC_MSG_CHECKING(for Mysql include-directory) AC_CACHE_VAL(pike_cv_mysql_include_dir, [ - for pike_cv_mysql_include_dir in /usr/local/include/mysql /usr/local/mysql/include/mysql /usr/gnu/include/mysql /usr/include/mysql /include/mysql /usr/local/mysql/include no; do + for pike_cv_mysql_include_dir in $incdirs; do if test -d $pike_cv_mysql_include_dir/.; then break else -- GitLab