Changeset 2837

Show
Ignore:
Timestamp:
10/15/07 18:00:36
Author:
jdapena
Message:

* Some fixes to mozembed build.
* Disable mozembed packages build in maemo.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/ChangeLog

    r2834 r2837  
     12007-10-15  Jose Dapena Paz  <jdapena@igalia.com> 
     2 
     3        * Some fixes to mozembed build. 
     4        * Disable mozembed packages build in maemo. 
     5 
    162007-10-12  Philip Van Hoof  <pvanhoof@gnome.org> 
    27 

  • trunk/configure.ac

    r2836 r2837  
    375375  AC_TNY_MOZ_CHECK 
    376376 
    377   if test x$mozilla_nspr = xno; then 
    378    AC_MSG_ERROR("You need Mozilla's NSPR") 
    379   fi 
    380  
    381   if test x$mozilla_nss = xno; then 
    382    AC_MSG_ERROR("You need Mozilla's NSS") 
    383   fi 
    384  
    385377  if test x$mozilla_xpcom = xno; then 
    386378   AC_MSG_ERROR("You need Mozilla's XPCOM") 
    …… 
    391383  fi 
    392384 
    393   extraplatpkgs="$mozilla_nspr $mozilla_nss $mozilla_xpcom $mozilla_gtkmozembed" 
     385  extraplatpkgs="$mozilla_xpcom $mozilla_gtkmozembed" 
    394386  extratnypkgs="$extratnypkgs $extraplatpkgs" 
    395387  PKG_CHECK_MODULES(LIBTINYMAILUI_MOZEMBED, $extraplatpkgs glib-2.0 >= 2.8 gobject-2.0 gtk+-2.0 $extragtkpkgs) 

  • trunk/debian/control.maemo1

    r2829 r2837  
    33Priority: optional 
    44Maintainer: Oystein Gisnas <oystein@gisnas.net> 
    5 Build-Depends: debhelper (>=4), cdbs, dpkg-dev (>= 1.13.18), libglib2.0-dev (>= 2.6), libgtk2.0-dev, libosso-gnomevfs2-dev, libgconf2-dev, libosso-dev, libconic0-dev, gnome-common, gtk-doc-tools, microb-engine-dev, libgtkmozembed-dev  
     5Build-Depends: debhelper (>=4), cdbs, dpkg-dev (>= 1.13.18), libglib2.0-dev (>= 2.6), libgtk2.0-dev, libosso-gnomevfs2-dev, libgconf2-dev, libosso-dev, libconic0-dev, gnome-common, gtk-doc-tools 
    66Standards-Version: 3.7.2 
    77 
    …… 
    224224 This package contains the debug symbol files for libtinymail-gnomevfs. 
    225225 
    226 Package: libtinymailui-mozembed-1.0-0 
    227 Architecture: any 
    228 Depends: ${shlibs:Depends} 
    229 Description: memory-effective framework for accessing e-mail - Camel library 
    230  Tinymail is a development framework for accessing E-mail services using 
    231  devices with few memory resources. 
    232  . 
    233  It supports local mail storage (Maildir,mh,spool & mbox), IMAP, Exchange 
    234  and NNTP. It can be used to send messages over SMTP and by using sendmail. 
    235  . 
    236  This package contains the library for rendering HTML. 
    237  
    238 Package: libtinymailui-mozembed-1.0-0-dev 
    239 Architecture: any 
    240 Depends: libtinymailui-mozembed-1.0-0 (= ${binary:Version}) 
    241 Description: memory-effective framework for accessing e-mail - development files 
    242  Tinymail is a development framework for accessing E-mail services using 
    243  devices with few memory resources. 
    244  . 
    245  It supports local mail storage (Maildir,mh,spool & mbox), IMAP, Exchange 
    246  and NNTP. It can be used to send messages over SMTP and by using sendmail. 
    247  . 
    248  This package contains the development files for libtinymailui-mozembed. 
     226# Package: libtinymailui-mozembed-1.0-0 
     227# Architecture: any 
     228# Depends: ${shlibs:Depends} 
     229# Description: memory-effective framework for accessing e-mail - Camel library 
     230# Tinymail is a development framework for accessing E-mail services using 
     231# devices with few memory resources. 
     232# . 
     233# It supports local mail storage (Maildir,mh,spool & mbox), IMAP, Exchange 
     234# and NNTP. It can be used to send messages over SMTP and by using sendmail. 
     235# . 
     236# This package contains the library for rendering HTML. 
     237 
     238# Package: libtinymailui-mozembed-1.0-0-dev 
     239# Architecture: any 
     240# Depends: libtinymailui-mozembed-1.0-0 (= ${binary:Version}) 
     241# Description: memory-effective framework for accessing e-mail - development files 
     242# Tinymail is a development framework for accessing E-mail services using 
     243# devices with few memory resources. 
     244# . 
     245# It supports local mail storage (Maildir,mh,spool & mbox), IMAP, Exchange 
     246# and NNTP. It can be used to send messages over SMTP and by using sendmail. 
     247# . 
     248# This package contains the development files for libtinymailui-mozembed. 

  • trunk/debian/rules.maemo

    r2829 r2837  
    3232        dh_testdir 
    3333        # Add here commands to configure the package. 
    34         CFLAGS="$(CFLAGS) -fPIC" ./configure --with-platform=maemo --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --with-ssl=nss --sysconfdir=/etc --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --with-html-component=mozembed 
     34        CFLAGS="$(CFLAGS) -fPIC" ./configure --with-platform=maemo --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --with-ssl=nss --sysconfdir=/etc --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info 
    3535 
    3636 

  • trunk/tests/c-demo/Makefile.am

    r1957 r2837  
    2222 
    2323if BUILD_MOZEMBED 
    24 INCLUDES += -DMOZEMBED 
     24INCLUDES += -DMOZEMBED -I$(top_srcdir)/libtinymailui-mozembed $(LIBTINYMAILUI_MOZEMBED_CFLAGS) 
    2525endif 
    2626 
    …… 
    5050endif 
    5151 
     52if BUILD_MOZEMBED 
     53tny_demoui_LDADD +=  $(top_builddir)/libtinymailui-mozembed/libtinymailui-mozembed-$(API_VERSION).la \ 
     54        $(LIBTINYMAILUI_MOZEMBED_LIBS) 
     55endif 
     56