From f08a56d4034f0fb153694bb0d9fd92906af0075a Mon Sep 17 00:00:00 2001 From: smorlat Date: Mon, 16 Mar 2009 14:57:09 +0000 Subject: [PATCH] fix make distcheck disable static plugin by default git-svn-id: svn+ssh://svn.savannah.nongnu.org/linphone/trunk@347 3f6dc0c8-ddfe-455d-9043-3cd528dc4637 --- linphone/coreapi/sipsetup.c | 5 ++--- linphone/mediastreamer2/plugins/msx264/configure.ac | 3 +-- linphone/po/POTFILES.in | 2 ++ 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/linphone/coreapi/sipsetup.c b/linphone/coreapi/sipsetup.c index 2055777b7..583e7e17e 100644 --- a/linphone/coreapi/sipsetup.c +++ b/linphone/coreapi/sipsetup.c @@ -17,13 +17,12 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ - -#include "linphonecore.h" - #ifdef HAVE_CONFIG_H #include "../config.h" #endif +#include "linphonecore.h" + #ifndef LINPHONE_PLUGINS_DIR #ifdef WIN32 #define LINPHONE_PLUGINS_DIR "liblinphone\\plugins\\" diff --git a/linphone/mediastreamer2/plugins/msx264/configure.ac b/linphone/mediastreamer2/plugins/msx264/configure.ac index 785505937..e257b42c9 100644 --- a/linphone/mediastreamer2/plugins/msx264/configure.ac +++ b/linphone/mediastreamer2/plugins/msx264/configure.ac @@ -16,8 +16,7 @@ AC_ARG_ENABLE(strict, dnl Checks for programs. AC_PROG_CC AC_PROG_LIBTOOL -AC_ENABLE_SHARED(yes) -AC_ENABLE_STATIC(no) +AC_DISABLE_STATIC CFLAGS="$CFLAGS -Wall" diff --git a/linphone/po/POTFILES.in b/linphone/po/POTFILES.in index e0e5c3ec3..729dfc62e 100644 --- a/linphone/po/POTFILES.in +++ b/linphone/po/POTFILES.in @@ -59,4 +59,6 @@ mediastreamer2/src/wincevideods.c mediastreamer2/src/winvideo.c mediastreamer2/src/winvideods.c mediastreamer2/src/winvideo2.c +mediastreamer2/src/ice.c +