From 19be9a5a377a4421b7052555ec05e859b55a7dc4 Mon Sep 17 00:00:00 2001
From: Tristan Matthews <tristan.matthews@savoirfairelinux.com>
Date: Thu, 13 Nov 2014 16:09:50 -0500
Subject: [PATCH] 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
---
daemon/Makefile.am | 9 ++++++---
daemon/bin/Makefile.am | 9 +++++++++
daemon/bin/winmain.cpp | 8 ++++++++
daemon/configure.ac | 4 ++--
4 files changed, 25 insertions(+), 5 deletions(-)
create mode 100644 daemon/bin/winmain.cpp
diff --git a/daemon/Makefile.am b/daemon/Makefile.am
index d0d8ea4351..04db57e013 100644
--- a/daemon/Makefile.am
+++ b/daemon/Makefile.am
@@ -19,10 +19,13 @@ unittest:
endif
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
if USE_DHT
diff --git a/daemon/bin/Makefile.am b/daemon/bin/Makefile.am
index 7d6340868f..f0f22c77a1 100644
--- a/daemon/bin/Makefile.am
+++ b/daemon/bin/Makefile.am
@@ -1,3 +1,11 @@
+if HAVE_WIN32
+libexec_PROGRAMS = ringcli
+ringcli_SOURCES = winmain.cpp
+#FIXME This is temporary
+ringcli_LDADD = $(SPEEX_LIBS)
+endif
+
+if SFL_DBUS
SUBDIRS=dbus
libexecdir=$(libdir)/sflphone
@@ -9,3 +17,4 @@ sflphoned_CXXFLAGS=-I$(top_srcdir)/src ${DBUSCPP_CFLAGS} \
-DTOP_BUILDDIR=\"$$(cd "$(top_builddir)"; pwd)\"
sflphoned_LDADD = dbus/libclient_dbus.la ${DBUSCPP_LIBS} $(top_builddir)/src/libsflphone.la
+endif
diff --git a/daemon/bin/winmain.cpp b/daemon/bin/winmain.cpp
new file mode 100644
index 0000000000..85e850d4ae
--- /dev/null
+++ b/daemon/bin/winmain.cpp
@@ -0,0 +1,8 @@
+#include <speex/speex.h>
+
+int main()
+{
+ const SpeexMode *mode = speex_lib_get_mode(SPEEX_MODEID_NB);
+ printf("Hello %s\n", mode->modeName);
+ return 0;
+}
diff --git a/daemon/configure.ac b/daemon/configure.ac
index 59900be1c7..4529071a47 100644
--- a/daemon/configure.ac
+++ b/daemon/configure.ac
@@ -310,8 +310,7 @@ AC_ARG_WITH([dbus],
[with_dbus=yes])
AS_IF([test "x$with_dbus" = "xyes"], [
PKG_CHECK_MODULES(DBUSCPP, dbus-c++-1,, AC_MSG_WARN([Missing dbus development files]))
- AC_CONFIG_FILES([bin/Makefile \
- bin/dbus/Makefile])
+ AC_CONFIG_FILES([bin/dbus/Makefile])
AC_CHECK_PROG(HAVE_DBUSXML2CPP, dbusxx-xml2cpp, true, false)
if test "x$HAVE_DBUSXML2CPP" = "xfalse"; then
@@ -578,6 +577,7 @@ dnl What Makefiles to generate
#TODO: split this list across where the relevant check is performed
AC_CONFIG_FILES([Makefile \
+ bin/Makefile \
src/Makefile \
src/sip/Makefile \
src/im/Makefile \
--
GitLab