Skip to content
Snippets Groups Projects
Commit 19be9a5a authored by Tristan Matthews's avatar Tristan Matthews
Browse files

daemon: add dummy windows CLI

For now, simply validates that contrib/autotools are ok.
It doesn't depend on libsflphone yet.

Refs #60455

Change-Id: I77c2b91cf64a17cd0e94cd24f882aaa0eac2b317
parent fcc997cb
No related branches found
No related tags found
No related merge requests found
...@@ -19,10 +19,13 @@ unittest: ...@@ -19,10 +19,13 @@ unittest:
endif endif
ACLOCAL_AMFLAGS = -I m4 ACLOCAL_AMFLAGS = -I m4
SUBDIRS = src ringtones man $(TESTS_DIR) doc
if SFL_DBUS
SUBDIRS += bin #FIXME: this will change when libsflphone is fixed
if HAVE_WIN32
SUBDIRS = bin
else
SUBDIRS = src ringtones man $(TESTS_DIR) doc bin
endif endif
if USE_DHT if USE_DHT
......
if HAVE_WIN32
libexec_PROGRAMS = ringcli
ringcli_SOURCES = winmain.cpp
#FIXME This is temporary
ringcli_LDADD = $(SPEEX_LIBS)
endif
if SFL_DBUS
SUBDIRS=dbus SUBDIRS=dbus
libexecdir=$(libdir)/sflphone libexecdir=$(libdir)/sflphone
...@@ -9,3 +17,4 @@ sflphoned_CXXFLAGS=-I$(top_srcdir)/src ${DBUSCPP_CFLAGS} \ ...@@ -9,3 +17,4 @@ sflphoned_CXXFLAGS=-I$(top_srcdir)/src ${DBUSCPP_CFLAGS} \
-DTOP_BUILDDIR=\"$$(cd "$(top_builddir)"; pwd)\" -DTOP_BUILDDIR=\"$$(cd "$(top_builddir)"; pwd)\"
sflphoned_LDADD = dbus/libclient_dbus.la ${DBUSCPP_LIBS} $(top_builddir)/src/libsflphone.la sflphoned_LDADD = dbus/libclient_dbus.la ${DBUSCPP_LIBS} $(top_builddir)/src/libsflphone.la
endif
#include <speex/speex.h>
int main()
{
const SpeexMode *mode = speex_lib_get_mode(SPEEX_MODEID_NB);
printf("Hello %s\n", mode->modeName);
return 0;
}
...@@ -310,8 +310,7 @@ AC_ARG_WITH([dbus], ...@@ -310,8 +310,7 @@ AC_ARG_WITH([dbus],
[with_dbus=yes]) [with_dbus=yes])
AS_IF([test "x$with_dbus" = "xyes"], [ AS_IF([test "x$with_dbus" = "xyes"], [
PKG_CHECK_MODULES(DBUSCPP, dbus-c++-1,, AC_MSG_WARN([Missing dbus development files])) PKG_CHECK_MODULES(DBUSCPP, dbus-c++-1,, AC_MSG_WARN([Missing dbus development files]))
AC_CONFIG_FILES([bin/Makefile \ AC_CONFIG_FILES([bin/dbus/Makefile])
bin/dbus/Makefile])
AC_CHECK_PROG(HAVE_DBUSXML2CPP, dbusxx-xml2cpp, true, false) AC_CHECK_PROG(HAVE_DBUSXML2CPP, dbusxx-xml2cpp, true, false)
if test "x$HAVE_DBUSXML2CPP" = "xfalse"; then if test "x$HAVE_DBUSXML2CPP" = "xfalse"; then
...@@ -578,6 +577,7 @@ dnl What Makefiles to generate ...@@ -578,6 +577,7 @@ dnl What Makefiles to generate
#TODO: split this list across where the relevant check is performed #TODO: split this list across where the relevant check is performed
AC_CONFIG_FILES([Makefile \ AC_CONFIG_FILES([Makefile \
bin/Makefile \
src/Makefile \ src/Makefile \
src/sip/Makefile \ src/sip/Makefile \
src/im/Makefile \ src/im/Makefile \
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment