diff options
author | Edward Rudd | 2004-01-06 00:32:46 +0000 |
---|---|---|
committer | Edward Rudd | 2004-01-06 00:32:46 +0000 |
commit | 60f9107f5a4e68f6a4f22721cc4f43fb8575807f (patch) | |
tree | 28b968c4d2c9587cf9d6d15768ad0f6f5fa0b767 /m4/mysql.m4 | |
parent | e2dfccb52240fd943ec6f1f2b8260f86d24d4cd2 (diff) |
update m4 files
release 1.92
Diffstat (limited to 'm4/mysql.m4')
-rw-r--r-- | m4/mysql.m4 | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/m4/mysql.m4 b/m4/mysql.m4 index c4c4a3b..7892f88 100644 --- a/m4/mysql.m4 +++ b/m4/mysql.m4 | |||
@@ -19,18 +19,18 @@ AC_ARG_ENABLE( | |||
19 | ac_save_CFLAGS=$CFLAGS | 19 | ac_save_CFLAGS=$CFLAGS |
20 | ac_save_LDFLAGS=$LDFLAGS | 20 | ac_save_LDFLAGS=$LDFLAGS |
21 | if test "x$mysql_prefix" != "x" && test "x$mysql_prefix" != "xyes"; then | 21 | if test "x$mysql_prefix" != "x" && test "x$mysql_prefix" != "xyes"; then |
22 | MYSQL_LDFLAGS="-L${mysql_prefix}/lib -L${mysql_prefix}/lib/mysql -L${mysql_prefix}/mysql/lib" | 22 | MYSQL_LDFLAGS="-L${mysql_prefix}/lib -L${mysql_prefix}/lib/mysql -L${mysql_prefix}/mysql/lib" |
23 | MYSQL_CFLAGS="-I${mysql_prefix}/include -I${mysql_prefix}/include/mysql -I${mysql_prefix}/mysql/include" | 23 | MYSQL_CFLAGS="-I${mysql_prefix}/include -I${mysql_prefix}/include/mysql -I${mysql_prefix}/mysql/include" |
24 | else | 24 | else |
25 | MYSQL_LDFLAGS="-L/usr/local/mysql/lib -L/usr/lib/mysql -L/usr/mysql/lib -L/usr/local/lib/mysql -L/usr/local/mysql/lib/mysql -L/usr/mysql/lib/mysql" | 25 | MYSQL_LDFLAGS="-L/usr/local/mysql/lib -L/usr/lib/mysql -L/usr/mysql/lib -L/usr/local/lib/mysql -L/usr/local/mysql/lib/mysql -L/usr/mysql/lib/mysql" |
26 | MYSQL_CFLAGS="-I/usr/local/mysql/include -I/usr/include/mysql -I/usr/mysql/include -I/usr/local/include/mysql -I/usr/local/mysql/include/mysql -I/usr/mysql/include/mysql" | 26 | MYSQL_CFLAGS="-I/usr/local/mysql/include -I/usr/include/mysql -I/usr/mysql/include -I/usr/local/include/mysql -I/usr/local/mysql/include/mysql -I/usr/mysql/include/mysql" |
27 | fi | 27 | fi |
28 | CFLAGS="$CFLAGS $MYSQL_CFLAGS" | 28 | CFLAGS="$CFLAGS $MYSQL_CFLAGS" |
29 | LDFLAGS="$LDFLAGS $MYSQL_LDFLAGS" | 29 | LDFLAGS="$LDFLAGS $MYSQL_LDFLAGS" |
30 | AC_CHECK_LIB(m, floor) | 30 | AC_CHECK_LIB(m, floor) |
31 | AC_CHECK_LIB(z, gzclose) | 31 | AC_CHECK_LIB(z, gzclose) |
32 | with_mysql="yes" | 32 | with_mysql="yes" |
33 | AC_DEFINE(WITH_MYSQL,,[with mysql]) | 33 | AC_DEFINE(WITH_MYSQL,1,[Define to 1 if we are compiling with mysql]) |
34 | AC_CHECK_LIB(mysqlclient, mysql_init, , | 34 | AC_CHECK_LIB(mysqlclient, mysql_init, , |
35 | [AC_MSG_ERROR(libmysqlclient is needed for MySQL support)]) | 35 | [AC_MSG_ERROR(libmysqlclient is needed for MySQL support)]) |
36 | MYSQL_LIBS=$LIBS | 36 | MYSQL_LIBS=$LIBS |
@@ -48,14 +48,14 @@ AC_ARG_ENABLE( | |||
48 | CFLAGS=$ac_save_CFLAGS | 48 | CFLAGS=$ac_save_CFLAGS |
49 | LDFLAGS=$ac_save_LDFLAGS | 49 | LDFLAGS=$ac_save_LDFLAGS |
50 | if test "x$no_mysql" = x; then | 50 | if test "x$no_mysql" = x; then |
51 | AC_MSG_RESULT(yes) | 51 | AC_MSG_RESULT(yes) |
52 | ifelse([$1], , :, [$1]) | 52 | ifelse([$1], , :, [$1]) |
53 | else | 53 | else |
54 | AC_MSG_RESULT(no) | 54 | AC_MSG_RESULT(no) |
55 | echo "*** MySQL could not be found ***" | 55 | echo "*** MySQL could not be found ***" |
56 | MYSQL_CFLAGS="" | 56 | MYSQL_CFLAGS="" |
57 | MYSQL_LDFLAGS="" | 57 | MYSQL_LDFLAGS="" |
58 | MYSQL_LIBS="" | 58 | MYSQL_LIBS="" |
59 | ifelse([$2], , :, [$2]) | 59 | ifelse([$2], , :, [$2]) |
60 | fi | 60 | fi |
61 | AC_SUBST(MYSQL_LDFLAGS) | 61 | AC_SUBST(MYSQL_LDFLAGS) |