diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2010-09-08 01:37:34 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2010-09-08 01:37:34 +0000 |
| commit | d4f48636cc2631625434326e146d04f503d0247a (patch) | |
| tree | a371a2337bddce3de3fa3fcac52275a8204570d9 /kitchensync/configure.in.in | |
| parent | d8b40941f9d1a221add0b9094eb09405a91a8aab (diff) | |
| download | tdepim-d4f48636cc2631625434326e146d04f503d0247a.tar.gz tdepim-d4f48636cc2631625434326e146d04f503d0247a.zip | |
Reverse OpenSync patch as it causes a build failure on Debian
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1172771 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kitchensync/configure.in.in')
| -rw-r--r-- | kitchensync/configure.in.in | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/kitchensync/configure.in.in b/kitchensync/configure.in.in index 2aeebedcb..31bb902c6 100644 --- a/kitchensync/configure.in.in +++ b/kitchensync/configure.in.in @@ -29,7 +29,9 @@ export PKG_CONFIG_PATH=${PKG_CONFIG_PATH}:$prefix/lib/pkgconfig:/usr/local/lib/p HAVE_OPENSYNC=0 -PKG_CHECK_MODULES(OPENSYNC, opensync-1.0 >= 0.33, HAVE_OPENSYNC=1,HAVE_OPENSYNC=0) +HAVE_OPENSYNC_ENGINE=0 +PKG_CHECK_MODULES(OPENSYNC, opensync-1.0 >= 0.19, HAVE_OPENSYNC=1,HAVE_OPENSYNC=0) +PKG_CHECK_MODULES(OPENSYNCENGINE, osengine-1.0 >= 0.19, HAVE_OPENSYNC_ENGINE=1, HAVE_OPENSYNC_ENGINE=0) PKG_CHECK_MODULES(LIBXML, libxml-2.0, , HAVE_OPENSYNC=0) PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.6, , HAVE_OPENSYNC=0) @@ -50,9 +52,9 @@ AC_SUBST(OPENSYNC_FORMATSDIR) AC_SUBST(OPENSYNC_HEADERDIR) dnl Check if we can compile KitchenSync -AM_CONDITIONAL(compile_kitchensync, test "$HAVE_OPENSYNC" = 1) +AM_CONDITIONAL(compile_kitchensync, test "$HAVE_OPENSYNC" = 1 -a "$HAVE_OPENSYNC_ENGINE" = 1) -if test "$HAVE_OPENSYNC" = 1; then +if test "$HAVE_OPENSYNC" = 1 -a "$HAVE_OPENSYNC_ENGINE" = 1 ; then AC_MSG_RESULT([found]) else AC_MSG_RESULT([not found]) |