mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-08-30 05:57:52 +00:00
Code Issues Releases Wiki Activity

Reduce repeated detection of mysql lib directory.

Browse Source 
Use common part once a bit later.
This commit is contained in:
Petr Menšík 2018-02-15 12:48:56 +01:00
parent e7a93321f0
commit 2a70eae04f
1 changed files with 6 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
contrib/dlz/config.dlz.in
View File

@ -152,23 +152,11 @@ then
then then
use_dlz_mysql=$d use_dlz_mysql=$d
mysql_include=$d/include/mysql mysql_include=$d/include/mysql
if test -d $d/lib/mysql
then
mysql_lib=$d/lib/mysql
else
mysql_lib=$d/lib
fi
break break
elif test -f $d/include/mysql.h elif test -f $d/include/mysql.h
then then
use_dlz_mysql=$d use_dlz_mysql=$d
mysql_include=$d/include mysql_include=$d/include
if test -d $d/lib/mysql
then
mysql_lib=$d/lib/mysql
else
mysql_lib=$d/lib
fi
break break
fi fi
done done
@ -179,21 +167,9 @@ then
if test -f $d/include/mysql/mysql.h if test -f $d/include/mysql/mysql.h
then then
mysql_include=$d/include/mysql 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 elif test -f $d/include/mysql.h
then then
mysql_include=$d/include mysql_include=$d/include
if test -d $d/lib/mysql
then
mysql_lib=$d/lib/mysql
else
mysql_lib=$d/lib
fi
fi fi
fi fi
@ -217,6 +193,12 @@ case "$use_dlz_mysql" in
[using mysql with libs ${mysql_lib} and includes ${mysql_include}]) [using mysql with libs ${mysql_lib} and includes ${mysql_include}])
;; ;;
*) *)
if test -d "$use_dlz_mysql/lib/mysql"
then
mysql_lib="$use_dlz_mysql/lib/mysql"
else
mysql_lib="$use_dlz_mysql/lib"
fi
DLZ_ADD_DRIVER(MYSQL, dlz_mysql_driver, DLZ_ADD_DRIVER(MYSQL, dlz_mysql_driver,
[-I${mysql_include}], [-I${mysql_include}],
[-L${mysql_lib} -lmysqlclient -lz -lcrypt -lm]) [-L${mysql_lib} -lmysqlclient -lz -lcrypt -lm])