Changeset 72 for osso-xterm

Show
Ignore:
Timestamp:
10/21/07 12:56:28 (1 year ago)
Author:
inz
Message:

Clean up configure.ac, allow building with tablet-browser-interface

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • osso-xterm/trunk/configure.ac

    r48 r72  
    3636AC_SUBST(VTE_CFLAGS) 
    3737 
    38 PKG_CHECK_MODULES(HILDON, hildon-1 >= 0.9.9, hildon1=yes, hildon1=no) 
    39 if test "$hildon1" == "yes"; then 
    40         AC_DEFINE(HILDON, 1, [Version of hildon libraries]) 
    41 else 
    42         PKG_CHECK_MODULES(HILDON_LIBS, hildon-libs >= 0.12.0) 
    43         AC_DEFINE(HILDON, 0, [Version of hildon libraries]) 
    44 fi 
    45 PKG_CHECK_MODULES(BROWSER, maemo-browser-interface, [], [PKG_CHECK_MODULES(BROWSER, osso-browser-interface)]) 
     38PKG_CHECK_MODULES(HILDON, hildon-1 >= 0.9.9, \ 
     39                  AC_DEFINE(HILDON, 1, [Version of hildon libraries]), \ 
     40                  [AC_DEFINE(HILDON, 0, [Version of hildon libraries]) \ 
     41                  PKG_CHECK_MODULES(HILDON_LIBS, hildon-libs >= 0.12.0)]) 
     42PKG_CHECK_MODULES(BROWSER, tablet-browser-interface, \ 
     43                  [AC_DEFINE(BROWSER, 1, [Version of browser includes])], \ 
     44                  [AC_DEFINE(BROWSER, 0, [Version of browser includes]) \ 
     45                  PKG_CHECK_MODULES(BROWSER, maemo-browser-interface, \ 
     46                                    [], \ 
     47                                    [PKG_CHECK_MODULES(BROWSER, \ 
     48                                     osso-browser-interface)])]) 
    4649AC_SUBST(HILDON_LIBS) 
    4750AC_SUBST(HILDON_CFLAGS) 
    48 AC_SUBST(HILDON_LIBS_LIBS) 
    49 AC_SUBST(HILDON_LIBS_CFLAGS) 
    5051 
    5152AC_DEFINE_UNQUOTED(LOCALEDIR, "/usr/share/locale", Locale dir) 

  • osso-xterm/trunk/debian/control

    r36 r72  
    33Priority: optional 
    44Maintainer: Santtu Lakkala <inz@inz.fi> 
    5 Build-Depends: debhelper (>= 4.0.0), libvte-dev, libdbus-1-dev, libgconf2-dev, libdbus-glib-1-dev, libglib2.0-dev, libhildon1-dev (>= 0.9.9) | hildon-libs-dev (>= 0.12.0), libosso-dev, maemo-browser-interface-dev | osso-browser-interface-dev 
     5Build-Depends: debhelper (>= 4.0.0), libvte-dev, libdbus-1-dev, libgconf2-dev, libdbus-glib-1-dev, libglib2.0-dev, libhildon1-dev (>= 0.9.9) | hildon-libs-dev (>= 0.12.0), libosso-dev, tablet-browser-interface-dev | maemo-browser-interface-dev | osso-browser-interface-dev 
    66Standards-Version: 3.6.2.1 
    77 

  • osso-xterm/trunk/src/terminal-app.c

    r25 r72  
    3535#include <stdlib.h> 
    3636#include <libosso.h> 
     37#if BROWSER == 0 
    3738#include <osso-browser-interface.h> 
     39#elif BROWSER == 1 
     40#include <tablet-browser-interface.h> 
     41#endif 
    3842 
    3943#include <libintl.h>