Skip to content
Snippets Groups Projects
Commit ac079c63 authored by Rene Brun's avatar Rene Brun
Browse files

From Mattias Ellert

If I install the standard redhat/fedora mysql libraries in a user location:

export MYSQL=/where/ever/you/have/write/permissions

rpm --dbpath $MYSQL/rpmdb --initdb

rpm --dbpath $MYSQL/rpmdb -ivh --noscripts --nodeps \
--relocate /usr=$MYSQL --relocate /etc=$MYSQL/etc \
mysql-5.0.18-2.1.i386.rpm mysql-devel-5.0.18-2.1.i386.rpm

and then try to configure root to use these libraries with the MYSQL environment variable it does not work.

The configure script looks for include files in $MYSQL nad $MYSQL/include, but not in $MYSQL/include/mysql. It look for libraries in $MYSQL and $MYSQL/lib, but not in $MYSQL/lib/mysql

This patch fixes this problem.


git-svn-id: http://root.cern.ch/svn/root/trunk@14983 27541ba8-7e3a-0410-8455-c3a389f83636
parent cda876a7
No related branches found
No related tags found
No related merge requests found
......@@ -1504,10 +1504,11 @@ if test ! "x$enable_mysql" = "xno"; then
result "not found"
# fall back in case mysql_config is not found
check_header "mysql.h" "$mysqlincdir" \
$MYSQL $MYSQL/include /usr/local/include /usr/local/include/mysql \
/usr/local/mysql /usr/local/mysql/include /opt/mysql \
/opt/mysql/include /usr/include /usr/include/mysql \
/usr/mysql /usr/mysql/include $finkdir/include/mysql
$MYSQL $MYSQL/include $MYSQL/include/mysql /usr/local/include \
/usr/local/include/mysql /usr/local/mysql /usr/local/mysql/include \
/opt/mysql /opt/mysql/include \
/usr/include /usr/include/mysql /usr/mysql /usr/mysql/include \
$finkdir/include/mysql
mysqlinc=$found_hdr
mysqlincdir=$found_dir
......@@ -1517,9 +1518,10 @@ if test ! "x$enable_mysql" = "xno"; then
fi
check_library "$mysqlclientlibs" "$enable_shared" "$mysqllibdir" \
$MYSQL $MYSQL/lib /usr/local/lib /usr/local/lib/mysql \
/usr/local/mysql /usr/local/mysql/lib /opt/mysql /opt/mysql/lib \
/usr/lib /usr/lib/mysql /usr/mysql /usr/mysql/lib \
$MYSQL $MYSQL/lib $MYSQL/lib/mysql /usr/local/lib \
/usr/local/lib/mysql /usr/local/mysql /usr/local/mysql/lib \
/opt/mysql /opt/mysql/lib \
/usr/lib /usr/lib/mysql /usr/mysql /usr/mysql/lib \
$finkdir/lib/mysql
mysqllib=$found_lib
mysqllibdir=$found_dir
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment