From 4c0ad0523e70d4c818a4de195d4200bb03ada553 Mon Sep 17 00:00:00 2001 From: Jose Dapena Paz Date: Mon, 13 Apr 2009 12:24:31 +0000 Subject: [PATCH] Only use -shared ldflag for modest if using launcher pmo-trunk-r8746 --- configure.ac | 4 ++++ src/Makefile.am | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index ae3aa86..bd6f20b 100644 --- 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 --- 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 -- 1.7.9.5