mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-04-30 12:15:32 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge bk-internal.mysql.com:/home/bk/mysql-5.1-build

Browse source 
into  chorlton.adsl.perkin.org.uk:/Users/jonathan/mysql/bk/build/5.1


libmysqld/Makefile.am:
  Auto merged
scripts/Makefile.am:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
scripts/mysql_config.sh:
  Auto merged
sql/Makefile.am:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/unireg.h:
  Auto merged
This commit is contained in:
unknown 2008-03-06 15:13:14 +00:00
commit fcdf0d11c5
14 changed files with 36 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

4
scripts/mysql_config.sh
View file

@ -87,6 +87,8 @@ pkglibdir='@pkglibdir@'
pkglibdir_rel=`echo $pkglibdir | sed -e "s;^$basedir/;;"`
fix_path pkglibdir $pkglibdir_rel lib/mysql lib
plugindir='@pkgplugindir@'
pkgincludedir='@pkgincludedir@'
fix_path pkgincludedir include/mysql include
@ -158,6 +160,7 @@ Options:
--include [$include]
--libs [$libs]
--libs_r [$libs_r]
--plugindir [$plugindir]
--socket [$socket]
--port [$port]
--version [$version]
@ -174,6 +177,7 @@ while test $# -gt 0; do
--include) echo "$include" ;;
--libs) echo "$libs" ;;
--libs_r) echo "$libs_r" ;;
--plugindir) echo "$plugindir" ;;
--socket) echo "$socket" ;;
--port) echo "$port" ;;
--version) echo "$version" ;;