Commit 689729d7 authored by Guillaume BIENKOWSKI's avatar Guillaume BIENKOWSKI
Browse files

Allow to build without the belledonne communications Unixodbc for more

recent distributions that ship with the multithreading fix.
parent 32f05084
......@@ -183,8 +183,11 @@ else()
add_custom_target(TARGET_flexisip ALL)
add_dependencies(TARGET_linphone_builder TARGET_flexisip)
add_dependencies(TARGET_flexisip TARGET_ortp )
linphone_builder_add_builder_to_target(TARGET_flexisip unixodbc )
linphone_builder_add_builder_to_target(TARGET_flexisip myodbc )
if( USE_BC_ODBC )
linphone_builder_add_builder_to_target(TARGET_flexisip unixodbc )
linphone_builder_add_builder_to_target(TARGET_flexisip myodbc )
endif()
linphone_builder_add_builder_to_target(TARGET_flexisip sofiasip )
linphone_builder_add_builder_to_target(TARGET_flexisip odb )
......
......@@ -22,9 +22,9 @@
set(EP_flexisip_GIT_REPOSITORY "gitosis@git.linphone.org:flexisip")
set(EP_flexisip_GIT_TAG_LATEST "master")
set(EP_flexisip_GIT_TAG "a247eba31e51b72502557523768308bbd9863d82")
set(EP_flexisip_GIT_TAG "308f48fcd1c50a48f4f62ec4e10d3d9fd462fa99")
set(EP_flexisip_DEPENDENCIES EP_ortp EP_unixodbc EP_myodbc EP_sofiasip )
set(EP_flexisip_DEPENDENCIES EP_ortp EP_sofiasip )
list(APPEND EP_flexisip_DEPENDENCIES EP_libodbmysql)
......@@ -38,6 +38,14 @@ set(EP_flexisip_CROSS_COMPILATION_OPTIONS
)
set(EP_flexisip_CONFIG_H_FILE "flexisip.spec")
list(APPEND EP_flexisip_CONFIGURE_OPTIONS "--disable-transcoder" "--enable-redis" "--with-odbc=${CMAKE_INSTALL_PREFIX}" )
if( USE_BC_ODBC )
message(STATUS "Flexisip to be built with BC ODBC")
list(APPEND EP_flexisip_CONFIGURE_OPTIONS "--with-odbc=${CMAKE_INSTALL_PREFIX}")
list(APPEND EP_flexisip_DEPENDENCIES EP_unixodbc EP_myodbc)
else()
message(STATUS "Flexisip to be built with system ODBC")
endif()
list(APPEND EP_flexisip_CONFIGURE_OPTIONS "--disable-transcoder" "--enable-redis" )
set(EP_flexisip_SPEC_FILE "flexisip.spec")
\ No newline at end of file
......@@ -137,7 +137,11 @@ set(EP_ortp_RPMBUILD_OPTIONS "--with bc --without srtp")
set(EP_unixodbc_RPMBUILD_OPTIONS "--with bc")
set(EP_myodbc_RPMBUILD_OPTIONS "--with bc")
set(EP_sofiasip_RPMBUILD_OPTIONS "--with bc --without glib")
set(EP_flexisip_RPMBUILD_OPTIONS "--with bc --without transcoder --without boostlog --with push")
if( USE_BC_ODBC )
set( EP_flexisip_RPMBUILD_OPTIONS "${EP_flexisip_RPMBUILD_OPTIONS} --with bcodbc")
endif()
set(LINPHONE_BUILDER_RPMBUILD_PACKAGE_PREFIX "bc-")
......
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