From f6ad95d6aa10e1ef2f22e4316c3bd677690ae7bd Mon Sep 17 00:00:00 2001
From: Sebastian Kemper <sebastian_ml@gmx.net>
Date: Sat, 3 Feb 2018 14:33:48 +0100
Subject: [PATCH] yate: clean up CONFIGURE_ARGS

- remove ARGS that are default anyway
- enable sse2 when target is x86_64
- remove --enable-inline as that causes too many warnings:

    ilbccodec.cpp:50:7: warning: inlining failed in call to 'virtual {anonymous}::iLBCFactory::~iLBCFactory()': call is unlikely and code size would grow [-Winline]
     class iLBCFactory : public TranslatorFactory
           ^~~~~~~~~~~
    ilbccodec.cpp:50:7: note: called from here
     class iLBCFactory : public TranslatorFactory
           ^~~~~~~~~~~

- --enable-internalregex removed as yate can use external regex
- make some choices depending on whether a package is selected; otherwise the
  build might fail, i.e. when spandsp is not installed but the Makefiles tells
  the build system to use spandsp anyway

Signed-off-by: Sebastian Kemper <sebastian_ml@gmx.net>
---
 net/yate/Makefile | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/net/yate/Makefile b/net/yate/Makefile
index 607384e..808f015 100644
--- a/net/yate/Makefile
+++ b/net/yate/Makefile
@@ -86,40 +86,40 @@ endef
 TARGET_CFLAGS += $(TARGET_CPPFLAGS)
 
 CONFIGURE_ARGS+= \
-	--enable-strings \
-	--enable-poll \
-	--enable-inline \
-	--enable-atomics \
-	--disable-sse2 \
+	$(if $(CONFIG_x86_64),--enable-sse2) \
 	--disable-sctp \
-	--enable-resolver \
-	--enable-internalregex \
 	--disable-dahdi \
 	--disable-zaptel \
 	--disable-wpcard \
 	--disable-tdmcard \
 	--disable-wanpipe \
 	--enable-ilbc \
-	--enable-ilbc-webrtc \
-	--enable-isac-float \
-	--disable-isac-fixed \
+	$(if $(CONFIG_PACKAGE_$(PKG_NAME)-mod-ilbcwebrtc),--enable-ilbc-webrtc,--disable-ilbc-webrtc) \
 	--enable-rtti \
-	--with-libpq="$(STAGING_DIR)/usr" \
-	--with-mysql="$(STAGING_DIR)/usr" \
+	$(if $(CONFIG_PACKAGE_$(PKG_NAME)-mod-pgsqldb),--with-libpq="$(STAGING_DIR)/usr",--without-libpq) \
+	$(if $(CONFIG_PACKAGE_$(PKG_NAME)-mod-mysqldb),--with-mysql="$(STAGING_DIR)/usr",--without-mysql) \
 	--without-wphwec \
 	--without-libgsm \
 	--without-amrnb \
-	--with-spandsp="$(STAGING_DIR)/usr/include" \
+	$(if $(CONFIG_PACKAGE_$(PKG_NAME)-mod-faxchan),--with-spandsp="$(STAGING_DIR)/usr/include",--without-spandsp) \
 	--without-pwlib \
 	--without-openh323 \
-	--with-openssl \
-	--with-zlib="$(STAGING_DIR)/usr" \
+	$(if $(CONFIG_PACKAGE_$(PKG_NAME)-mod-openssl),--with-openssl,--without-openssl) \
+	$(if $(CONFIG_PACKAGE_$(PKG_NAME)-mod-zlibcompress),--with-zlib="$(STAGING_DIR)/usr",--without-zlib) \
 	--without-libqt4 \
 	--without-qtstatic \
 	--without-coredumper \
 	--without-doxygen \
 	--without-kdoc
 
+ifneq ($(CONFIG_PACKAGE_$(PKG_NAME)-isaccodec),)
+CONFIGURE_ARGS+=$(if $(CONFIG_SOFT_FLOAT),--disable-isac-float --enable-isac-fixed,--disable-isac-fixed --enable-isac-float)
+else
+CONFIGURE_ARGS+= \
+	--disable-isac-fixed \
+	--disable-isac-float
+endif
+
 define Package/$(PKG_NAME)/install
 	$(INSTALL_DIR) $(1)/usr/lib
 	
-- 
2.30.2