Commit 7ff43ce7 authored by Pavel Vainerman's avatar Pavel Vainerman

Добавил возможность отключить сборку SQLITE (--disable-sqlite).

Немного переписал spec.
parent ce88e8f6
...@@ -8,4 +8,4 @@ export CFLAGS ...@@ -8,4 +8,4 @@ export CFLAGS
CXXFLAGS="$CFLAGS" CXXFLAGS="$CFLAGS"
export CXXFLAGS export CXXFLAGS
./configure --enable-maintainer-mode --prefix=/usr ./configure --enable-maintainer-mode --prefix=/usr $*
%def_enable doc %def_enable doc
%def_enable mysql
%def_enable sqlite
%define oname uniset %define oname uniset
Name: libuniset Name: libuniset
...@@ -17,8 +20,14 @@ Source: /var/ftp/pvt/Etersoft/Ourside/unstable/sources/tarball/%name-%version.ta ...@@ -17,8 +20,14 @@ Source: /var/ftp/pvt/Etersoft/Ourside/unstable/sources/tarball/%name-%version.ta
# Automatically added by buildreq on Fri Nov 26 2010 # Automatically added by buildreq on Fri Nov 26 2010
BuildRequires: libcomedi-devel libcommoncpp2-devel libomniORB-devel libsigc++2.0-devel python-modules xsltproc BuildRequires: libcomedi-devel libcommoncpp2-devel libomniORB-devel libsigc++2.0-devel python-modules xsltproc
%if_enabled mysql
# Using old package name instead of libmysqlclient-devel it absent in branch 5.0 for yauza # Using old package name instead of libmysqlclient-devel it absent in branch 5.0 for yauza
BuildRequires: libMySQL-devel BuildRequires: libMySQL-devel
%endif
%if_enabled sqlite
BuildRequires: libsqlite3-devel
%endif
%if_enabled doc %if_enabled doc
BuildRequires: doxygen BuildRequires: doxygen
...@@ -37,6 +46,7 @@ Requires: %name = %version-%release ...@@ -37,6 +46,7 @@ Requires: %name = %version-%release
%description devel %description devel
Libraries needed to develop for UniSet. Libraries needed to develop for UniSet.
%if_enabled mysql
%package mysql-dbserver %package mysql-dbserver
Group: Development/Databases Group: Development/Databases
Summary: MySQL-dbserver implementatioin for UniSet Summary: MySQL-dbserver implementatioin for UniSet
...@@ -56,7 +66,9 @@ Obsoletes: %oname-mysql-devel ...@@ -56,7 +66,9 @@ Obsoletes: %oname-mysql-devel
%description mysql-devel %description mysql-devel
Libraries needed to develop for uniset MySQL Libraries needed to develop for uniset MySQL
%endif
%if_enabled sqlite
%package sqlite-dbserver %package sqlite-dbserver
Group: Development/Databases Group: Development/Databases
Summary: SQLite-dbserver implementatioin for UniSet Summary: SQLite-dbserver implementatioin for UniSet
...@@ -76,7 +88,8 @@ Obsoletes: %oname-sqlite-devel ...@@ -76,7 +88,8 @@ Obsoletes: %oname-sqlite-devel
%description sqlite-devel %description sqlite-devel
Libraries needed to develop for uniset SQLite Libraries needed to develop for uniset SQLite
%endif
%package utils %package utils
Summary: UniSet utilities Summary: UniSet utilities
Group: Development/Tools Group: Development/Tools
...@@ -87,6 +100,8 @@ Obsoletes: %oname-utils ...@@ -87,6 +100,8 @@ Obsoletes: %oname-utils
%description utils %description utils
UniSet utilities UniSet utilities
%if_enabled doc
%package doc %package doc
Group: Development/C++ Group: Development/C++
Summary: Documentations for developing with UniSet Summary: Documentations for developing with UniSet
...@@ -95,6 +110,8 @@ BuildArch: noarch ...@@ -95,6 +110,8 @@ BuildArch: noarch
%description doc %description doc
Documentations for developing with UniSet Documentations for developing with UniSet
%endif
%package extensions %package extensions
Group: Development/C++ Group: Development/C++
...@@ -123,12 +140,7 @@ Libraries needed to develop for uniset extensions ...@@ -123,12 +140,7 @@ Libraries needed to develop for uniset extensions
%build %build
%autoreconf %autoreconf
%if_enabled doc %configure %{subst_enable doc} %{subst_enable mysql} %{subst_enable sqlite}
%configure
%else
%configure --disable-docs --disable-static
%endif
%make %make
%install %install
...@@ -161,19 +173,27 @@ rm -f %buildroot%_libdir/*.la ...@@ -161,19 +173,27 @@ rm -f %buildroot%_libdir/*.la
%_includedir/%oname/*.tcc %_includedir/%oname/*.tcc
%_includedir/%oname/IOs/ %_includedir/%oname/IOs/
%_includedir/%oname/modbus/ %_includedir/%oname/modbus/
%if_enabled mysql
%_includedir/%oname/mysql/ %_includedir/%oname/mysql/
%endif
%if_enabled sqlite
%_includedir/%oname/sqlite/ %_includedir/%oname/sqlite/
%endif
%_libdir/libUniSet.so %_libdir/libUniSet.so
%_datadir/idl/%oname/ %_datadir/idl/%oname/
%_pkgconfigdir/libUniSet.pc %_pkgconfigdir/libUniSet.pc
%if_enabled mysql
%files mysql-dbserver %files mysql-dbserver
%_bindir/%oname-mysql-*dbserver %_bindir/%oname-mysql-*dbserver
%_libdir/*-mysql.so* %_libdir/*-mysql.so*
%files mysql-devel %files mysql-devel
%_pkgconfigdir/libUniSetMySQL.pc %_pkgconfigdir/libUniSetMySQL.pc
%endif
%if_enabled sqlite
%files sqlite-dbserver %files sqlite-dbserver
%_bindir/%oname-sqlite-*dbserver %_bindir/%oname-sqlite-*dbserver
...@@ -181,6 +201,7 @@ rm -f %buildroot%_libdir/*.la ...@@ -181,6 +201,7 @@ rm -f %buildroot%_libdir/*.la
%files sqlite-devel %files sqlite-devel
%_pkgconfigdir/libUniSetSQLite.pc %_pkgconfigdir/libUniSetSQLite.pc
%endif
%if_enabled doc %if_enabled doc
%files doc %files doc
......
...@@ -38,7 +38,23 @@ PKG_CHECK_MODULES(XML, libxml-2.0) ...@@ -38,7 +38,23 @@ PKG_CHECK_MODULES(XML, libxml-2.0)
PKG_CHECK_MODULES(OMNI, omniORB4) PKG_CHECK_MODULES(OMNI, omniORB4)
PKG_CHECK_MODULES(SIGC, sigc++-2.0) PKG_CHECK_MODULES(SIGC, sigc++-2.0)
PKG_CHECK_MODULES(COMCPP, libccgnu2) PKG_CHECK_MODULES(COMCPP, libccgnu2)
PKG_CHECK_MODULES(SQLITE3, sqlite3)
#check sqlite support
AC_MSG_CHECKING([sqlite support])
buildsqlite=true
AC_ARG_ENABLE(sqlite, AC_HELP_STRING([--disable-sqlite], [disable SQLite support]),
[ if test $enableval = yes; then buildsqlite=true; else buildsqlite=false; fi],[ buildsqlite=true; ])
if test ${buildsqlite} = true; then
AC_MSG_RESULT([enabled])
PKG_CHECK_MODULES(SQLITE3, sqlite3)
else
AC_MSG_RESULT([disabled])
fi
AM_CONDITIONAL(DISABLE_SQLITE, test ${buildsqlite} = false)
# export # export
LDFLAGS="${OMNI_LIBS} ${XML_LIBS}" LDFLAGS="${OMNI_LIBS} ${XML_LIBS}"
......
#if DISABLE_SQLITE if DISABLE_SQLITE
#else else
USQLITE_VER=@LIBVER@ USQLITE_VER=@LIBVER@
...@@ -27,5 +27,5 @@ devel_includedir = $(includedir)/@PACKAGE@/sqlite ...@@ -27,5 +27,5 @@ devel_includedir = $(includedir)/@PACKAGE@/sqlite
pkgconfigdir = $(libdir)/pkgconfig pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = libUniSetSQLite.pc pkgconfig_DATA = libUniSetSQLite.pc
#endif endif
\ No newline at end of file
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