* build fixes

pmo-trunk-r1527

diff --git a/configure.ac b/configure.ac
index cf87c59..9e0f26c 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -141,10 +141,12 @@ else
 fi
 
 dnl do we have the easy setup stuff?
+have_easysetup=false
 if test -d src/${with_platform}/easysetup; then        
-      AC_DEFINE_UNQUOTED(MODEST_HAVE_EASYSETUP, 1, ["Whether the easysetup feature is available."])
+       have_easysetup=true
+       AC_DEFINE_UNQUOTED(MODEST_HAVE_EASYSETUP, 1, ["Whether the easysetup feature is available."])
 fi
-AM_CONDITIONAL(MODEST_HAVE_EASYSETUP,test -d src/${with_platform}/easysetup) 
+AM_CONDITIONAL(MODEST_HAVE_EASYSETUP,test x$have_easysetup = xtrue) 
 
 
 dnl ## setup the testing framework (ie., make check)
@@ -207,10 +209,11 @@ src/maemo/modest.service
 echo
 echo "modest configure results"
 echo "-----------------------------------"
-echo "Platform       : $with_platform"
-echo "Build tests    : $build_tests"
-echo "Build docs     : $build_docs"
-echo "Debug version  : $with_debug"
+echo "Platform         : $with_platform"
+echo "Build easy setup : $have_easysetup"
+echo "Build tests      : $build_tests"
+echo "Build docs       : $build_docs"
+echo "Debug version    : $with_debug"
 echo ""
 echo "NOTE: you should do a 'make clean' after changing architecture or platform (--with-platform=)"
 echo ""

diff --git a/src/Makefile.am b/src/Makefile.am
index 01684f7..0faa06f 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,6 +1,6 @@
 #
 # Makefile.am
-# Time-stamp: <2007-04-06 16:29:33 (djcb)>
+# Time-stamp: <2007-04-10 10:58:05 (djcb)>
 SUBDIRS=$(MODEST_PLATFORM) widgets
 DIST_SUBDIRS = widgets gnome maemo
 
@@ -24,13 +24,6 @@ modest-marshal.c: modest-marshal.list
 modest-marshal.h: modest-marshal.list
        glib-genmarshal --header --prefix=modest_marshal < modest-marshal.list > modest-marshal.h
 
-if MODEST_HAVE_EASYSETUP
-       easysetupmaybe=$(MODEST_PLATFORM)/easysetup/libmodest-easysetup.la
-else
-       easysetupmaybe=$(MODEST_PLATFORM)/easysetup/libmodest-easysetup.la      
-endif
-
-
 bin_PROGRAMS=\
        modest
 

diff --git a/src/maemo/Makefile.am b/src/maemo/Makefile.am
index 4cd6edc..e8e4473 100644 (file)
--- a/src/maemo/Makefile.am
+++ b/src/maemo/Makefile.am
@@ -64,9 +64,10 @@ libmodest_ui_la_SOURCES=              \
        modest-connection-specific-smtp-edit-window.h \
        modest-connection-specific-smtp-edit-window.c
 
-LDADD = \
+libmodest_ui_la_LIBADD = \
        $(MODEST_GSTUFF_LIBS) \
-       $(MODEST_LIBTINYMAIL_MAEMO_LIBS)
+       $(MODEST_LIBTINYMAIL_MAEMO_LIBS) \
+       easysetup/libmodest-easysetup.la 
 
 PIXMAP_FILES=\
        pixmaps/*.png