Commit 44234ec3 authored by Pavel Vainerman's avatar Pavel Vainerman

Добавил в configure.ac проверку на существование mysql.h

parent 64e27208
############################################################################
# This file is part of the UniSet library #
############################################################################
UMYSQL_VER=@LIBVER@ UMYSQL_VER=@LIBVER@
lib_LTLIBRARIES = libUniSet-mysql.la lib_LTLIBRARIES = libUniSet-mysql.la
libUniSet_mysql_la_LDFLAGS = -version-info $(UMYSQL_VER) libUniSet_mysql_la_LDFLAGS = -version-info $(UMYSQL_VER)
libUniSet_mysql_la_SOURCES = DBInterface.cc DBServer_MySQL.cc libUniSet_mysql_la_SOURCES = DBInterface.cc DBServer_MySQL.cc
libUniSet_mysql_la_LIBADD = $(top_builddir)/lib/libUniSet.la -lmysqlclient libUniSet_mysql_la_LIBADD = $(top_builddir)/lib/libUniSet.la -lmysqlclient
libUniSet_mysql_la_LDFLAGS = -version-info @LIBVER@
bin_PROGRAMS = uniset-mysql-dbserver bin_PROGRAMS = uniset-mysql-dbserver
uniset_mysql_dbserver_LDADD = libUniSet-mysql.la $(top_builddir)/lib/libUniSet.la uniset_mysql_dbserver_LDADD = libUniSet-mysql.la $(top_builddir)/lib/libUniSet.la
...@@ -19,4 +14,3 @@ include $(top_builddir)/conf/setting.mk ...@@ -19,4 +14,3 @@ include $(top_builddir)/conf/setting.mk
# install # install
devel_include_HEADERS = *.h devel_include_HEADERS = *.h
devel_includedir = $(includedir)/@PACKAGE@/mysql devel_includedir = $(includedir)/@PACKAGE@/mysql
...@@ -53,17 +53,18 @@ test "x$IDL" = "x" && AC_MSG_ERROR([*** omniidl not found.]) ...@@ -53,17 +53,18 @@ test "x$IDL" = "x" && AC_MSG_ERROR([*** omniidl not found.])
#check mysql support #check mysql support
AC_MSG_CHECKING([mysql support]) AC_MSG_CHECKING([mysql support])
dmysql=false buildmysql=true
AC_ARG_ENABLE(mysql, AC_HELP_STRING([--disable-mysql], [disable MySQL support]), AC_ARG_ENABLE(mysql, AC_HELP_STRING([--disable-mysql], [disable MySQL support]),
[ if test $enableval = yes; then dmysql=false; else dmysql=true; fi],[ dmysql=false; ]) [ if test $enableval = yes; then buildmysql=true; else buildmysql=false; fi],[ buildmysql=true; ])
if test ${dmysql} = false; then if test ${buildmysql} = true; then
AC_MSG_RESULT([yes]) AC_MSG_RESULT([enabled])
AC_CHECK_HEADERS([mysql/mysql.h])
else else
AC_MSG_RESULT([no]) AC_MSG_RESULT([disabled])
fi fi
AM_CONDITIONAL(DISABLE_MYSQL, test ${dmysql} = true) AM_CONDITIONAL(DISABLE_MYSQL, test ${buildmysql} = false)
#check build extensions #check build extensions
ext=true ext=true
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment