contrib: fix common host conf

We assumed all hosts wanted --enable-static --disable-shared
It caused an issue with libspeex and libopus on OSX (Unresolved symbols).
This dependencies are re-enabled for all platforms by this patch.

Refs #68286

Change-Id: Ie6d158e6de6b22bfe93b45e9dfe0dfbe3f3b7218

daemon/contrib/src/libav/rules.mak

@@ -33,6 +33,7 @@ LIBAVCONF += \
 LIBAVCONF += \
 		--enable-libx264 \
 		--enable-libopus \
+		--enable-libspeex \
 		--enable-libvpx
 
 #encoders/decoders
@@ -54,7 +55,9 @@ LIBAVCONF += \
 		--enable-encoder=libvpx_vp8 \
 		--enable-decoder=vp8 \
 		--enable-encoder=h263 \
-		--enable-decoder=h263
+		--enable-decoder=h263 \
+		--enable-encoder=libspeex \
+		--enable-decoder=libspeex
 
 # Linux
 ifdef HAVE_LINUX
@@ -62,14 +65,6 @@ LIBAVCONF += \
 	--enable-x11grab
 endif
 
-# There is an unresolved symbol for speex when linking statically
-ifndef HAVE_DARWIN_OS
-LIBAVCONF += \
-          --enable-libspeex \
-          --enable-encoder=libspeex \
-          --enable-decoder=libspeex
-endif
-
 DEPS_libav = zlib x264 vpx $(DEPS_vpx)
 
 ifdef HAVE_CROSS_COMPILE

daemon/contrib/src/main.mak

@@ -261,7 +261,12 @@ HOSTCONF += --libdir="$(PREFIX)/lib"
 HOSTCONF += --build="$(BUILD)" --host="$(HOST)" --target="$(HOST)"
 HOSTCONF += --program-prefix=""
 # libtool stuff:
-HOSTCONF += --enable-static --disable-shared --disable-dependency-tracking
+HOSTCONF += --disable-dependency-tracking
+
+ifdef HAVE_LINUX
+HOSTCONF += --enable-static --disable-shared
+endif
+
 ifdef HAVE_WIN32
 HOSTCONF += --without-pic
 PIC :=