forked from mirrors/linphone-iphone
Remove check for libsoup.
This commit is contained in:
Ghislain MARY
parent
16eba02ebf
commit
7b3d7861e2
8 changed files with 4 additions and 109 deletions
|
|
@ -82,16 +82,6 @@ if(MSVC)
|
|||
)
|
||||
endif()
|
||||
endif()
|
||||
if(ENABLE_ASSISTANT)
|
||||
if(NOT EXISTS "${CMAKE_CURRENT_BINARY_DIR}/libsoup.zip")
|
||||
message(STATUS "Installing libsoup")
|
||||
file(DOWNLOAD http://www.linphone.org/files/libsoup_2.24.0-1_win32.zip "${CMAKE_CURRENT_BINARY_DIR}/libsoup.zip" SHOW_PROGRESS)
|
||||
execute_process(
|
||||
COMMAND "${CMAKE_COMMAND}" "-E" "tar" "x" "${CMAKE_CURRENT_BINARY_DIR}/libsoup.zip"
|
||||
WORKING_DIRECTORY "${CMAKE_INSTALL_PREFIX}"
|
||||
)
|
||||
endif()
|
||||
endif()
|
||||
endif()
|
||||
|
||||
find_package(BelleSIP REQUIRED)
|
||||
|
|
@ -132,13 +122,7 @@ if(ENABLE_NOTIFY)
|
|||
endif()
|
||||
endif()
|
||||
if(ENABLE_ASSISTANT)
|
||||
find_package(Soup)
|
||||
if(SOUP_FOUND)
|
||||
set(BUILD_WIZARD 1)
|
||||
else()
|
||||
message(WARNING "Could not find the soup library!")
|
||||
set(ENABLE_ASSISTANT OFF CACHE BOOL "Turn on assistant compiling." FORCE)
|
||||
endif()
|
||||
set(BUILD_WIZARD 1)
|
||||
endif()
|
||||
find_package(Gettext)
|
||||
|
||||
|
|
@ -163,9 +147,6 @@ endif()
|
|||
if(ENABLE_TUNNEL)
|
||||
include_directories(${TUNNEL_INCLUDE_DIRS})
|
||||
endif()
|
||||
if(ENABLE_ASSISTANT)
|
||||
include_directories(${SOUP_INCLUDE_DIRS})
|
||||
endif()
|
||||
if(ENABLE_DEBUG_LOGS)
|
||||
add_definitions("-DDEBUG")
|
||||
endif()
|
||||
|
|
|
|||
3
README
3
README
|
|
@ -26,7 +26,6 @@ This is Linphone, a free (GPL) video softphone based on the SIP protocol.
|
|||
- theora (optional)
|
||||
+ gsm codec (gsm source package or libgsm-dev or gsm-devel) (optional)
|
||||
+ libreadline (optional: for convenient command line in linphonec)
|
||||
+ libsoup (optional: for wizard - account creation assistant)
|
||||
+ libsqlite3 (optional : for a local history of chat messages)
|
||||
+ if you want uPnP support (optional):
|
||||
- libupnp (version 1.6 branch (not patched with 18-url-upnpstrings.patch))
|
||||
|
|
@ -39,7 +38,7 @@ libglew1.6-dev libv4l-dev libxml2-dev
|
|||
|
||||
+ for optional library
|
||||
$ sudo apt-get install libreadline-dev libgsm1-dev libtheora-dev \
|
||||
libsoup2.4-dev libsqlite3-dev libupnp4-dev libsrtp-dev
|
||||
libsqlite3-dev libupnp4-dev libsrtp-dev
|
||||
|
||||
+ Install zrtp (optional), for unbreakable call encryption
|
||||
$ git clone git://git.linphone.org:bzrtp
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@ In order to enable generation of bundle for older MacOS version, it is recommend
|
|||
|
||||
Install `GTK`. It is recommended to use the `quartz` backend for better integration.
|
||||
|
||||
sudo port install gtk2 +quartz +no_x11 libsoup
|
||||
sudo port install gtk2 +quartz +no_x11
|
||||
sudo port install gtk-osx-application +no_python
|
||||
sudo port install hicolor-icon-theme
|
||||
|
||||
|
|
@ -51,7 +51,7 @@ Install `GTK`. It is recommended to use the `quartz` backend for better integrat
|
|||
|
||||
brew install cairo --without-x11
|
||||
brew install gtk+ --without-x11
|
||||
brew install gtk-mac-integration libsoup hicolor-icon-theme
|
||||
brew install gtk-mac-integration hicolor-icon-theme
|
||||
|
||||
### Building Linphone
|
||||
|
||||
|
|
|
|||
|
|
@ -1,65 +0,0 @@
|
|||
############################################################################
|
||||
# FindSoup.cmake
|
||||
# Copyright (C) 2014 Belledonne Communications, Grenoble France
|
||||
#
|
||||
############################################################################
|
||||
#
|
||||
# This program is free software; you can redistribute it and/or
|
||||
# modify it under the terms of the GNU General Public License
|
||||
# as published by the Free Software Foundation; either version 2
|
||||
# of the License, or (at your option) any later version.
|
||||
#
|
||||
# This program is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with this program; if not, write to the Free Software
|
||||
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||
#
|
||||
############################################################################
|
||||
#
|
||||
# - Find the soup include file and library
|
||||
#
|
||||
# SOUP_FOUND - system has libsoup
|
||||
# SOUP_INCLUDE_DIRS - the libsoup include directory
|
||||
# SOUP_LIBRARIES - The libraries needed to use libsoup
|
||||
|
||||
if(WIN32)
|
||||
set(GTK2_ADDITIONAL_SUFFIXES "../lib/glib-2.0/include" "../lib/gtk-2.0/include")
|
||||
endif()
|
||||
find_package(GTK2 2.18 REQUIRED gtk)
|
||||
|
||||
set(_SOUP_ROOT_PATHS
|
||||
${CMAKE_INSTALL_PREFIX}
|
||||
)
|
||||
|
||||
find_path(SOUP_INCLUDE_DIRS
|
||||
NAMES libsoup/soup.h
|
||||
HINTS _SOUP_ROOT_PATHS
|
||||
PATH_SUFFIXES include/libsoup-2.4
|
||||
)
|
||||
|
||||
if(SOUP_INCLUDE_DIRS)
|
||||
set(HAVE_LIBSOUP_SOUP_H 1)
|
||||
list(APPEND SOUP_INCLUDE_DIRS ${GTK2_INCLUDE_DIRS})
|
||||
endif()
|
||||
|
||||
find_library(SOUP_LIBRARIES
|
||||
NAMES soup-2.4
|
||||
HINTS ${_SOUP_ROOT_PATHS}
|
||||
PATH_SUFFIXES bin lib
|
||||
)
|
||||
|
||||
if(SOUP_LIBRARIES)
|
||||
list(APPEND SOUP_LIBRARIES ${GTK2_LIBRARIES})
|
||||
endif()
|
||||
|
||||
include(FindPackageHandleStandardArgs)
|
||||
find_package_handle_standard_args(Soup
|
||||
DEFAULT_MSG
|
||||
SOUP_INCLUDE_DIRS SOUP_LIBRARIES HAVE_LIBSOUP_SOUP_H
|
||||
)
|
||||
|
||||
mark_as_advanced(SOUP_INCLUDE_DIRS SOUP_LIBRARIES HAVE_LIBSOUP_SOUP_H)
|
||||
12
configure.ac
12
configure.ac
|
|
@ -739,16 +739,6 @@ AC_ARG_ENABLE(assistant,
|
|||
[build_wizard=check]
|
||||
)
|
||||
|
||||
dnl check libsoup (needed for wizard)
|
||||
if test "$build_wizard" != "false" ; then
|
||||
PKG_CHECK_MODULES(LIBSOUP, [libsoup-2.4 >= 2.26],[],
|
||||
[if test "$build_wizard" = "true" ; then
|
||||
AC_MSG_ERROR([Could not found libsoup, assistant cannot be compiled.])
|
||||
else
|
||||
build_wizard=false
|
||||
fi]
|
||||
)
|
||||
fi
|
||||
if test "$build_wizard" != "false" ; then
|
||||
PKG_CHECK_MODULES(LIBGTKWIZARD, [gtk+-2.0 >= 2.22.0],[],
|
||||
[if test "$build_wizard" = "true" ; then
|
||||
|
|
@ -758,8 +748,6 @@ if test "$build_wizard" != "false" ; then
|
|||
fi]
|
||||
)
|
||||
fi
|
||||
AC_SUBST(LIBSOUP_CFLAGS)
|
||||
AC_SUBST(LIBSOUP_LIBS)
|
||||
AM_CONDITIONAL(BUILD_WIZARD, test x$build_wizard != xfalse)
|
||||
if test "$build_wizard" != "false" ; then
|
||||
build_wizard=true
|
||||
|
|
|
|||
|
|
@ -139,9 +139,6 @@ endif()
|
|||
if(ENABLE_TUNNEL)
|
||||
list(APPEND LIBS ${TUNNEL_LIBRARIES})
|
||||
endif()
|
||||
if(ENABLE_ASSISTANT)
|
||||
list(APPEND LIBS ${SOUP_LIBRARIES})
|
||||
endif()
|
||||
if(MSVC AND NOT "${CMAKE_SYSTEM_NAME}" STREQUAL "WindowsPhone")
|
||||
list(APPEND LIBS ${LIBGCC} ${LIBMINGWEX})
|
||||
endif()
|
||||
|
|
|
|||
|
|
@ -137,7 +137,6 @@ liblinphone_la_LIBADD= \
|
|||
$(ORTP_LIBS) \
|
||||
$(SIPSTACK_LIBS) \
|
||||
$(TUNNEL_LIBS) \
|
||||
$(LIBSOUP_LIBS) \
|
||||
$(SQLITE3_LIBS) \
|
||||
$(LIBXML2_LIBS) \
|
||||
$(LDAP_LIBS) \
|
||||
|
|
@ -170,7 +169,6 @@ COMMON_CFLAGS=\
|
|||
$(STRICT_OPTIONS) \
|
||||
-DIN_LINPHONE \
|
||||
$(SIPSTACK_CFLAGS) \
|
||||
$(LIBSOUP_CFLAGS) \
|
||||
-DENABLE_TRACE \
|
||||
-DLOG_DOMAIN=\"LinphoneCore\" \
|
||||
$(IPV6_CFLAGS) \
|
||||
|
|
|
|||
|
|
@ -101,9 +101,6 @@ if(ENABLE_NOTIFY)
|
|||
target_include_directories(linphone-gtk PUBLIC ${NOTIFY_INCLUDE_DIRS})
|
||||
target_link_libraries(linphone-gtk ${NOTIFY_LIBRARIES})
|
||||
endif()
|
||||
if(ENABLE_ASSISTANT)
|
||||
target_link_libraries(linphone-gtk ${SOUP_LIBRARIES})
|
||||
endif()
|
||||
|
||||
install(TARGETS linphone-gtk
|
||||
RUNTIME DESTINATION bin
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue