From 78a32ceed062851cf56a93f1d50cbb2b8c0eb2be Mon Sep 17 00:00:00 2001
From: Edric Milaret <edric.ladent-milaret@savoirfairelinux.com>
Date: Thu, 7 May 2015 16:46:55 -0400
Subject: [PATCH] windows: simplify configure for cross-compilation
Refs #70869
Change-Id: I255c790c2a4da7bf1deec695f19c596ca4b60dca
---
configure.ac | 9 ++++++++-
contrib/src/libav/rules.mak | 2 ++
2 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
index 3bac0eae2d..11ae08a9d0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -264,6 +264,7 @@ if test "${HAVE_ANDROID}" = "1"; then
fi
AM_CONDITIONAL([BUILD_OPENSL], test "x$have_opensl" = "xyes")
+if test "${SYS}" != "mingw32"; then
dnl Check for alsa development package - name: libasound2-dev
ALSA_MIN_VERSION=1.0
AC_ARG_WITH([alsa],
@@ -275,9 +276,11 @@ AS_IF([test "x$with_alsa" = "xyes"], [
]);
AC_DEFINE_UNQUOTED([HAVE_ALSA], `if test "x$with_alsa" = "xyes"; then echo 1; else echo 0; fi`, [Define if you have alsa])
+fi
AM_CONDITIONAL(BUILD_ALSA, test "x$with_alsa" = "xyes")
+if test "${SYS}" != "mingw32"; then
dnl Check for pulseaudio development package - name: libpulse-dev
LIBPULSE_MIN_VERSION=0.9.15
AC_ARG_WITH([pulse],
@@ -290,6 +293,7 @@ AS_IF([test "x$with_pulse" = "xyes"], [
]);
AC_DEFINE_UNQUOTED([HAVE_PULSE], `if test "x$with_pulse" = "xyes"; then echo 1; else echo 0; fi`, [Define if you have pulseaudio])
+fi
AM_CONDITIONAL(BUILD_PULSE, test "x$with_pulse" = "xyes")
AC_ARG_WITH([jack],
@@ -340,6 +344,7 @@ AS_IF([test "x$enable_coverage" = "xyes"], [
# DBUSCPP
dnl Check for dbuscpp, the C++ bindings for D-Bus
+if test "${SYS}" != "mingw32"; then
AC_ARG_WITH([dbus],
[AS_HELP_STRING([--without-dbus], [disable support for dbus])],
[],
@@ -361,7 +366,7 @@ AS_IF([test "x$with_dbus" = "xyes"], [
AS_IF([test "x$CLANG" = "xyes"], [
AC_MSG_ERROR([dbus does not compile when clang is used, rerun with --without-dbus])
]);
-
+fi
AM_CONDITIONAL(RING_DBUS, true)],
AM_CONDITIONAL(RING_DBUS, false));
@@ -447,6 +452,7 @@ CPPUNIT_MIN_VERSION=1.12
PKG_CHECK_MODULES(CPPUNIT, cppunit >= ${CPPUNIT_MIN_VERSION}, AM_CONDITIONAL(BUILD_TEST, test 1 = 1 ), AM_CONDITIONAL(BUILD_TEST, test 0 = 1 ))
+if test "${SYS}" != "mingw32"; then
# GSM CODEC
# required dependency(ies): libgsm
dnl check for libgsm1 (doesn't use pkg-config)
@@ -463,6 +469,7 @@ AS_IF([test "x$with_gsm" != xno],
])
AC_DEFINE_UNQUOTED([HAVE_GSM], `if test "x$with_gsm" = "xyes"; then echo 1; else echo 0; fi`, [Define if you have libgsm])
+fi
AM_CONDITIONAL(BUILD_GSM, test "x$with_gsm" = "xyes" )
diff --git a/contrib/src/libav/rules.mak b/contrib/src/libav/rules.mak
index fc93d559bc..565b7ca8d8 100644
--- a/contrib/src/libav/rules.mak
+++ b/contrib/src/libav/rules.mak
@@ -2,7 +2,9 @@
LIBAV_HASH := f851477889ae48e2f17073cf7486e1d5561b7ae4
LIBAV_GITURL := git://git.libav.org/libav.git
+ifndef HAVE_WIN32
PKGS += libav
+endif
#disable everything
#ensure to add this option first
--
GitLab