Changeset 1834

Show
Ignore:
Timestamp:
04/24/07 13:17:59
Author:
djcb
Message:

* make tinymail/maemo buildable with or without libconic

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/ChangeLog

    r1827 r1834  
     12007-04-24 Dirk-Jan C. Binnema <dirk-jan.binnema@nokia.com> 
     2 
     3        * Make tinymail/maemo buildable with or without libconic 
     4 
    152007-04-23  Philip Van Hoof  <pvanhoof@gnome.org> 
    26 

  • trunk/configure.ac

    r1810 r1834  
    353353dnl ### libtinymail-maemo, a platform library implementation for the maemo platform ## 
    354354if test x$PLATFORMDIR = xlibtinymail-maemo; then 
    355  PKG_CHECK_MODULES(LIBTINYMAIL_MAEMO, glib-2.0 >= 2.8 gobject-2.0 gconf-2.0 gtk+-2.0 hildon-libs libosso conic, conic=yes,conic=no) 
    356  if test "$conic"=="yes"; then 
    357      MAEMO_DEVICE='tny-maemo-conic-device.$(OBJEXT)' 
    358  fi 
     355        PKG_CHECK_MODULES(LIBTINYMAIL_MAEMO, glib-2.0 >= 2.8 gobject-2.0 gconf-2.0 gtk+-2.0 libosso)  
     356        PKG_CHECK_MODULES(LIBTINYMAIL_MAEMO_CONIC,conic,HAVE_CONIC=yes,HAVE_CONIC=no) 
     357        if test "x$HAVE_CONIC"=="xno"; then 
     358                MAEMO_DEVICE="" 
     359        else 
     360                MAEMO_DEVICE='tny-maemo-conic-device.$(OBJEXT)' 
     361                AC_SUBST(LIBYINYMAIL_MAEMO_CONIC_CFLAGS) 
     362                AC_SUBST(LIBTINYMAIL_MAEMO_CONIC_LIBS) 
    359363 dnl HACK: unless we are building for arm, make the device a 'dummy' assuming it is always online 
    360364 dnl this is because scratcbhox-Conic does not support ethernet, and will therefore never consider 
    361365 dnl itself 'online'     
    362 if test -z "`sb-conf show -c | grep arm`"; then 
    363  AC_DEFINE_UNQUOTED(MAEMO_CONIC_DUMMY,1,["Whether to hack the TnyMaemoConicDevice to somewhat work in sbox"]) 
    364 fi 
    365  
    366  AC_SUBST([MAEMO_DEVICE]) 
    367 else 
    368  LIBTINYMAIL_MAEMO_CFLAGS= 
    369  LIBTINYMAIL_MAEMO_LIBS= 
    370 fi 
    371 AC_SUBST(LIBTINYMAIL_MAEMO_CFLAGS) 
    372 AC_SUBST(LIBTINYMAIL_MAEMO_LIBS) 
    373  
     366                if test -z "`sb-conf show -c | grep arm`"; then 
     367                        AC_DEFINE_UNQUOTED(MAEMO_CONIC_DUMMY,1,["Whether to hack the TnyMaemoConicDevice to somewhat work in sbox"]) 
     368                fi 
     369        fi       
     370 
     371        AC_SUBST([MAEMO_DEVICE]) 
     372        AC_SUBST(LIBTINYMAIL_MAEMO_CFLAGS) 
     373        AC_SUBST(LIBTINYMAIL_MAEMO_LIBS) 
     374fi 
    374375 
    375376 

  • trunk/libtinymail-maemo/Makefile.am

    r1792 r1834  
    22        $(LIBTINYMAIL_MAEMO_CFLAGS) \ 
    33        $(LIBTINYMAIL_CAMEL_CFLAGS) \ 
     4        $(LIBTINYMAIL_MAEMO_CONIC_CFLAGS) \ 
    45        -I$(top_srcdir)/libtinymail \ 
    56        -I$(top_srcdir)/libtinymailui \ 
    …… 
    1718        tny-maemo-device.h \ 
    1819        tny-maemo-platform-factory.h \ 
    19         tny-maemo-conic-device.h 
     20        tny-maemo-conic-device.h        
    2021 
    2122libtinymail_maemo_1_0_la_SOURCES =  \ 
    …… 
    2324        tny-maemo-account-store.c \ 
    2425        tny-maemo-device.c \ 
    25         tny-maemo-platform-factory.c \ 
    26         tny-maemo-conic-device.c 
     26        tny-maemo-platform-factory.c 
    2727 
     28EXTRA_libtinymail_maemo_1_0_la_SOURCES = \ 
     29        tny-maemo-conic-device.c                                  
     30                                         
    2831libtinymail_maemo_1_0_la_LIBADD = \ 
    2932        $(LIBTINYMAIL_MAEMO_LIBS) \ 
     33        $(LIBTINYMAIL_MAEMO_CONIC_LIBS) \ 
     34        @MAEMO_DEVICE@ \ 
    3035        $(top_builddir)/libtinymail/libtinymail-$(API_VERSION).la \ 
    3136        $(top_builddir)/libtinymailui/libtinymailui-$(API_VERSION).la \ 
    3237        $(top_builddir)/libtinymailui-gtk/libtinymailui-gtk-$(API_VERSION).la \ 
    3338        $(top_builddir)/libtinymail-camel/libtinymail-camel-$(API_VERSION).la 
     39 
     40libtinymail_maemo_1_0_la_DEPENDENCIES=\ 
     41        @MAEMO_DEVICE@ 
    3442 
    3543libtinymail_maemo_1_0_la_LDFLAGS = -export-dynamic \