| 1 | --- configure.orig 2010-08-11 07:33:18.000000000 -0700 |
|---|
| 2 | +++ configure 2010-08-11 07:36:04.000000000 -0700 |
|---|
| 3 | @@ -11471,7 +11471,7 @@ |
|---|
| 4 | CFLAGS="$CFLAGS -I$mysql_path/include" |
|---|
| 5 | MYSQL_LIB="$mysql_path/libmysql_r/libmysqlclient_r.la" |
|---|
| 6 | else |
|---|
| 7 | - mysql_config="$mysql_path/bin/mysql_config" |
|---|
| 8 | + mysql_config="$mysql_path/bin/@@mysql_config@@" |
|---|
| 9 | if test ! -x $mysql_config |
|---|
| 10 | then |
|---|
| 11 | { { $as_echo "$as_me:$LINENO: error: File $mysql_config doesn't exists or isn't executable. Please specify with --with-mysql-path where bin/mysql_config can be found" >&5 |
|---|
| 12 | @@ -11484,7 +11484,7 @@ |
|---|
| 13 | TEST_PATHS="/opt/mysql/mysql /usr/local/mysql /usr" |
|---|
| 14 | for i in $TEST_PATHS |
|---|
| 15 | do |
|---|
| 16 | - mysql_config="$i/bin/mysql_config" |
|---|
| 17 | + mysql_config="$i/bin/@@mysql_config@@" |
|---|
| 18 | if test -x $mysql_config |
|---|
| 19 | then |
|---|
| 20 | MYSQL_PATH_ARG="--with-mysql-path=$TEST_PATHS" |
|---|
| 21 | @@ -21313,7 +21313,8 @@ |
|---|
| 22 | if test -n "$CONFIG_FILES"; then |
|---|
| 23 | |
|---|
| 24 | |
|---|
| 25 | -ac_cr=' |
|---|
| 26 | ' |
|---|
| 27 | +ac_cr=' |
|---|
| 28 | +' |
|---|
| 29 | ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null` |
|---|
| 30 | if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then |
|---|
| 31 | ac_cs_awk_cr='\\r' |
|---|
