Commit a33e816d authored by jehan's avatar jehan

fix flexisip rpm build for presence server

parent 0b733d67
......@@ -537,7 +537,7 @@ if test x$use_xsd != xno ; then
# check that we don't match a bad xsd executable
if test -z "`$XSDCXX version | grep CodeSynthesis`" ; then
AC_MSG_ERROR([xsd executable is not the good XSD (this can happen on Mac OS). $xsd_err_msg])
use_xsd = no
use_xsd=no
fi
# check xsd headers
......@@ -554,7 +554,7 @@ if test x$use_xsd != xno ; then
# if XSD is enabled, we need Xerces as a dependency
PKG_CHECK_MODULES(XERCESC, [xerces-c >= 3.0.0])
use_xsd = yes
use_xsd=yes
AC_DEFINE([ENABLE_XSD], 1, [Enable XSD])
fi
AM_CONDITIONAL(BUILD_XSD, [test x$use_xsd != xno] )
......
......@@ -27,12 +27,12 @@ ${guide_pdf}: $(srcdir)/${guide}.tex $(top_builddir)/src/flexisip
$(srcdir)/latex_include_generator.sh
# Several times to make sure the TOC is up-to-date
- pdflatex --interaction=nonstopmode "\newcommand\flexisipversion{ $(VERSION)}\input{$(guide_tex)}"
endif
fldocdir=$(datadir)/doc/$(PACKAGE)-$(VERSION)
fldoc_DATA = $(docfiles)
dist_fldoc_DATA=$(guide_tex)
endif
......@@ -44,6 +44,8 @@
## end rpmbuild options
%define _unpackaged_files_terminate_build 0
# These lines are here because we can build the RPM for flexisip, in which
# case we prefix the entire installation so that we don't break compatibility
# with the user's libs.
......@@ -94,7 +96,7 @@ Requires: boost-log >= 1.41.0
%if %{protobuf}
Requires: protobuf >= 2.3.0
Requires: protobuf-c >= 0.15
Requires: protobuf-c-devel >= 0.15
BuildRequires: protobuf-c-devel >= 0.15
BuildRequires: protobuf-compiler >= 2.3.0
%endif
......@@ -219,6 +221,7 @@ fi
%docdir %{_docdir}
%{_docdir}
%{_bindir}/*
%{_libdir}/*.so.*
%{_sysconfdir}/init.d/flexisip
%{_sysconfdir}/flexisip
......
......@@ -199,7 +199,7 @@ flexisip_binder_LDADD=$(flexisip_LDADD)
nodist_flexisip_binder_SOURCES=$(nodistsources)
noinst_PROGRAMS=expr
expr_SOURCES=test/expr.cc expressionparser.cc expressionparser.hh sipattrextractor.hh
expr_SOURCES=test/expr.cc expressionparser.cc expressionparser.hh sipattrextractor.hh flexisip-exception.cc flexisip-exception.hh
expr_CXXFLAGS=-DTEST_BOOL_EXPR -DNO_SOFIA $(MEDIASTREAMER_CFLAGS) $(ORTP_CFLAGS)
expr_LDADD=$(flexisip_LDADD)
......
......@@ -10,9 +10,9 @@ libflexisip_presence_la_SOURCES = presence-server.cc presence-server.h \
signaling-exception.cc signaling-exception.hh\
subscription.cc subscription.hh etag-manager.hh presentity-manager.hh
libflexisip_presence_la_LIBADD= libxml_binding_generated.la $(ORTP_LIBS) $(BELLESIP_LIBS) $(XERCESC_LIBS)
libflexisip_presence_la_LIBADD= ../xml/libxml_binding_generated.la $(ORTP_LIBS) $(BELLESIP_LIBS) $(XERCESC_LIBS)
AM_CPPFLAGS= -I $(abs_srcdir)/../ -I$(builddir)/xml $(SOFIA_CFLAGS) -DBELLE_SIP_USE_STL=1 $(BELLESIP_CFLAGS) $(ORTP_CFLAGS) $(XSDCXX_CPPFLAGS) $(XERCESC_CFLAGS)
AM_CPPFLAGS= -I $(abs_srcdir)/../ -I$(builddir)/../xml $(SOFIA_CFLAGS) -DBELLE_SIP_USE_STL=1 $(BELLESIP_CFLAGS) $(ORTP_CFLAGS) $(XSDCXX_CPPFLAGS) $(XERCESC_CFLAGS)
AM_LDFLAGS=
endif
belle-sip @ 86a007de
Subproject commit e639d51a582b05ae659bf2726320200ba0b74681
Subproject commit 86a007dea4c34ceb13a3e4316376710d4f73a322
cmake-builder @ 5a46079d
Subproject commit 8ffd5cb604e4dd0a9d6bbb84560d1c42027c00f3
Subproject commit 5a46079ddd25c7e58a4e0579b2911b49d9eb1a35
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