Commit 509516fb authored by Ghislain MARY's avatar Ghislain MARY

Include patch from linphone web version.

parent b5d1414e
......@@ -21,6 +21,7 @@ fi
ORTP_PKGCONFIG_VERSION=${ORTP_VERSION}
AC_SUBST(LIBORTP_SO_CURRENT, $LIBORTP_SO_CURRENT)
AC_SUBST(LIBORTP_SO_VERSION)
AC_SUBST(ORTP_VERSION)
AC_SUBST(ORTP_PKGCONFIG_VERSION)
......@@ -42,6 +43,8 @@ dnl Checks for programs.
AC_PROG_CC
LT_INIT([win32-dll shared disable-static])
gl_LD_OUTPUT_DEF
AC_MSG_CHECKING([warning make an error on compilation])
AC_ARG_ENABLE(strict,
[AS_HELP_STRING([--enable-strict], [Enable error on compilation warning (default=yes)])],
......@@ -145,6 +148,7 @@ case "$target_os" in
;;
esac
AM_CONDITIONAL(BUILD_WIN32, test "$mingw_found" = "yes")
AC_CONFIG_COMMANDS([libtool-hacking],
[if test "$mingw_found" = "yes" ; then
echo "Hacking libtool to work with mingw..."
......@@ -384,6 +388,13 @@ AC_ARG_ENABLE(tests_enabled,
)
AM_CONDITIONAL(ENABLE_TESTS, test x$tests_enabled = xyes)
case "$target_os" in
*linux*)
# Eliminate -lstdc++ addition to postdeps for cross compiles.
postdeps_CXX=`echo " $postdeps_CXX " | sed 's, -lstdc++ ,,g'`
;;
esac
dnl ##################################################
dnl # Check for doxygen
dnl ##################################################
......
......@@ -51,5 +51,19 @@ libortp_la_LIBADD= $(PTHREAD_LIBS) $(RT_LIBS) -lm $(SRTP_LIBS) $(SSL_LIBS) $(LIB
libortp_la_LDFLAGS= -version-info $(LIBORTP_SO_VERSION) -no-undefined
if HAVE_LD_OUTPUT_DEF
libortp_la_LDFLAGS += -Wl,--output-def,libortp-$(LIBORTP_SO_CURRENT).def
defexecdir = $(libdir)
defexec_DATA = libortp-$(LIBORTP_SO_CURRENT).def
CLEANFILES = $(defexec_DATA)
libortp-$(LIBORTP_SO_CURRENT).def: libortp.la
if BUILD_WIN32
defexec_DATA += libortp-$(LIBORTP_SO_CURRENT).lib
libortp-$(LIBORTP_SO_CURRENT).lib: libortp-$(LIBORTP_SO_CURRENT).def libortp.la
$(DLLTOOL) --dllname libortp-$(LIBORTP_SO_CURRENT).dll --input-def libortp-$(LIBORTP_SO_CURRENT).def --output-lib $@ libortp.la
endif
endif
SUBDIRS= . tests
......@@ -39,7 +39,7 @@
#endif
#if (defined(WIN32) || defined(_WIN32_WCE)) && !defined(WINAPI_FAMILY_PHONE_APP)
#include <Mswsock.h>
#include <mswsock.h>
#endif
#ifdef HAVE_SYS_UIO_H
......
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