Only use -shared ldflag for modest if using launcher

pmo-trunk-r8746

diff --git a/configure.ac b/configure.ac
index ae3aa86..bd6f20b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -274,7 +274,11 @@ then
        PKG_CHECK_MODULES(MAEMO_LAUNCHER, [maemo-launcher-app])
        AC_SUBST(MAEMO_LAUNCHER_CFLAGS)
        AC_SUBST(MAEMO_LAUNCHER_LIBS)
+       MAEMO_LAUNCHER_MODEST_LDFLAGS="-shared "
+else
+       MAEMO_LAUNCHER_MODEST_LDFLAGS="-export-dynamic "
 fi
+AC_SUBST(MAEMO_LAUNCHER_MODEST_LDFLAGS)
 
 have_easysetup=false
 if test "x$with_toolkit" == "xgtk"; then

diff --git a/src/Makefile.am b/src/Makefile.am
index 5a50eff..db86a97 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -208,7 +208,7 @@ modest_LDADD = \
        ${easysetupmaybe}                               \
        libmodest.la)
 
-modest_LDFLAGS = -shared -Wl,--version-script=export.map
+modest_LDFLAGS = $(MAEMO_LAUNCHER_MODEST_LDFLAGS) -Wl,--version-script=export.map
 
 # modest_UNWANTED = -export-dynamic -Wl,--export-dynamic