Commit 3cadf36e authored by Simon Morlat's avatar Simon Morlat

fix configure script.

It is not allowed to call AC_PROG_CC and AC_PROG_CXX conditionally. Configure aborts shortly.
parent 95c3e2b2
......@@ -35,16 +35,10 @@ m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])],)
AC_SUBST([docdir], [${datadir}/doc])
AC_CONFIG_HEADERS(config.h)
AC_CONFIG_MACRO_DIR([m4])
case $target in
*apple-darwin*)
AC_PROG_CXX(["xcrun clang++" g++])
AC_PROG_CC(["xcrun clang" gcc])
;;
*)
AC_PROG_CC
AC_PROG_CXX
;;
esac
AC_PROG_CXX(["xcrun clang++" g++])
AC_PROG_CC(["xcrun clang" gcc])
AC_ISC_POSIX
AC_C_INLINE
AC_HEADER_STDC
......
......@@ -5048,9 +5048,9 @@ int linphone_core_get_camera_sensor_rotation(LinphoneCore *lc) {
static MSVideoSizeDef supported_resolutions[]={
{ { MS_VIDEO_SIZE_1080P_W,MS_VIDEO_SIZE_1080P_H } , "1080p" },
{ { MS_VIDEO_SIZE_720P_W,MS_VIDEO_SIZE_720P_H } , "720p" },
{ { MS_VIDEO_SIZE_UXGA_W, MS_VIDEO_SIZE_UXGA_H } , "uxga" },
{ { MS_VIDEO_SIZE_SXGA_MINUS_W, MS_VIDEO_SIZE_SXGA_MINUS_H } , "sxga-" },
{ { MS_VIDEO_SIZE_720P_W,MS_VIDEO_SIZE_720P_H } , "720p" },
{ { MS_VIDEO_SIZE_XGA_W, MS_VIDEO_SIZE_XGA_H } , "xga" },
{ {MS_VIDEO_SIZE_SVGA_W,MS_VIDEO_SIZE_SVGA_H} , "svga" },
{ {MS_VIDEO_SIZE_4CIF_W,MS_VIDEO_SIZE_4CIF_H} , "4cif" },
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment