From: auroux Date: Sat, 3 Jun 2006 13:48:12 +0000 (+0000) Subject: Merged revision to configure.in (0.2.1 and Maemo) X-Git-Url: https://git.donarmstrong.com/?p=xournal.git;a=commitdiff_plain;h=b7f81681f4ad85328ff836d98bb2493cb22b2ee5 Merged revision to configure.in (0.2.1 and Maemo) --- diff --git a/configure.in b/configure.in index d7e52a9..ceb6249 100644 --- a/configure.in +++ b/configure.in @@ -10,13 +10,21 @@ 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 ]) -