summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorcmiller@zippy.cornsilk.net <>2006-09-15 11:25:02 -0400
committercmiller@zippy.cornsilk.net <>2006-09-15 11:25:02 -0400
commit895bf0555b80563fcee7e01714df000305a684cb (patch)
tree223c8cb9f532208d7cad18dcd9c8d3c006b77e70 /scripts
parent8f7eac7a3526a056a9049aac82ee2e39c4da0d7e (diff)
parentb0fc6840b414910ced218dc5fd779acfd588bec2 (diff)
downloadmariadb-git-895bf0555b80563fcee7e01714df000305a684cb.tar.gz
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
Diffstat (limited to 'scripts')
-rw-r--r--scripts/mysql_config.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/mysql_config.sh b/scripts/mysql_config.sh
index 84ff518c381..fa25d7973eb 100644
--- a/scripts/mysql_config.sh
+++ b/scripts/mysql_config.sh
@@ -101,7 +101,7 @@ ldflags='@LDFLAGS@'
libs=" $ldflags -L$pkglibdir -lmysqlclient @ZLIB_DEPS@ @NON_THREADED_LIBS@"
libs="$libs @openssl_libs@ @STATIC_NSS_FLAGS@"
libs_r=" $ldflags -L$pkglibdir -lmysqlclient_r @ZLIB_DEPS@ @LIBS@ @openssl_libs@"
-embedded_libs=" $ldflags -L$pkglibdir -lmysqld @ZLIB_DEPS@ @LIBS@ @WRAPLIBS@ @innodb_system_libs@"
+embedded_libs=" $ldflags -L$pkglibdir -lmysqld @ZLIB_DEPS@ @LIBS@ @WRAPLIBS@ @innodb_system_libs@ @openssl_libs@"
cflags="-I$pkgincludedir @CFLAGS@ " #note: end space!
include="-I$pkgincludedir"