Commit e50bfebe authored by unknown's avatar unknown
Browse files

Merge jwinstead@bk-internal.mysql.com:/home/bk/mysql-4.1 

into mysql.com:/home/jwinstead2/mysql-4.1-clean
parents d3faf620 c9da387e

scripts/mysql_config.sh

+4 −2
Original line number Diff line number Diff line
@@ -88,7 +88,7 @@ client_libs='@CLIENT_LIBS@' 


libs="$ldflags -L$pkglibdir -lmysqlclient $client_libs"

libs=`echo "$libs" | sed -e 's;  \+; ;g' | sed -e 's;^ *;;' | sed -e 's; *\$;;'`

libs_r="$ldflags -L$pkglibdir -lmysqlclient_r @LIBS@ @openssl_libs@"

libs_r="$ldflags -L$pkglibdir -lmysqlclient_r @LIBS@ @ZLIB_LIBS@ @openssl_libs@"

libs_r=`echo "$libs_r" | sed -e 's;  \+; ;g' | sed -e 's;^ *;;' | sed -e 's; *\$;;'`

cflags="-I$pkgincludedir @CFLAGS@ " #note: end space!

include="-I$pkgincludedir"
@@ -100,6 +100,8 @@ for remove in DDBUG_OFF DSAFEMALLOC USAFEMALLOC DSAFE_MUTEX \ 
              DPEDANTIC_SAFEMALLOC DUNIV_MUST_NOT_INLINE DFORCE_INIT_OF_VARS \

              DEXTRA_DEBUG DHAVE_purify 'O[0-9]' 'W[-A-Za-z]*'

do

  # The first option we might strip will always have a space before it because

  # we set -I$pkgincludedir as the first option

  cflags=`echo "$cflags"|sed -e "s/ -$remove  */ /g"` 

done

cflags=`echo "$cflags"|sed -e 's/ *\$//'`