From 2c5cef3bb325535aa66cda0870b6ebb643d5cab9 Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Fri, 18 Jan 2013 16:04:58 +0100 Subject: [PATCH] Fix library dependencies linking on Debian based systems. --- configure.ac | 13 +++++++++++++ console/Makefile.am | 7 ++----- gtk/Makefile.am | 6 ++---- 3 files changed, 17 insertions(+), 9 deletions(-) diff --git a/configure.ac b/configure.ac index 1d8f9227..10370968 100644 --- a/configure.ac +++ b/configure.ac @@ -84,6 +84,19 @@ IT_PROG_INTLTOOL([0.40], [no-xml]) AM_CONDITIONAL(BUILD_TESTS,test x$build_tests != xno) dnl Initialize libtool LT_INIT([win32-dll shared disable-static]) +dnl Enable library dependencies linking +AC_ARG_ENABLE(deplibs-link, + [AS_HELP_STRING([--disable-deplibs-link ], [Disable library dependencies linking (might break builds)])], + [enable_deplibs_linking="$enableval"], + [enable_deplibs_linking="yes"]) +AC_MSG_NOTICE([Enable library dependencies linking: $enable_interlib_deps]) +if test "${enable_deplibs_linking}" == "yes"; then + link_all_deplibs=yes + link_all_deplibs_CXX=yes +else + link_all_deplibs=no + link_all_deplibs_CXX=no +fi AC_CONFIG_COMMANDS([libtool-hacking],[ if test "$mingw_found" = "yes" ; then diff --git a/console/Makefile.am b/console/Makefile.am index 23a7635d..82ce998e 100644 --- a/console/Makefile.am +++ b/console/Makefile.am @@ -26,11 +26,8 @@ endif linphonec_SOURCES=linphonec.c linphonec.h commands.c linphonec_CFLAGS=$(COMMON_CFLAGS) $(CONSOLE_FLAGS) -linphonec_LDADD=$(top_builddir)/coreapi/liblinphone.la $(READLINE_LIBS) \ - $(MEDIASTREAMER_LIBS) \ - $(ORTP_LIBS) \ - $(SPEEX_LIBS) \ - $(OSIP_LIBS) \ +linphonec_LDADD=$(top_builddir)/coreapi/liblinphone.la \ + $(READLINE_LIBS) \ $(X11_LIBS) if BUILD_WIN32 diff --git a/gtk/Makefile.am b/gtk/Makefile.am index 78f5d0de..1caded7c 100644 --- a/gtk/Makefile.am +++ b/gtk/Makefile.am @@ -53,10 +53,8 @@ linphone_SOURCES+= \ setupwizard.c endif -linphone_LDADD=$(ORTP_LIBS) \ - $(MEDIASTREAMER_LIBS) \ - $(top_builddir)/coreapi/liblinphone.la \ - $(LIBGTK_LIBS) $(NOTIFY1_LIBS) $(NOTIFY4_LIBS) $(LIBGTKMAC_LIBS) $(INTLLIBS) +linphone_LDADD= $(top_builddir)/coreapi/liblinphone.la \ + $(LIBGTK_LIBS) $(NOTIFY1_LIBS) $(NOTIFY4_LIBS) $(LIBGTKMAC_LIBS) $(INTLLIBS) if BUILD_WIN32 -- 2.39.2