diff options
| author | unknown <tsmith@ramayana.hindu.god> | 2007-09-28 10:55:28 -0600 |
|---|---|---|
| committer | unknown <tsmith@ramayana.hindu.god> | 2007-09-28 10:55:28 -0600 |
| commit | d7e230e1fc987ae9c175512d66b33d5c1642f9a8 (patch) | |
| tree | 46cf13bd29c548d5b0f651877e446ba0be6c3513 /scripts/mysql_config.sh | |
| parent | 9a640f848e465f2bebd27072fa651a230e9632f9 (diff) | |
| parent | 573f3a00de9c497dc81e6970ec0bd8f2344fb3d5 (diff) | |
| download | mariadb-git-d7e230e1fc987ae9c175512d66b33d5c1642f9a8.tar.gz | |
Merge ramayana.hindu.god:/home/tsmith/m/bk/51
into ramayana.hindu.god:/home/tsmith/m/bk/maint/51
configure.in:
Auto merged
libmysql/libmysql.c:
Auto merged
scripts/mysql_config.sh:
Auto merged
Diffstat (limited to 'scripts/mysql_config.sh')
| -rw-r--r-- | scripts/mysql_config.sh | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/scripts/mysql_config.sh b/scripts/mysql_config.sh index 6b054e83720..ae58655ed0f 100644 --- a/scripts/mysql_config.sh +++ b/scripts/mysql_config.sh @@ -92,9 +92,14 @@ fix_path pkgincludedir include/mysql include version='@VERSION@' socket='@MYSQL_UNIX_ADDR@' -port='@MYSQL_TCP_PORT@' ldflags='@LDFLAGS@' +if [ @MYSQL_TCP_PORT_DEFAULT@ -eq 0 ]; then + port=0 +else + port=@MYSQL_TCP_PORT@ +fi + # Create options # We intentionally add a space to the beginning and end of lib strings, simplifies replace later libs=" $ldflags -L$pkglibdir -lmysqlclient @ZLIB_DEPS@ @NON_THREADED_LIBS@" |