X-Git-Url: http://git.maemo.org/git/?p=maemo-recorder;a=blobdiff_plain;f=configure.ac;h=1402df63dde390d2a7f4c0de7e2b7e8fc1f531ec;hp=182699257719a729e8e13431611370b2493c5e02;hb=1f88ed45c2aa50d140981764fcb8de1e479d833b;hpb=674479b9aa34a3ef8edd8f9bac83661c3e5e200d;ds=sidebyside diff --git a/configure.ac b/configure.ac index 1826992..1402df6 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_INIT(Makefile.am) -AM_INIT_AUTOMAKE(maemo_recorder, 0.0.15) +AM_INIT_AUTOMAKE(maemo-recorder, 0.2.0) AC_PROG_CPP AC_PROG_INSTALL @@ -46,11 +46,11 @@ PKG_CHECK_MODULES(GCONF, gconf-2.0 >= 2.6) AC_SUBST(GCONF_CFLAGS) AC_SUBST(GCONF_LIBS) -PKG_CHECK_MODULES(HILDON_LGPL, hildon-libs) +PKG_CHECK_MODULES(HILDON_LGPL, hildon-1) AC_SUBST(HILDON_LGPL_LIBS) AC_SUBST(HILDON_LGPL_CFLAGS) -PKG_CHECK_MODULES(HILDON_FM, hildon-fm) +PKG_CHECK_MODULES(HILDON_FM, hildon-fm-2) AC_SUBST(HILDON_FM_LIBS) AC_SUBST(HILDON_FM_CFLAGS) @@ -62,6 +62,10 @@ PKG_CHECK_MODULES(GNOME_VFS, gnome-vfs-2.0) AC_SUBST(GNOME_VFS_LIBS) AC_SUBST(GNOME_VFS_CFLAGS) +PKG_CHECK_MODULES(OSSO_EMAIL, libmodest-dbus-client-1.0) +AC_SUBST(OSSO_EMAIL_LIBS) +AC_SUBST(OSSO_EMAIL_CFLAGS) + dnl MIME-type registration AC_PATH_PROG(UPDATE_MIME_DATABASE, update-mime-database, no) AM_CONDITIONAL(HAVE_26_MIME, test x$UPDATE_MIME_DATABASE != xno) @@ -69,14 +73,15 @@ AM_CONDITIONAL(HAVE_26_MIME, test x$UPDATE_MIME_DATABASE != xno) AC_PATH_PROG(UPDATE_DESKTOP_DATABASE, update-desktop-database, no) AM_CONDITIONAL(HAVE_28_MIME, test x$UPDATE_DESKTOP_DATABASE != xno) -AC_PATH_PROG(OSSO_UPDATE_MIME, osso-update-category-database, no) -if test x"$OSSO_UPDATE_MIME" = xno; then - AC_MSG_ERROR([osso-update-category-database not found in your paths - should be installed with osso-update-category-database package]) -fi -AC_SUBST(OSSO_UPDATE_MIME) +#AC_PATH_PROG(OSSO_UPDATE_MIME, osso-update-category-database, no) +#if test x"$OSSO_UPDATE_MIME" = xno; then +# AC_MSG_ERROR([osso-update-category-database not found in your paths - should be installed with osso-update-category-database package]) +#fi +#AC_SUBST(OSSO_UPDATE_MIME) AC_OUTPUT([ Makefile \ src/Makefile \ - mime/Makefile ]) + mime/Makefile \ + data/Makefile ])