Check usehildon variable to compile using correct libraries. Also check this to inclu...

diff --git a/Makefile.am b/Makefile.am
index 7a982a6c80efa4d843e50ab5087865df9bb5b6cc..0a4d4bc4a2d302e02cb14f9cc1cb3a4c78342e82 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,7 +5,9 @@ SUBDIRS = src
 EXTRA_DIST = \
        autogen.sh \
        xournal.glade \
-       xournal.gladep
+       xournal.gladep \
+       maemo/xournal.desktop \
+       maemo/xournal.service
 
 install-data-local:
        @$(NORMAL_INSTALL)
@@ -50,3 +52,10 @@ dist-hook:
          fi \
        fi
 
+if USE_HILDON
+desktopdir = $(datadir)/applications/hildon
+desktop_DATA = maemo/xournal.desktop 
+
+servicedir = $(libdir)/dbus-1.0/services
+service_DATA = maemo/xournal.service
+endif

diff --git a/configure.in b/configure.in
index d7e52a97e54b4dcab1331e9b87f6e59e435000c0..85c4e00b20187fd1fefad6530c6b506c87c00855 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -10,11 +10,20 @@ AC_PROG_CC
 AM_PROG_CC_STDC
 AC_HEADER_STDC
 
-pkg_modules="gtk+-2.0 >= 2.4.0 libgnomecanvas-2.0 >= 2.4.0 libgnomeprintui-2.2 >= 2.0.0"
+dnl set this var to NONE (PC) or other thing (Maemo)
+usehildon='NONE'
+if test "x$usehildon" != xNONE
+then
+  pkg_modules="gtk+-2.0 >= 2.4.0 libgnomecanvas-2.0 >= 2.4.0 libgnomeprintui-2.2 >= 2.0.0 hildon-libs libosso"
+else
+  pkg_modules="gtk+-2.0 >= 2.4.0 libgnomecanvas-2.0 >= 2.4.0 libgnomeprintui-2.2 >= 2.0.0"
+fi
 PKG_CHECK_MODULES(PACKAGE, [$pkg_modules])
 AC_SUBST(PACKAGE_CFLAGS)
 AC_SUBST(PACKAGE_LIBS)
 
+AM_CONDITIONAL(USE_HILDON, test "x$usehildon" != xNONE)
+
 AC_OUTPUT([
 Makefile
 src/Makefile