fixed bug #1650 "mysql_config --libmysqd-libs misses libwrap"
This commit is contained in:
parent
0b7ccfa882
commit
24413c7d8c
@ -114,6 +114,7 @@ SUFFIXES = .sh
|
||||
-e 's!@''LDFLAGS''@!@SAVE_LDFLAGS@!'\
|
||||
-e 's!@''CLIENT_LIBS''@!@CLIENT_LIBS@!' \
|
||||
-e 's!@''LIBS''@!@LIBS@!' \
|
||||
-e 's!@''WRAPLIBS''@!@WRAPLIBS@!' \
|
||||
-e 's!@''innodb_system_libs''@!@innodb_system_libs@!' \
|
||||
-e 's!@''openssl_libs''@!@openssl_libs@!' \
|
||||
-e 's!@''VERSION''@!@VERSION@!' \
|
||||
|
@ -92,7 +92,7 @@ libs_r="$ldflags -L$pkglibdir -lmysqlclient_r @LIBS@ @openssl_libs@"
|
||||
libs_r=`echo "$libs_r" | sed -e 's; \+; ;g' | sed -e 's;^ *;;' | sed -e 's; *\$;;'`
|
||||
cflags="-I$pkgincludedir @CFLAGS@"
|
||||
include="-I$pkgincludedir"
|
||||
embedded_libs="$ldflags -L$pkglibdir -lmysqld @LIBS@ @innodb_system_libs@"
|
||||
embedded_libs="$ldflags -L$pkglibdir -lmysqld @LIBS@ @WRAPLIBS@ @innodb_system_libs@"
|
||||
embedded_libs=`echo "$embedded_libs" | sed -e 's; \+; ;g' | sed -e 's;^ *;;' | sed -e 's; *\$;;'`
|
||||
|
||||
# Remove some options that a client doesn't have to care about
|
||||
|
Loading…
x
Reference in New Issue
Block a user