From 89426c885568df99413258f6365c08a3698539cf Mon Sep 17 00:00:00 2001 From: ivanfrade Date: Fri, 24 Mar 2006 17:55:57 +0000 Subject: [PATCH] Check usehildon variable to compile using correct libraries. Also check this to include desktop and service files in makefile --- Makefile.am | 11 ++++++++++- configure.in | 11 ++++++++++- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am index 7a982a6..0a4d4bc 100644 --- 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 d7e52a9..85c4e00 100644 --- 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 -- 2.39.2