Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
jami-daemon
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
savoirfairelinux
jami-daemon
Commits
78a32cee
Commit
78a32cee
authored
10 years ago
by
Edric Milaret
Committed by
Guillaume Roguez
10 years ago
Browse files
Options
Downloads
Patches
Plain Diff
windows: simplify configure for cross-compilation
Refs #70869 Change-Id: I255c790c2a4da7bf1deec695f19c596ca4b60dca
parent
017f7a2f
No related branches found
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
configure.ac
+8
-1
8 additions, 1 deletion
configure.ac
contrib/src/libav/rules.mak
+2
-0
2 additions, 0 deletions
contrib/src/libav/rules.mak
with
10 additions
and
1 deletion
configure.ac
+
8
−
1
View file @
78a32cee
...
@@ -264,6 +264,7 @@ if test "${HAVE_ANDROID}" = "1"; then
...
@@ -264,6 +264,7 @@ if test "${HAVE_ANDROID}" = "1"; then
fi
fi
AM_CONDITIONAL([BUILD_OPENSL], test "x$have_opensl" = "xyes")
AM_CONDITIONAL([BUILD_OPENSL], test "x$have_opensl" = "xyes")
if test "${SYS}" != "mingw32"; then
dnl Check for alsa development package - name: libasound2-dev
dnl Check for alsa development package - name: libasound2-dev
ALSA_MIN_VERSION=1.0
ALSA_MIN_VERSION=1.0
AC_ARG_WITH([alsa],
AC_ARG_WITH([alsa],
...
@@ -275,9 +276,11 @@ AS_IF([test "x$with_alsa" = "xyes"], [
...
@@ -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])
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")
AM_CONDITIONAL(BUILD_ALSA, test "x$with_alsa" = "xyes")
if test "${SYS}" != "mingw32"; then
dnl Check for pulseaudio development package - name: libpulse-dev
dnl Check for pulseaudio development package - name: libpulse-dev
LIBPULSE_MIN_VERSION=0.9.15
LIBPULSE_MIN_VERSION=0.9.15
AC_ARG_WITH([pulse],
AC_ARG_WITH([pulse],
...
@@ -290,6 +293,7 @@ AS_IF([test "x$with_pulse" = "xyes"], [
...
@@ -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])
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")
AM_CONDITIONAL(BUILD_PULSE, test "x$with_pulse" = "xyes")
AC_ARG_WITH([jack],
AC_ARG_WITH([jack],
...
@@ -340,6 +344,7 @@ AS_IF([test "x$enable_coverage" = "xyes"], [
...
@@ -340,6 +344,7 @@ AS_IF([test "x$enable_coverage" = "xyes"], [
# DBUSCPP
# DBUSCPP
dnl Check for dbuscpp, the C++ bindings for D-Bus
dnl Check for dbuscpp, the C++ bindings for D-Bus
if test "${SYS}" != "mingw32"; then
AC_ARG_WITH([dbus],
AC_ARG_WITH([dbus],
[AS_HELP_STRING([--without-dbus], [disable support for dbus])],
[AS_HELP_STRING([--without-dbus], [disable support for dbus])],
[],
[],
...
@@ -361,7 +366,7 @@ AS_IF([test "x$with_dbus" = "xyes"], [
...
@@ -361,7 +366,7 @@ AS_IF([test "x$with_dbus" = "xyes"], [
AS_IF([test "x$CLANG" = "xyes"], [
AS_IF([test "x$CLANG" = "xyes"], [
AC_MSG_ERROR([dbus does not compile when clang is used, rerun with --without-dbus])
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, true)],
AM_CONDITIONAL(RING_DBUS, false));
AM_CONDITIONAL(RING_DBUS, false));
...
@@ -447,6 +452,7 @@ CPPUNIT_MIN_VERSION=1.12
...
@@ -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 ))
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
# GSM CODEC
# required dependency(ies): libgsm
# required dependency(ies): libgsm
dnl check for libgsm1 (doesn't use pkg-config)
dnl check for libgsm1 (doesn't use pkg-config)
...
@@ -463,6 +469,7 @@ AS_IF([test "x$with_gsm" != xno],
...
@@ -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])
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" )
AM_CONDITIONAL(BUILD_GSM, test "x$with_gsm" = "xyes" )
...
...
This diff is collapsed.
Click to expand it.
contrib/src/libav/rules.mak
+
2
−
0
View file @
78a32cee
...
@@ -2,7 +2,9 @@
...
@@ -2,7 +2,9 @@
LIBAV_HASH
:=
f851477889ae48e2f17073cf7486e1d5561b7ae4
LIBAV_HASH
:=
f851477889ae48e2f17073cf7486e1d5561b7ae4
LIBAV_GITURL
:=
git://git.libav.org/libav.git
LIBAV_GITURL
:=
git://git.libav.org/libav.git
ifndef
HAVE_WIN32
PKGS
+=
libav
PKGS
+=
libav
endif
#disable everything
#disable everything
#ensure to add this option first
#ensure to add this option first
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment