Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
U
uniset2
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
1
Issues
1
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
UniSet project repositories
uniset2
Commits
44234ec3
Commit
44234ec3
authored
Mar 10, 2011
by
Pavel Vainerman
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Добавил в configure.ac проверку на существование mysql.h
parent
64e27208
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
12 deletions
+7
-12
Makefile.am
Utilities/DBServer-MySQL/Makefile.am
+0
-6
configure.ac
configure.ac
+7
-6
No files found.
Utilities/DBServer-MySQL/Makefile.am
View file @
44234ec3
############################################################################
# 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
configure.ac
View file @
44234ec3
...
@@ -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=fals
e
buildmysql=tru
e
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=fals
e; ])
[ if test $enableval = yes; then
buildmysql=true; else buildmysql=false; fi],[ buildmysql=tru
e; ])
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} = tru
e)
AM_CONDITIONAL(DISABLE_MYSQL, test ${
buildmysql} = fals
e)
#check build extensions
#check build extensions
ext=true
ext=true
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment