Changeset 50

Show
Ignore:
Timestamp:
11/08/07 13:27:07
Author:
pvanhoof
Message:

2007-11-08 Philip Van Hoof <pvanhoof@gnome.org>

        • Detecting the Tinymail platform library
Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/ChangeLog

    r49 r50  
     12007-11-08  Philip Van Hoof  <pvanhoof@gnome.org> 
     2 
     3        * Detecting the Tinymail platform library 
     4 
    152007-11-06  Philip Van Hoof  <pvanhoof@gnome.org> 
    26 

  • trunk/configure.ac

    r47 r50  
    1515AC_PROG_LIBTOOL 
    1616 
     17tinymail_platform="none" 
     18AC_MSG_CHECKING(Tinymail platform module name) 
     19tinymail_platform_pcs="libtinymail-gnome-desktop-1.0_-DGNOMEDESKTOP libtinymail-gpe-1.0_-DGPE libtinymail-olpc-1.0_-DOLPC libtinymail-maemo-1.0_-DMAEMO" 
     20for pc in $tinymail_platform_pcs; do 
     21        mypc=`echo $pc | cut -d _ -f -1` 
     22        if pkg-config --exists $mypc; then 
     23                tinymail_platform=$mypc 
     24                tinymail_addcfags=`echo $pc | cut -d _ -f 2` 
     25                break; 
     26        fi 
     27done 
     28AC_MSG_RESULT($tinymail_platform) 
     29 
     30 
    1731PKG_CHECK_MODULES(TMUT,  
    1832        gtk+-2.0 >= 2.6  
    …… 
    2135        libtinymailui-1.0  
    2236        libtinymailui-gtk-1.0 
    23         libtinymail-gnome-desktop-1.0 
     37        $tinymail_platform 
    2438)  
    2539 
     40TMUT_CFLAGS="$TMUT_CFLAGS $tinymail_addcfags" 
    2641AC_SUBST(TMUT_CFLAGS) 
    2742AC_SUBST(TMUT_LIBS) 

  • trunk/src/Makefile.am

    r47 r50  
    11SUBDIRS = modest-widgets . 
    2 INCLUDES = $(TMUT_CFLAGS) -DGNOMEDESKTOP \ 
     2INCLUDES = $(TMUT_CFLAGS) \ 
    33        -I$(top_srcdir)/src/modest-widgets 
    44 

  • trunk/src/modest-widgets/Makefile.am

    r47 r50  
    1 INCLUDES = $(TMUT_CFLAGS) -DGNOMEDESKTOP 
     1INCLUDES = $(TMUT_CFLAGS) 
    22 
    33noinst_LIBRARIES = libmodestwidgets.a