diff options
author | Sergey Poznyakoff <gray@gnu.org.ua> | 2010-06-22 09:25:00 +0300 |
---|---|---|
committer | Sergey Poznyakoff <gray@gnu.org.ua> | 2010-06-22 09:25:00 +0300 |
commit | b20b5cf9d52808f6f84971f2851046fb5248bd14 (patch) | |
tree | 77920911e278dcdacd86f0c019aa5c58dd1afc47 /configure.ac | |
parent | 9aa885f548d8f6867f8e8cd20d143c4c72a771a1 (diff) | |
download | smap-b20b5cf9d52808f6f84971f2851046fb5248bd14.tar.gz smap-b20b5cf9d52808f6f84971f2851046fb5248bd14.tar.bz2 |
Implement mysql module.
* acinclude.m4: New file.
* modules/mysql/Makefile.am: New file.
* modules/mysql/mysql.c: New file.
* configure.ac: Test for mysql.
* lib/wordsplit.c (expvar): Take additional argument, for
propagating node flags.
(node_expand_vars): Propagate _WSNF_JOIN flag from the original
node.
(wordsplit_unquote_copy): Remove special handling for \' and \".
* modules/Makefile.am [MYSQL_COND]: Set MYSQL_DIR
(SUBDIRS): Add $MYSQL_DIR
* modules/mailutils/mailutils.c: Move smap_debug_alloc to module
initialization function.
* modules/sed/sed.c (sed_init_db): Remove smap_debug_alloc.
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index 564cde2..7c69d93 100644 --- a/configure.ac +++ b/configure.ac @@ -117,6 +117,27 @@ GINT_INIT([gint],[1.8 with-guile nodoc], [status_guile=no]) AM_CONDITIONAL([GUILE_COND],[test $status_guile = yes]) +# Mysql +AC_ARG_WITH(mysql, + AC_HELP_STRING([--with-mysql], + [use MySQL]), + [status_mysql=${withval}], + [status_mysql=maybe]) + +AC_SUBST(MYSQL_LIBS) +if test $status_mysql != no; then + MU_CHECK_LIB(mysqlclient, + mysql_real_connect, + [-lm], + [ status_mysql=yes + MYSQL_LIBS=$mu_cv_lib_mysqlclient ], + [ if test $status_mysql = yes; then + AC_MSG_FAILURE([the requested library libmysqlclient is not found or is unusable]) + fi + status_mysql=no ], + [/usr/local/lib/mysql /usr/lib/mysql]) +fi +AM_CONDITIONAL([MYSQL_COND],[test $status_mysql = yes]) # Readline AC_ARG_WITH([readline], @@ -172,6 +193,7 @@ Smap configured with the following settings: TCP wrappers ............................. $status_tcpwrap Mailutils ................................ $status_mailutils Guile .................................... $status_guile +MySQL .................................... $status_mysql Readline ................................. $status_readline ******************************************************************* @@ -184,6 +206,7 @@ else status_mailutils=$status_mailutils fi status_guile=$status_guile +status_mysql=$status_mysql status_readline=$status_readline ]) @@ -198,5 +221,6 @@ AC_CONFIG_FILES([Makefile modules/sed/Makefile modules/mailutils/Makefile modules/guile/Makefile + modules/mysql/Makefile doc/Makefile]) AC_OUTPUT |